Merge branch 'hjq_new_course' into develop

app/controllers/files_controller.rb

@@ -529,6 +529,7 @@ class FilesController < ApplicationController
            if attachment.publish_time > Date.today
              attachment.is_publish = 0
            end
+           attachment.description = params[:description]
            attachment.save
          end
        end

app/models/journals_for_message.rb

@@ -288,7 +288,7 @@ class JournalsForMessage < ActiveRecord::Base
     if self.jour_type == "Course"
       course_member_score(self.jour_id, self.user_id, "JournalForMessage")
     elsif self.jour_type == "HomeworkCommon"
-      course_member_score(self.jour_id, self.user_id, "HomeworkCommon")
+      course_member_score(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
 

app/views/files/_course_file.html.erb

@@ -91,7 +91,7 @@
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
           <%= submit_tag "课内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %>
-          <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
+          <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
           <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>
               <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
               <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "blue-btn fr mr5", :remote => true) %>

app/views/files/_resource_detail.html.erb

@@ -27,6 +27,10 @@
         <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
         <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
       </div>
+      <% unless file.description.blank? %>
+          <div class="cl"></div>
+          <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
+      <% end %>
       <div class="cl"></div>
       <div class="tag_h">
         <!-- container_type = 1 代表是课程里的资源 -->

app/views/files/_subfield_files.html.erb

@@ -40,7 +40,7 @@
       <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
           <%= submit_tag "栏目内搜索", :class => "blueBtn mr5 fl",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
-          <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+          <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
           <input class="blueBtn fr mr5" value="上传资源" onclick="org_upload_files(<%= org_subfield.id %>);">
           <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :subfield_file_id => @org_subfield.id), :class => "blue-btn fr mr5", :remote => true) %>
           <%#= link_to "上传资源",subfield_upload_file_org_subfield_files_path(@org_subfield.id, :in_org => 1),:method => "post",:class=>"blueBtn fr mr5",:remote => true %>

app/views/files/_upload_course_files.erb

@@ -22,6 +22,14 @@
           <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
           </div>
           <div class="cl"></div>
+          <div class="mb5">
+            <label class="fl c_dark f14" style="margin-top: 4px;">附件描述：</label>
+            <div class="fl">
+              <input  type="text" name="description"  placeholder="文件描述" class="fl W120 ">
+            </div>
+            <div class="cl"></div>
+          </div>
+
           <% if User.current.allowed_to?(:as_teacher,course) %>
               <div class="mb5">
                 <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>

app/views/files/index.html.erb

@@ -13,7 +13,6 @@
       </div>
   <% end %>
 
-
 <script type='text/javascript'>
     var slideHeight = 29;
     function readmore(aNode) {

app/views/users/_import_resource_info.html.erb

@@ -1,8 +1,13 @@
 <script>
     $(document).ready(function(){
-        $(".subjectChoose").click(function(){
-            $(".subjectChoose").removeClass("chooseActive");
-            $(this).addClass("chooseActive");
+        <% if type == "1" %>
+            $("#my_resources_choose").addClass("choose-active");
+            $("#public_resources_choose").removeClass("choose-active");
+        <% end %>
+
+        $(".subject-choose").click(function(){
+            $(".subject-choose").removeClass("choose-active");
+            $(this).addClass("choose-active");
         });
         $(".popupClose").click(function(){
             $(".popupWrap").hide();
@@ -12,20 +17,20 @@
 <div class="f16 fb fontBlue mb10">选用资源库中的资源</div>
 <div class="subjectList fl mr10">
   <% if !params[:course_id].nil? %>
-      <a href="<%= import_resources_user_path(User.current, :type => '6', :course_id => params[:course_id]) %>" class="subjectChoose chooseActive fl" data-remote="true">公共资源</a>
-      <a href="<%= import_resources_user_path(User.current, :type => '1', :course_id => params[:course_id]) %>"  class="subjectChoose fl" data-remote="true">我的资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '6', :course_id => params[:course_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '1', :course_id => params[:course_id]) %>"  id="my_resources_choose"  class="subject-choose fl" data-remote="true">我的资源</a>
   <% elsif !params[:project_id].nil? %>
-      <a href="<%= import_resources_user_path(User.current, :type => '6', :project_id => params[:project_id]) %>" class="subjectChoose chooseActive fl" data-remote="true">公共资源</a>
-      <a href="<%= import_resources_user_path(User.current, :type => '1', :project_id => params[:project_id]) %>"  class="subjectChoose fl" data-remote="true">我的资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '6', :project_id => params[:project_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '1', :project_id => params[:project_id]) %>"  id="my_resources_choose"  class="subject-choose fl" data-remote="true">我的资源</a>
   <% elsif !params[:subfield_file_id].nil? %>
-      <a href="<%= import_resources_user_path(User.current, :type => '6', :subfield_file_id => params[:subfield_file_id]) %>" class="subjectChoose chooseActive fl" data-remote="true">公共资源</a>
-      <a href="<%= import_resources_user_path(User.current, :type => '1', :subfield_file_id => params[:subfield_file_id]) %>"  class="subjectChoose fl" data-remote="true">我的资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '6', :subfield_file_id => params[:subfield_file_id]) %>" id="public_resources_choose" class="subject-choose choose-active fl" data-remote="true">公共资源</a>
+      <a href="<%= import_resources_user_path(User.current, :type => '1', :subfield_file_id => params[:subfield_file_id]) %>"  id="my_resources_choose" class="subject-choose fl" data-remote="true">我的资源</a>
   <% end %>
-  <%= form_tag( url_for(:controller => 'users', :action => 'resource_search', :id => User.current.id),
+  <%#= form_tag( url_for(:controller => 'users', :action => 'import_resources_search', :id => User.current.id, :type => 1),
                 :remote => true , :method => 'get',  :id => 'resource_search_form') do %>
-      <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />
-      <%= hidden_field_tag(:type,type.nil? ? 1 : type) %>
-  <% end %>
+      <!--<input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />-->
+      <%#= hidden_field_tag(:type,type.nil? ? 1 : type) %>
+  <%# end %>
 
   <div class="cl"></div>
 
@@ -50,7 +55,7 @@
             </label>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
-          <li class="subjectCount fl"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="subjectCount fl hidden"><%= number_to_human_size(attach.filesize) %></li>
           <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
         </ul>

app/views/users/import_resources.js.erb

@@ -1,9 +1,9 @@
 <% if params[:project_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :project_id => params[:project_id]} ) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :project_id => params[:project_id]} ) %>');
 <% elsif params[:course_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :course_id => params[:course_id]} ) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :course_id => params[:course_id]} ) %>');
 <% elsif params[:subfield_file_id] %>
