Merge branch 'szzh' into dev_zanle

Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb

app/controllers/homework_common_controller.rb

@@ -63,7 +63,7 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
-      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0

app/controllers/messages_controller.rb

@@ -231,8 +231,10 @@ class MessagesController < ApplicationController
     @isReply = false
     if @project
       (render_403; return false) unless @message.editable_by?(User.current)
-    else
+    elsif @course
       (render_403; return false) unless @message.course_editable_by?(User.current)
+    else
+      (render_403; return false) unless @message.org_subfield_editable_by?(User.current)
     end
 
     @message.safe_attributes = params[:message]
@@ -279,8 +281,10 @@ class MessagesController < ApplicationController
   def destroy
     if @project
       (render_403; return false) unless @message.destroyable_by?(User.current)
-    else
+    elsif @course
       (render_403; return false) unless @message.course_destroyable_by?(User.current)
+    else
+      (render_403; return false) unless @message.org_subfield_editable_by?(User.current)
     end
     r = @message.to_param
     @message.destroy

app/controllers/organizations_controller.rb

@@ -282,6 +282,16 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def hide_org_subfield
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @org_subfield.update_attribute(:hide, 1)
+  end
+
+  def show_org_subfield
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+    @org_subfield.update_attribute(:hide, 0)
+  end
+
   def org_resources_subfield
     @org = Organization.find(params[:id])
     @subfield = @org.org_subfields.where('field_type = "Resource" ')
@@ -289,4 +299,5 @@ class OrganizationsController < ApplicationController
       format.js
     end
   end
+
 end

app/controllers/users_controller.rb

@@ -522,7 +522,7 @@ class UsersController < ApplicationController
         else
           homework.publish_time = params[:homework_common][:publish_time]
         end
-        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
+        homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
         homework.homework_type = params[:homework_type].to_i || 1
         homework.late_penalty = 10
         homework.teacher_priority = 1

app/helpers/org_subfields_helper.rb

@@ -1,2 +1,3 @@
 module OrgSubfieldsHelper
+  include OrganizationsHelper
 end

app/helpers/organizations_helper.rb

@@ -17,6 +17,15 @@ module OrganizationsHelper
       s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end
 
-
+  def get_default_name field
+    case field.name
+      when 'activity' then
+        return '动态'
+      when 'course' then
+        return '课程'
+      when 'project' then
+        return '项目'
+    end
+  end
 
 end

app/models/mailer.rb

@@ -155,7 +155,6 @@ class Mailer < ActionMailer::Base
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
   def send_for_user_activities(user, date_to, days)
     date_from = date_to - days.days
-    subject = "[ #{user.show_name}#{l(:label_day_mail)}]"
     date_from = "#{date_from} 17:59:59"
     date_to = "#{date_to} 17:59:59"
     # 生成token用于直接点击登录
@@ -270,10 +269,11 @@ class Mailer < ActionMailer::Base
     total_count = @issues.count + @issues_journals.count + @course_messages.count + @project_messages.count + @course_news.count + @course_news_comments.count + @project_news.count + @project_news_comments.count +
                   @project_attachments.count + @course_journal_messages.count + @user_journal_messages.count + @project_journal_messages.count + @forums.count + @memos.count + @attachments.count +
                   @bids.count + @wiki_contents.count
+    subject = "[ #{user.show_name}#{l(:label_day_mail_first)}#{total_count}#{l(:label_day_mail_last)}]"
     @subject = " #{user.show_name}#{l(:label_day_mail_first)}#{total_count}#{l(:label_day_mail_last)}"
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
-    mail :to => user.mail,:subject => subject if has_content
+    mail :to => user.mail,:subject => @subject if has_content
   end
 
   # 作业截止时间邮件提醒

app/models/message.rb

@@ -44,6 +44,8 @@ class Message < ActiveRecord::Base
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
 
+  after_destroy :delete_org_activities
+
   acts_as_searchable :columns => ['subject', 'content'],
                      :include => {:board => :project},
                      :project_key => "#{Board.table_name}.project_id",
