Download as
Browse Code »

Commit f94d51d765b185c53a98f6541cb5b834117f4024

Authored by Dmitriy Zaporozhets
1 parent 42c46f37
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

moved project remove button to edit section

Showing 2 changed files with 8 additions and 14 deletions   Show diff stats
app/views/projects/_form.html.haml
  Diff comments   View file @f94d51d
... ... @@ -42,9 +42,6 @@
42 42 %td= f.text_area :description, :placeholder => "project description", :style => "height:50px"
43 43  
44 44 %br
45   - .actions
46   - = f.submit :class => "button"
47   -
48 45 %div{ :class => "ajax_loader", :style => "display:none;height:200px;"}
49 46 %center
50 47 = image_tag "ajax-loader.gif", :class => "append-bottom"
... ... @@ -52,6 +49,14 @@
52 49 %h3.prepend-top Creating project & repository. Please wait for few minutes
53 50 - else
54 51 %h3.prepend-top Updating project & repository. Please wait for few minutes
  52 +
  53 + .merge-tabs
  54 + = f.submit 'Save', :class => "grey-button"
  55 +  
  56 + - unless @project.new_record?
  57 + .right
  58 + = link_to 'Remove', @project, :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
  59 +
55 60  
56 61 :javascript
57 62 $('.new_project, .edit_project').bind('ajax:before', function() {
... ...
app/views/projects/empty.html.erb
  Diff comments   View file @f94d51d
... ... @@ -34,17 +34,6 @@ eos
34 34 %>
35 35 <%= raw bash_lexer.highlight(exist_repo_setup_str) %>
36 36  
37   - <br /><br />
38   - <h2>Remove this project?</h2>
39   - <div class="error">
40   - <p>
41   - Be careful! <br/>
42   - Project cant be recovered after destroy.</p>
43   - <%= link_to 'Destroy', @project,
44   - :confirm => 'Are you sure?', :method => :delete,
45   - :class => "left button negative span-6", :style => "text-align:center" %>
46   - <div class="clear"></div>
47   - </div>
48 37 <br/>
49 38 </div>
50 39 </div>
... ...