##// END OF EJS Templates
code layout clean up app/views/issues/index.html.erb...
Toshi MARUYAMA -
r8394:077ddfbea3d9
parent child
Show More
@@ -1,14 +1,16
1 <div class="contextual">
1 <div class="contextual">
2 <% if !@query.new_record? && @query.editable_by?(User.current) %>
2 <% if !@query.new_record? && @query.editable_by?(User.current) %>
3 <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
3 <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
4 <%= link_to l(:button_delete), query_path(@query), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
4 <%= link_to l(:button_delete), query_path(@query), :confirm => l(:text_are_you_sure),
5 :method => :delete, :class => 'icon icon-del' %>
5 <% end %>
6 <% end %>
6 </div>
7 </div>
7
8
8 <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
9 <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
9 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
10 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
10
11
11 <% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
12 <% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
13 :method => :get, :id => 'query_form') do %>
12 <%= hidden_field_tag 'set_filter', '1' %>
14 <%= hidden_field_tag 'set_filter', '1' %>
13 <div id="query_form_content" class="hide-when-print">
15 <div id="query_form_content" class="hide-when-print">
14 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
16 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
@@ -27,7 +29,11
27 </tr>
29 </tr>
28 <tr>
30 <tr>
29 <td><label for='group_by'><%= l(:field_group_by) %></label></td>
31 <td><label for='group_by'><%= l(:field_group_by) %></label></td>
30 <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %></td>
32 <td><%= select_tag('group_by',
33 options_for_select(
34 [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
35 @query.group_by)
36 ) %></td>
31 </tr>
37 </tr>
32 </table>
38 </table>
33 </div>
39 </div>
@@ -38,7 +44,9
38 <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
44 <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
39 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
45 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
40 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
46 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
41 <%= link_to_function l(:button_save), "$('query_form').action='#{ @project ? new_project_query_path : new_query_path }'; submit_query_form('query_form')", :class => 'icon icon-save' %>
47 <%= link_to_function l(:button_save),
48 "$('query_form').action='#{ @project ? new_project_query_path : new_query_path }'; submit_query_form('query_form')",
49 :class => 'icon icon-save' %>
42 <% end %>
50 <% end %>
43 </p>
51 </p>
44 <% end %>
52 <% end %>
@@ -83,8 +91,15
83 <% end %>
91 <% end %>
84
92
85 <% content_for :header_tags do %>
93 <% content_for :header_tags do %>
86 <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
94 <%= auto_discovery_link_tag(:atom,
87 <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
95 {:query_id => @query, :format => 'atom',
96 :page => nil, :key => User.current.rss_key},
97 :title => l(:label_issue_plural)) %>
98 <%= auto_discovery_link_tag(:atom,
99 {:controller => 'journals', :action => 'index',
100 :query_id => @query, :format => 'atom',
101 :page => nil, :key => User.current.rss_key},
102 :title => l(:label_changes_details)) %>
88 <% end %>
103 <% end %>
89
104
90 <%= context_menu issues_context_menu_path %>
105 <%= context_menu issues_context_menu_path %>
General Comments 0
You need to be logged in to leave comments. Login now