@@ -316,4 +318,8 @@ class Message < ActiveRecord::Base
       end
     end
   end
+
+  def delete_org_activities
+    OrgActivity.where("org_act_type='Message' and org_act_id =#{self.id} and container_type='OrgSubfield'").destroy_all
+  end
 end

app/services/courses_service.rb

@@ -196,6 +196,8 @@ class CoursesService
       @course.tea_id = current_user.id
       @course.term = params[:term]
       @course.time = params[:time]
+      @course.end_term = params[:end_term]
+      @course.end_time = params[:end_time]
       #@course.school_id = params[:occupation]
       @course.school_id = current_user.user_extensions.school_id
       @course.setup_time = params[:setup_time]

app/views/courses/new.html.erb

@@ -22,6 +22,14 @@
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
           <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {}  %>
           <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{}  %>
+          <span class="c_red" id="course_time_term_notice"></span>
+        </li>
+        <div class="cl"></div>
+        <li  class="ml45 mb10">
+          <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
+          <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {}  %>
+          <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{}  %>
+          <span class="mr15 c_red">仅针对跨越多个学期的班级，否则不用修改。</span>
         </li>
         <div class="cl"></div>
         <li class="ml45 mb10">
@@ -31,7 +39,7 @@
           <a id="psw_btn" href="javascript:void(0)">显示明码</a>
           <span class="c_red" id="course_course_password_notice"></span>
           <div class="cl"></div>
-        <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
+          <span class="ml80 c_red">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
         </li>
         <li class="ml45">
           <label class="fl" >&nbsp;&nbsp;<%= l(:label_new_course_description)%>&nbsp;&nbsp;：</label>
@@ -41,19 +49,19 @@
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="course_is_public" name="course[is_public]"  type="checkbox" value="1">
-        <span class="c_grey">（打钩为公开，不打钩则不公开，若不公开，仅课程成员可见该课程。）</span>
+          <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
           <label >学生列表公开&nbsp;&nbsp;：</label>
           <input id="course_open_student" name="course[open_student]"  type="checkbox" value="1">
-        <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
+          <span class="c_grey">（选中后课外用户可见学生列表，否则仅对课内成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
           <label >学生上传资源&nbsp;&nbsp;：</label>
           <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" />
-          <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+          <span class="c_grey">（选中后允许学生上传课程资源，否则不允许）</span>
           <div class="cl"></div>
         </li>
         <li class=" ml90" >
@@ -65,3 +73,13 @@
   </ul>
 </div><!--talknew end-->
 <div class="cl"></div>
+<script>
+  $(function(){
+      $("#time").change(function(){
+        document.getElementById("end_time").options[document.getElementById("time").selectedIndex].selected = true;
+      });
+      $("#term").change(function(){
+          document.getElementById("end_term").options[document.getElementById("term").selectedIndex].selected = true;
+      });
+  });
+</script>

app/views/courses/settings.html.erb

@@ -50,6 +50,12 @@
             <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"}  %>
           </li>
           <div class="cl"></div>
+          <li  class="ml45 mb10">
+            <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
+            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time_selected"}  %>
+            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term_selected"}  %>
+          </li>
+          <div class="cl"></div>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
             <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password();">
@@ -134,4 +140,6 @@
     }
     $("#time_selected").click(select);
     $("#term_selected").click(select);
+    $("#end_time_selected").click(select);
+    $("#end_term_selected").click(select);
 </script>

app/views/layouts/base_org.html.erb

@@ -120,6 +120,7 @@
         <!--</div>-->
 
         <div class="cl"></div>
+        <% if User.current.logged? %>
             <div class="f12 fontGrey3">
               <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
               <% if User.current.logged? %>
@@ -133,6 +134,7 @@
                   （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
               <% end %>
             </div>
+        <% end %>
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>

app/views/messages/_course_show.html.erb

@@ -37,11 +37,12 @@
       <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @topic.author.id == User.current.id%>
