From c5a9defb3f4257c6e8c7002ffa96be107dffddd2 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 21 Nov 2014 17:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E7=A8=8B=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_file.html.erb | 18 ++++++++++++++++--
 app/views/files/_course_list.html.erb |  2 +-
 app/views/tags/_tag_add.html.erb      | 13 +++++++------
 public/stylesheets/resource.css       | 10 +++++-----
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 49747ae11..04ce917c8 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -18,6 +18,20 @@
       hideModal($("#popbox_upload"));
   }
 
+   function presscss(id)
+   {
+       if(id == "incourse")
+       {
+         $('#incourse').attr("class", "re_schbtn b_dblue");
+         $('#insite').attr("class", "re_schbtn b_lblue");
+       }
+       else
+       {
+         $('#incourse').attr("class", "re_schbtn b_lblue");
+         $('#insite').attr("class", "re_schbtn b_dblue");
+       }
+   }
+
 </script>
 
 <div class="container">
@@ -25,8 +39,8 @@
 <div class="re_top">
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search f_l",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "课内搜索", :class => "re_schbtn b_dblue",:name => "incourse"%>
-          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite" %>
+          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onclick => "presscss('incourse')"%>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onclick => "presscss('insite')" %>
       <% end %>
   <% if is_course_teacher(User.current,@course) %>
     <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload()">上传资源</a>
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index fa22c404d..cb776aeb7 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -37,7 +37,7 @@
       </div>
       <div class="cl"></div>
       <div class="">
-        <p class="f_l c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+        <p class="f_l c_grey02 font">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <%= link_to( l(:button_delete), attachment_path(file),
                      :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
         <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用0 </p>
diff --git a/app/views/tags/_tag_add.html.erb b/app/views/tags/_tag_add.html.erb
index 14f2dc965..0b59015f2 100644
--- a/app/views/tags/_tag_add.html.erb
+++ b/app/views/tags/_tag_add.html.erb
@@ -1,13 +1,14 @@
 <%= link_to '+ 添加标签', 'javascript:void(0);',
             :class => "yellowBtn f_l",
             :onclick=>"$('#add_tag_#{obj.id}').slideToggle();" if User.current.logged? %> <!-- $('#put-tag-form-#{obj.class}-#{obj.id}').toggle(); readmore(this); -->
-<span id="add_tag_<%= obj.id %>" style="display:none; vertical-align: middle;" class="ml10 f_l">
+
                   <%= form_for "tag_for_save",:remote=>true,:url => save_tag_path,
                                :update => "tags_show",
                                :complete => '$("#put-tag-form").hide();' do |f| %>
-			        <%= f.text_field :name ,:id => "tags_name_#{obj.id}",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class => "isTxt w90 f_l" %>
-                    <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
-                    <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
-                    <%= f.submit "",:class => "submit f_l" %>
+                    <span id="add_tag_<%= obj.id %>" style="display:none; vertical-align: middle;" class="ml10 f_l">
+			          <%= f.text_field :name ,:id => "tags_name_#{obj.id}",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class => "isTxt w90 f_l" %>
+                      <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
+                      <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+                      <%= f.submit "",:class => "submit f_l" %>
+                    </span>
 			      <% end %>
-</span>
\ No newline at end of file
diff --git a/public/stylesheets/resource.css b/public/stylesheets/resource.css
index 1046429be..fc6b74b75 100644
--- a/public/stylesheets/resource.css
+++ b/public/stylesheets/resource.css
@@ -12,11 +12,12 @@ a:hover{ text-decoration:underline;}
 .b_lblue{ background:#64bdd9 !important;}
 .b_dblue{ background:#55a1b9 !important; cursor:pointer !important;}
 .f_b{ font-weight: bold !important;}
-.c_blue{ color:#64bdd9;}
+.c_blue{ color:#64bdd9 !important;}
 .c_grey{ color:#999999 !important;}
 .c_grey02{ color:#666666 !important;}
+.font{ font-size: 12px;}
 .f_14{ font-size:14px ;}
-.c_dblue{ color:#3e6d8e;}
+.c_dblue{ color:#3e6d8e !important;}
 .w90{width:90px;}
 .ml10{margin-left:10px;}
 .ml5{margin-left:5px;}
@@ -46,14 +47,14 @@ a:hover{ text-decoration:underline;}
     text-shadow: none !important;
 }
 a.re_fabu { display:block; width:90px; height:35px; font-size:14px; color:#fff; text-align:center; padding-top:5px; margin:5px; }
-a:hover.re_fabu{background:#55a1b9;}
+a:hover.re_fabu{background:#55a1b9 !important;}
 /****列表***/
 .re_con{ margin:5px; width:683px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
 a.re_select{ display:block; width:88px; height:22px; background:url(images/pic_select01.png) 0 0 no-repeat; color:#fff; font-weight:bold; margin-left:10px;}
 a:hover.re_select{background:url(images/pic_select02.png) 0 0 no-repeat;}
-.re_open{display:block; width:46px; height:22px; background:url(images/pic_open01.png) 0 0 no-repeat; color:#fff; font-weight:bold; margin-left:10px;}
+.re_open{display:block; width:46px; height:22px; background:url(images/pic_open01.png) 0 0 no-repeat; color:#fff !important; font-weight:bold; margin-left:10px;}
 a:hover.re_open{background:url(images/pic_open02.png) 0 0 no-repeat;}
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding:10px 0;}
@@ -76,7 +77,6 @@ a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
     margin-top:2px !important;
     margin-left:3px !important;
     border:none !important;
-    margin-left:0px !important;
     box-shadow: none !important;
     padding: 0px !important;
     border-radius: 0 !important;