1.增加项目/课程快捷功能；

2.增加私信功能

app/controllers/files_controller.rb

@@ -24,7 +24,10 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,:search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,:search_files_in_subfield]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,
+                                        :search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,
+                                        :search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,
+                                        :search_files_in_subfield,:upload_files_menu]
 
   helper :sort
   include SortHelper
@@ -784,4 +787,8 @@ class FilesController < ApplicationController
   def subfield_upload_file
     @org_subfield = OrgSubfield.find(params[:org_subfield_id])
   end
+
+  def upload_files_menu
+    p 1
+  end
 end

app/controllers/words_controller.rb

@@ -236,7 +236,11 @@ class WordsController < ApplicationController
     if User.current.logged?
       @user = User.find(params[:id])
       if params[:new_form][:user_message].size>0 && User.current.logged? && @user
-        @user.add_jour(User.current, params[:new_form][:user_message])
+        if params[:private] && params[:private] == '1'
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:user_message], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+        else
+          @user.add_jour(User.current, params[:new_form][:user_message])
+        end
       end
       redirect_to feedback_path(@user)
     else

app/models/journals_for_message.rb

@@ -15,8 +15,9 @@ class JournalsForMessage < ActiveRecord::Base
                   "m_parent_id", # 留言信息的父留言id
                     "is_readed", # 留言是否已读
                 "m_reply_count", # 留言的回复数量
-                  "m_reply_id"   # 回复某留言的留言id(a留言回复了b留言，这是b留言的id)
+                  "m_reply_id" ,  # 回复某留言的留言id(a留言回复了b留言，这是b留言的id)
-               "is_comprehensive_evaluation"  # 1 教师评论、2 匿评、3 留言
+               "is_comprehensive_evaluation",  # 1 教师评论、2 匿评、3 留言
+              "private"
   acts_as_tree :foreign_key => 'm_parent_id', :counter_cache => :m_reply_count, :order => "#{JournalsForMessage.table_name}.created_on ASC"
   after_destroy :delete_kindeditor_assets
   belongs_to :project,

app/views/files/upload_files_menu.js.erb

@@ -0,0 +1,15 @@
+<% if @project %>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/upload_project_files_on_navbar',:locals => {:container => @project}) %>');
+    showModal('ajax-modal', '513px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+    $('#ajax-modal').parent().css("top","40%").css("left","36%");
+    $('#ajax-modal').parent().addClass("popbox_polls");
+<% elsif @course %>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+    showModal('ajax-modal', '513px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+    $('#ajax-modal').parent().css("top","40%").css("left","36%");
+    $('#ajax-modal').parent().addClass("popbox_polls");
+<% end %>

app/views/layouts/_user_courses.html.erb

@@ -1,6 +1,19 @@
 <% courses.each do |course|%>
-    <li class="homepageLeftMenuCoursesLine">
+    <li class="homepageLeftMenuCoursesLine pr">
       <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}", :title => course.name+"（"+course.time.to_s+course.term+"）"%>
+      <div class="homepagePostSetting mt8 mr10">
+        <ul>
+          <li class="menuSetting">
+            <ul class="homepagePostSettiongText boxShadow">
+              <li><%= link_to "发布作业", homework_common_index_path(:course => course.id,:is_new => 1), :class => 'postOptionLink' %></li>
+              <li><%= link_to "发布通知", new_course_news_path(course), :class => 'postOptionLink' %></li>
+              <li><%= link_to "上传资源",upload_files_menu_path(:course_id => course.id), :remote => true, :class => 'postOptionLink' %></li>
+              <li><%= link_to "发布新帖",course_boards_path(  course, :flag => true, :is_new => 1), :class => 'postOptionLink' %></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">屏蔽动态</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
     </li>
 <% end %>
 

app/views/layouts/_user_projects.html.erb

@@ -1,6 +1,18 @@
 <% projects.each do |project|%>
-    <li class="homepageLeftMenuCoursesLine">
+    <li class="homepageLeftMenuCoursesLine pr">
       <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%>
+      <div class="homepagePostSetting mt8 mr10">
+        <ul>
+          <li class="menuSetting">
+            <ul class="homepagePostSettiongText boxShadow">
+              <li><%=link_to "发布问题", new_project_issue_path(project), :class => 'postOptionLink', :target => '_blank' %></li>
+              <li><%=link_to "发布新帖",project_boards_path(project, :flag => true), :class => 'postOptionLink',:target => '_blank' %></li>
+              <li><%= link_to "上传资源",upload_files_menu_path(:project_id => project.id), :remote => true, :class => 'postOptionLink' %></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">屏蔽动态</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
     </li>
 <% end %>
 <% if projects.size == 5%>

app/views/layouts/new_base_user.html.erb

@@ -10,7 +10,7 @@
   <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside','prettify','users',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","new_user",'prettify'%>
+  <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
@@ -27,6 +27,42 @@
       tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
     });
   </script>
