From b66de0ee9fe938fc57b5b5904c549deb1d1123da Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 17:03:43 +0800 Subject: [PATCH] =?UTF-8?q?issue=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 111 ++++++++------------------------- 1 file changed, 26 insertions(+), 85 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 76467275d..67867e2c6 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

<%= l(:label_issue_edit) %>

@@ -12,6 +12,7 @@
<%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
+

@@ -20,114 +21,53 @@


-

由<%= @issue.author %> - <%# if @issue.created_on != @issue.updated_on %> - 添加于 <%= format_time(@issue.created_on).html_safe %> - <%# else %> - <%#= format_time(@issue.updated_on).html_safe %> - <%# end %> + 由<%= @issue.author %>添加于 <%= format_time(@issue.created_on).html_safe %>

+ 'action_menu' %>
-
- <% if @issue.description? || @issue.attachments.any? -%> + <% if @issue.description? || @issue.attachments.any? -%> +
<% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> <% end %> -
-
- - - <%= link_to_attachment_project @issue, :thumbnails => true %>
- <% end -%> +
+ <% end -%> + +
+ + + <%= link_to_attachment_project @issue, :thumbnails => true %>
<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> -
-
- -
- <%= issue_fields_rows do |rows| %> -
    -

  •  状态  : 

    +
+
-

<%= @issue.status.name %>

- -
- <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> -

  •  指派给  : 

    - <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> -
    • - <% end %> -
    - - + + <%= render :partial => 'attributes_show' %> + -
    -

    <%= format_date(@issue.start_date) %>

    - - <% end %> -
    - <% unless @issue.disabled_core_fields.include?('estimated_hours') %> -

  •  周期  : 

    - <%= l_hours(@issue.estimated_hours) %> -
    • - <% end %> -
    - - - <% end %> - <%#= render_custom_fields_rows(@issue) %> - <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> - - -
    - <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %> -
    -
    + <% if @issue.editable? %>
    <%= render :partial => 'edit' %>

    - - - + <%#--引用时不能修改，剥离出引用内容--%> <%= l(:button_submit) %> <% end %> - <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%> @@ -138,6 +78,7 @@ <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %> <% end %> +
    <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>