+      <% if User.current.logged? %>
       <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
+              <% if @topic.author.id == User.current.id  %>
                   <li>
                       <%= link_to(
                                   l(:button_edit),
@@ -57,8 +58,9 @@
                                   :data => {:confirm => l(:text_are_you_sure)},
                                   :class => 'postOptionLink'
                           ) if @message.course_destroyable_by?(User.current) %>
-                <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
                   </li>
+              <% end %>
+              <li> <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %></li>
             </ul>
           </li>
         </ul>

app/views/messages/_org_subfield_show.html.erb

@@ -7,6 +7,7 @@
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
+        $(".postRightContainer").css("margin-left", "0px");
     });
 </script>
 <script>
@@ -67,7 +68,7 @@
       <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @topic.author.id == User.current.id%>
+      <% if @message.org_subfield_editable_by?(User.current) %>
           <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">

app/views/messages/_project_show.html.erb

@@ -99,11 +99,12 @@
         <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
       </div>
       <div class="postThemeWrap">
-        <% if @topic.author.id == User.current.id%>
+        <% if User.current.logged? %>
             <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
               <ul>
                 <li class="homepagePostSettingIcon">
                   <ul class="homepagePostSettiongText">
+                    <% if @topic.author.id == User.current.id %>
                         <li>
                           <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
                         </li>
@@ -113,6 +114,7 @@
                                       :class => 'postOptionLink'
                               ) if @message.destroyable_by?(User.current) %>
                         </li>
+                    <% end %>
                     <li> <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %></li>
                   </ul>
                 </li>

app/views/messages/_show_org_subfields.html.erb

@@ -9,7 +9,7 @@
               </li>
           <% end %>
       <% else %>
-        <li><span class="mt3 fl mr5">暂无资源栏目</span></li>
+        <li><span class="mt3 fl mr5">暂无帖子栏目</span></li>
       <% end %>
   <% else %>
       <span class="fontBlue pl10">请在左侧选择组织</span>

app/views/org_document_comments/show.html.erb

@@ -5,7 +5,7 @@
         showNormalImage('message_description_<%= @document.id %>');
     });
 </script>
-<div class="resources mt10" id="organization_document_<%= @document.id %>">
+<div class="resources" id="organization_document_<%= @document.id %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_path(@document.creator_id) %>

app/views/org_subfields/create.js.erb

@@ -1,5 +1,7 @@
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
+    :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
+    :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
 $("#subfield_name").val("");

app/views/org_subfields/destroy.js.erb

@@ -1,4 +1,6 @@
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
+    :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
+    :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/organizations/_org_left_subfield_list.html.erb

@@ -1,6 +1,10 @@
-<div class="homepageLeftMenuBlock">
+<% org_activity_field = organization.org_subfields.where('field_type="default" and name="activity" and field_type="default"').first %>
+<% org_course_field = organization.org_subfields.where('field_type="default" and name="course" and field_type="default"').first %>
+<% org_project_field = organization.org_subfields.where('field_type="default" and name="project" and field_type="default"').first %>
+<div class="homepageLeftMenuBlock" style="display:<%= org_activity_field.hide == 0?'block':'none' %>;" id="org_subfield_<%= org_activity_field.id %>">
   <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
 </div>
+<div style="display:<%= org_project_field.hide == 0?'block':'none' %>;" id="org_subfield_<%= org_project_field.id %>">
     <div class="homepageLeftMenuBlock">
       <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
       <% if User.current.logged? and User.current.admin_of_org?(organization) %>
@@ -13,6 +17,8 @@
         <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
       </ul>
     </div>
+</div>
+<div style="display:<%= org_course_field.hide == 0?'block':'none' %>;" id="org_subfield_<%= org_course_field.id %>">
     <div class="homepageLeftMenuBlock">
       <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
       <% if User.current.logged? and User.current.admin_of_org?(organization) %>
@@ -24,11 +30,14 @@
         <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
       </ul>
     </div>
