parent
f5b528dc4d
commit
440855c0e6
@ -1,181 +1,181 @@
|
|||||||
<div class="project_r_h">
|
<div class="project_r_h">
|
||||||
<h2 class="project_h2"><%= l(:label_issue_plural) %></h2>
|
<h2 class="project_h2"><%= l(:label_issue_plural) %></h2>
|
||||||
</div>
|
</div>
|
||||||
<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
|
<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
|
||||||
<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
|
<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>
|
||||||
|
|
||||||
<%= render :partial => 'action_menu' %>
|
<%= render :partial => 'action_menu' %>
|
||||||
|
|
||||||
<h3>
|
<h3>
|
||||||
<%= issue_heading(@issue) %>
|
<%= issue_heading(@issue) %>
|
||||||
</h3>
|
</h3>
|
||||||
|
|
||||||
<style type="text/css"></style>
|
<style type="text/css"></style>
|
||||||
|
|
||||||
<div class="<%= @issue.css_classes %> details">
|
<div class="<%= @issue.css_classes %> details">
|
||||||
<% if @prev_issue_id || @next_issue_id %>
|
<% if @prev_issue_id || @next_issue_id %>
|
||||||
<div class="next-prev-links contextual">
|
<div class="next-prev-links contextual">
|
||||||
<%= link_to_if @prev_issue_id,
|
<%= link_to_if @prev_issue_id,
|
||||||
"\xc2\xab #{l(:label_previous)}",
|
"\xc2\xab #{l(:label_previous)}",
|
||||||
(@prev_issue_id ? issue_path(Issue.find_by_id(@prev_issue_id)) : nil),
|
(@prev_issue_id ? issue_path(Issue.find_by_id(@prev_issue_id)) : nil),
|
||||||
:title => "##{@prev_issue_id}" %> |
|
:title => "##{@prev_issue_id}" %> |
|
||||||
<% if @issue_position && @issue_count %>
|
<% if @issue_position && @issue_count %>
|
||||||
<span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
|
<span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= link_to_if @next_issue_id,
|
<%= link_to_if @next_issue_id,
|
||||||
"#{l(:label_next)} \xc2\xbb",
|
"#{l(:label_next)} \xc2\xbb",
|
||||||
(@next_issue_id ? issue_path(Issue.find_by_id(@next_issue_id)) : nil),
|
(@next_issue_id ? issue_path(Issue.find_by_id(@next_issue_id)) : nil),
|
||||||
:title => "##{@next_issue_id}" %>
|
:title => "##{@next_issue_id}" %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<!-- <%#= avatar(@issue.author, :size => "50") %> -->
|
<!-- <%#= avatar(@issue.author, :size => "50") %> -->
|
||||||
|
|
||||||
<div class="subject" style="word-wrap: break-word;">
|
<div class="subject" style="word-wrap: break-word;">
|
||||||
<%= render_issue_subject_with_tree(@issue) %>
|
<%= render_issue_subject_with_tree(@issue) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 顶和踩 在这里添加 -->
|
<!-- 顶和踩 在这里添加 -->
|
||||||
<span id="praise_tread" style="float: right">
|
<span id="praise_tread" style="float: right">
|
||||||
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @issue,:show_flag => true,:user_id =>User.current.id,:horizontal => false}%>
|
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @issue,:show_flag => true,:user_id =>User.current.id,:horizontal => false}%>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<p class="author">
|
<p class="author">
|
||||||
<%= authoring @issue.created_on, @issue.author %>.
|
<%= authoring @issue.created_on, @issue.author %>.
|
||||||
<% if @issue.created_on != @issue.updated_on %>
|
<% if @issue.created_on != @issue.updated_on %>
|
||||||
<%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
|
<%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
|
||||||
<% end %>
|
<% end %>
|
||||||
</p>
|
</p>
|
||||||
<!-- added by william -for tag -->
|
<!-- added by william -for tag -->
|
||||||
<div id="tags">
|
<div id="tags">
|
||||||
<%= render :partial => 'tags/tag', :locals => {:obj => @issue,:object_flag => "3" }%>
|
<%= render :partial => 'tags/tag', :locals => {:obj => @issue,:object_flag => "3" }%>
|
||||||
</div>
|
</div>
|
||||||
<table class="attributes">
|
<table class="attributes">
|
||||||
<%= issue_fields_rows do |rows|
|
<%= issue_fields_rows do |rows|
|
||||||
rows.left l(:field_status), h(@issue.status.name), :class => 'status'
|
rows.left l(:field_status), h(@issue.status.name), :class => 'status'
|
||||||
rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
|
rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
|
||||||
|
|
||||||
unless @issue.disabled_core_fields.include?('assigned_to_id')
|
unless @issue.disabled_core_fields.include?('assigned_to_id')
|
||||||
#modified by nie
|
#modified by nie
|
||||||
#modified by huang
|
#modified by huang
|
||||||
rows.left l(:field_assigned_to), (image_tag url_to_avatar(@issue.assigned_to(@user)), :class => 'avatar').to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
|
rows.left l(:field_assigned_to), (image_tag url_to_avatar(@issue.assigned_to(@user)), :class => 'avatar').to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
|
||||||
end
|
end
|
||||||
# end huang
|
# end huang
|
||||||
unless @issue.disabled_core_fields.include?('category_id')
|
unless @issue.disabled_core_fields.include?('category_id')
|
||||||
rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
|
rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
|
||||||
end
|
end
|
||||||
unless @issue.disabled_core_fields.include?('fixed_version_id')
|
unless @issue.disabled_core_fields.include?('fixed_version_id')
|
||||||
rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
|
rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
|
||||||
end
|
end
|
||||||
|
|
||||||
unless @issue.disabled_core_fields.include?('start_date')
|
unless @issue.disabled_core_fields.include?('start_date')
|
||||||
rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
|
rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
|
||||||
end
|
end
|
||||||
unless @issue.disabled_core_fields.include?('due_date')
|
unless @issue.disabled_core_fields.include?('due_date')
|
||||||
rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
|
rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
|
||||||
end
|
end
|
||||||
unless @issue.disabled_core_fields.include?('done_ratio')
|
unless @issue.disabled_core_fields.include?('done_ratio')
|
||||||
rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
|
rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
|
||||||
end
|
end
|
||||||
unless @issue.disabled_core_fields.include?('estimated_hours')
|
unless @issue.disabled_core_fields.include?('estimated_hours')
|
||||||
unless @issue.estimated_hours.nil?
|
unless @issue.estimated_hours.nil?
|
||||||
rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
|
rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if User.current.allowed_to?(:view_time_entries, @project)
|
if User.current.allowed_to?(:view_time_entries, @project)
|
||||||
rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
|
rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
|
||||||
end
|
end
|
||||||
end %>
|
end %>
|
||||||
<%= render_custom_fields_rows(@issue) %>
|
<%= render_custom_fields_rows(@issue) %>
|
||||||
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
|
<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<% if @issue.description? || @issue.attachments.any? -%>
|
<% if @issue.description? || @issue.attachments.any? -%>
|
||||||
<hr />
|
<hr />
|
||||||
<% if @issue.description? %>
|
<% if @issue.description? %>
|
||||||
<div class="description">
|
<div class="description">
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
|
<%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p><strong><%=l(:field_description)%></strong></p>
|
<p><strong><%=l(:field_description)%></strong></p>
|
||||||
<div class="wiki">
|
<div class="wiki">
|
||||||
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
|
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= link_to_attachments @issue, :thumbnails => true %>
|
<%= link_to_attachments @issue, :thumbnails => true %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|
||||||
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
|
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
|
||||||
|
|
||||||
<% if false # !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
|
<% if false # !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
<div id="issue_tree">
|
<div id="issue_tree">
|
||||||
<div class="contextual">
|
<div class="contextual">
|
||||||
<%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
|
<%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p><strong><%=l(:label_subtask_plural)%></strong></p>
|
<p><strong><%=l(:label_subtask_plural)%></strong></p>
|
||||||
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
|
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
|
<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
|
||||||
<hr />
|
<hr />
|
||||||
<div id="relations">
|
<div id="relations">
|
||||||
<%= render :partial => 'relations' %>
|
<%= render :partial => 'relations' %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% if @changesets.present? %>
|
<% if @changesets.present? %>
|
||||||
<div id="issue-changesets">
|
<div id="issue-changesets">
|
||||||
<h3><%=l(:label_associated_revisions)%></h3>
|
<h3><%=l(:label_associated_revisions)%></h3>
|
||||||
<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
|
<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @journals.present? %>
|
<% if @journals.present? %>
|
||||||
<div id="history">
|
<div id="history">
|
||||||
<h3><%=l(:label_history)%></h3>
|
<h3><%=l(:label_history)%></h3>
|
||||||
<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
|
<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
||||||
<div style="clear: both;"></div>
|
<div style="clear: both;"></div>
|
||||||
<%= render :partial => 'action_menu' %>
|
<%= render :partial => 'action_menu' %>
|
||||||
|
|
||||||
<div style="clear: both;"></div>
|
<div style="clear: both;"></div>
|
||||||
<% if @issue.editable? %>
|
<% if @issue.editable? %>
|
||||||
<div id="update">
|
<div id="update">
|
||||||
<h3><%= l(:button_update) %></h3>
|
<h3><%= l(:button_update) %></h3>
|
||||||
<%= render :partial => 'edit' %>
|
<%= render :partial => 'edit' %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% other_formats_links do |f| %>
|
<% other_formats_links do |f| %>
|
||||||
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
|
<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
|
||||||
<%= f.link_to 'PDF' %>
|
<%= f.link_to 'PDF' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
||||||
<% content_for :sidebar do %>
|
<% content_for :sidebar do %>
|
||||||
<%= render :partial => 'issues/sidebar' %>
|
<%= render :partial => 'issues/sidebar' %>
|
||||||
|
|
||||||
<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
|
<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
|
||||||
(@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
|
(@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
|
||||||
<div id="watchers">
|
<div id="watchers">
|
||||||
<%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
|
<%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
|
<%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= context_menu issues_context_menu_path %>
|
<%= context_menu issues_context_menu_path %>
|
||||||
|
|||||||
@ -1,32 +1,30 @@
|
|||||||
<div id="tags_show">
|
<div id="tags_show" style="float: left;">
|
||||||
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
|
<%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %>
|
||||||
</div>
|
</div>
|
||||||
|
<div style="float: left;">
|
||||||
<% if User.current.logged? %>
|
<% if User.current.logged? %>
|
||||||
<span> <%= toggle_link (l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
|
<span> <%= toggle_link (l(:label_add_tag)), 'put-tag-form', {:focus => 'tags_name'} %> </span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div id="put-tag-form" style="display: none;text-align: center">
|
<div id="put-tag-form" style="display: none;text-align: center">
|
||||||
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
|
<%= form_for "tag_for_save",:remote=>true,:url=>tag_path,
|
||||||
:update => "tags_show",
|
:update => "tags_show",
|
||||||
:complete => '$("#put-tag-form").slideUp();' do |f| %>
|
:complete => '$("#put-tag-form").slideUp();' do |f| %>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<%= f.text_field :name ,:id => "tags_name",:size=>"20",
|
<%= f.text_field :name ,:id => "tags_name",:size=>"20",
|
||||||
:require=>true,
|
:require=>true,
|
||||||
:maxlength => Setting.tags_max_length,
|
:maxlength => Setting.tags_max_length,
|
||||||
:minlength=>Setting.tags_min_length %>
|
:minlength=>Setting.tags_min_length %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
|
<%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
|
||||||
|
|
||||||
|
|
||||||
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
|
<%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
|
||||||
|
<td style="margin-left: 5px" vertical-valign="middle" >
|
||||||
<td style="margin-left: 5px">
|
|
||||||
<a href="#" onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l"></a>
|
<a href="#" onclick='$("#tags_name").parent().submit();' type="button" class="submit f_l"></a>
|
||||||
</td>
|
</td>
|
||||||
<tr>
|
<tr>
|
||||||
</table>
|
</table>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
Loading…
Reference in new issue