Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7d56a51b
Commit
7d56a51b
authored
Mar 26, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Js refactoring and ajax animation replaced
parent
f1c534c6
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
41 additions
and
54 deletions
+41
-54
app/assets/images/ajax-loader-facebook.gif
app/assets/images/ajax-loader-facebook.gif
+0
-0
app/assets/images/ajax-loader.gif
app/assets/images/ajax-loader.gif
+0
-0
app/assets/images/ajax_loader.gif
app/assets/images/ajax_loader.gif
+0
-0
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+4
-0
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+3
-1
app/assets/javascripts/projects.js
app/assets/javascripts/projects.js
+14
-0
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+1
-1
app/views/issues/index.html.haml
app/views/issues/index.html.haml
+1
-1
app/views/merge_requests/show.html.haml
app/views/merge_requests/show.html.haml
+1
-2
app/views/projects/_form.html.haml
app/views/projects/_form.html.haml
+1
-1
app/views/projects/create.js.haml
app/views/projects/create.js.haml
+1
-0
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+7
-24
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+7
-24
app/views/projects/update.js.haml
app/views/projects/update.js.haml
+1
-0
No files found.
app/assets/images/ajax-loader-facebook.gif
deleted
100644 → 0
View file @
f1c534c6
723 Bytes
app/assets/images/ajax-loader.gif
deleted
100644 → 0
View file @
f1c534c6
4.08 KB
app/assets/images/ajax_loader.gif
0 → 100644
View file @
7d56a51b
7.37 KB
app/assets/javascripts/application.js
View file @
7d56a51b
...
@@ -70,3 +70,7 @@ function showMenu() {
...
@@ -70,3 +70,7 @@ function showMenu() {
function
resetMenu
()
{
function
resetMenu
()
{
$
(
this
).
removeClass
(
"
hover
"
);
$
(
this
).
removeClass
(
"
hover
"
);
}
}
function
slugify
(
text
)
{
return
text
.
replace
(
/
[^
-a-zA-Z0-9
]
+/g
,
'
_
'
).
toLowerCase
();
}
app/assets/javascripts/merge_requests.js
View file @
7d56a51b
...
@@ -31,10 +31,12 @@ var MergeRequest = {
...
@@ -31,10 +31,12 @@ var MergeRequest = {
$
.
ajax
({
$
.
ajax
({
type
:
"
GET
"
,
type
:
"
GET
"
,
url
:
$
(
"
.merge-diffs-tab
"
).
attr
(
"
data-url
"
),
url
:
$
(
"
.merge-diffs-tab
"
).
attr
(
"
data-url
"
),
beforeSend
:
function
(){
$
(
'
.status
'
).
addClass
(
"
loading
"
)},
complete
:
function
(){
complete
:
function
(){
MergeRequest
.
diffs_loaded
=
true
;
MergeRequest
.
diffs_loaded
=
true
;
$
(
"
.merge_request_notes
"
).
hide
();
$
(
"
.merge_request_notes
"
).
hide
();
$
(
"
.dashboard-loader
"
).
hide
()},
$
(
'
.status
'
).
removeClass
(
"
loading
"
);
},
dataType
:
"
script
"
});
dataType
:
"
script
"
});
}
}
}
}
app/assets/javascripts/projects.js
0 → 100644
View file @
7d56a51b
function
Projects
()
{
$
(
"
#project_name
"
).
live
(
"
change
"
,
function
(){
var
slug
=
slugify
(
$
(
this
).
val
());
$
(
"
#project_code
"
).
val
(
slug
);
$
(
"
#project_path
"
).
val
(
slug
);
});
$
(
'
.new_project, .edit_project
'
).
live
(
'
ajax:before
'
,
function
()
{
$
(
'
.project_new_holder, .project_edit_holder
'
).
hide
();
$
(
'
.ajax_loader
'
).
show
();
});
$
(
'
form #project_default_branch
'
).
chosen
();
}
app/assets/stylesheets/common.scss
View file @
7d56a51b
...
@@ -589,7 +589,7 @@ table a code {
...
@@ -589,7 +589,7 @@ table a code {
.loading
{
.loading
{
margin
:
20px
auto
;
margin
:
20px
auto
;
background
:
url(ajax
-loader-facebook
.gif)
no-repeat
center
center
;
background
:
url(ajax
_loader
.gif)
no-repeat
center
center
;
width
:
40px
;
width
:
40px
;
height
:
40px
;
height
:
40px
;
}
}
...
...
app/views/issues/index.html.haml
View file @
7d56a51b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Issues
Issues
%span
.rss-icon
%span
.rss-icon
=
link_to
project_issues_path
(
@project
,
:atom
,
{
:private_token
=>
current_user
.
private_token
})
do
=
link_to
project_issues_path
(
@project
,
:atom
,
{
:private_token
=>
current_user
.
private_token
})
do
=
image_tag
"Rss-UI.PNG"
,
:width
=>
22
,
:title
=>
"feed"
=
image_tag
"Rss-UI.PNG"
,
:width
=>
16
,
:title
=>
"feed"
-
if
can?
current_user
,
:write_issue
,
@project
-
if
can?
current_user
,
:write_issue
,
@project
=
link_to
new_project_issue_path
(
@project
),
:class
=>
"right btn small"
,
:title
=>
"New Issue"
,
:remote
=>
true
do
=
link_to
new_project_issue_path
(
@project
),
:class
=>
"right btn small"
,
:title
=>
"New Issue"
,
:remote
=>
true
do
...
...
app/views/merge_requests/show.html.haml
View file @
7d56a51b
...
@@ -73,12 +73,11 @@
...
@@ -73,12 +73,11 @@
=
link_to
"#diffs"
,
"data-url"
=>
diffs_project_merge_request_path
(
@project
,
@merge_request
),
:class
=>
"merge-diffs-tab tab"
do
=
link_to
"#diffs"
,
"data-url"
=>
diffs_project_merge_request_path
(
@project
,
@merge_request
),
:class
=>
"merge-diffs-tab tab"
do
Diff
Diff
%img
{
:src
=>
"/assets/ajax-loader-facebook.gif"
,
:class
=>
"dashboard-loader"
}
.merge_request_notes
#notes
=
render
"notes/notes"
,
:tid
=>
@merge_request
.
id
,
:tt
=>
"merge_request"
.merge_request_notes
#notes
=
render
"notes/notes"
,
:tid
=>
@merge_request
.
id
,
:tt
=>
"merge_request"
.merge-request-diffs
.merge-request-diffs
.status
:javascript
:javascript
$
(
function
(){
$
(
function
(){
...
...
app/views/projects/_form.html.haml
View file @
7d56a51b
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
.clearfix
.clearfix
=
f
.
label
:description
=
f
.
label
:description
.input
.input
=
f
.
text_area
:description
,
:placeholder
=>
"project description"
,
:class
=>
"x
large"
,
:rows
=>
4
=
f
.
text_area
:description
,
:placeholder
=>
"project description"
,
:class
=>
"x
xlarge"
,
:rows
=>
5
%p
.hint
Markdown is enabled.
%p
.hint
Markdown is enabled.
%br
%br
...
...
app/views/projects/create.js.haml
View file @
7d56a51b
...
@@ -3,5 +3,6 @@
...
@@ -3,5 +3,6 @@
location.href = "
#{
project_path
(
@project
,
:notice
=>
'Project was successfully created.'
)
}
";
location.href = "
#{
project_path
(
@project
,
:notice
=>
'Project was successfully created.'
)
}
";
-
else
-
else
:plain
:plain
$('.project_new_holder').show();
$("#new_project").replaceWith("
#{
escape_javascript
(
render
(
'form'
))
}
");
$("#new_project").replaceWith("
#{
escape_javascript
(
render
(
'form'
))
}
");
$('.ajax_loader').hide();
$('.ajax_loader').hide();
app/views/projects/edit.html.haml
View file @
7d56a51b
=
render
"project_head"
=
render
"project_head"
%h3
Edit Project
.project_edit_holder
%hr
%h3
Edit Project
=
render
"projects/form"
%hr
%div
{
:class
=>
"ajax_loader"
,
:style
=>
"display:none;height:200px;"
}
=
render
"projects/form"
%div
.ajax_loader.hide
%center
%center
=
image_tag
"ajax-loader.gif"
,
:class
=>
"append-bottom
"
%div
.padded
=
image_tag
"ajax_loader.gif
"
%h3
.prepend-top
Saving project
&
repository. Please wait...
%h3
.prepend-top
Saving project
&
repository. Please wait...
:javascript
:javascript
$
(
function
(){
$
(
function
(){
new
Projects
();
});
$
(
"
#project_name
"
).
live
(
"
change
"
,
function
(){
var
slug
=
slugify
(
$
(
this
).
val
());
$
(
"
#project_code
"
).
val
(
slug
);
$
(
"
#project_path
"
).
val
(
slug
);
});
});
function
slugify
(
text
)
{
return
text
.
replace
(
/
[^
-a-zA-Z0-9
]
+/g
,
'
_
'
).
toLowerCase
();
}
$
(
function
(){
$
(
'
.edit_project
'
).
live
(
'
ajax:before
'
,
function
()
{
$
(
this
).
hide
();
$
(
'
.ajax_loader
'
).
show
();
});
$
(
'
form #project_default_branch
'
).
chosen
();
})
app/views/projects/new.html.haml
View file @
7d56a51b
%h3
New Project
.project_new_holder
%hr
%h3
New Project
=
render
'form'
%hr
%div
{
:class
=>
"ajax_loader"
,
:style
=>
"display:none;height:200px;"
}
=
render
'form'
%div
.ajax_loader.hide
%center
%center
=
image_tag
"ajax-loader.gif"
,
:class
=>
"append-bottom
"
%div
.padded
=
image_tag
"ajax_loader.gif
"
%h3
.prepend-top
Creating project
&
repository. Please wait for few minutes
%h3
.prepend-top
Creating project
&
repository. Please wait for few minutes
:javascript
:javascript
$
(
function
(){
$
(
function
(){
new
Projects
();
});
$
(
"
#project_name
"
).
live
(
"
change
"
,
function
(){
var
slug
=
slugify
(
$
(
this
).
val
());
$
(
"
#project_code
"
).
val
(
slug
);
$
(
"
#project_path
"
).
val
(
slug
);
});
});
function
slugify
(
text
)
{
return
text
.
replace
(
/
[^
-a-zA-Z0-9
]
+/g
,
'
_
'
).
toLowerCase
();
}
$
(
function
(){
$
(
'
.new_project
'
).
live
(
'
ajax:before
'
,
function
()
{
$
(
this
).
hide
();
$
(
'
.ajax_loader
'
).
show
();
});
$
(
'
form #project_default_branch
'
).
chosen
();
})
app/views/projects/update.js.haml
View file @
7d56a51b
...
@@ -3,5 +3,6 @@
...
@@ -3,5 +3,6 @@
location.href = "
#{
edit_project_path
(
@project
,
:notice
=>
'Project was successfully updated.'
)
}
";
location.href = "
#{
edit_project_path
(
@project
,
:notice
=>
'Project was successfully updated.'
)
}
";
-
else
-
else
:plain
:plain
$('.project_edit_holder').show();
$(".edit_project").replaceWith("
#{
escape_javascript
(
render
(
'form'
))
}
");
$(".edit_project").replaceWith("
#{
escape_javascript
(
render
(
'form'
))
}
");
$('.ajax_loader').hide();
$('.ajax_loader').hide();
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment