diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2011-12-15 21:42:33 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2011-12-15 21:42:33 +0200 |
| commit | f94d51d765b185c53a98f6541cb5b834117f4024 (patch) | |
| tree | c745a019a8112a1cf721018463ab6af6e6986fdf | |
| parent | 42c46f3720d86857ef256ad368226093f7768ecd (diff) | |
| download | gitlab-ce-f94d51d765b185c53a98f6541cb5b834117f4024.tar.gz | |
moved project remove button to edit section
| -rw-r--r-- | app/views/projects/_form.html.haml | 11 | ||||
| -rw-r--r-- | app/views/projects/empty.html.erb | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 254563bda81..788c2b462c2 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -42,9 +42,6 @@ %td= f.text_area :description, :placeholder => "project description", :style => "height:50px" %br - .actions - = f.submit :class => "button" - %div{ :class => "ajax_loader", :style => "display:none;height:200px;"} %center = image_tag "ajax-loader.gif", :class => "append-bottom" @@ -52,6 +49,14 @@ %h3.prepend-top Creating project & repository. Please wait for few minutes - else %h3.prepend-top Updating project & repository. Please wait for few minutes + + .merge-tabs + = f.submit 'Save', :class => "grey-button" + + - unless @project.new_record? + .right + = link_to 'Remove', @project, :confirm => 'Are you sure?', :method => :delete, :class => "red-button" + :javascript $('.new_project, .edit_project').bind('ajax:before', function() { diff --git a/app/views/projects/empty.html.erb b/app/views/projects/empty.html.erb index a4c359d3d4b..b85f801edd0 100644 --- a/app/views/projects/empty.html.erb +++ b/app/views/projects/empty.html.erb @@ -34,17 +34,6 @@ eos %> <%= raw bash_lexer.highlight(exist_repo_setup_str) %> - <br /><br /> - <h2>Remove this project?</h2> - <div class="error"> - <p> - Be careful! <br/> - Project cant be recovered after destroy.</p> - <%= link_to 'Destroy', @project, - :confirm => 'Are you sure?', :method => :delete, - :class => "left button negative span-6", :style => "text-align:center" %> - <div class="clear"></div> - </div> <br/> </div> </div> |