与班级相关平台班级名称规范调整

app/helpers/users_helper.rb

@@ -162,17 +162,17 @@ module UsersHelper
   end
 
   def current_time_and_term_resource course
-    str = ""
+    str = course.syllabus.title + "<span class='fb'> · </span>"
     term = cur_course_term_resource
     name = course.name
     if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
-      str = name + "(" + course.time.to_s + course.term.to_s + ")"
+      str = str + name + "(" + course.time.to_s + course.term.to_s + ")"
     elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
-      str = name + "(" + course.time.to_s + course.term.to_s + ")"
+      str = str + name + "(" + course.time.to_s + course.term.to_s + ")"
     elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
-      str = name + "(" + course.end_time.to_s + course.end_term.to_s + ")"
+      str = str + name + "(" + course.end_time.to_s + course.end_term.to_s + ")"
     else
-      str = name + "(" + Time.now.year.to_s + cur_course_term_resource.to_s + ")"
+      str = str + name + "(" + Time.now.year.to_s + cur_course_term_resource.to_s + ")"
     end
     str
   end

app/views/courses/_recommendation.html.erb

@@ -4,7 +4,10 @@
       <% exc_course.each_with_index do |e_course, i| %>
           <li>
             <span class="sy_sq_orange fl mr5 mt5"><%= i+1 %></span>
+            <%= link_to e_course.syllabus.title, syllabus_path(e_course.syllabus_id), :target => '_blank', :class => "sy_class_ltitle fl"%>
+            <span class="fl">&nbsp;<font class="fb c_grey">·</font>&nbsp;</span>
             <%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle fl mb10" %>
+            <div class="cl"></div>
             <p class="sy_cgrey ml20">
               <% homework_count = e_course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
               <% if homework_count > 0 %>

app/views/layouts/_course_base_info.html.erb

@@ -54,7 +54,11 @@
 </div>
 <div class="sy_class_info fl ml15">
   <div  class="sy_class_titbox">
-    <h3 class="fl sy_class_title"><%=@course.name %></h3>
+    <h3 class="fl sy_class_title">
+      <%= link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class =>'c_dark', :target => '_blank'%>
+      &nbsp;<font class="fb">·</font>&nbsp;
+      <%=@course.name %>
+    </h3>
     <span class="<%= @course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
     <p class="sy_cgrey fl mt3">
       <span class=" mr15">教师：<%= course_teacher_link teacher_num %></span>

app/views/layouts/_user_courses.html.erb

@@ -2,7 +2,12 @@
     <li>
       <span class="user_icons_class"></span>
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
-      <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
+      <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu hidden" title="<%= course.syllabus.title+' · '+(course.is_public? ? '公开班级：' : '私有班级：')+course.name+'（'+current_time_and_term(course)+'）' %>">
+        <%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank'%>
+        &nbsp;<font class="fb">·</font>&nbsp;
+        <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank'%>
+      </p>
+      <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
                   :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
       <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
       <% wechat_count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>

app/views/syllabuses/_syllabus_course_list.html.erb

@@ -18,11 +18,19 @@
       <% @courses.each do |course| %>
           <ul class="sy_classlist">
             <div class="fl">
-              <% if !course.is_public && !User.current.member_of_course?(course) %>
+              <% if course.is_public == 0 && !User.current.member_of_course?(course) && !User.current.admin? %>
-                  <h3 class="sy_classlist_title fl"><%=course.name %>（<%=current_time_and_term_short(course) %>）</h3>
+                  <h3 class="sy_classlist_title fl">
+                    <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_classlist_title fl", :style => 'color:#000', :target => '_blank' %>
+                    <span class="fl">&nbsp;<font class="fb">·</font>&nbsp;</span>
+                    <%=course.name %>（<%=current_time_and_term_short(course) %>）
+                  </h3>
               <% else %>
+                <h3 class="sy_classlist_title fl">
+                  <%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_classlist_title fl", :style => 'color:#000', :target => '_blank' %>
+                  <span class="fl">&nbsp;<font class="fb">·</font>&nbsp;</span>
                   <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "sy_classlist_title fl",
                               :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
+                </h3>
               <% end %>
               <span class="<%= course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
               <div class="cl"></div>

app/views/users/_course_attachment.html.erb

