From 8a6bbf50a90e2b33e39d70b7eb944d129cf0e1c0 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 24 Jun 2016 09:30:46 +0800
Subject: [PATCH] =?UTF-8?q?css=E6=96=87=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/about_us.html.erb           |  2 +-
 app/views/account/agreement.html.erb          | 23 ++-----------------
 app/views/account/lost_password.html.erb      |  2 +-
 app/views/courses/settings/_join_org.html.erb |  2 +-
 app/views/files/_subfield_files.html.erb      |  2 +-
 app/views/forums/index.html.erb               |  2 +-
 app/views/layouts/base.html.erb               |  2 +-
 app/views/layouts/base_forums.html.erb        |  4 ++--
 app/views/layouts/base_memos.html.erb         |  2 +-
 app/views/layouts/base_organization.html.erb  | 10 ++++----
 app/views/layouts/base_tags.html.erb          |  2 +-
 app/views/layouts/base_users_new.html.erb     |  2 +-
 app/views/layouts/base_welcome.html.erb       |  2 +-
 app/views/layouts/course_base.html.erb        |  2 +-
 app/views/layouts/new_base.html.erb           |  2 +-
 app/views/layouts/static_base.html.erb        |  2 +-
 app/views/layouts/users_base.html.erb         |  2 +-
 app/views/organizations/_org_members.html.erb |  2 +-
 .../projects/settings/_join_org.html.erb      |  2 +-
 app/views/users/_show_user_org.html.erb       |  2 +-
 app/views/users/user_homeworks.html.erb       |  2 +-
 app/views/users/user_organizations.html.erb   |  2 +-
 app/views/users/user_resource.html.erb        |  5 ++--
 23 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/app/views/account/about_us.html.erb b/app/views/account/about_us.html.erb
index f990cd64c..a2b1c895b 100644
--- a/app/views/account/about_us.html.erb
+++ b/app/views/account/about_us.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/public'%>
 <div class="homepageContent BgBox">
   <h2 class="BgBox_h2">关于我们</h2>
   <div class="AgreementBox">
diff --git a/app/views/account/agreement.html.erb b/app/views/account/agreement.html.erb
index 921f66350..ac0b9906c 100644
--- a/app/views/account/agreement.html.erb
+++ b/app/views/account/agreement.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/public'%>
 <!--<div class="homepageContentContainer mb20" >-->
   <div class="homepageContent BgBox mt10">
   	<h2 class="BgBox_h2">Trustie服务协议</h2>
@@ -28,24 +28,5 @@
     
     
   </div><!---BgBox end--->
-<!--</div>&lt;!&ndash;-homepageContentContainer end-&ndash;&gt;-->
-<script>
-$(".resourcesList").mousedown(function(e) {  
-if (3 == e.which) {  
-         document.oncontextmenu = function() {return false;}  
-         $("#contextMenu").hide();  
-         $("#contextMenu").attr("style","display: block; position: fixed; top:"  
-         + e.pageY  
-         + "px; left:"  
-         + e.pageX  
-         + "px; width: 80px;");  
-         $("#contextMenu").show();  
-         }
-		 
-});
-$(".resourcesList").click(function(e) {  
-		 $("#contextMenu").hide();
-		 document.oncontextmenu = function() {return true;}
-}); 
-</script>
+<!--</div>-->
 
diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index 5bf93fd14..2a5d7d23e 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/public'%>
 
 <div class="homepageContentContainer ">
   <div class="homepageContent BgBox">
diff --git a/app/views/courses/settings/_join_org.html.erb b/app/views/courses/settings/_join_org.html.erb
index f7b4d7551..2774a6c9a 100644
--- a/app/views/courses/settings/_join_org.html.erb
+++ b/app/views/courses/settings/_join_org.html.erb
@@ -5,7 +5,7 @@
 
 <!--</div>-->
 <!--</div>-->