-<% organization.org_subfields.each do |field| %>
-    <div class="homepageLeftMenuBlock">
+</div>
+<% organization.org_subfields.where("field_type != 'default'").each do |field| %>
+    <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
       <% if field.field_type == "Post" %>
         <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
+        <% if User.current.member_of_org?organization %>
           <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
+       <% end %>
       <% else %>
         <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
         <% if User.current.member_of_org?organization %>

app/views/organizations/_org_subfield_message.html.erb

@@ -11,7 +11,7 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.board.org_subfield.name.to_s+" | 资源栏目讨论区",org_subfield_boards_path(activity.board.org_subfield), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",org_subfield_boards_path(activity.board.org_subfield), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.board.org_subfield.name %>(项目讨论区)</a>-->
       </div>
       <div class="homepagePostTitle break_word">

app/views/organizations/_show_home_page.html.erb

@@ -1,16 +1,16 @@
-<div class="resources mt10" id="organization_document_<%= document.id %>">
+<div class="resources <%= User.current.logged? ? 'mt10' :'' %>" id="organization_document_<%= document.id %>">
   <div class="homepagePostBrief">
 
     <div class="homepagePostDes" style="width:690px;">
-
+    <% if User.current.logged? %>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
-
+    <% end %>
       <% unless document.content.blank? %>
           <div class="homepagePostIntro" >
             <%= document.content.html_safe %>
           </div>
       <% end %>
-      <% if params[:show_homepage].nil? %>
+      <% if params[:show_homepage].nil? and User.current.logged? %>
           <div class="homepagePostDate" style="float:right;">
             发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
           </div>

app/views/organizations/_subfield_list.html.erb

@@ -1,36 +1,36 @@
-
 <ul class="orgListRow">
   <li class="orgListUser fb">已有栏目</li>
-    <li class="orgListUser fb">状态</li>
+  <li class="orgListStatus fb">状态</li>
   <li class="orgListStatus fb">类型</li>
   <div class="cl"></div>
 </ul>
+
+<% default_fields.each do |field| %>
+    <% name = get_default_name(field) %>
     <ul class="orgListRow">
-    <li class="orgListUser">动态</li>
-    <li class="orgListUser">默认</li>
-    <li class="orgListStatus">默认</li>
-    <div class="cl"></div>
-  </ul>
-  <ul class="orgListRow">
-    <li class="orgListUser">项目</li>
-    <li class="orgListUser">默认</li>
+      <li class="orgListUser"><%= name %></li>
       <li class="orgListStatus">默认</li>
-    <div class="cl"></div>
-  </ul>
-  <ul class="orgListRow">
-    <li class="orgListUser">课程</li>
-    <li class="orgListUser">默认</li>
       <li class="orgListStatus">默认</li>
+      <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为显示" %></a>
       <div class="cl"></div>
     </ul>
+<% end %>
+
 <% subfields.each do |field| %>
     <ul class="orgListRow">
-        <li class="orgListUser"><div id="subfield_show_<%= field.id %>"><%= field.name %></div><div id="subfield_edit_<%= field.id %>" style="display:none;">
-          <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;" /></div></li>
-        <li class="orgListUser">新增</li>
+      <li class="orgListUser">
+        <div id="subfield_show_<%= field.id %>"><%= field.name %></div>
+        <div id="subfield_edit_<%= field.id %>" style="display:none;">
+          <input type="text" name="name" onblur="update_subfield('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.name %>" style="width:70px;"/>
+        </div>
+      </li>
+      <li class="orgListStatus">新增</li>
       <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
-        <%= link_to "删除",org_subfield_path(field), :method => 'delete',:remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr5" %>
+      <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
+      <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="hide($(this),'<%= field.id %>');" id="hide_<%= field.id %>"><%= field.hide==0?"设为隐藏":"设为显示" %></a>
+      <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkBlue fr mr10" %>
       <a href="javascript:void(0);" class="linkBlue fr mr10" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
+
       <div class="cl"></div>
     </ul>
 <% end %>