@@ -12,7 +12,9 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 班级资源", course_files_path(activity.course), :class => "newsBlue ml15" %>
+        <%=link_to activity.course.syllabus.title, syllabus_path(activity.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.course.name.to_s+" | 班级资源", course_files_path(activity.course), :class => "newsBlue" %>
       </div>
       <div class="homepagePostTitle break_word" >
         <%= link_to activity.filename, course_files_path(activity.course), :class => "postGrey" %>

app/views/users/_course_create.html.erb

@@ -12,7 +12,9 @@
             <%= link_to activity.try(:teacher).try(:realname), user_path(activity.tea_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.name.to_s+" | 班级", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+        <%=link_to activity.syllabus.title, syllabus_path(activity.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.name.to_s+" | 班级", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue" %>
       </div>
       <div class="homepagePostTitle break_word" >
         <%= link_to activity.name, course_path(activity.id,:host=>Setting.host_course), :class => "postGrey" %>

app/views/users/_course_homework.html.erb

@@ -9,7 +9,9 @@
       <div class="homepagePostTo break_word">
         <%= link_to activity.user.show_name, user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
          TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 班级作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
+        <%=link_to activity.course.syllabus.title, syllabus_path(activity.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.course.name.to_s+" | 班级作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue"%>
       </div>
       <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>

app/views/users/_course_journalsformessage.html.erb

@@ -9,7 +9,9 @@
         <%= link_to activity.user.show_name, user_path(activity.user_id), :class => "newsBlue mr15" %>
          TO
         <% course=Course.find(activity.jour_id) %>
-        <%= link_to course.name.to_s+" | 班级留言", course_feedback_path(course), :class => "newsBlue ml15" %>
+        <%=link_to course.syllabus.title, syllabus_path(course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to course.name.to_s+" | 班级留言", course_feedback_path(course), :class => "newsBlue" %>
       </div>
       <!--<div class="homepagePostTitle break_word list_style upload_img">
         <%# if activity.parent %>

app/views/users/_course_message.html.erb

@@ -8,7 +8,9 @@
       <div class="homepagePostTo break_word">
         <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO
-        <%= link_to activity.course.name.to_s+" | 班级讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%=link_to activity.course.syllabus.title, syllabus_path(activity.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.course.name.to_s+" | 班级讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->

app/views/users/_course_news.html.erb

@@ -8,7 +8,9 @@
       <div class="homepagePostTo break_word">
          <%= link_to activity.author.show_name, user_path(activity.author_id), :class => "newsBlue mr15" %>
          TO  <!--+"(课程名称)"-->
-        <%= link_to activity.course.name.to_s+" | 班级通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
+        <%=link_to activity.course.syllabus.title, syllabus_path(activity.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to activity.course.name.to_s+" | 班级通知", course_news_index_path(activity.course), :class => "newsBlue" %>
       </div>
       <div class="homepagePostTitle break_word hidden fl m_w600"> <!--+"(通知标题)"-->
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>

app/views/users/_course_poll.html.erb

@@ -16,7 +16,10 @@
             <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
+        <% course = Course.find(activity.polls_group_id) %>
+        <%=link_to course.syllabus.title, syllabus_path(course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to course.name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue" %>
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
       <div class="homepagePostTitle break_word" >

app/views/users/_homework_repository_list.html.erb

@@ -15,10 +15,14 @@
         </h3>
         <span class="<%=homework.course.is_public? ? 'hw_icon_open' : 'hw_icon_private'%> fl mt3"></span>
         <div class="cl"></div>
-        <p class="sy_cgrey">
+        <div class="sy_cgrey">
           <span class="fl">
             <span class="fl">来源：</span>
-            <%=link_to homework.course.name.to_s + "（#{current_time_and_term_short(homework.course)}）", course_path(homework.course), :class => 'hw_cgrey hw_list_classname fl mr15', :target => '_blank' %>
+            <p class="fl syllabus_course_name">
+            <%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey fl', :target => '_blank' %>
+            <span class="fl"> • </span>
+            <%=link_to homework.course.name.to_s + "（#{current_time_and_term_short(homework.course)}）", course_path(homework.course), :class => 'hw_cgrey fl mr15', :target => '_blank' %>
+            </p>
           </span>
           <% if type == "2" %>
               <span class="mr15 fl">
@@ -42,7 +46,7 @@
           <% else %>
             <span class="fl mr15">发布时间：<%= format_date(homework.publish_time) %></span>
         <% end %>
-        </p>
+        </div>
         <div class="cl"></div>
       </div>
       <% student_ids = homework.course.student.empty? ? [] : homework.course.student.map{|student| student.student_id}.join(',') %>

app/views/users/_manage_homework_list.html.erb

@@ -13,6 +13,8 @@
           <div class="cl"></div>
           <p class="sy_cgrey clear">
             <span class="fl">来源：</span>
+            <%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey fl', :target => '_blank' %>
+            <span class="fl"> • </span>
             <%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey hw_classname fl mr15' %>
             <span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
             <span class="fl">作品：</span>

app/views/users/_receive_homework_list.html.erb

@@ -13,6 +13,8 @@
           <div class="cl"></div>
           <p class="sy_cgrey clear">
             <span class=" fl">来源：</span>
+            <%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey fl', :target => '_blank' %>
+            <span class="fl"> • </span>
             <%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey hw_classname fl mr15' %>
             <span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
             <% my_work = cur_user_works_for_homework(homework) %>

app/views/users/_resources_list.html.erb

@@ -13,13 +13,13 @@
             <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
-          <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
+          <!--<li class="resource-list-quote fr"><%#= attach.quotes.nil? ? 0 : attach.quotes %></li>-->
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
           <li class="resource-list-uploader fr hidden"><%= User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
-          <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
+          <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach).html_safe %>"><%= get_resource_origin(attach).html_safe %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>

app/views/users/_user_homework_detail.html.erb

@@ -8,7 +8,9 @@
       <div class="homepagePostTo">
         <%= link_to homework_common.user.show_name, user_activities_path(homework_common.user_id), :class => "newsBlue mr15"%>
         TO
-        <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
+        <%=link_to homework_common.course.syllabus.title, syllabus_path(homework_common.course.syllabus_id), :class => 'newsBlue ml15', :target => '_blank' %>
+        <span class="fb" style="color: #269ac9"> • </span>
+        <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue"%>
       </div>
           <span class="homepagePostTitle hidden fl m_w505">
             <% if is_in_course == 1%>

app/views/users/_user_resource_tip_list.html.erb

@@ -8,12 +8,12 @@
         <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
     <% end %>
   </li>
-  <li class="resource-list-quote fr">
+  <!--<li class="resource-list-quote fr">-->
-    <%= link_to "引用数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "fl", :remote => true %>
+    <!--<%#= link_to "引用数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "fl", :remote => true %>-->
-    <% if @order == "quotes" %>
+    <!--<%# if @order == "quotes" %>-->
-        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+        <!--<%#= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "quotes"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>-->
-    <% end %>
+    <!--<%# end %>-->
-  </li>
+  <!--</li>-->
   <li class="resource-list-download fr">
     <%= link_to "下载数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "fl", :remote => true %>
     <% if @order == "downloads" %>

public/stylesheets/css/public.css

@@ -321,7 +321,7 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
 .resource-list-checkbox {width:20px; height:40px; line-height:40px; text-align:center; vertical-align:middle;}
 .resource-checkbox {margin-top:14px; width:12px; height:12px;}
 .resource-list-name {width:380px; height:40px; line-height:40px; text-align:left;}
-.resource-list-from {width:150px; height:40px; line-height:40px; text-align:center;}
+.resource-list-from {width:210px; height:40px; line-height:40px; text-align:center;}
 .resource-list-size {width:80px; height:40px; line-height:40px; text-align:center;}
 .resource-list-type {width:80px; height:40px; line-height:40px; text-align:center;}
 .resource-list-uploader {width:80px; height:40px; line-height:40px; text-align:center;}

public/stylesheets/syllabus.css

@@ -602,6 +602,7 @@ a:hover.sy_class_ltitle{ color:#333;}
 /*.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}*/
 .hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;}
 .hw_list_classname{ width:300px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+.syllabus_course_name{ width:450px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 .hw_list_teachername{ width:80px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 /* 测试集显示 */
 .hw_popup_testtable{background:#fff; color:#888888; margin:10px 0;  border-right:1px solid #e7e7e7; border-bottom:1px solid #e7e7e7;}