From 7ab6c4526268d09429a48ae02771811d7fe3d180 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 23 Oct 2015 15:37:58 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BD=AC=E6=8D=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=E3=80=82=202=E3=80=81url?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/show.html.erb      |  6 +++---
 app/views/repositories/to_gitlab.html.erb | 12 ++++++++++--
 config/locales/projects/zh.yml            |  6 +++++-
 public/stylesheets/application.css        |  9 +++++++++
 public/stylesheets/repository.css         |  7 +++++++
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index b1f6ba6ce..f2716c3ea 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -5,11 +5,11 @@
 <div class="repository_con" style="line-height:1.9;">
   <%= render :partial => 'navigation' %>
   <div class="cl"></div>
-  <div class=" c_dark f14">
+  <div class=" repository-url">
     <% if @repository.type.to_s=="Repository::Gitlab" %>
-          <%= @repos_url %>
+        版本库地址：<%= @repos_url %>
     <% else %>
-          <%= h @repository.url %>
+        版本库地址：<%= h @repository.url %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/repositories/to_gitlab.html.erb b/app/views/repositories/to_gitlab.html.erb
index eccf7259d..d06c087ed 100644
--- a/app/views/repositories/to_gitlab.html.erb
+++ b/app/views/repositories/to_gitlab.html.erb
@@ -1,4 +1,12 @@
+<div class="repository-update-dec">
+  <p class="c_orange">
+    <%= l(:label_repository_migrate_dec) %>
+  </p>
 <%= form_for(@repository, url: to_gitlab_project_repository_path(@project, @repository)) do |f| %>
 <input type="text" name="repo_name"/>
-<button type="submit">转换到新版本</button>
-<% end %>
\ No newline at end of file
+    <button type="submit">转换到新版本</button>
+<% end %>
+<span class="c_grey">
+  <%= l(:label_repository_name_dec) %>
+</span>
+</div>
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index dbce93219..7feb6f26a 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -440,4 +440,8 @@ zh:
   #     
   field_sharing: 共享
   label_title_code_review: 代码评审
-  label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！
\ No newline at end of file
+  label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！
+
+  # 版本库迁移
+  label_repository_migrate_dec: 注意：Trustie版本库近期进行了一次大的改造，历史版本需要转换成新的版本，输入新的版本库名，即可完成转换。 转换过程可能需要等待一段时间。
+  label_repository_name_dec: 版本库名仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用，长度必须在 1 到 254 个字符之间，一旦保存，标识无法修改。
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index dbc91353b..d89b572e5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -17,6 +17,15 @@ li{list-style-type:none;}
 .cancel_btn {background-color: #c1c1c1; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
 .cancel_btn:hover {background-color:#656565; }
 /*huang*/
+.repository-update-dec{
+    padding: 10px;
+}
+.repository-update-dec .c_grey {
+    color: #999999;
+}
+.repository-update-dec .c_orange {
+    color: #ff7143;
+}
 
 .hwork_input_news{ border:1px solid #64bdd9; height:22px; width:594px; background:#fff; margin-bottom:10px; padding:5px;}
 .ml55{ margin-left:55px;}
diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css
index 1a542d579..7745af1e5 100644
--- a/public/stylesheets/repository.css
+++ b/public/stylesheets/repository.css
@@ -81,4 +81,11 @@
 }
 .repository-title-dec{
     color: #fff !important;
+}
+.repository-url{
+    color: #2D2D2D;
+    margin: auto 0px;
+    text-align: center;
+    font-size: 14px;
+    margin-bottom: 10px;
 }
\ No newline at end of file