diff --git a/app/assets/images/ajax-loader-facebook.gif b/app/assets/images/ajax-loader-facebook.gif deleted file mode 100644 index 6350e5f4..00000000 Binary files a/app/assets/images/ajax-loader-facebook.gif and /dev/null differ diff --git a/app/assets/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif deleted file mode 100644 index c97ec6ea..00000000 Binary files a/app/assets/images/ajax-loader.gif and /dev/null differ diff --git a/app/assets/images/ajax_loader.gif b/app/assets/images/ajax_loader.gif new file mode 100644 index 00000000..c585e8f9 Binary files /dev/null and b/app/assets/images/ajax_loader.gif differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 85fb8e78..042bca91 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -70,3 +70,7 @@ function showMenu() { function resetMenu() { $(this).removeClass("hover"); } + +function slugify(text) { + return text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase(); +} diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 96bc1ccb..b051928e 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -31,10 +31,12 @@ var MergeRequest = { $.ajax({ type: "GET", url: $(".merge-diffs-tab").attr("data-url"), + beforeSend: function(){ $('.status').addClass("loading")}, complete: function(){ MergeRequest.diffs_loaded = true; $(".merge_request_notes").hide(); - $(".dashboard-loader").hide()}, + $('.status').removeClass("loading"); + }, dataType: "script"}); } } diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js new file mode 100644 index 00000000..84272698 --- /dev/null +++ b/app/assets/javascripts/projects.js @@ -0,0 +1,14 @@ +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(); +} diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d785d4ff..eaf8e6af 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -589,7 +589,7 @@ table a code { .loading { margin:20px auto; - background: url(ajax-loader-facebook.gif) no-repeat center center; + background: url(ajax_loader.gif) no-repeat center center; width:40px; height:40px; } diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 283e936e..7146027b 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -3,7 +3,7 @@ Issues %span.rss-icon = 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 = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 4f1d49b8..88624a58 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -73,12 +73,11 @@ = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do 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-diffs - +.status :javascript $(function(){ diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 5d22f11d..8f6244f2 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -49,7 +49,7 @@ .clearfix = f.label :description .input - = f.text_area :description, :placeholder => "project description", :class => "xlarge", :rows => 4 + = f.text_area :description, :placeholder => "project description", :class => "xxlarge", :rows => 5 %p.hint Markdown is enabled. %br diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml index 2b3106c8..80ca332d 100644 --- a/app/views/projects/create.js.haml +++ b/app/views/projects/create.js.haml @@ -3,5 +3,6 @@ location.href = "#{project_path(@project, :notice => 'Project was successfully created.')}"; - else :plain + $('.project_new_holder').show(); $("#new_project").replaceWith("#{escape_javascript(render('form'))}"); $('.ajax_loader').hide(); diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index be8aae7d..53a0320b 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -1,29 +1,12 @@ = render "project_head" -%h3 Edit Project -%hr -= render "projects/form" -%div{ :class => "ajax_loader", :style => "display:none;height:200px;"} +.project_edit_holder + %h3 Edit Project + %hr + = render "projects/form" +%div.ajax_loader.hide %center - = image_tag "ajax-loader.gif", :class => "append-bottom" + %div.padded= image_tag "ajax_loader.gif" %h3.prepend-top Saving project & repository. Please wait... :javascript - $(function(){ - $("#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(); - }) + $(function(){ new Projects(); }); diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 5883e7b8..3f3d51d0 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -1,28 +1,11 @@ -%h3 New Project -%hr -= render 'form' -%div{ :class => "ajax_loader", :style => "display:none;height:200px;"} +.project_new_holder + %h3 New Project + %hr + = render 'form' +%div.ajax_loader.hide %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 :javascript - $(function(){ - $("#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(); - }) + $(function(){ new Projects(); }); diff --git a/app/views/projects/update.js.haml b/app/views/projects/update.js.haml index de12527e..ee0d3699 100644 --- a/app/views/projects/update.js.haml +++ b/app/views/projects/update.js.haml @@ -3,5 +3,6 @@ location.href = "#{edit_project_path(@project, :notice => 'Project was successfully updated.')}"; - else :plain + $('.project_edit_holder').show(); $(".edit_project").replaceWith("#{escape_javascript(render('form'))}"); $('.ajax_loader').hide();