+  <script>
+      $(document).ready(function(){
+          $("#relateProject,.relatePInfo").mouseover(function(){
+              $(".relatePInfo").css("display","block");
+          })
+          $("#relateProject,.relatePInfo").mouseout(function(){
+              $(".relatePInfo").css("display","none");
+          })
+          $(".homepagePostPortrait").mouseover(function(){
+              $(this).children(".userCard").css("display","block");
+          })
+          $(".homepagePostPortrait").mouseout(function(){
+              $(this).children(".userCard").css("display","none");
+          })
+          $(".userCard").mouseover(function(){
+              $(this).css("display","block");
+          })
+          $(".userCard").mouseout(function(){
+              $(this).css("display","none");
+          })
+          $(".coursesLineGrey").mouseover(function(){
+              $(this).css("color","#ffffff");
+          })
+          $(".coursesLineGrey").mouseout(function(){
+              $(this).css("color","#808080");
+          })
+          $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){
+              $(this).prev().css("color","#ffffff");
+              $(this).css("z-index", "9999");
+          })
+          $(".homepagePostSetting").mouseout(function(){
+              $(this).prev().css("color","#808080");
+              $(this).css("z-index", "1");
+          })
+      })
+  </script>
 </head>
 
 <body onload="prettyPrint();">

app/views/users/user_newfeedback.html.erb

@@ -26,9 +26,11 @@
       <%= form_for('new_form',:url =>  leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
           <p nhname='contentmsg'></p>
+          <input id="private_flag" name="private" type="hidden" value="0"/>
           <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
-          <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
+          <!--<a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>-->
-          <a href="javascript:void(0);" class="blue_n_btn fr mr5" id="submit_feedback_user" style="margin-top:6px;" >留言</a>
+          <a href="javascript:void(0);" class="blue_n_btn fr" id="submit_feedback_user" style="margin-top:6px;" >留言</a>
+          <a href="javascript:void(0);" class="greyBtn2 postReplySubmit mt5 mr15" id="private_submit_feedback_user">私信</a> </div>
       <% end%>
     </div>
     <div class="cl"></div>
@@ -52,6 +54,11 @@
 <script type="text/javascript">
     $(function(){
         $("#submit_feedback_user").one('click',function() {
+            $("#private_flag").val("0");
+            $("#submit_feedback_user").submit();
+        });
+        $("#private_submit_feedback_user").one('click',function() {
+            $("#private_flag").val("1");
             $("#submit_feedback_user").submit();
         });
     });

config/routes.rb

@@ -1079,6 +1079,7 @@ RedmineApp::Application.routes.draw do
   match 'system_log/time_analysis'
   match "/system_log" ,:to => 'system_log#index'
   match 'system_log/clear'
+  get 'upload_files_menu', :to => 'files#upload_files_menu'
   ##ended by lizanle
 
   resources :git_callback do

db/migrate/20160106065255_add_private_to_journals_for_messages.rb

@@ -0,0 +1,5 @@
+class AddPrivateToJournalsForMessages < ActiveRecord::Migration
+  def change
+    add_column :journals_for_messages, :private, :integer, :default => 0
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151231023610) do
+ActiveRecord::Schema.define(:version => 20160106065255) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -958,13 +958,14 @@ ActiveRecord::Schema.define(:version => 20151231023610) do
     t.text     "notes"
     t.integer  "status"
     t.integer  "reply_id"
-    t.datetime "created_on",                  :null => false
+    t.datetime "created_on",                                 :null => false
-    t.datetime "updated_on",                  :null => false
+    t.datetime "updated_on",                                 :null => false
     t.string   "m_parent_id"
     t.boolean  "is_readed"
     t.integer  "m_reply_count"
     t.integer  "m_reply_id"
     t.integer  "is_comprehensive_evaluation"
+    t.integer  "private",                     :default => 0
   end
 
   create_table "kindeditor_assets", :force => true do |t|
@@ -1192,6 +1193,18 @@ ActiveRecord::Schema.define(:version => 20151231023610) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "org_messages", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "sender_id"
+    t.integer  "organization_id"
+    t.string   "message_type"
+    t.integer  "message_id"
+    t.integer  "viewed"
+    t.string   "content"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
   create_table "org_projects", :force => true do |t|
     t.integer  "organization_id"
     t.integer  "project_id"

public/stylesheets/new_user.css

