Project

General

Profile

Download (17.5 KB)

Feature #23555 » rm_23555_add_cancel_button.patch

Marius BĂLTEANU, 2017-03-08 07:09

View differences:

app/views/auth_sources/edit.html.erb
3 3 
<%= labelled_form_for @auth_source, :as => :auth_source, :url => auth_source_path(@auth_source), :html => {:id => 'auth_source_form'} do |f| %>
4 4 
  <%= render :partial => auth_source_partial_name(@auth_source), :locals => { :f => f } %>
5 5 
  <%= submit_tag l(:button_save) %>
6 
  <%= link_to l(:button_cancel), url_for(:back) %>
6 7 
<% end %>
app/views/auth_sources/new.html.erb
4 4 
  <%= hidden_field_tag 'type', @auth_source.type %>
5 5 
  <%= render :partial => auth_source_partial_name(@auth_source), :locals => { :f => f } %>
6 6 
  <%= submit_tag l(:button_create) %>
7 
  <%= link_to l(:button_cancel), url_for(:back) %>
7 8 
<% end %>
app/views/custom_fields/select_type.html.erb
10 10 
  <% end %>
11 11 
  </p>
12 12 
  </div>
13 
  <p><%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %></p>
13 
  <p>
14 
    <%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %>
15 
    <%= link_to l(:button_cancel), url_for(:back) %>
16 
  </p>
14 17 
<% end %>
app/views/documents/new.html.erb
2 2 

  		




  3
  3
  
    
<%= labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>

  		




  4
  4
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  5
  
  
    
  <p><%= submit_tag l(:button_create) %></p>

  		




  
  5
  
    
  <p>

  		




  
  6
  
    
    <%= submit_tag l(:button_create) %>

  		




  
  7
  
    
    <%= link_to l(:button_cancel), url_for(:back) %>

  		




  
  8
  
    
  </p>

  		




  6
  9
  
    
<% end %>

  		












  

    
      app/views/enumerations/edit.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put, :multipart => true} do |f| %>

  		




  4
  4
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  5
  5
  
    
  <%= submit_tag l(:button_save) %>

  		




  
  6
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/enumerations/new.html.erb
    
  





  4
  4
  
    
  <%= f.hidden_field :type  %>

  		




  5
  5
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  6
  6
  
    
  <%= submit_tag l(:button_create) %>

  		




  
  7
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  7
  8
  
    
<% end %>

  		












  

    
      app/views/files/new.html.erb
    
  





  13
  13
  
    
<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>

  		




  14
  14
  
    
</div>

  		




  15
  15
  
    
<%= submit_tag l(:button_add) %>

  		




  
  16
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  16
  17
  
    
<% end %>

  		












  

    
      app/views/groups/_general.html.erb
    
  





  1
  1
  
    
<%= labelled_form_for @group, :url => group_path(@group), :html => {:multipart => true} do |f| %>

  		




  2
  2
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  3
  3
  
    
<%= submit_tag l(:button_save) %>

  		




  
  4
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  4
  5
  
    
<% end %>

  		












  

    
      app/views/groups/new.html.erb
    
  





  5
  5
  
    
<p>

  		




  6
  6
  
    
  <%= f.submit l(:button_create) %>

  		




  7
  7
  
    
  <%= f.submit l(:button_create_and_continue), :name => 'continue' %>

  		




  
  8
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  8
  9
  
    
</p>

  		




  9
  10
  
    
<% end %>

  		












  

    
      app/views/issue_categories/edit.html.erb
    
  





  4
  4
  
    
                     :url => issue_category_path(@category), :html => {:method => :put} do |f| %>

  		




  5
  5
  
    
<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>

  		




  6
  6
  
    
<%= submit_tag l(:button_save) %>

  		




  
  7
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  7
  8
  
    
<% end %>

  		












  

    
      app/views/issue_categories/new.html.erb
    
  





  4
  4
  
    
                      :url => project_issue_categories_path(@project) do |f| %>

  		




  5
  5
  
    
<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>

  		




  6
  6
  
    
<%= submit_tag l(:button_create) %>

  		




  
  7
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  7
  8
  
    
<% end %>

  		












  

    
      app/views/issue_statuses/edit.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @issue_status do |f| %>

  		




  4
  4
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  5
  5
  
    
  <%= submit_tag l(:button_save) %>

  		




  
  6
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/issue_statuses/new.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @issue_status do |f| %>

  		




  4
  4
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  5
  5
  
    
  <%= submit_tag l(:button_create) %>

  		




  
  6
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/issues/bulk_edit.html.erb
    
  





  188
  188
  
    

  		




  189
  189
  
    
<% if @values_by_custom_field.present? %>

  		




  190
  190
  
    
<div class="flash warning">

  		




  191
  
  
    
  <%= l(:warning_fields_cleared_on_bulk_edit) %>:<br /> 

  		




  
  191
  
    
  <%= l(:warning_fields_cleared_on_bulk_edit) %>:<br />

  		




  192
  192
  
    
  <%= safe_join(@values_by_custom_field.map {|field, ids| content_tag "span", "#{field.name} (#{ids.size})"}, ', ') %>

  		




  193
  193
  
    