@@ -58,4 +58,17 @@
         $(edit_id).hide();
 //       $(edit_id).focus();
     }
+
+    function hide(content, id){
+        if (content.text() == '设为隐藏')
+            $.ajax({
+                url: "/organizations/hide_org_subfield?org_subfield_id=" + id,
+                type: "post"
+            });
+        else
+            $.ajax({
+                url: "/organizations/show_org_subfield?org_subfield_id=" + id,
+                type: "post"
+            });
+    }
 </script>

app/views/organizations/hide_org_subfield.js.erb

@@ -0,0 +1,2 @@
+$("#hide_<%= @org_subfield.id %>").text("设为显示");
+$("#org_subfield_<%= @org_subfield.id %>").css("display", "none");

app/views/organizations/setting.html.erb

@@ -107,7 +107,8 @@
       </div>
       <div class="undis ml15 mr15" id="orgContent_3">
         <div class="orgMemberList" id="org_subfield_list">
-          <%= render :partial => 'organizations/subfield_list', :locals => {:subfields => @organization.org_subfields } %>
+          <%= render :partial => 'organizations/subfield_list', :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
+                                                                            :subfields => @organization.org_subfields.where("field_type != 'default'") } %>
         </div>
         <div class="fr orgMemContainer">
           <div class="orgMemberAdd">

app/views/organizations/show.html.erb

@@ -16,7 +16,7 @@
     .homepagePostReplyInputContainer .ke-inline-block {display: none;}
     .homepagePostReplyInputContainer .ke-container {float: left;}
 </style>
-<% if params[:show_homepage].nil? %>
+<% if params[:show_homepage].nil? and User.current.logged? %>
 <div class="homepageRightBanner">
   <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
   <% if params[:org_subfield_id].nil? %>

app/views/organizations/show_org_subfield.js.erb

@@ -0,0 +1,2 @@
+$("#hide_<%= @org_subfield.id %>").text("设为隐藏");
+$("#org_subfield_<%= @org_subfield.id %>").css("display", "block");

