Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts: app/views/users/show.html.erbGitlabVersion
commit
4bd083b059
@ -1,120 +1,127 @@
|
|||||||
<div class="content-title-top">
|
<div class="content-title-top">
|
||||||
<div>
|
<% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
|
||||||
<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
|
<div>
|
||||||
:html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
|
<%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
|
||||||
|
:html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
|
||||||
|
|
||||||
<%= link_to l(:label_query), '#', :class => 'icon icon-help',
|
<%= link_to l(:label_query), '#', :class => 'icon icon-help',
|
||||||
:onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
|
:onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
|
||||||
</div>
|
</div>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<% if !@query.new_record? && @query.editable_by?(User.current) %>
|
<% if !@query.new_record? && @query.editable_by?(User.current) %>
|
||||||
<%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
|
<%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
|
||||||
<%= delete_link query_path(@query) %>
|
<%= delete_link query_path(@query) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
|
<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
|
||||||
<div style="clear:right; ">
|
<div style="clear:right; ">
|
||||||
<%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form', :class => 'query_form') do %>
|
<%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %>
|
||||||
<%= hidden_field_tag 'set_filter', '1' %>
|
<%= hidden_field_tag 'set_filter', '1' %>
|
||||||
|
|
||||||
<div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
|
<div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
|
||||||
<span>---<%= l :label_query_new %>---</span>
|
<span>---<%= l :label_query_new %>---</span>
|
||||||
<div id="query_form_content" class="hide-when-print">
|
|
||||||
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
|
<div id="query_form_content" class="hide-when-print">
|
||||||
<legend onclick="toggleFieldset(this);">
|
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
|
||||||
<%= l(:label_issue_query_condition) %>
|
<legend onclick="toggleFieldset(this);">
|
||||||
</legend>
|
<%= l(:label_issue_query_condition) %>
|
||||||
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
|
</legend>
|
||||||
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
<div style="<%= @query.new_record? ? "" : "display: none;" %>">
|
||||||
</div>
|
<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
|
||||||
</fieldset>
|
</div>
|
||||||
<fieldset class="collapsible collapsed" >
|
</fieldset>
|
||||||
<legend onclick="toggleFieldset(this);">
|
<fieldset class="collapsible collapsed">
|
||||||
<%= l(:label_options) %>
|
<legend onclick="toggleFieldset(this);">
|
||||||
</legend>
|
<%= l(:label_options) %>
|
||||||
<div style="display: none;">
|
</legend>
|
||||||
<table>
|
<div style="display: none;">
|
||||||
<tr>
|
<table>
|
||||||
<td><%= l(:field_column_names) %></td>
|
<tr>
|
||||||
<td><%= render_query_columns_selection(@query) %></td>
|
<td><%= l(:field_column_names) %></td>
|
||||||
</tr>
|
<td><%= render_query_columns_selection(@query) %></td>
|
||||||
<tr>
|
</tr>
|
||||||
<td><label for='group_by'><%= l(:field_group_by) %></label></td>
|
<tr>
|
||||||
<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by) ) %></td>
|
<td><label for='group_by'><%= l(:field_group_by) %></label></td>
|
||||||
</tr>
|
<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
|
||||||
<tr>
|
</tr>
|
||||||
<td><%= l(:button_show) %></td>
|
<tr>
|
||||||
<td><%= available_block_columns_tags(@query) %></td>
|
<td><%= l(:button_show) %></td>
|
||||||
</tr>
|
<td><%= available_block_columns_tags(@query) %></td>
|
||||||
</table>
|
</tr>
|
||||||
</div>
|
</table>
|
||||||
</fieldset>
|
</div>
|
||||||
<div class="buttons hide-when-print">
|
</fieldset>
|
||||||
<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
|
<div class="buttons hide-when-print">
|
||||||
<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
|
<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
|
||||||
</div>
|
<%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
</div>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%= error_messages_for 'query' %>
|
<%= error_messages_for 'query' %>
|
||||||
|
|
||||||
<% if @query.valid? %>
|
<% if @query.valid? %>
|
||||||
<% if @issues.empty? %>
|
<% if @issues.empty? %>
|
||||||
<p class="nodata">
|
<p class="nodata">
|
||||||
<%= l(:label_no_data) %>
|
<%= l(:label_no_data) %>
|
||||||
</p>
|
</p>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
|
<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
|
||||||
<div class="pagination"><ul><%= pagination_links_full @issue_pages, @issue_count %></ul></div>
|
<div class="pagination">
|
||||||
<% end %>
|
<ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
|
||||||
<div style="float: right; padding-top: 30px">
|
</div>
|
||||||
<% other_formats_links do |f| %>
|
<% end %>
|
||||||
<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
|
<div style="float: right; padding-top: 30px">
|
||||||
<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
<% other_formats_links do |f| %>
|
||||||
<%= f.link_to 'PDF', :url => params %>
|
<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
|
||||||
<% end %>
|
<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
||||||
</div>
|
<%= f.link_to 'PDF', :url => params %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
<div id="csv-export-options" style="display:none;">
|
|
||||||
<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
|
|
||||||
<%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
|
<div id="csv-export-options" style="display:none;">
|
||||||
<p>
|
<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
|
||||||
<label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
|
<%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
|
||||||
</p>
|
<p>
|
||||||
<p>
|
<label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
|
||||||
<label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
|
</p>
|
||||||
</p>
|
|
||||||
<p class="buttons">
|
<p>
|
||||||
<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
|
<label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
|
||||||
<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
|
</p>
|
||||||
</p>
|
|
||||||
<% end %>
|
<p class="buttons">
|
||||||
</div>
|
<%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
|
||||||
|
<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
|
<%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
|
||||||
|
|
||||||
<% content_for :sidebar do %>
|
<% content_for :sidebar do %>
|
||||||
<%= render :partial => 'issues/sidebar' %>
|
<%= render :partial => 'issues/sidebar' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= auto_discovery_link_tag(:atom,
|
<%= auto_discovery_link_tag(:atom,
|
||||||
{:query_id => @query, :format => 'atom',
|
{:query_id => @query, :format => 'atom',
|
||||||
:page => nil, :key => User.current.rss_key},
|
:page => nil, :key => User.current.rss_key},
|
||||||
:title => l(:label_issue_plural)) %>
|
:title => l(:label_issue_plural)) %>
|
||||||
<%= auto_discovery_link_tag(:atom,
|
<%= auto_discovery_link_tag(:atom,
|
||||||
{:controller => 'journals', :action => 'index',
|
{:controller => 'journals', :action => 'index',
|
||||||
:query_id => @query, :format => 'atom',
|
:query_id => @query, :format => 'atom',
|
||||||
:page => nil, :key => User.current.rss_key},
|
:page => nil, :key => User.current.rss_key},
|
||||||
:title => l(:label_changes_details)) %>
|
:title => l(:label_changes_details)) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= context_menu issues_context_menu_path %>
|
<%= context_menu issues_context_menu_path %>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue