From 6fbb6629d78db5af01b4e4e6ea93ee8c97968200 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 19 Oct 2016 10:17:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A8=E6=80=81issue=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=89=A9=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_issue_reply.html.erb | 10 +++++----- app/views/projects/_project_reply_banner.html.erb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/projects/_project_issue_reply.html.erb b/app/views/projects/_project_issue_reply.html.erb index 019e435b8..3e21d49c8 100644 --- a/app/views/projects/_project_issue_reply.html.erb +++ b/app/views/projects/_project_issue_reply.html.erb @@ -1,5 +1,5 @@ <% count = activity.journals.count %> -
+
<%= render :partial => 'projects/project_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id} %> <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %> @@ -13,11 +13,11 @@ autoUrl('reply_content_<%= comment.id %>'); }); -
  • +
  • <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
    -
    +
    <%= render :partial => 'projects/project_issue_contents', :locals => {:comment => comment}%> <% if !comment.content_detail.blank? || comment.class == Journal %> @@ -76,9 +76,9 @@
    <% end %> -
    +
    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
    -
    +
    <% if User.current.logged? %>
    <%= form_for('new_form',:url => add_journal_issue_path(activity.id, :user_activity_id => user_activity_id),:method => "post", :remote => true) do |f| %> diff --git a/app/views/projects/_project_reply_banner.html.erb b/app/views/projects/_project_reply_banner.html.erb index 58c0688ee..6efbf9fda 100644 --- a/app/views/projects/_project_reply_banner.html.erb +++ b/app/views/projects/_project_reply_banner.html.erb @@ -1,4 +1,4 @@ -
    +
    回复 ︿ From e4a6a5f58dfdf929be6c689e337e3263054bd8e5 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 19 Oct 2016 11:17:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_issue_detail.html.erb | 28 +++++++++---------- public/stylesheets/css/project.css | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/views/projects/_project_issue_detail.html.erb b/app/views/projects/_project_issue_detail.html.erb index f0431bc26..ff70849e1 100644 --- a/app/views/projects/_project_issue_detail.html.erb +++ b/app/views/projects/_project_issue_detail.html.erb @@ -44,7 +44,7 @@ <%# end %> <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "status"},:remote=>'true', :method => :put, :id=>"issue_query_form_#{activity.id}", :class => 'query_form') do %>
  • -

     状态  : 

    +

     状态  : 

    <%= activity.status.name %>

    <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]), {:include_blank => false, :selected => @status_id ? @status_id : 0 }, @@ -56,7 +56,7 @@
    <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "assigned"},:remote=>'true', :method => :put, :id=>"issue_query_assign_form_#{activity.id}", :class => 'query_form') do %>
  • -

     指派  : 

    +

     指派  : 

    <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %> @@ -71,8 +71,8 @@
      <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "prior"},:remote=>'true', :method => :put, :id=>"issue_query_prior_form_#{activity.id}", :class => 'query_form') do %>
    • -

       优先级  : 

      - <%= activity.priority.name %> +

       优先级  : 

      + <%= activity.priority.name %> <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]), {:include_blank => false,:selected=>@priority_id ? @priority_id : 0}, {:onchange=>"remote_function('#issue_query_prior_form_#{activity.id}');",:id=>"priority_id",:name=>"priority_id",:class=>"w70 undis issueEdit"}) %> @@ -81,8 +81,8 @@
      <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "ratio"},:remote=>'true', :method => :put, :id=>"issue_query_done_form_#{activity.id}", :class => 'query_form') do %>
    • -

       完成度  : 

      - <%= activity.done_ratio %>% +

       完成度  : 

      + <%= activity.done_ratio %>% <%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }), {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0}, {:onchange=>"remote_function('#issue_query_done_form_#{activity.id}');",:id=>"done_ratio",:name=>"done_ratio",:class=>"w70 undis issueEdit"}) %> @@ -93,23 +93,23 @@
    • -

       开始  : 

      -

      <%= format_date(activity.start_date) %>

      +

       开始  : 

      +

      <%= format_date(activity.start_date) %>

    • -

       周期  : 

      - <%= l_hours(activity.estimated_hours) %>
      • +

       周期  : 

      + <%= l_hours(activity.estimated_hours) %>
    • -

       计划完成  : 

      - <%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %>
      • +

       计划完成  : 

      + <%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %>
    • -

       <%=l(:milestone)%>  : 

      - <%= (activity.fixed_version ? link_to_user_version(activity.fixed_version) : "--") %>
      • +

       <%=l(:milestone)%>  : 

      + <%= (activity.fixed_version ? link_to_user_version(activity.fixed_version) : "--") %>
    diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index d2ec83c2e..4e492e9b9 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -256,8 +256,8 @@ p.percent { .newpro_box input{ height:26px; float:left; margin-bottom:10px;} .newpro_box textarea{ height:150px; float:left; margin-bottom:10px;} .newpro_box select{ height:29px; float:left; margin-bottom:10px;} -.label{ width:80px; text-align:right; font-size:14px; display:block; float:left;} -.label02{ width:110px; text-align:right; font-size:14px; display:block; float:left;} +.label{ width:80px; text-align:right; display:block; float:left; white-space: nowrap;} +.label02{ width:110px; text-align:right; display:block; float:left; white-space: nowrap;} .label03{ width:70px; text-align:right; display:block; float:left; white-space: nowrap;} .collapsible{ border-left:none;border-right:none;border-bottom:none; border-top:1px solid #e4e4e4; padding-top:10px; } .icon-reload { background-image: url(/images/reload.png); } From af5db3713c4f425079a0b517bd8f696782fd7c36 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 19 Oct 2016 14:57:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?issue=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=B1=9E=E6=80=A7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BA=8C=E7=BA=A7=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E9=A1=B5=E9=9D=A2=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_attributes_show.html.erb | 16 ++++++++-------- app/views/issues/_detail.html.erb | 4 ++-- app/views/issues/_issue_replies.html.erb | 8 ++++---- app/views/issues/_issue_reply_ke_form.html.erb | 4 ++-- app/views/issues/show.html.erb | 12 ++++++------ public/stylesheets/css/project.css | 1 - 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/app/views/issues/_attributes_show.html.erb b/app/views/issues/_attributes_show.html.erb index 7ff59fd9d..a968281b2 100644 --- a/app/views/issues/_attributes_show.html.erb +++ b/app/views/issues/_attributes_show.html.erb @@ -2,45 +2,45 @@
    <%= issue_fields_rows do |rows| %>
      -

    •  状态  : 

      <%= @issue.status.name %>

      +

    •  状态  : 

      <%= @issue.status.name %>

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

    •  指派给  : 

      <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> +

    •  指派给  : 

      <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %>
      • <% end %>
      -

    •  优先级  : 

      <%= @issue.priority.name %> +

    •  优先级  : 

      <%= @issue.priority.name %>
      • <% unless @issue.disabled_core_fields.include?('done_ratio') %> -

    •  % 完成  : 

      <%= @issue.done_ratio %>% +

    •  % 完成  : 

      <%= @issue.done_ratio %>%
      • <% end %>
      <% unless @issue.disabled_core_fields.include?('start_date') %> -

    •  开始  : 

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

      +

    •  开始  : 

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

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

    •  周期  : 

      <%= l_hours(@issue.estimated_hours) %> +

    •  周期  : 

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

    •  计划完成  : 

      <%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %> +

    •  计划完成  : 

      <%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %>
      • <% end %>
      <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> -

    •  <%=l(:milestone)%>  : 

      <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> +

    •  <%=l(:milestone)%>  : 

      <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %>
      • <% end %>
      diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb index 9ae3dfc43..8f0eaabe6 100644 --- a/app/views/issues/_detail.html.erb +++ b/app/views/issues/_detail.html.erb @@ -2,8 +2,8 @@
      <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
      -
      -

      +

      +

      <% case @issue.tracker_id %> <% when 1%> 【缺陷】 diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb index 1bc8dc132..d80f4a3e8 100644 --- a/app/views/issues/_issue_replies.html.erb +++ b/app/views/issues/_issue_replies.html.erb @@ -6,11 +6,11 @@ autoUrl('reply_content_<%= comment.id %>'); }); -

    • +
    • <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
      -
      +
      <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
      @@ -55,13 +55,13 @@
      • <% end %>
    -
    +
    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
    -
    +
    <% if User.current.logged? %>
    <%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %> diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb index cf4c3e504..1393cb948 100644 --- a/app/views/issues/_issue_reply_ke_form.html.erb +++ b/app/views/issues/_issue_reply_ke_form.html.erb @@ -1,10 +1,10 @@ -
    +
    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
    -
    +
    <% if User.current.logged? %>
    <%= form_for('new_form',:url => add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 40728d451..4f8af8656 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -15,12 +15,12 @@ } }); -
    -
    -
    问题跟踪
    +
    + -
    +
    @@ -33,9 +33,9 @@
    -
    +
    -
    +
    <%=render :partial => 'issue_reply_banner' %>
    diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 4e492e9b9..f2ab58883 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -476,7 +476,6 @@ a.upload_btn_grey{background:#a3a3a3;} a:hover.upload_btn_grey{background:#8a8a8a;} .upload_btn{width:80px; height:26px;} .upload_check{ margin-top:4px;} -.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;} .talk_info a{ color:#15bccf; } .ping_disfoot span a span{ color: #6883b6;}