app/views/users/_course_message.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
@@ -43,17 +43,34 @@
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
-      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
+
+      <% if activity.author.id == User.current.id%>
+          <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
-              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                edit_board_message_path(activity.id,:board_id=>activity.board_id),
+                                :class => 'postOptionLink'
+                        ) if activity.course_editable_by?(User.current) %>
+                  </li>
+                  <li>
+                    <%= link_to(
+                                l(:button_delete),
+                                delete_board_message_path(activity.id,:board_id=>activity.board_id),
+                                :method => :post,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if activity.course_destroyable_by?(User.current) %>
+                    <%= link_to "发送",messages_join_org_subfield_path(:message_id => activity.id) , :remote=> true,:class => 'postOptionLink' %>
+                  </li>
                 </ul>
               </li>
             </ul>
           </div>
+    <% end %>
     </div>
     <div class="cl"></div>
   </div>

app/views/users/_project_message.html.erb

@@ -1,4 +1,4 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -44,6 +44,33 @@
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
+      <% if activity.author.id == User.current.id%>
+          <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                edit_board_message_path(activity.id,:board_id=>activity.board_id),
+                                :class => 'postOptionLink'
+                        ) if activity.editable_by?(User.current) %>
+                  </li>
+                  <li>
+                    <%= link_to(
+                                l(:button_delete),
+                                delete_board_message_path(activity.id,:board_id=>activity.board_id),
+                                :method => :post,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if activity.destroyable_by?(User.current) %>
+                    <%= link_to "发送",messages_join_org_subfield_path(:message_id => activity.id) , :remote=> true,:class => 'postOptionLink' %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>

app/views/users/_user_homework_form.html.erb

@@ -5,9 +5,9 @@
     <script type="text/javascript">
       $(function(){
         if($.trim($("#anonymous_comment").val()) == 1) {
-            $("#anonymous_comment").attr('checked',false);
-        } else {
             $("#anonymous_comment").attr('checked',true);
+        } else {
+            $("#anonymous_comment").attr('checked',false);
         }
         $("#BluePopupBox a.BlueCirBtn").click();
         <% if edit_mode && homework.is_group_homework? %>
@@ -16,9 +16,9 @@
       });
       function checked_val() {
           if ($("#anonymous_comment").is(":checked")) {
-              $("#anonymous_comment").val(0);
-          } else {
               $("#anonymous_comment").val(1);
+          } else {
+              $("#anonymous_comment").val(0);
           }
       }
     </script>
@@ -53,8 +53,8 @@
     </div>
     <% if !edit_mode || edit_mode && homework.homework_detail_manual.comment_status < 2 %>
         <div class="fl f14 ml10" style="margin-top: 4px;">
-          <input type="checkbox" name="homework_common[anonymous_comment]" checked="checked" value="<%=edit_mode ? homework.anonymous_comment : 0 %>" id="anonymous_comment"/>
-          <span class="f14 c_grey mr10">启用匿评</span>
+          <input type="checkbox" name="homework_common[anonymous_comment]" value="<%=edit_mode ? homework.anonymous_comment : 0 %>" id="anonymous_comment"/>
+          <span class="f14 c_grey mr10">禁用匿评</span>
         </div>
     <% end %>
   </div>

config/locales/courses/en.yml

@@ -15,7 +15,7 @@ en:
   label_homework: Task
   label_course_news: 课程通知  
   label_main_teacher: 主讲教师
-  label_course_term: 开课学期  
+  label_course_term: 开始学期
 
   label_join_course: 加入
   label_exit_course: exit course

config/locales/courses/zh.yml

@@ -19,7 +19,7 @@ zh:
   label_course_news: 课程通知
   label_course_mail_news_reply: 课程通知回复
   label_main_teacher: 主讲教师
-  label_course_term: 开课学期
+  label_course_term: 开始学期
   label_isuue_mail_status: 更新了issue状态！
 
   label_join_course: 加入

config/routes.rb

@@ -52,6 +52,8 @@ RedmineApp::Application.routes.draw do
     collection do
       get 'check_uniq'
       get 'autocomplete_search'
+      post 'hide_org_subfield'
+      post 'show_org_subfield'
     end
     resources :org_document_comments do
       member do
@@ -414,12 +416,12 @@ RedmineApp::Application.routes.draw do
   match 'boards/:id/join_to_org_subfields', :to => 'boards#join_to_org_subfields'
   get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
   match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
-  get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
+  get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit',:as=>'edit_board_message'
 
   post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
   post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
   post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
-  post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
+  post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy',:as=>'delete_board_message'
   match 'messages/join_org_subfield', :to => 'messages#join_org_subfield'
   match 'messages/get_subfield_on_click_org', :to => 'messages#get_subfield_on_click_org'
   match 'messages/join_org_subfields', :to => 'messages#join_org_subfields'

db/migrate/20151231012634_add_last_term_to_course.rb

@@ -0,0 +1,17 @@
+class AddLastTermToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :end_time, :integer
+    add_column :courses, :end_term, :string
+
+    count = Course.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do
+        Course.page(i).per(30).each do |course|
+          course.end_time = course.time
+          course.end_term = course.term
+          course.save
+        end
+      end
+    end
+  end
+end

db/migrate/20151231023235_add_hide_to_org_subfields.rb

@@ -0,0 +1,5 @@
+class AddHideToOrgSubfields < ActiveRecord::Migration
+  def change
+    add_column :org_subfields, :hide, :integer, :default => 0
+  end
+end

db/migrate/20151231023610_add_records_to_org_subfields.rb

@@ -0,0 +1,9 @@
+class AddRecordsToOrgSubfields < ActiveRecord::Migration
+  def change
+    Organization.all.each do |org|
+      OrgSubfield.create(:organization_id => org.id, :name => 'activity', :field_type => 'default')
+      OrgSubfield.create(:organization_id => org.id, :name => 'course', :field_type => 'default')
+      OrgSubfield.create(:organization_id => org.id, :name => 'project', :field_type => 'default')
+    end
+  end
+end

db/schema.rb

@@ -11,6 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
+
 ActiveRecord::Schema.define(:version => 20151102090519) do
 
   create_table "activities", :force => true do |t|
@@ -184,6 +185,7 @@ ActiveRecord::Schema.define(:version => 20151102090519) do
     t.integer "last_message_id"
     t.integer "parent_id"
     t.integer "course_id"
+    t.integer "org_subfield_id"
   end
 
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
@@ -444,6 +446,8 @@ ActiveRecord::Schema.define(:version => 20151102090519) do
     t.integer  "inherit_members", :limit => 1, :default => 1
     t.integer  "open_student",                 :default => 0
     t.integer  "outline",                      :default => 0
+    t.integer  "end_time"
+    t.string   "end_term"
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -1051,6 +1055,30 @@ ActiveRecord::Schema.define(:version => 20151102090519) do
     t.string  "role"
   end
 
+  create_table "org_projects", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+  end
+
+  create_table "org_subfield_messages", :force => true do |t|
+    t.integer  "org_subfield_id"
+    t.integer  "message_id"
+    t.string   "message_type"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "org_subfields", :force => true do |t|
+    t.integer  "organization_id"
+    t.integer  "priority"
+    t.string   "name"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "field_type"
+    t.integer  "hide",            :default => 0
+  end
+
   create_table "organizations", :force => true do |t|
     t.string   "name"
     t.text     "description"

public/javascripts/course.js

@@ -119,6 +119,46 @@ function regex_course_class_period()
         return false;
     }
 }