</div>

  		




  194
  194
  
    
<% end %>

  		




  ......




  204
  204
  
    
  <% else %>

  		




  205
  205
  
    
    <%= submit_tag l(:button_submit) %>

  		




  206
  206
  
    
  <% end %>

  		




  
  207
  
    
    <%= link_to l(:button_cancel), url_for(:back) %>

  		




  207
  208
  
    
</p>

  		




  208
  209
  
    

  		




  209
  210
  
    
<% end %>

  		












  

    
      app/views/issues/new.html.erb
    
  





  51
  51
  
    
  <%= submit_tag l(:button_create) %>

  		




  52
  52
  
    
  <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

  		




  53
  53
  
    
  <%= preview_link preview_new_issue_path(:project_id => @issue.project), 'issue-form' %>

  		




  
  54
  
    
  | <%= link_to l(:button_cancel), url_for(:back) %>

  		




  54
  55
  
    
<% end %>

  		




  55
  56
  
    

  		




  56
  57
  
    
<div id="preview" class="wiki"></div>

  		












  

    
      app/views/my/account.html.erb
    
  





  34
  34
  
    
  <%= call_hook(:view_my_account, :user => @user, :form => f) %>

  		




  35
  35
  
    
</fieldset>

  		




  36
  36
  
    

  		




  37
  
  
    
<p class="mobile-hide"><%= submit_tag l(:button_save) %></p>

  		




  
  37
  
    
<p class="mobile-hide">

  		




  
  38
  
    
  <%= submit_tag l(:button_save) %>

  		




  
  39
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  
  40
  
    
</p>

  		




  38
  41
  
    
</div>

  		




  39
  42
  
    

  		




  40
  43
  
    
<div class="splitcontentright">

  		












  

    
      app/views/news/edit.html.erb
    
  





  4
  4
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  5
  5
  
    
<%= submit_tag l(:button_save) %>

  		




  6
  6
  
    
<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %>

  		




  
  7
  
    
| <%= link_to l(:button_cancel), url_for(:back) %>

  		




  7
  8
  
    
<% end %>

  		




  8
  9
  
    
<div id="preview" class="wiki"></div>

  		




  9
  10
  
    

  		












  

    
      app/views/news/new.html.erb
    
  





  5
  5
  
    
  <%= render :partial => 'news/form', :locals => { :f => f } %>

  		




  6
  6
  
    
  <%= submit_tag l(:button_create) %>

  		




  7
  7
  
    
  <%= preview_link preview_news_path(:project_id => @project), 'news-form' %>

  		




  
  8
  
    
  | <%= link_to l(:button_cancel), url_for(:back) %>

  		




  8
  9
  
    
<% end %>

  		




  9
  10
  
    
<div id="preview" class="wiki"></div>

  		












  

    
      app/views/projects/_edit.html.erb
    
  





  1
  1
  
    
<%= labelled_form_for @project, :html => {:multipart => true} do |f| %>

  		




  2
  2
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  3
  3
  
    
<%= submit_tag l(:button_save) %>

  		




  
  4
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  4
  5
  
    
<% end %>

  		












  

    
      app/views/projects/new.html.erb
    
  





  4
  4
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  5
  5
  
    
<%= submit_tag l(:button_create) %>

  		




  6
  6
  
    
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

  		




  
  7
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  7
  8
  
    
<% end %>

  		












  

    
      app/views/projects/settings/_activities.html.erb
    
  





  39
  39
  
    
</div>

  		




  40
  40
  
    

  		




  41
  41
  
    
<%= submit_tag l(:button_save) %>

  		




  
  42
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  42
  43
  
    
<% end %>

  		












  

    
      app/views/roles/edit.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @role do |f| %>

  		




  4
  4
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  5
  5
  
    
<%= submit_tag l(:button_save) %>

  		




  
  6
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/roles/new.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @role do |f| %>

  		




  4
  4
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  5
  5
  
    
<%= submit_tag l(:button_create) %>

  		




  
  6
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/roles/permissions.html.erb
    
  





  58
  58
  
    
</table>

  		




  59
  59
  
    
</div>

  		




  60
  60
  
    
<p><%= check_all_links 'permissions_form' %></p>

  		




  61
  
  
    
<p><%= submit_tag l(:button_save) %></p>

  		




  
  61
  
    
<p>

  		




  
  62
  
    
  <%= submit_tag l(:button_save) %>

  		




  
  63
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  
  64
  
    
</p>

  		




  62
  65
  
    
<% end %>

  		












  

    
      app/views/search/index.html.erb
    
  





  32
  32
  
    
<%= hidden_field_tag 'options', '', :id => 'show-options' %>

  		




  33
  33
  
    

  		




  34
  34
  
    
</div>

  		




  35
  
  
    
