Merge branch 'szzh' into develop

Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb

app/controllers/issues_controller.rb

@@ -55,6 +55,7 @@ class IssuesController < ApplicationController
   helper :timelog
   include Redmine::Export::PDF
   helper :project_score
+  include ApplicationHelper
 
   def index
     retrieve_query

app/controllers/org_subfields_controller.rb

@@ -1,5 +1,6 @@
 class OrgSubfieldsController < ApplicationController
   helper :attachments
+  include FilesHelper
   layout 'base_org'
   def create
     if OrgSubfield.where("organization_id=#{params[:organization_id]} and name=?",params[:name]).count == 0

app/controllers/organizations_controller.rb

@@ -311,6 +311,7 @@ class OrganizationsController < ApplicationController
 
   def agree_apply_subdomain
     @organization = Organization.find(params[:organization_id])
+    OrgMessage.find(params[:act_id]).update_attribute(:viewed, 1)
     @organization.update_attribute(:domain, params[:org_domain])
     if OrgMessage.where("message_type='AgreeApplySubdomain' and organization_id=#{@organization.id} and content=?",params[:org_domain]).count == 0
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])

app/controllers/student_work_controller.rb

@@ -1,6 +1,7 @@
 class StudentWorkController < ApplicationController
   layout "base_courses"
   include StudentWorkHelper
+  include ApplicationHelper
   require 'bigdecimal'
   require "base64"
   before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]

app/views/attachments/update_file_dense.js.erb

@@ -6,8 +6,8 @@ $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@atta
                                                               :remote => true, :class => "postOptionLink", :method => :post) %>");
 
 <% else %>
-$("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)),
+$("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)),
-                                                              :remote=>true,:class=>"f_l re_open",:method => :post) %>");
+                                                              :remote=>true,:class=>"postOptionLink",:method => :post) %>");
 <% end %>
 <% if @attachment.is_public? %>
     $("#image_private_<%= @attachment.id%>").html('')

app/views/courses/private_or_public.js.erb

@@ -10,7 +10,9 @@
 <% else %>
     <% if @course.is_public? %>
         $("#set_course_public_<%= @course.id %>").text("设为私有");
+        $("#show_course_<%= @course.id %>").attr("title","公开课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% else %>
         $("#set_course_public_<%= @course.id %>").text("设为公开");
+        $("#show_course_<%= @course.id %>").attr("title","私有课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% end %>
 <% end %>

app/views/org_subfields/show.html.erb

@@ -6,6 +6,7 @@
     <%= render :partial => 'org_subfields/show_post_type'%>
 <% end %>
 
+
 <script type='text/javascript'>
     var slideHeight = 29;
     function readmore(aNode) {
@@ -58,6 +59,7 @@
         }
     }
 
+
     function attachment_contenttypes_searchex(value) {
         <% if  @project%>
         $.ajax({
@@ -72,6 +74,8 @@
         <%end%>
     }
 
+
+
     function attachtype_edit(value) {
         <% if  @project%>
         $.ajax({
@@ -87,6 +91,62 @@
         <%end%>
     }
 
+    function attachmenttypes_searchex(value) {
+        <% if  @project%>
+        $.ajax({
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>',
+            type: "POST",
+            data: {
+                type: encodeURIComponent(value),
+                contentType: $('#attach_sufix_browse').val()
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function course_attachmenttypes_searchex(value) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: encodeURIComponent(value),
+                contentType: $('#attach_sufix_browse').val()
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
+    function course_attachment_contenttypes_searchex(value) {
+        <% if  @course%>
+        $.ajax({
+
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+    function course_attachtype_edit(value) {
+        <% if  @course%>
+        $.ajax({
+            url: '<%=getattachtype_course_files_path(course_id: @course)%>',
+            type: "POST",
+            data: {
+                type: $('#attachment_browse').val(),
+                contentType: encodeURIComponent(value)
+            }
+
+        }).complete(eval_ajax);
+        <%end%>
+    }
+
     function attachmenttypes_change(id, type) {
         <% if  @project%>
         $.ajax({

app/views/organizations/_subfield_list.html.erb

@@ -28,7 +28,9 @@
       <li class="orgListStatus">新增</li>
       <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
       <li class="orgListUser hidden">
-        <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');"><%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %></div>
+        <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
+          <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
+        </div>
         <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
           <input type="text" name="name" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
         </div>

app/views/projects/_attachment_acts.html.erb

@@ -2,6 +2,7 @@
   <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 => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">

app/views/projects/_project_create.html.erb

@@ -4,6 +4,7 @@
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">

app/views/projects/_project_news.html.erb

@@ -2,6 +2,7 @@
   <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 => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">

app/views/users/_course_attachment.html.erb

@@ -2,6 +2,7 @@
   <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 => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">

app/views/users/_course_journalsformessage.html.erb

@@ -2,6 +2,7 @@
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">

app/views/users/_resource_share_for_orgs.html.erb

@@ -22,7 +22,8 @@
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
   <div class="sectionWrap fl mr15">
-    <ul class="fontGrey3">
+
+    <ul class="fontGrey3 sectionContent">
       <% unless @orgs.empty? %>
           <% @orgs.each do |org|%>
               <li>

app/views/users/_show_detail_info.html.erb

@@ -5,7 +5,7 @@
     <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="个人头像"  />-->
   </div>
   <div class="fl">
-    <p class="homepageImageName mb5" style="max-width:88px;font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;"><%= user %></p>
+    <p class="homepageImageName mb5 hidden" style="max-width:88px;font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:21px; float:left;"><%= user %></p>
     <span class="homepageImageSex"></span>
     <div class="cl"></div>
     <p class="mb8 c_dark f14">

config/routes.rb

@@ -37,6 +37,14 @@ RedmineApp::Application.routes.draw do
     end
   end
   resources :organizations do
+    resources :org_document_comments do
+      member do
+
+      end
+      collection do
+
+      end
+    end
     member do
       get 'setting'#, :action => 'settings', :as => 'settings'
       get 'clear_org_avatar_temp'
@@ -63,14 +71,6 @@ RedmineApp::Application.routes.draw do
       post 'show_org_subfield'
       post 'agree_apply_subdomain'
     end
-    resources :org_document_comments do
-      member do
-
-      end
-      collection do
-
-      end
-    end
   end
 
   Organization.where("domain is not null").each do |org|

public/stylesheets/org.css

@@ -93,16 +93,15 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 /*转发样式*/
 .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
 .shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;}
-.sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; background-color:#f1f1f1; min-height:150px; padding-top:5px;}
+.sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; min-height:150px; padding-top:5px;}
 .columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
 .columnWrap li {padding-left:10px; color:#585858;}
 .columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
 .sectionRow:hover {background-color:#cccccc; cursor:pointer;}
-.sectionContent {display:none;}
+.sectionContent {}
-.sectionContent li {padding-left:30px;}
+.sectionContent li {padding-left:10px; line-height:20px;}
-.sectionContent li:hover {background-color:#cccccc; cursor:pointer;}
+.sectionContent li:hover {background-color:#cccccc;}
-.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;
+.sectionContent span {width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:20px; vertical-align:top;}
-                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}