-<%= stylesheet_link_tag 'org' %>
+<%= stylesheet_link_tag 'css/org' %>
 
 <div>
   <div class="relateOrg fl">
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 516e42c68..498f1e4aa 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'courses'%>
+<%= stylesheet_link_tag 'css/courses'%>
 <script>
     function searchone4reload(fileid){
         var url = "<%= searchone4reload_org_subfield_files_path(@org_subfield)%>";
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index c2997ac25..889def55e 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -1,5 +1,5 @@
 <%= javascript_include_tag 'new_user' %>
-<%= stylesheet_link_tag 'public'%>
+<%= stylesheet_link_tag 'css/common','css/public'%>
 <script>
   function add_class(id){
       if($("#"+id).hasClass("sortArrowActiveD")){
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 96b015bdc..625526131 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -17,7 +17,7 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index b5e13d801..021b281d9 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -7,7 +7,7 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') %>
 
@@ -18,7 +18,7 @@
 
 		<%= call_hook :view_layouts_base_html_head %>
 		<%= yield :header_tags -%>
-      <%= stylesheet_link_tag 'base','header','new_user', :media => 'all'%>
+      <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
       <!-- MathJax的配置 -->
       <script type="text/javascript"
               src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 984fd99ab..fabec880d 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -15,7 +15,7 @@
 	<%= javascript_include_tag "ckeditor/ckeditor.js",'prettify' %>
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/layouts/base_organization.html.erb b/app/views/layouts/base_organization.html.erb
index 0d7309ddd..e205b4549 100644
--- a/app/views/layouts/base_organization.html.erb
+++ b/app/views/layouts/base_organization.html.erb
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','css/structure','css/public','repository','org' %>
 <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -104,10 +104,10 @@
 <div id="Footer">
   <div class="footerAboutContainer">
     <ul class="footerAbout">
-      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
     </ul>
   </div>
   <div class="cl"></div>
diff --git a/app/views/layouts/base_tags.html.erb b/app/views/layouts/base_tags.html.erb
index 08ebb02d7..b47156ad2 100644
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@@ -20,7 +20,7 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 6a16940fc..074438ed7 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -14,7 +14,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/structure','prettify','css/public', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "avatars",'prettify'%>
diff --git a/app/views/layouts/base_welcome.html.erb b/app/views/layouts/base_welcome.html.erb
index 6d3b900c6..79e87cfaf 100644
--- a/app/views/layouts/base_welcome.html.erb
+++ b/app/views/layouts/base_welcome.html.erb
@@ -5,7 +5,7 @@
   <title><%=h html_title %></title>
   <meta name="description" content="<%= Redmine::Info.app_name %>" />
   <meta name="keywords" content="issue,bug,tracker" />
-  <%= stylesheet_link_tag 'public', 'pleft', 'project', :media => 'all' %>
+  <%= stylesheet_link_tag 'css/common', 'css/structure', 'css/public','css/project', :media => 'all' %>
 
   <%= javascript_include_tag "jquery.leanModal.min" %>
 
diff --git a/app/views/layouts/course_base.html.erb b/app/views/layouts/course_base.html.erb
index c46c73b99..bf7e540ca 100644
--- a/app/views/layouts/course_base.html.erb
+++ b/app/views/layouts/course_base.html.erb
@@ -21,7 +21,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/layouts/new_base.html.erb b/app/views/layouts/new_base.html.erb
index e7695f0e7..1b177cae1 100644
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@@ -13,7 +13,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify', 'org'%>
+  <%= stylesheet_link_tag 'css/common','css/structure', 'css/public', 'css/courses','prettify', 'css/org'%>
   <%= javascript_include_tag "course","header",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/app/views/layouts/static_base.html.erb b/app/views/layouts/static_base.html.erb
index 096b1699b..c7cb37be5 100644
--- a/app/views/layouts/static_base.html.erb
+++ b/app/views/layouts/static_base.html.erb
@@ -16,7 +16,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb
index 8eeee553e..63539f03b 100644
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@@ -16,7 +16,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header','new_user' ,:media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public' ,:media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb
index b846b940f..ecaa2ced9 100644
--- a/app/views/organizations/_org_members.html.erb
+++ b/app/views/organizations/_org_members.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'courses' %>
+<%= stylesheet_link_tag  'css/courses' %>
 <div class="resources">
     <div class="project_r_h" style="width: 720px;">
       <h2 class="project_h2"> 组织成员</h2>
diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb
index 6270e5477..903525607 100644
--- a/app/views/projects/settings/_join_org.html.erb
+++ b/app/views/projects/settings/_join_org.html.erb
@@ -5,7 +5,7 @@
 
   <!--</div>-->
 <!--</div>-->
-<%= stylesheet_link_tag 'org' %>
+<%= stylesheet_link_tag 'css/org' %>
 
   <div>
     <div class="relateOrg fl">
diff --git a/app/views/users/_show_user_org.html.erb b/app/views/users/_show_user_org.html.erb
index e753092fa..f5b7f4224 100644
--- a/app/views/users/_show_user_org.html.erb
+++ b/app/views/users/_show_user_org.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'project' %>
+<%= stylesheet_link_tag  'css/common','css/structure','css/public','css/org','css/project','repository' %>
 <%#= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
 <div class="homepageContentContainer">
   <div class="homepageContent">
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 86939b510..606126f25 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'public' %>
+<%= stylesheet_link_tag  'css/common','css/structure','css/public','css/org','repository' %>
 <script>
     $(document).ready(function(){
         $(".resource-switch").click(function(){
diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb
index 57b939af8..3dc8332da 100644
--- a/app/views/users/user_organizations.html.erb
+++ b/app/views/users/user_organizations.html.erb
@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'project' %>
+<%= stylesheet_link_tag  'css/common','css/structure','css/public','css/org','repository' %>
 <%#= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
 <div class="homepageContentContainer">
   <div class="homepageContent">
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 80167db56..cb302fc40 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -1,6 +1,7 @@
 <%= javascript_include_tag 'bootstrap' %>
-<%= stylesheet_link_tag 'project' %>
-<%= stylesheet_link_tag 'leftside' %>
+<%= stylesheet_link_tag 'css/project' %>
+<%= stylesheet_link_tag 'css/structure' %>
+<%= stylesheet_link_tag 'css/popup' %>
 <%= javascript_include_tag 'attachments' %>
 
 <script>