From 298b767fc4676674920eef5f4de656fe127264b7 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 1 Dec 2014 15:03:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E4=BA=8E=E8=AF=BE=E7=A8=8B=E5=A4=96=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E4=B8=8D=E5=9C=A8=E6=98=BE=E7=A4=BA=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/files_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index c9a232c36..e1aebefdc 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -86,7 +86,7 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? || (attachment.container_type == "Course" && attachment.author.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+      if attachment.is_public? || (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
         result << attachment
       end
     end
@@ -106,7 +106,7 @@ module FilesHelper
   def visable_attachemnts_insite attachments,course
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? || (attachment.container_type == "Course" && attachment.container_id == course.id  && attachment.author.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+      if attachment.is_public? || (attachment.container_type == "Course" && attachment.container_id == course.id  && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
         result << attachment
       end
     end

From d37d7fb83de0a6d1f55138441a9209222fdcb20f Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 1 Dec 2014 16:34:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97=E4=B8=A4=E4=B8=AA=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8C=89=E9=92=AE=E9=BC=A0=E6=A0=87=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=89=8D=E6=94=B9=E5=8F=98=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E4=BB=A3=E7=A0=81=E8=A2=AB=E8=BF=98=E5=8E=9F=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_file.html.erb | 85 ++++++++++++++-------------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 04ce917c8..030b6cb24 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -4,55 +4,60 @@
 
 <%= stylesheet_link_tag  'resource', :media => 'all' %>
 <script>
-  function show_upload()
-  {
-      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course}) %>');
-      showModal('ajax-modal', '513px');
-      $('#ajax-modal').siblings().remove();
-      $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-      $('#ajax-modal').parent().css("top","5").css("left","511");
-  }
-
-  function closeModal()
-  {
-      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");
-       }
-   }
+    function show_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().css("top","5").css("left","511");
+    }
+
+    function closeModal()
+    {
+        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");
+        }
+    }
+    function buttoncss()
+    {
+        $('#incourse').attr("class", "re_schbtn b_lblue");
+        $('#insite').attr("class", "re_schbtn b_lblue");
+    }
 
 </script>
 
 <div class="container">
-<div class="resource"><!--资源库内容开始--->
-<div class="re_top">
+  <div class="resource"><!--资源库内容开始--->
+    <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_lblue",:name => "incourse",:id => "incourse", :onclick => "presscss('incourse')"%>
-          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onclick => "presscss('insite')" %>
+          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
       <% end %>
-  <% if is_course_teacher(User.current,@course) %>
-    <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload()">上传资源</a>
-  <% end %>
-</div><!---re_top end-->
-<div class="cl"></div>
+      <% if is_course_teacher(User.current,@course) %>
+          <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload()">上传资源</a>
+      <% end %>
+    </div><!---re_top end-->
+    <div class="cl"></div>
 
-<div class="re_con" id="course_list">
-<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@curse_attachments}  %>
-</div><!---re_con end-->
+    <div class="re_con" id="course_list">
+      <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@curse_attachments}  %>
+    </div><!---re_con end-->
 
-</div>
+  </div>
 
 </div>
 <% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file

From a7d7b790d2045d2cc84d122f9ecca9b9d0025a22 Mon Sep 17 00:00:00 2001
From: zhuhao <zh13964069093@163.com>
Date: Mon, 1 Dec 2014 20:26:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=AC=E5=85=B1=E9=A1=B5=E4=B8=AA?=
 =?UTF-8?q?=E6=80=A7=E7=AD=BE=E5=90=8D=E7=9A=84=E6=8F=90=E4=BA=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb | 7 +++++--
 config/locales/zh.yml                 | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 186166dc8..ba84abc68 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -189,7 +189,7 @@
 											<div id="introduction" style="display: none">
 												<%= form_for('new_form', :method => :post,
 												        :url => {:controller => 'words', :action => 'add_brief_introdution'}) do |f|%>
-                                                    <table border="0" width="100%" align="center" >
+                                                    <table border="0" width="100%" align="center" id="my_brief_introduction">
                                                         <tr>
                                                             <td>
                                                               <%= f.text_area 'user_introduction', :rows => 3,
@@ -203,8 +203,11 @@
                                                     <table border="0" width="200px" align="center">
                                                         <tr>
                                                             <td align="right">
-                                                              <%= submit_tag l(:button_submit), :name => nil ,
+                                                              <%#= submit_tag l(:button_submit), :name => nil ,
                                                                                 :class => "bid_btn" %>
+                                                              <a href="#"  onclick='$("#my_brief_introduction").parent().submit();'  class="ButtonColor m3p10" >
+                                                                <%= l(:label_submit)%>
+                                                              </a>
                                                             </td>
                                                         </tr>
                                                     </table>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c303f0004..5aedd93a7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1723,6 +1723,7 @@ zh:
   label_user_create_project: 创建了
   label_user_create_project_homework: 创建了作业
 #added by bai
+  label_submit: 提交
   label_identity: 身份
   label_teacher: 教师
   label_teacher_homework: 教师姓名