From dd25cdc065519aff0ff55e0061df8516c7f167c3 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 21 Apr 2015 14:19:50 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=89=E7=A7=8D=E7=B1=BB=E5=9E=8B=E6=9C=AF=E8=AF=AD=202?=
 =?UTF-8?q?=E3=80=81=E6=9C=AA=E7=99=BB=E5=BD=95=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=8F=90=E4=BA=A4bug=203=E3=80=81width?=
 =?UTF-8?q?=E6=9E=9C=E6=96=AD=E7=A9=BA=E7=99=BD=E5=A4=84=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb           | 11 ++++++-----
 app/views/layouts/base_projects.html.erb |  6 +++---
 config/locales/projects/zh.yml           |  6 +++---
 public/stylesheets/project.css           |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index d68e1fc7d..bed1e3d77 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -113,12 +113,13 @@
       <div id="update">
         <%= render :partial => 'edit' %>
       </div>
+      <!--留言-->
+      <p style="padding-top: 5px"></p>
+      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
+        <%= l(:button_submit) %>
+      </a>
   <% end %>
-  <!--留言-->
-  <p style="padding-top: 5px"></p>
-  <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
-    <%= l(:button_submit) %>
-  </a>
+
   <%#= submit_tag l(:button_submit) %>
   <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%>
 </div>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index ca9f43d53..b825800e1 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -225,9 +225,9 @@
       <div class=" mt10">
         <h3 class="mb10 c_blue">请选择项目类型：</h3>
         <ul class="mb10" id="project_type">
-          <li><input type="radio" name="project_type" <%= @project.project_new_type == 1 ? 'checked' : ''%> id="development_group"/><label >&nbsp;&nbsp;开发组</label></li>
-          <li><input type="radio" name="project_type" <%= @project.project_new_type == 2 ? 'checked' : ''%> id="research_group"/><label >&nbsp;&nbsp;科研组</label></li>
-          <li><input type="radio" name="project_type" <%= @project.project_new_type == 3 ? 'checked' : ''%> id="friend_organization"/><label >&nbsp;&nbsp;朋友圈</label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 1 ? 'checked' : ''%> id="development_group"/><label >&nbsp;&nbsp;开发模式</label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 2 ? 'checked' : ''%> id="research_group"/><label >&nbsp;&nbsp;研讨模式</label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 3 ? 'checked' : ''%> id="friend_organization"/><label >&nbsp;&nbsp;圈子模式</label></li>
         </ul>
         <a href="javascript:void(0)" class="orange_btn" onclick="click_ok('<%= change_project_type_project_path @project%>');" >确定</a>
 
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 3c4d4a97c..49fe0e19a 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -55,9 +55,9 @@ zh:
   label_apply_project_waiting: 已处理申请，请等待管理员审核
   label_unapply_project: 取消申请
   lable_sure_exit_project: 是否确认退出该项目
-  label_friend_organization: 朋友圈
-  label_research_group: 科研组
-  label_development_team: 开发组
+  label_friend_organization: 圈子模式
+  label_research_group: 研讨模式
+  label_development_team: 开发模式
 
   label_member: 成员
   project_module_attachments: 资源  
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 75caa9c14..c2eb127c9 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -72,7 +72,7 @@ a:hover.problem_pic{border:1px solid #64bdd9;}
 a.problem_name{ color:#ff5722; }
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.problem_tit02{ color:#0781b4;  font-weight:bold;width:400px; }
+a.problem_tit02{ color:#0781b4;  font-weight:bold;max-width:400px;}
 a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; }
 .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 a.pro_mes{ float:left; color:#a0a0a0; display:block; width:100px; height:20px;  }