From 2fb587105825eeeb4389599dcf1c0fe9a3bc7c9e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 15 May 2015 11:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=98=BE=E7=A4=BA=E6=96=B0?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb | 83 ++++++++++++++++------------------
 public/stylesheets/project.css | 11 +++--
 2 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 8fb63bd10..1d1802172 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -46,59 +46,52 @@
       <!--属性-->
       <div class="pro_info_box mb10">
         <%= issue_fields_rows do |rows| %>
-            <ul class="fl">
-
-              <li><p class="label"><span class="c_red f12">*</span>&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
-
-                <p class="pro_info_p"><%= @issue.status.name %></p>
-              </li>
-              <div class="cl"></div>
-              <li><p class="label"><span class="c_red f12">*</span>&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
-                <span class="pro_info_p"><%= @issue.priority.name %></span>
-              </li>
-              <div class="cl"></div>
+              <ul class="fl" >
+                <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
+                </li>
+                <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
-                  <li><p class="label">&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "-" %></span>
-                  </li>
+                <li><p class="label03" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-                  <li><p class="label">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "-") %></span>
-                  </li>
+                <div class="cl"></div>
+              </ul>
+              <ul class="fl" >
+                <li><p class="label03" >&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
+                </li>
+                <div class="cl"></div>
+              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
+                <li><p class="label03" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-            </ul>
-            <ul class="fl ml90">
-              <% unless @issue.disabled_core_fields.include?('start_date') %>
-                  <li><p class="label02">&nbsp;开始日期&nbsp;&nbsp;:&nbsp;</p>
+                <div class="cl"></div>
+              </ul>
 
-                    <p class="pro_info_p"><%= format_date(@issue.start_date) %></p></li>
-              <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('due_date') %>
-                  <li><p class="label02">&nbsp;计划完成日期&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= format_date(@issue.due_date) %></span>
-                  </li>
+              <ul class="fl " >
+              <% unless @issue.disabled_core_fields.include?('start_date') %>
+                <li><p class="label03" style="width:50px;" >&nbsp;开始&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
+                </li>
               <% end %>
-              <div class="cl"></div>
+                <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
-
-                  <li><p class="label02">&nbsp;预期时间&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
-                  </li>
-
+                <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-                  <li><p class="label02">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= @issue.done_ratio %>%</span>
-                  </li>
+                <div class="cl"></div>
+              </ul>
+              <ul class="fl " >
+                <% unless @issue.disabled_core_fields.include?('due_date') %>
+                <li><p class="label03" >&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %></span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-            </ul>
-        <% end %>
+                <div class="cl"></div>
+              <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
+                <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
+                </li>
+              <% end %>
+                <div class="cl"></div>
+              </ul>
+            <% end %><!--pro_info_box end-->
         <%#= render_custom_fields_rows(@issue) %>
         <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
       </div>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 3b04e23bf..74d7c58b3 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -87,11 +87,11 @@ a.pro_mes_w{ height:20px; float:left;display:block; color:#999999;}
 .pro_page_top{ font-size:14px; border-bottom:2px solid #64bdd9; margin-bottom:10px; padding-bottom:5px;}
 .pro_page_tit{color:#3e4040;  font-weight:bold;width:480px; float:left; font-size:14px; margin-bottom:5px;}
 .pro_pic_box{ margin-left:60px; }
-.pro_pic{ width:100px; height:75px;line-height:73px;border:2px solid #CCC; margin:10px 0; text-align: center;}
-.pro_info_box{ margin-left:60px; background:#f0fbff; height:80px; padding:10px 0;}
+.pro_pic{ width:100px; border:2px solid #CCC; margin:10px 0;}
+.pro_info_box{ margin-left:60px; border:1px dashed #CCC; height:45px; padding:10px 0;}
 .pro_info_box ul{}
-.pro_info_box ul li{ margin-bottom:10px;}
-.pro_info_p{ color:#0781b4  !important; float:left;  width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;padding-top:2.5px;}
+.pro_info_box ul li{ height:24px;}
+.pro_info_p{color:#0781b4 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .edit_pro_box{overflow:hidden;display:none; margin-bottom:30px; border-bottom:1px dashed #CCC; padding-bottom:10px;}
 /****翻页***/
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
@@ -354,6 +354,9 @@ a:hover.st_add{ color:#ff8e15;}
 .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:14 background-image: url(../images/true.png); }*/
+.label02{ width:110px; text-align:right; font-size:14px;    display:block; float:left;}
+.label03{ width:70px; text-align:right;    display:block; float:left;}
+.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); }
 .icon {
     background-position: 0% 50%;