Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/courses_controller.rb

@@ -1284,18 +1284,18 @@ class CoursesController < ApplicationController
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
-        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+        ) AS score,(SELECT max(message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
          resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id
         ) AS act_score,(SELECT SUM(exercise_users.score) FROM exercise_users,exercises WHERE exercise_users.exercise_id = exercises.id
         AND exercises.course_id = #{@course.id} AND exercise_users.user_id = members.user_id) AS ex_score,
-        (SELECT student_id FROM user_extensions WHERE user_extensions.user_id = members.user_id) AS student_id,
-        (SELECT message_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_num,
-        (SELECT message_reply_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_reply_num,
-        (SELECT news_reply_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_reply_num,
-        (SELECT news_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_num,
-        (SELECT resource_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS resource_num,
-        (SELECT journal_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS journal_num,
-        (SELECT homework_journal_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS homework_journal_num,
+        (SELECT max(student_id) FROM user_extensions WHERE user_extensions.user_id = members.user_id) AS student_id,
+        (SELECT max(message_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_num,
+        (SELECT max(message_reply_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_reply_num,
+        (SELECT max(news_reply_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_reply_num,
+        (SELECT max(news_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_num,
+        (SELECT max(resource_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS resource_num,
+        (SELECT max(journal_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS journal_num,
+        (SELECT max(homework_journal_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS homework_journal_num,
         (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND hc.course_id = #{@course.id} AND ss.work_status != 0 AND ss.user_id = members.user_id) AS homework_num,
         (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{@course.id} AND exercises.end_time >= eu.created_at AND eu.user_id = members.user_id) AS exercise_num
         FROM members
@@ -1309,18 +1309,18 @@ class CoursesController < ApplicationController
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
           AND student_works.user_id = members.user_id
-        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+        ) AS score,(SELECT max(message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
          resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id
         ) AS act_score,(SELECT SUM(exercise_users.score) FROM exercise_users,exercises WHERE exercise_users.exercise_id = exercises.id
         AND exercises.course_id = #{@course.id} AND exercise_users.user_id = members.user_id) AS ex_score,
-        (SELECT student_id FROM user_extensions WHERE user_extensions.user_id = members.user_id) AS student_id,
-        (SELECT message_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_num,
-        (SELECT message_reply_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_reply_num,
-        (SELECT news_reply_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_reply_num,
-        (SELECT news_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_num,
-        (SELECT resource_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS resource_num,
-        (SELECT journal_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS journal_num,
-        (SELECT homework_journal_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS homework_journal_num,
+        (SELECT max(student_id) FROM user_extensions WHERE user_extensions.user_id = members.user_id) AS student_id,
+        (SELECT max(message_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_num,
+        (SELECT max(message_reply_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_reply_num,
+        (SELECT max(news_reply_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_reply_num,
+        (SELECT max(news_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_num,
+        (SELECT max(resource_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS resource_num,
+        (SELECT max(journal_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS journal_num,
+        (SELECT max(homework_journal_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS homework_journal_num,
         (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND hc.course_id = #{@course.id} AND ss.work_status != 0 AND ss.user_id = members.user_id) AS homework_num,
         (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{@course.id} AND exercises.end_time >= eu.created_at AND eu.user_id = members.user_id) AS exercise_num
         FROM members
@@ -1338,14 +1338,14 @@ class CoursesController < ApplicationController
          resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id
         ) AS act_score,(SELECT SUM(exercise_users.score) FROM exercise_users,exercises WHERE exercise_users.exercise_id = exercises.id
         AND exercises.course_id = #{@course.id} AND exercise_users.user_id = members.user_id) AS ex_score,
-        (SELECT student_id FROM user_extensions WHERE user_extensions.user_id = members.user_id) AS student_id,
-        (SELECT message_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_num,
-        (SELECT message_reply_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_reply_num,
-        (SELECT news_reply_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_reply_num,
-        (SELECT news_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_num,
-        (SELECT resource_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS resource_num,
-        (SELECT journal_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS journal_num,
-        (SELECT homework_journal_num FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS homework_journal_num,
+        (SELECT max(student_id) FROM user_extensions WHERE user_extensions.user_id = members.user_id) AS student_id,
+        (SELECT max(message_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_num,
+        (SELECT max(message_reply_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS message_reply_num,
+        (SELECT max(news_reply_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_reply_num,
+        (SELECT max(news_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS news_num,
+        (SELECT max(resource_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS resource_num,
+        (SELECT max(journal_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS journal_num,
+        (SELECT max(homework_journal_num) FROM course_contributor_scores AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id) AS homework_journal_num,
         (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND hc.course_id = #{@course.id} AND ss.work_status != 0 AND ss.user_id = members.user_id) AS homework_num,
         (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{@course.id} AND exercises.end_time >= eu.created_at AND eu.user_id = members.user_id) AS exercise_num
         FROM members

app/controllers/syllabus_member_controller.rb

@@ -45,12 +45,12 @@ class SyllabusMemberController < ApplicationController
     member = SyllabusMember.find(params[:id])
     @syllabus = member.syllabus
     members = @syllabus.syllabus_members
-    if params[:opr] == 'up' && member.rank > 2
+    if params[:opr] == 'up' && member.rank > 1
       before_mem = members.where("rank = #{member.rank - 1}").first
       if before_mem && member.update_attribute('rank', member.rank - 1)
         before_mem.update_attribute('rank', before_mem.rank + 1)
       end
-    elsif params[:opr] == 'down' && member.rank > 1 && member.rank < members.count
+    elsif params[:opr] == 'down' && member.rank < members.count
       after_mem = members.where("rank = #{member.rank + 1}").first
       if after_mem && member.update_attribute('rank', member.rank + 1)
         after_mem.update_attribute('rank', after_mem.rank - 1)

app/controllers/syllabuses_controller.rb

@@ -33,6 +33,8 @@ class SyllabusesController < ApplicationController
       @syllabus.user_id = User.current.id
       @syllabus.description = Message.where("id = 19412").first.nil? ? '' : Message.where("id = 19412").first.content
       if @syllabus && @syllabus.save
+        member =  SyllabusMember.create(:user_id => @syllabus.user_id, :rank => 1)
+        @syllabus.syllabus_members << member
         respond_to do |format|
           flash[:notice] = l(:notice_successful_create)
           format.html {redirect_to syllabus_path(@syllabus)}

app/controllers/users_controller.rb

@@ -3200,6 +3200,7 @@ class UsersController < ApplicationController
         ori = Attachment.find_by_id(send_id)
         # 如果该附件已经存课程中，则只更新附件创建时间
         mul_container.attachments.each do |att|
+          @exist = false
           if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
             att.created_on = Time.now
             att.save

app/helpers/application_helper.rb

@@ -3578,7 +3578,9 @@ def get_group_member_names work
 end
 
 def course_syllabus_option user = User.current
-  syllabuses = user.syllabuses
+  syllabus_members = SyllabusMember.where("user_id = #{user.id}")
+  syllabus_ids = syllabus_members.empty? ? "(-1)" : "(" + syllabus_members.map{|mem| mem.syllabus_id}.join(',') + ")"
+  syllabuses = Syllabus.where("id in #{syllabus_ids}")
   type = []
   option1 = []
   option1 << "请选择课程"

app/models/user.rb

@@ -853,6 +853,13 @@ class User < Principal
     OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count > 0
   end
 
+  def member_of_syl?(syllabus)
+    if !self.logged?
+      return false
+    end
+    SyllabusMember.where("user_id =? and syllabus_id =?", self.id, syllabus.id).count > 0
+  end
+
   def admin_of_org?(org)
     if self.admin?
       return true

app/views/admin/homework.html.erb

@@ -38,11 +38,13 @@
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
               <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
             </td>
-            <% if homework.course %>
-            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
-              <%= link_to(homework.course.name, course_path(homework.course.id)) %>
+
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%= homework.course.nil? ? "" : homework.course.name %>'>
+              <% if homework.course %>
+                <%= link_to homework.course.name, course_path(homework.course.id) %>
+              <% end %>
             </td>
-            <% end %>
+
             <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
               <% if homework.try(:user).try(:realname) == ' '%>
                   <%= link_to(homework.try(:user), user_path(homework.user_id)) %>

app/views/calendars/show.html.erb

@@ -36,5 +36,5 @@
 <% html_title(l(:label_calendar)) -%>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>

app/views/courses/settings.html.erb

@@ -32,8 +32,9 @@
           </li>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:210px'}  %>
-            <span class="c_red" id="edit_syllabus_notice">如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>，然后【刷新】</span>
+            <span><%=@course.syllabus.title %></span>
+            <%#= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:210px'}  %>
+            <!--<span class="c_red" id="edit_syllabus_notice">如果列表中没有对应的课程，请您先<%#=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>，然后【刷新】</span>-->
           </li>
           <li class="ml45">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>

app/views/gantts/show.html.erb

@@ -319,5 +319,5 @@
 <% end %>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>

app/views/layouts/_logined_header.html.erb

@@ -14,11 +14,12 @@
           <li class="navHomepageMenu fl">
             <%= link_to "题库",  user_homeworks_user_path(User.current), :class => "c_white f16 db p10"%>
           </li>
-          <!--<li class="navHomepageMenu fl mr30">-->
-            <!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
-          <!--</li>-->
+          <li class="navHomepageMenu fl mr30">
+            <%= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>
+          </li>
+      <% else %>
           <li class="navHomepageMenu fl mr40">
-            <a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="c_white f16 db p10" >帮助中心</a>
+            <a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="c_white f16 db p10" >公共贴吧</a>
           </li>
       <% end %>
     </ul>

app/views/layouts/base_projects.html.erb

@@ -89,7 +89,7 @@
   </div>
 
 
-  <div id="RSide" class="fl">
+  <div class="fl">
     <%= render_flash_messages %>
     <%= yield %>
     <%= call_hook :view_layouts_base_content %>

app/views/layouts/base_users_new.html.erb

@@ -146,13 +146,13 @@
         </div>
       <% if @center_flag %>
             <div class="subNav">
-            <a href="<%=url_for(:controller => 'users', :action => 'user_courses',:id=>@user.id)%>" class=" f14 c_blue02">
+            <a href="<%=url_for(:controller => 'users', :action => 'user_courselist',:id=>@user.id)%>" class=" f14 c_blue02">
               我的课程
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.courses.count%>)</span>
             </a>
           </div>
             <div class="subNav">
-            <a href="<%=url_for(:controller => 'users', :action => 'user_projects',:id=>@user.id)%>" class=" f14 c_blue02">
+            <a href="<%=url_for(:controller => 'users', :action => 'user_projectlist',:id=>@user.id)%>" class=" f14 c_blue02">
               我的项目
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.count%>)</span>
             </a>

app/views/poll/other_poll.js.erb

@@ -1,6 +1,6 @@
 
 <% if @polls.empty? %>
-    alert('您目前还没有自己新建的问卷');
+    alert('您目前其他课程无问卷可导入');
 <% else %>
     $('#ajax-modal').html('<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>');
 

app/views/projects/feedback.html.erb

@@ -50,5 +50,5 @@ function checkMaxLength() {
 <% html_title(l(:label_project_tool_response)) -%>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>

app/views/pull_requests/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => "pull_requests/pull_request_container" %>
+<%#= render :partial => "pull_requests/pull_request_container" %>
 <ul id="mergeBanner" class="project-merge-banner">
   <li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li>
   <li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li>
@@ -16,7 +16,8 @@
 
 
 <script>
-    $("#mergeBanner").parent().css("width","730px");
+    $("#mergeBanner").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
+    $("#mergeBanner").parent().before("<div class='homepageRightBanner mb10'><span class='f16 fontGrey3'>Pull Request</span></div>");
 
     $(".project-merge-banner li").click(function(){
         $(".project-merge-banner li").removeClass("active");

app/views/quality_analysis/_result_list.html.erb

@@ -36,7 +36,7 @@
 <% end %>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
 
 

app/views/repositories/show.html.erb

@@ -94,5 +94,5 @@
 <% html_title(l(:label_repository)) -%>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>

app/views/student_work/_evaluation_title.html.erb

@@ -33,7 +33,7 @@
           <%= render :partial => "evaluation_work", :locals => {:student_work => student_work, :index => i}%>
       <tr>
         <td colspan="12">
-          <div id="about_hwork_<%= student_work.id%>">
+          <div id="about_hwork_<%= student_work.id%>" class="about_hwork">
           </div>
         </td>
       </tr>

app/views/student_work/_evaluation_un_group.html.erb

@@ -3,7 +3,7 @@
       <div class="syllabus_courses_list" id="student_work_<%= student_work.id%>" style="cursor: default; background-color:#f6f6f6;">
         <%= render :partial => 'evaluation_un_group_work', :locals => {:student_work => student_work} %>
       </div>
-      <div id="about_hwork_<%= student_work.id %>"></div>
+      <div id="about_hwork_<%= student_work.id %>" class="about_hwork"></div>
 
       <div id="group_member_work_<%= student_work.id%>">
         <%= render :partial => 'group_member_work', :locals => {:student_work => student_work} %>

app/views/student_work/_evaluation_un_title.html.erb

@@ -78,7 +78,7 @@
       <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work, :index => i} %>
       <tr>
         <td colspan="12">
-          <div id="about_hwork_<%= student_work.id %>">
+          <div id="about_hwork_<%= student_work.id %>" class="about_hwork">
           </div>
         </td>
       </tr>

app/views/student_work/_group_member_work.html.erb

@@ -6,6 +6,6 @@
       <%= render :partial => 'evaluation_un_group_member_work', :locals => {:st => st, :anon_count => anon_count} %>
     </div>
     <% if j != 0 %>
-        <div id="about_hwork_<%= st.id %>"></div>
+        <div id="about_hwork_<%= st.id %>" class="about_hwork"></div>
     <% end %>
 <% end %>

app/views/student_work/show.js.erb

@@ -2,6 +2,7 @@ if($("#about_hwork_<%= @work.id%>").children().length > 0){
   $("#about_hwork_<%= @work.id%>").html("");
 }
 else{
+  $(".about_hwork").html("");
   <% if @homework.homework_type == 2%>
     $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>@work,:score =>@score,:student_work_scores => @student_work_scores}) %>");
 

app/views/syllabuses/_syllabus_course_list.html.erb

@@ -75,9 +75,9 @@
       </div>
    </div>
 <% else %>
-    <div class="icons_tishi"><img src="../images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
-    <% if User.current == @syllabus.user %>
-        <p class="sy_tab_con_p">您建立的课程还未创建班级，请
+    <div class="icons_tishi"><img src="/images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
+    <% if User.current.member_of_syl?(@syllabus) %>
+        <p class="sy_tab_con_p">该课程还未创建班级，请
           <%= link_to "新建班级", new_course_path(:host=> Setting.host_course, :syllabus_id => @syllabus.id), :class => "sy_corange", :target => '_blank'%>
           ，谢谢啦！</p>
     <% else %>

app/views/syllabuses/_syllabus_member_list.html.erb

@@ -13,13 +13,14 @@
   </tr>
   </thead>
   <tbody>
+  <% count = @members.count %>
   <% @members.each_with_index do |member, i| %>
       <% user = member.user %>
-      <% allow_delete = @syllabus.courses.where(:tea_id => member.user_id).empty? && i != 0 %>
+      <% allow_delete = is_admin && @syllabus.courses.where(:tea_id => member.user_id).empty? %>
       <tr>
         <td><%= member.rank %></td>
         <td>
-          <% if member.rank == 1 %>
+          <% if user == @syllabus.user %>
               <div style="display: inline-block"><span class="sy_new_name fl"><%= user.show_name %></span><span class="sy_new_orange ml5 fl mt12">创建者</span></div>
           <% else %>
               <span class="sy_new_long_name"><%= user.show_name %></span>
@@ -35,23 +36,20 @@
         <td><%= courses.where("tea_id != #{user.id}").count %></td>
         <% if is_admin %>
             <td>
-              <% if i == 0 %>
-                  &nbsp;
+              <% if user == @syllabus.user %>
+              <% elsif allow_delete %>
+                  <%= link_to('删除', {:controller => 'syllabus_member', :action => 'destroy', :id => member.id, :syllabus => @syllabus.id},:remote => true, :method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr sy_btn_grey mr5", :title => l(:button_delete)) %>
               <% else %>
-                  <% if allow_delete %>
-                      <%= link_to('删除', {:controller => 'syllabus_member', :action => 'destroy', :id => member.id, :syllabus => @syllabus.id},:remote => true, :method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr sy_btn_grey mr5", :title => l(:button_delete)) %>
-                  <% else %>
-                      <a href="javascript:void(0)" class="fr sy_btn_grey mr5" title="该老师已在本课程下创建了班级，不能删除">删除</a>
-                  <% end %>
-                  <% if i == 1 %>
-                      <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %>
-                  <% elsif i == @members.count - 1 %>
-                      <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %>
-                  <% else %>
-                      <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %>
-                      <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %>
-                  <% end %>
+                  <a href="javascript:void(0)" class="fr sy_btn_grey mr5" title="该老师已在本课程下创建了班级，不能删除">删除</a>
               <% end %>
+            <% if i != 0 && i < count - 1 %>
+                <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %>
+                <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %>
+            <% elsif i < count - 1 %>
+                <%= link_to('下移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'down'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '下移') %>
+            <% elsif i == count - 1 %>
+                <%= link_to('上移', {:controller => 'syllabus_member', :action => 'update_rank', :id => member.id, :syllabus => @syllabus.id, :opr => 'up'},:remote => true, :method => 'post', :class => "fr sy_btn_blue mr5", :title => '上移') %>
+            <% end %>
             </td>
         <% end %>
       </tr>

app/views/syllabuses/show.html.erb

@@ -5,6 +5,7 @@
     $(function() {
         sd_create_editor_from_data(<%= @syllabus.id %>, null, "100%", "<%= @syllabus.class.to_s %>");
         showNormalImage('syllabus_description_<%= @syllabus.id %>');
+        autoUrl('syllabus_description_<%= @syllabus.id %>');
     });
 </script>
 <ul id="sy_tab_nav">

app/views/users/_homework_opr.html.erb

@@ -15,7 +15,7 @@
   <%= user_for_homework_common activity,is_teacher %>
 </div>
 <% work = cur_user_works_for_homework activity %>
-<% if activity.end_time < Date.today && !is_teacher && !work.nil? && work.user == User.current %>
+<% if !is_teacher && !work.nil? && work.user == User.current && activity.end_time < Date.today %>
     <div class="homepagePostSubmit">
       <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 2, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
     </div>

app/views/versions/index.html.erb

@@ -74,5 +74,5 @@
 <%= context_menu issues_context_menu_path %>
 
 <script>
-  $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>

app/views/wiki/edit.html.erb

@@ -68,5 +68,5 @@
 <% html_title @page.pretty_title %>
 
 <script>
-    $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>

app/views/wiki/show.html.erb

@@ -95,6 +95,6 @@
         });
     };
 
-        $("#RSide").css("width","730px");
+    $(".project_r_h").parent().css({"width":"730px","background-color":"#fff","padding":"10px","margin-left":"10px","margin-bottom":"10px"});
 </script>
 </div>

db/migrate/20161008015936_add_syllabus_members.rb

@@ -0,0 +1,13 @@
+class AddSyllabusMembers < ActiveRecord::Migration
+  def up
+    Syllabus.all.each do |syllabus|
+      if syllabus.syllabus_members.empty?
+        member =  SyllabusMember.create(:user_id => syllabus.user_id, :rank => 1)
+        syllabus.syllabus_members << member
+      end
+    end
+  end
+
+  def down
+  end
+end

public/stylesheets/css/project.css

@@ -564,7 +564,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .sy_class_infobox{
     padding:15px;
     background:#fff;
-    margin:12px auto 0;
+    margin:0px auto ;
     width:968px;
     border:1px solid #e5e5e5;
     position: relative;