From 348eae5c45d5c2879c98d13b36b676b3269eb909 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Apr 2015 10:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BA=93=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb               | 6 +++---
 app/views/projects/settings/_new_repositories.html.erb | 6 +++---
 app/views/projects/settings/_versions.html.erb         | 6 +++---
 public/stylesheets/public.css                          | 3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 8890e88a4..096dadf8b 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -228,9 +228,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 class="f14">&nbsp;&nbsp;开发模式：<span class="f12 ml5 c_grey">为团队开发提供一系列在线协同工具。</span></label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 2 ? 'checked' : ''%> id="research_group"/><label class="f14">&nbsp;&nbsp;研讨模式：<span class="f12 ml5 c_grey">为小组研究提供阶段汇报和交流工具。</span></label></li>
+          <li><input type="radio" name="project_type" <%= @project.project_new_type == 3 ? 'checked' : ''%> id="friend_organization"/><label class="f14">&nbsp;&nbsp;圈子模式：<span class="f12 ml5 c_grey">为朋友圈提供简洁的交流和分享工具。</span></label></li>
         </ul>
         <a href="javascript:void(0)" class="orange_btn" onclick="click_ok('<%= change_project_type_project_path @project%>');" >确定</a>
 
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index a5f476079..7eda0e473 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -25,7 +25,7 @@
     <td> <%= checked_image repository.is_default? %></td>
     <td><%=h repository.scm_name %></td>
     <%if repository.scm_name=="Git"%>
-        <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" class="c_blue" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
+        <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
          <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%></td><!--Modified by tanxianbo-->
     <%else %>
         <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
@@ -33,8 +33,8 @@
     <td><a href="javascript:viod(0)" class="c_blue" >
       <% if repository.scm_name=="Git"%>
         <%if User.current.allowed_to?(:manage_repository, @project) %>
-          <%= link_to(l(:label_user_plural), committers_repository_path(repository),
-                      :class => 'c_blue') %>
+          <%= link_to(l(:label_user_plural), committers_repository_path(repository)
+                      ) %>
         <% end %>
   <% end %>
     </a></td>
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
index 2ca875681..5b0f27953 100644
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -42,9 +42,9 @@
           </td>
           <td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%= h(version.wiki_page_title)%>">
             <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki',
-                                                                   :action => 'show',
-                                                                   :project_id => version.project,
-                                                                   :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %>
+                                                                 :action => 'show',
+                                                                 :project_id => version.project,
+                                                                 :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %>
           </td>
           <td class="buttons">
             <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2f45bbd69..125a36064 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -131,6 +131,7 @@ a.c_green{ color:#28be6c;}
 .c_blue{ color:#15bccf;}
 .c_red{ color:#F00;}
 .c_green{ color:#28be6c;}
+.c_grey{color:#999;}
 .c_dblue{ color:#09658c;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
@@ -404,7 +405,7 @@ div.flash.warning, .conflict {
 /*弹出框*/
 .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);}
 .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
-.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
+.white_content02{display:none;position:fixed;top:15%;left:30%;width:310px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}
 .floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
 a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}