+//验证开始学期和结束学期
+function regex_time_term(){
+    var obj_time = document.getElementById("time");
+    var obj_end_time = document.getElementById("end_time");
+    var obj_term = document.getElementById("term");
+    var obj_end_term = document.getElementById("end_term");
+    var time = obj_time.options[obj_time.selectedIndex];
+    var end_time = obj_end_time.options[obj_end_time.selectedIndex];
+    var term = obj_term.options[obj_term.selectedIndex];
+    var end_term = obj_end_term.options[obj_end_term.selectedIndex];
+    if(time.value == end_time.value) {
+        if(set_term_val(term.value) > set_term_val(end_term.value)) {
+            $("#course_time_term_notice").html("开始学期不能晚于结束学期");
+            $("#course_time_term_notice").show();
+            return false;
+        } else {
+            $("#course_time_term_notice").html("");
+            $("#course_time_term_notice").hide();
+            return true;
+        }
+    } else if(time.value < end_time.value) {
+        $("#course_time_term_notice").html("");
+        $("#course_time_term_notice").hide();
+        return true;
+    } else {
+        $("#course_time_term_notice").html("开始学期不能晚于结束学期");
+        $("#course_time_term_notice").show();
+        return false;
+    }
+}
+//学期转换为数字
+function set_term_val(val) {
+    if(val == "春季学期"){
+        return 1;
+    } else if(val == "夏季学期"){
+        return 2;
+    } else if(val == "秋季学期"){
+        return 3;
+    }
+}
 //验证密码
 function regex_course_password()
 {
@@ -145,7 +185,7 @@ function regex_course_password()
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
+    if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
     {
         $("#new_course").submit();
     }

public/stylesheets/courses.css

@@ -156,7 +156,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .resourceSendO {width:65px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:2px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;cursor: pointer}
-a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px; text-align:center;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 a.postOptionLink2 {color:#616060; display:block; width:35px; padding:0px 15px;}
 a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}

public/stylesheets/org.css

@@ -103,3 +103,4 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 .sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;
                 background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .org_login_list a {color:#269ac9;}
+div.flash {margin-top :0px !important}

public/stylesheets/project.css

@@ -1140,5 +1140,5 @@ a.postRouteLink:hover {text-decoration:underline;}
 
 .ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
 .ReplyToMessageInputContainer {width:582px; float:left;}
-a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
+a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px; text-align:center;}
 a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}