-$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :subfield_file_id => params[:subfield_file_id]} ) %>');
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => @type, :subfield_file_id => params[:subfield_file_id]} ) %>');
 <% end %>
 showModal('ajax-modal', '615px');
 $('#ajax-modal').siblings().remove();

app/views/users/import_resources_search.js.erb

@@ -0,0 +1,25 @@
+//$("#resources_list").html('<%#= escape_javascript( render :partial => 'users/import_resource_info' ,:locals=>{ :attachments => @attachments, :type => @type})%>');
+//$("#pages").html('<%#= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+//$("#res_all_count").html(<%#= @atta_count%>);
+//$("#res_count").html(0);
+//$("#checkboxAll").attr('checked',false);
+
+
+<% if params[:project_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :project_id => params[:project_id]} ) %>');
+<% elsif params[:course_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :course_id => params[:course_id]} ) %>');
+<% elsif params[:subfield_file_id] %>
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1, :subfield_file_id => params[:subfield_file_id]} ) %>');
+<% end %>
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+<% if params[:project_id] %>
+$('#ajax-modal').parent().css("top","10%").css("left","34%").css("border","3px solid #269ac9");
+<% else %>
+$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
+<% end %>
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+

app/views/users/user_resource.html.erb

@@ -12,7 +12,7 @@
 
     }
     $(document).ready(function(){
-            $(".resource-switch").click(function(){
+           $(".resource-switch").click(function(){
                 $(".resource-switch").children().removeClass("resource-tab-active");
                 $(this).children().addClass("resource-tab-active");
             });
@@ -69,14 +69,13 @@
         }
     }
 </script>
-
 <div>
   <ul class="resource-banner">
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '6') %>" class="resource-tab resource-tab-active" data-remote="true">公共资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '6', :status => @status) %>" class="resource-tab resource-tab-active" id="public_resource_list" data-remote="true">公共资源</a>
     </li>
     <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '1') %>"  class="resource-tab" data-remote="true">我的资源</a>
+      <a href="<%= user_resource_user_path(@user, :type => '1', :status => @status) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
     <li class="fl w770 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
@@ -84,19 +83,23 @@
         <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
           <ul class="resourcesType">
             <li>
-              <%= link_to '全部' ,user_resource_user_path(:id => @user.id, :type => 1), :remote => true, :method => 'get', :class => 'resourcesTypeAll resourcesGrey' %>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 1)%>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
             </li>
             <li>
-              <%= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 2) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
+              <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
             </li>
             <li>
-              <%= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 3) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
+              <%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
             </li>
             <li>
-              <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 5) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
+              <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
             </li>
             <li>
-              <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 4) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
+              <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
             </li>
           </ul>
         </li>

app/views/users/user_resource.js.erb

@@ -3,4 +3,13 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
-$("#res_all_count").html(<%= @atta_count%>);
+$("#res_all_count").html(<%= @atta_count %>);
+
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6', :status => @status) %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1', :status => @status) %>');
+
+$("#resource_type_all").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 1) %>');
+$("#resource_type_course").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 2) %>');
+$("#resource_type_project").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 3) %>');
+$("#resource_type_user").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 5) %>');
+$("#resource_type_file").attr('href','<%= user_resource_user_path(@user,:type => @type, :status => 4) %>');

config/routes.rb

@@ -538,6 +538,7 @@ RedmineApp::Application.routes.draw do
       get 'edit_brief_introduction'
       get "user_resource"
       get "import_resources"
+      get "import_resources_search"
       post "import_into_container"
       get "resource_search"
       post "user_resource_create"