<p><%= submit_tag l(:button_submit) %></p>

  		




  
  35
  
    
<p>

  		




  
  36
  
    
  <%= submit_tag l(:button_submit) %>

  		




  
  37
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  
  38
  
    
</p>

  		




  36
  39
  
    
<% end %>

  		




  37
  40
  
    

  		




  38
  41
  
    
<% if @results %>

  		












  

    
      app/views/timelog/bulk_edit.html.erb
    
  





  46
  46
  
    
  </div>

  		




  47
  47
  
    
</div>

  		




  48
  48
  
    

  		




  49
  
  
    
<p><%= submit_tag l(:button_submit) %></p>

  		




  
  49
  
    
<p>

  		




  
  50
  
    
  <%= submit_tag l(:button_submit) %>

  		




  
  51
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  
  52
  
    
</p>

  		




  50
  53
  
    
<% end %>

  		












  

    
      app/views/timelog/edit.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %>

  		




  4
  4
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  5
  5
  
    
  <%= submit_tag l(:button_save) %>

  		




  
  6
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/timelog/new.html.erb
    
  





  4
  4
  
    
  <%= render :partial => 'form', :locals => {:f => f} %>

  		




  5
  5
  
    
  <%= submit_tag l(:button_create) %>

  		




  6
  6
  
    
  <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

  		




  
  7
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  7
  8
  
    
<% end %>

  		












  

    
      app/views/trackers/_form.html.erb
    
  





  41
  41
  
    
<!--[eoform:tracker]-->

  		




  42
  42
  
    
</div>

  		




  43
  43
  
    
<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>

  		




  
  44
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  44
  45
  
    
</div>

  		




  45
  46
  
    

  		




  46
  47
  
    
<div class="splitcontentright">

  		












  

    
      app/views/trackers/fields.html.erb
    
  





  68
  68
  
    
    </tbody>

  		




  69
  69
  
    
    </table>

  		




  70
  70
  
    
    </div>

  		




  71
  
  
    
    <p><%= submit_tag l(:button_save) %></p>

  		




  
  71
  
    
    <p>

  		




  
  72
  
    
      <%= submit_tag l(:button_save) %>

  		




  
  73
  
    
      <%= link_to l(:button_cancel), url_for(:back) %>

  		




  
  74
  
    
    </p>

  		




  72
  75
  
    
    <% @trackers.each do |tracker| %>

  		




  73
  76
  
    
      <%= hidden_field_tag "trackers[#{tracker.id}][core_fields][]", '' %>

  		




  74
  77
  
    
      <%= hidden_field_tag "trackers[#{tracker.id}][custom_field_ids][]", '' %>

  		












  

    
      app/views/users/_general.html.erb
    
  





  4
  4
  
    
    <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>

  		




  5
  5
  
    
  <% end -%>

  		




  6
  6
  
    
  <p><%= submit_tag l(:button_save) %></p>

  		




  
  7
  
    

  		




  7
  8
  
    
<% end %>

  		












  

    
      app/views/users/new.html.erb
    
  





  8
  8
  
    
  <p>

  		




  9
  9
  
    
    <%= submit_tag l(:button_create) %>

  		




  10
  10
  
    
    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

  		




  
  11
  
    
    <%= link_to l(:button_cancel), url_for(:back) %>

  		




  11
  12
  
    
  </p>

  		




  12
  13
  
    
<% end %>

  		




  13
  14
  
    

  		












  

    
      app/views/versions/edit.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @version, :html => {:multipart => true} do |f| %>

  		




  4
  4
  
    
<%= render :partial => 'form', :locals => { :f => f } %>

  		




  5
  5
  
    
<%= submit_tag l(:button_save) %>

  		




  
  6
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		




  7
  8
  
    

  		












  

    
      app/views/versions/new.html.erb
    
  





  3
  3
  
    
<%= labelled_form_for @version, :url => project_versions_path(@project), :html => {:multipart => true} do |f| %>

  		




  4
  4
  
    
<%= render :partial => 'versions/form', :locals => { :f => f } %>

  		




  5
  5
  
    
<%= submit_tag l(:button_create) %>

  		




  
  6
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  6
  7
  
    
<% end %>

  		












  

    
      app/views/wiki/new.html.erb
    
  





  13
  13
  
    
  </div>

  		




  14
  14
  
    

  		




  15
  15
  
    
  <%= submit_tag(l(:label_next)) %>

  		




  
  16
  
    
  <%= link_to l(:button_cancel), url_for(:back) %>

  		




  16
  17
  
    

  		




  17
  18
  
    
<% end %>

  		












  

    
      app/views/workflows/copy.html.erb
    
  





  35
  35
  
    
</p>

  		




  36
  36
  
    
</fieldset>

  		




  37
  37
  
    
<%= submit_tag l(:button_copy) %>

  		




  
  38
  
    
<%= link_to l(:button_cancel), url_for(:back) %>

  		




  38
  39
  
    
<% end %>

  		















  (2-2/2)