From a8a7029746ed210a8cb1d706f0c73fa7ae2b3a52 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 9 Nov 2016 16:26:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20=E7=8F=AD=E7=BA=A7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=B5=84=E6=BA=90=E6=8F=8F=E8=BF=B0=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB=E5=9E=8B=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E6=97=B6=EF=BC=8C=E5=AF=B9=E5=AD=A6=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=80=E8=A1=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_resource_detail.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index fd804ca9c..4e046b50a 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -48,7 +48,7 @@
               <% end %>
             </div>
           <% else %>
-            <div class="fontGrey2 mb4">
+            <div class="fontGrey2 mb4 break_word">
                 资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
           <% end %>

From c5ab8550ff7024d81c2c0224575aa557d47592a4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 10 Nov 2016 09:12:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=EF=BC=8C=E9=85=8D=E7=BD=AE=E7=9A=84=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_versions_form.html.erb | 4 +++-
 app/views/versions/_edit.html.erb                       | 4 +++-
 app/views/versions/_new_milestone.html.erb              | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/settings/_new_versions_form.html.erb b/app/views/projects/settings/_new_versions_form.html.erb
index cc61b1993..5d9243eea 100644
--- a/app/views/projects/settings/_new_versions_form.html.erb
+++ b/app/views/projects/settings/_new_versions_form.html.erb
@@ -12,8 +12,10 @@
         </li>
         <li class="mb10 clear">
           <label class=" fl">&nbsp;<%= l(:milestone_date_closed) %>&nbsp;&nbsp;:&nbsp;</label>
-          <%= f.text_field :effective_date, :size => 10, :readonly => true, :class=>"issues_calendar_input fl", :placeholder=>"结束日期", :style=>"height:28px;", :id => "setting_version_effective_date" %>
+          <label class=" fl" style="width:105px;border:1px solid #c8c8c8;">
+          <%= f.text_field :effective_date, :size => 10, :readonly => true, :class=>"issues_calendar_input fl", :placeholder=>"结束日期", :style=>"height:28px;border-left:none;border-top:none;border-bottom:none;", :id => "setting_version_effective_date" %>
           <%= calendar_for('setting_version_effective_date') %>
+          </label>
         </li>
         <li class="mb10 clear">
           <label class="fl">&nbsp;<%= l(:field_status) %>&nbsp;&nbsp;:&nbsp;</label>
diff --git a/app/views/versions/_edit.html.erb b/app/views/versions/_edit.html.erb
index f9ce5a8b1..e38041efe 100644
--- a/app/views/versions/_edit.html.erb
+++ b/app/views/versions/_edit.html.erb
@@ -22,10 +22,12 @@
             </li>
             <li class="mb10 clear">
               <label class=" fl"><span class="c_red f12">*</span>&nbsp;日期&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"issues_calendar_input fl", :id => "version_effective_date2", :placeholder=>"结束日期", :style=>"height:28px;", :no_label => true  %>
+              <label class=" fl" style="border:1px solid #c8c8c8;">
+              <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"issues_calendar_input fl", :id => "version_effective_date2", :placeholder=>"结束日期", :style=>"height:28px;border-left:none;border-top:none;border-bottom:none", :no_label => true  %>
               <%#= calendar_for('version_effective_date2') %>
               <!--<input type="text" placeholder="结束日期" class="issues_calendar_input fl ">-->
               <!--<a href="" class="issues_data_img fl"></a>-->
+              </label>
             </li>
             <li class="mb10 clear">
               <label class="fl ml5">&nbsp;状态&nbsp;&nbsp;:&nbsp;</label>
diff --git a/app/views/versions/_new_milestone.html.erb b/app/views/versions/_new_milestone.html.erb
index b0b6208d0..47c1d2b39 100644
--- a/app/views/versions/_new_milestone.html.erb
+++ b/app/views/versions/_new_milestone.html.erb
@@ -22,8 +22,10 @@
             </li>
             <li class="mb10 clear">
               <label class=" fl ml5">&nbsp;日期&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :effective_date, :size => 10, :readonly => true, :class => "issues_calendar_input fl ml3", :id => "version_index_create_name", :placeholder=>"结束日期", :style=>"height:28px;", :no_label => true  %>
+              <label class=" fl" style="border:1px solid #c8c8c8;">
+              <%= f.text_field :effective_date, :size => 10, :readonly => true, :class => "issues_calendar_input fl ml3", :id => "version_index_create_name", :placeholder=>"结束日期", :style=>"height:28px;border-left:none;border-top:none;border-bottom:none;", :no_label => true  %>
               <%#= calendar_for('version_index_create_name') %>
+              </label>
             </li>
             <li class="mb10 clear">
               <label class="ml5">&nbsp;状态&nbsp;&nbsp;:&nbsp;</label>