@@ -1396,3 +1396,33 @@ span.at {color:#269ac9;}
 .function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
 .weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
 
+/*151228样式更新*/
+.menuSetting {background:url(../images/hwork_icon.png) -79px -132px no-repeat; display:inline-block; width:20px; height:20px;}
+.boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
+a.greyBtn{ display:inline-block; background:#f2f3f3; padding:0px 5px; height:20px; border:1px solid #d3d3d3; color:#888888; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.greyBtn{border:1px solid #888888; }
+a.blueBtn{ display:inline-block; background:#269ac9; padding:0px 5px; height:20px; border:1px solid #269ac9; color:#ffffff; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a.blueBtn:hover {background-color:#298fbd;}
+a.cancelBtn{ display:inline-block; background:#c1c1c1; padding:0px 5px; height:20px; border:1px solid #d3d3d3; color:#ffffff; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a.cancelBtn:hover {background:#888888;}
+a.userFollow{ display:inline-block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.userFollow{border:1px solid #888888; }
+a.userCancel{ display:inline-block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.userCancel{border:1px solid #888888; }
+.pAbsolute {position:absolute; z-index:999;}
+.userAvatarWrap {width:50px; height:50px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
+.userAvatarWrap:hover {border:1px solid #269ac9;}
+.mr27 {margin-right:27px;}
+.userCard {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px; top:-176px; left:-95px; position:absolute; z-index:999; display:none;}
+.userCard font {display:block; border-width:8px; position:absolute; bottom:-16px; left:110px; border-style:solid dashed dashed dashed; border-color:#FFF transparent transparent transparent; font-size:0; line-height:0;}
+.userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;}
+a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;}
+a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;}
+.mesType {background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 15px; left:-50px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999; white-space:nowrap;}
+a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; background-color:#cecece; padding:3px 10px;}
+.PMTag {padding:0px 5px; background-color:#555555; border-radius:3px; color:#ffffff;}
+.upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
+.upload_box{ width:430px; margin:15px auto;}
+a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;}
+a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 8px; text-align:center;cursor: pointer;}
+

public/stylesheets/public.css

@@ -934,4 +934,30 @@ span.at {color:#269ac9;}
 .sectionContent {display:block;}
 .sectionContent li {padding-left:30px;}
 .sectionContent li:hover {background-color:#cccccc; cursor:pointer;}
-.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}
+.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}
+
+/*151228样式更新*/
+.menuSetting {background:url(../images/hwork_icon.png) -5px -132px no-repeat; display:inline-block; width:20px; height:20px;}
+.boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
+a.greyBtn{ display:inline-block; background:#f2f3f3; padding:0px 5px; height:20px; border:1px solid #d3d3d3; color:#888888; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.greyBtn{border:1px solid #888888; }
+a.blueBtn{ display:inline-block; background:#269ac9; padding:0px 5px; height:20px; border:1px solid #269ac9; color:#ffffff; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a.blueBtn:hover {background-color:#298fbd;}
+a.cancelBtn{ display:inline-block; background:#c1c1c1; padding:0px 5px; height:20px; border:1px solid #d3d3d3; color:#ffffff; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a.cancelBtn:hover {background:#888888;}
+a.userFollow{ display:inline-block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.userFollow{border:1px solid #888888; }
+a.userCancel{ display:inline-block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.userCancel{border:1px solid #888888; }
+.pAbsolute {position:absolute; z-index:999;}
+.userAvatarWrap {width:50px; height:50px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
+.userAvatarWrap:hover {border:1px solid #269ac9;}
+.mr27 {margin-right:27px;}
+.userCard {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px; top:-176px; left:-95px; position:absolute; z-index:999; display:none;}
+.userCard font {display:block; border-width:8px; position:absolute; bottom:-16px; left:110px; border-style:solid dashed dashed dashed; border-color:#FFF transparent transparent transparent; font-size:0; line-height:0;}
+.userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;}
+a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;}
+a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;}
+.mesType {background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 15px; left:-50px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999; white-space:nowrap;}
+a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; background-color:#cecece; padding:3px 10px;}
+.PMTag {padding:0px 5px; background-color:#555555; border-radius:3px; color:#ffffff;}

public/stylesheets/users.css

@@ -144,4 +144,12 @@ a:hover.c_lgrey{ color:#3ca5c6;}
 /*.cr{clear:  right;}*/
 
 div.content{padding-top:10px;}
-.pcontent>.school_list,.content>.school_list { padding-left: 5px;}
+.pcontent>.school_list,.content>.school_list { padding-left: 5px;}
+
+/*151231留言样式*/
+.messageWrap {width:658px; margin-left:10px;}
+.mesWrap2{ margin-left:60px; border-bottom:1px dashed #c9c9c9; padding-top:10px;}
+.mesContent2{width:613px;}
+.leaveMes {width:651px; height:50px; resize:none; border:1px solid #dddddd;}
+.mesSwitch {background:url(../images/public_icon.png) -4px -780px no-repeat; width:15px; height:18px; display:inline-block;}
+.pr {position:relative;}