From c6c9507abe4f54cf8a01bcf72ca2b813e970a8c4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 30 Sep 2017 20:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=B9=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/_achieve_ways.html.erb | 3 ++-
 config/routes.rb                         | 5 +++++
 public/stylesheets/css/taskstyle.css     | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/views/shixuns/_achieve_ways.html.erb b/app/views/shixuns/_achieve_ways.html.erb
index 870c396bc..e3b31e6be 100644
--- a/app/views/shixuns/_achieve_ways.html.erb
+++ b/app/views/shixuns/_achieve_ways.html.erb
@@ -8,6 +8,7 @@
     <div class="newupload_conbox clearfix">
       <ul>
         <% if @path.present? %>
+            <a class="f14 fb" href="<%= search_file_list_shixun_path(@shixun) %>" data-remote="true">根目录/</a>
             <%
                dirs = @path.split('/')
                link_path = ''
@@ -16,7 +17,7 @@
                  link_path << '/' unless link_path.empty?
                  link_path << "#{dir}"
             %>
-                <span class="c_grey"></span><%= link_to (h(dir)+'/'), search_file_list_shixun_path(@shixun, :path => to_path_param(to_path_param(link_path))), :class => "f14 fb", :remote => true %>
+                <%= link_to (h(dir)+'/'), search_file_list_shixun_path(@shixun, :path => to_path_param(to_path_param(link_path))), :class => "f14 fb", :remote => true %>
             <% end %>
         <% end %>
         <% if @dir.present? %>
diff --git a/config/routes.rb b/config/routes.rb
index 5f33567db..958c98a7c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -252,6 +252,11 @@ RedmineApp::Application.routes.draw do
       get 'add_departments_part'
       post 'save_school'
       post 'update_user_message'
+      post 'add_auto_users_trial'
+      post 'create_auto_users_trial'
+      match 'update_auto_users_trial', :via => [:get, :post]
+      match 'account',  :via => [:get, :post]
+      post 'shixun_can_copy'
     end
   end
   # Enable Grack support
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index d74dd10d9..566f9520a 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -70,7 +70,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
 .panel-inner-title{ font-size: 14px; color: #666; max-width:85%; line-height:30px;word-wrap: break-word; margin-bottom: 10px}
 .panel-footer{ min-width:1000px; height: 210px!important;}
 /* 弹框 */
-.task-popup-text-center{ text-align: center; color: #666;}
+.task-popup-text-center{ text-align: center; color: #333;}
 .task-popup-title{ border-bottom: 1px solid #eee; padding:10px 15px; }
 .task-popup-content{ padding:0px 15px 15px 15px;}
 .task-popup-submit{ margin: 0 auto 15px; width: 120px;}
@@ -430,11 +430,11 @@ html>body #ajax-indicator-base { position: fixed; }
 
 /*二次回复的提示语的样式*/
 .points-data-tip-top{position:absolute;left:100px;top:-30px;opacity:.7;width:150px;height:30px;z-index:9999;display:none;}
-.data-tip-top{position:relative;box-shadow:0px 0px 8px #000;backgund:#000;color:#fff;word-wrap: break-word;
+.data-tip-top1{position:relative;box-shadow:0px 0px 8px #000;background:#000;color:#fff;word-wrap: break-word;
     text-align:center;border-radius:4px;padding:0 10px;border:1px solid #000;}
-.data-tip-top:after,.data-tip-top:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
+.data-tip-top1:after,.data-tip-top1:before{position: absolute;content:'';width:0;height:0;left: 45%;bottom:-10px;border-left: 5px solid transparent;
     border-right: 5px solid transparent;border-top: 10px solid #000;}
-.data-tip-top:before{bottom:-11px;}
+.data-tip-top1:before{bottom:-11px;}
 /*选择题tab切换*/
 .nav_option li{overflow: hidden;width: 110px; text-align: center;cursor: pointer;height: 38px;line-height: 38px;border-top-right-radius: 5px;border-top-left-radius: 5px;border:1px solid #e2e2e2;border-bottom: 0px;color: #FF7500;border-right: none;}
 .nav_option li:last-child{border-right: 1px solid #e2e2e2;}