Merge branch 'develop' into cxt_course

Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css

app/controllers/admin_controller.rb

@@ -51,6 +51,37 @@ class AdminController < ApplicationController
     end
   end
 
+  #管理员界面精品课程列表
+  def excellent_courses
+    @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
+    respond_to do |format|
+      format.html
+    end
+  end
+
+ #管理员界面课程资源列表
+  def course_resource_list
+    @resource = Attachment.where(:container_type => 'Course')
+    @resource = paginateHelper @resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #管理员界面項目资源列表
+  def project_resource_list
+    @pro_resource = Attachment.where(:container_type => 'Project')
+    @pro_resource = paginateHelper @pro_resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+
   def users
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)

app/controllers/blog_comments_controller.rb

@@ -91,8 +91,12 @@ class BlogCommentsController < ApplicationController
 
   def edit
     @article = BlogComment.find(params[:id])
-    respond_to do |format|
-      format.html {render :layout=>'new_base_user'}
+    if User.current.admin? || User.current.id == @article.author_id
+      respond_to do |format|
+        format.html { render :layout => 'new_base_user' }
+      end
+    else
+      render_403
     end
   end
 

app/controllers/courses_controller.rb

@@ -850,6 +850,8 @@ class CoursesController < ApplicationController
     #   render_403
     #   return
     # end
+    # 统计访问量
+    @course.update_attribute(:visits, @course.visits.to_i + 1)
     #更新创建课程消息状态
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)

app/controllers/files_controller.rb

@@ -854,9 +854,7 @@ class FilesController < ApplicationController
     @result = visable_attachemnts @result
     if params[:other]
       @result = @result.select{|attachment|
-        attachment.tag_list.exclude?('软件') &&
-            attachment.tag_list.exclude?('媒体') &&
-            attachment.tag_list.exclude?('代码')
+        attachment.tag_list.index{|tag|tag != '软件' and tag != '媒体' and tag != '代码'}.present?
       }
     else
       @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?

app/controllers/news_controller.rb

@@ -107,32 +107,18 @@ class NewsController < ApplicationController
 
   def show
     # 更新news对应的forge_messages的消息viewed字段
+    ids = @news.comments.map { |comment| comment.id }.join(",") unless @news.comments.nil?
     if @project
-      query_message_news = @news.forge_messages
+      # 更新新闻
+      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      # 更新新闻的时候一并更新回复
+      ForgeMessage.where("forge_message_id in (#{ids}) and forge_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     else
-      query_message_news = @news.course_messages
+      query_message_news = CourseMessage.where("course_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      CourseMessage.where("course_message_id in (#{ids}) and course_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     end
-    query_message_news.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-    end
-    # 更新项目新闻的评阅的消息viewed字段
-    current_message_comments = @news.comments
-    current_message_comments.each do |current_message_comment|
-    if @project
-      query_message_comment = current_message_comment.forge_messages
-    else
-      query_message_comment = current_message_comment.course_messages
-    end
-    query_message_comment.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-      end
-    end
-    # end
-
+    query_message_news.update_attribute(:viewed, true) unless query_message_news.nil?
+    # over
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

app/controllers/organizations_controller.rb

@@ -69,6 +69,8 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
+      # 统计访问量
+      @organization.update_attribute(:visits, @organization.visits.to_i + 1)
       if params[:org_subfield_id]
         @org_subfield = OrgSubfield.find(params[:org_subfield_id])
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0

app/controllers/projects_controller.rb

@@ -298,6 +298,8 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
+    # 统计访问量
+    @project.update_attribute(:visits, @project.visits.to_i + 1)
 =begin
     cond = @project.project_condition(Setting.display_subprojects_issues?)
     has = {

app/controllers/users_controller.rb

@@ -425,7 +425,7 @@ class UsersController < ApplicationController
   end
 
   def choose_user_course
-    homework = HomeworkCommon.find params[:homework].to_i
+    homework = HomeworkCommon.find params[:send_id].to_i
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
       @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
@@ -1199,6 +1199,10 @@ class UsersController < ApplicationController
   end
 
   def show
+    # 统计访问量
+    unless User.current == @user
+      @user.update_attribute(:visits, @user.visits.to_i + 1)
+    end
     #更新用户申请成为课程老师或教辅消息的状态
     if params[:course_id] != nil
       join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
@@ -1568,7 +1572,7 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
-    Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
+    attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == 2
@@ -2353,9 +2357,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids
-    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
-                                       "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("created_on desc")
+    attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("created_on desc")
   end
 
   # 获取我的资源
@@ -2372,7 +2374,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源课程
   def get_course_resources_public user_course_ids
-    attchments = Attachment.where("(container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("created_on desc")
   end
 
   # 获取我的项目资源
@@ -2382,7 +2384,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids
-    attchments = Attachment.where("(container_type = 'Project') or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 获取我上传的附件
@@ -2392,7 +2394,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public
-    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 获取我的用户类型资源
@@ -2402,7 +2404,7 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public
-    attchments = Attachment.where("container_type = 'Principal'").order("created_on desc")
+    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2634,9 +2636,7 @@ class UsersController < ApplicationController
       end
     elsif  params[:type] == "6" #全部资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = Attachment.where("((is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
-                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and  (filename like :p)" ,:p => search).order("created_on desc")
+      @attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("created_on desc")
     end
     @type = params[:type]
     @limit = 25

app/helpers/application_helper.rb

@@ -2945,9 +2945,35 @@ end
 def user_url_in_org(user_id)
   if Rails.env.development?
     return "http://localhost:3000/users/" + user_id.to_s
+  else
+    return "https://" +  Setting.host_name + "/users/" + user_id.to_s
+  end
+end
+
+def logout_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/logout"
+  else
+    return "https://" + Setting.host_name + "/logout"
+  end
+end
+
+def signin_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/login?login=true"
+  elsif Rails.env.test?
+    return "https://test.forge.trustie.net/login?login=true"
+  else
+    return "https://www.trustie.net/login?login=true"
+  end
+end
+
+def register_url_without_domain
+  if Rails.env.development?
+    return "http://localhost:3000/login?login=false"
   elsif Rails.env.test?
-    return "https://www.test.forge.trustie.net/users/" + user_id.to_s
+    return "https://test.forge.trustie.net/login?login=false"
   else
-    return "https://www.trustie.net/users/" + user_id.to_s
+    return "https://www.trustie.net/login?login=false"
   end
 end

app/helpers/courses_helper.rb

@@ -71,6 +71,11 @@ module CoursesHelper
     project.members.count
   end
 
+  # 统计课程中作品的数量
+  def student_works_num course
+    StudentWork.find_by_sql("SELECT * FROM student_works WHERE homework_common_id IN (SELECT id FROM homework_commons WHERE course_id = '#{course.id}')").count
+  end
+
   # 返回教师数量，即roles表中定义的Manager
   def teacherCount project
     project ? project.members.count - studentCount(project).to_i : 0

app/models/attachment.rb

@@ -499,6 +499,12 @@ class Attachment < ActiveRecord::Base
     result
   end
 
+  def self.attach_filesex_public(obj, attachments,attachment_type, is_public)
+    result = obj.save_attachmentsex_public(attachments, User.current,attachment_type, is_public)
+    obj.attach_saved_attachments
+    result
+  end
+
   def self.latest_attach(attachments, filename)
     attachments.sort_by(&:created_on).reverse.detect {
       |att| att.filename.downcase == filename.downcase

app/models/course_activity.rb

@@ -71,7 +71,8 @@ class CourseActivity < ActiveRecord::Base
       name = lead_message.subject
       content = lead_message.content
       # message的status状态为0为正常，为1表示创建课程时发送的message
-      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
+      # author_id 默认为课程使者创建
+      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => 1 , :sticky => true, :status => true )
       # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
       message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1) if message.course_acts.first
     end

app/views/admin/course_resource_list.html.erb

@@ -0,0 +1,64 @@
+<h3><%=l(:label_course_resource_list)%></h3>
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+
+      <th style="width: 60px;">
+        资源名称
+      </th>
+      <th style="width: 30px;">
+        资源大小
+      </th>
+      <th style="width: 25px;">
+        资源类型
+      </th>
+      <th style="width: 23px;">
+        上传时间
+      </th>
+      <th style="width: 15px;">
+        下载次数
+      </th>
+      <th style="width: 20px;">
+        上传者
+      </th>
+      <th style="width: 35px;">
+        所属课程
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @resource.each do |resource| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: left;">
+            <%= link_to truncate(resource.filename, :length => 18), download_named_attachment_path(resource.id, resource.filename ), :title => resource.filename,:class=>'resourcesBlack'%>
+          </td>
+          <td style=" text-align: center;">
+            <%=  number_to_human_size(resource.filesize)%>
+          </td>
+          <td style=" text-align: center;">
+            课程资源
+          </td>
+          <td style=" text-align: center;">
+            <%= format_date(resource.created_on)%>
+          </td>
+          <td style=" text-align: center;">
+            <%= resource.downloads %>
+          </td>
+          <td style=" text-align: center;">
+            <%= link_to(User.find(resource.author_id).realname, user_path(User.find(resource.author_id)) ) %>
+          </td>
+          <td style=" text-align: center;">
+            <%=link_to truncate(Course.find(resource.container_id).name, :length => 10), course_path(Course.find(resource.container_id)), :title => Course.find(resource.container_id).name, :class => "hidden fl w170" %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>

app/views/admin/excellent_courses.html.erb

@@ -0,0 +1,75 @@
+<h3>
+  <%=l(:label_excellent_courses_list)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 25px;">
+        序号
+      </th>
+      <th style="width: 120px;">
+        课程名
+      </th>
+      <th style="width: 50px;">
+        主讲老师
+      </th>
+      <th style="width: 30px;">
+        学生数
+      </th>
+      <th style="width: 25px;">
+        作业数
+      </th>
+      <th style="width: 25px;">
+        作品数
+      </th>
+      <th style="width: 25px;">
+        资源数
+      </th>
+      <th style="width: 70px;">
+        帖子数
+      </th>
+      <th style="width: 70px;">
+        动态数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @courses.each do |course| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= course.id %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
+            <span>
+              <%= link_to(course.name, course_path(course.id)) %>
+            </span>
+          </td>
+          <td align="center">
+            <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+          </td>
+          <td align="center">
+            <%= studentCount(course) %>
+          </td>
+          <td class="center">
+            <%= course.homework_commons.count%>
+          </td>
+          <td class="center">
+            <%= student_works_num(course) %>
+          </td>
+          <td class="center">
+            <%= visable_attachemnts_incourse(course).count%>
+          </td>
+          <td class="center">
+            <%= course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", course.boards.first.id, nil).count %>
+
+          </td>
+          <td class="center">
+            <%= course.course_activities.count%>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>

app/views/admin/project_resource_list.html.erb

@@ -0,0 +1,64 @@
+<h3><%=l(:label_project_resource_list)%></h3>
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+
+      <th style="width: 60px;">
+        资源名称
+      </th>
+      <th style="width: 30px;">
+        资源大小
+      </th>
+      <th style="width: 25px;">
+        资源类型
+      </th>
+      <th style="width: 23px;">
+        上传时间
+      </th>
+      <th style="width: 15px;">
+        下载次数
+      </th>
+      <th style="width: 20px;">
+        上传者
+      </th>
+      <th style="width: 35px;">
+        所属项目
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @pro_resource.each do |pro_resource| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: left;">
+            <%= link_to truncate(pro_resource.filename, :length => 18), download_named_attachment_path(pro_resource.id, pro_resource.filename ), :title => pro_resource.filename,:class=>'resourcesBlack'%>
+          </td>
+          <td style=" text-align: center;">
+            <%=  number_to_human_size(pro_resource.filesize)%>
+          </td>
+          <td style=" text-align: center;">
+            项目资源
+          </td>
+          <td style=" text-align: center;">
+            <%= format_date(pro_resource.created_on)%>
+          </td>
+          <td style=" text-align: center;">
+            <%= pro_resource.downloads %>
+          </td>
+          <td style=" text-align: center;">
+            <%= link_to(User.find(pro_resource.author_id).realname, user_path(User.find(pro_resource.author_id)) ) %>
+          </td>
+          <td style=" text-align: center;">
+            <%=link_to truncate(Project.find(pro_resource.container_id).name, :length => 10), project_path(Project.find(pro_resource.container_id)), :title => Project.find(pro_resource.container_id).name, :class => "hidden fl w170" %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>

app/views/blog_comments/_simple_ke_reply_form.html.erb

@@ -1,21 +1,21 @@
-<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-  <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= reply.id%>'>
-      <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
-          <input type="hidden" name="quote[quote]" id="quote_quote">
-          <% if course_id%>
-              <input type="hidden" name="course_id" id="" value="<%= course_id%>">
-          <% end %>
-          <input type="hidden" name="blog_comment[title]" id="reply_subject">
-          <div nhname='toolbar_container_<%= reply.id%>'></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
-          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
-          <div class="cl"></div>
-          <p nhname='contentmsg_<%= reply.id%>'></p>
-      <% end%>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <div class="cl"></div>
+<div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+  <div class="ReplyToMessageInputContainer mb10">
+    <div nhname='new_message_<%= reply.id%>'>
+      <%= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %>
+          <input type="hidden" name="quote[quote]" id="quote_quote">
+          <% if course_id%>
+              <input type="hidden" name="course_id" id="" value="<%= course_id%>">
+          <% end %>
+          <input type="hidden" name="blog_comment[title]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="blog_comment[content]"></textarea>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:2px;">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= reply.id%>'></p>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
 </div>

app/views/blog_comments/edit.html.erb

@@ -1,6 +1,5 @@
-<% if User.current.logged? && User.current.id == @user.id %>
-    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
-                          :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
-        <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
-    <% end %>
-<% end %>
+
+<%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
+                       :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
+     <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
+<% end %>

app/views/blog_comments/show.html.erb

@@ -38,7 +38,7 @@
       <%= link_to image_tag(url_to_avatar(@article.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@article.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @article.author.id == User.current.id%>
+      <% if @article.author.id == User.current.id || User.current.admin? %>
           <div class="homepagePostSetting" id="message_setting_<%= @article.id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">
@@ -48,7 +48,7 @@
                                 l(:button_edit),
                                 {:action => 'edit', :id => @article.id,:in_act => params[:in_act]},
                                 :class => 'postOptionLink'
-                        ) if User.current && User.current.id == @article.author.id %>
+                        ) if User.current.admin? || User.current.id == @article.author.id %>
                   </li>
                   <li>
                     <%= link_to(
@@ -57,7 +57,7 @@
                                 :method => :delete,
                                 :data => {:confirm => l(:text_are_you_sure)},
                                 :class => 'postOptionLink'
-                        ) if User.current && User.current.id == @article.author.id %>
+                        ) if User.current.admin? || User.current.id == @article.author.id %>
                   </li>
                   <li>
                     <% if @article.id == @article.blog.homepage_id %>

app/views/files/_org_subfield_list.html.erb

@@ -9,7 +9,7 @@
           </div>
           <div class="homepagePostDes">
             <div class="homepagePostTitle break_word mt-4">
-              <%= link_to file.is_public? ? truncate(file.filename, length: 70) : truncate(file.filename,length: 50, omission: '...'),
+              <%= link_to file.is_public? ? truncate(file.filename, length: 45) : truncate(file.filename,length: 35, omission: '...'),
                           download_named_attachment_path(file.id, file.filename),
                           :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14 f_l"  %>
               <%= file_preview_eye(file, class: 'preview') %>

app/views/files/_upload_course_files.erb

@@ -25,7 +25,7 @@
           <div class="mb5">
             <label class="fl c_dark f14" style="margin-top: 4px;">附件描述：</label>
             <div class="fl">
-              <input  type="text" name="description"  placeholder="文件描述" class="fl W120 ">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
             </div>
             <div class="cl"></div>
           </div>

app/views/issues/_issue_replies.html.erb

@@ -1,86 +1,86 @@
-<ul>
-  <% issue.journals.reorder("created_on desc").each do |reply| %>
-      <script type="text/javascript">
-          $(function(){
-              showNormalImage('reply_content_<%= reply.id %>');
-          });
-      </script>
-      <% replies_all_i=replies_all_i + 1 %>
-      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
-        <div class="homepagePostReplyPortrait" >
-          <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
-        </div>
-        <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher mt-4">
-            <% if reply.try(:user).try(:realname) == ' ' %>
-                <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-            <% else %>
-                <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-            <% end %>
-            <%#= format_time(reply.created_on) %>
-          </div>
-          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-            <% if reply.details.any? %>
-                <% details_to_strings(reply.details).each do |string| %>
-                    <p><%= string %></p>
-                <% end %>
-            <% end %>
-            <P><%= reply.notes.html_safe %></P>
-          </div>
-          <div style="margin-top: 7px">
-            <%= format_time(reply.created_on) %>
-            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-              <%= link_to(
-                          l(:button_reply),
-                          {:controller => 'issues', :action => 'reply', :user_id => reply.user_id, :id => issue.id, :journal_id => reply.id},
-                          :remote => true,
-                          :method => 'get',
-                          :class => 'fr newsBlue',
-                          :title => l(:button_reply)) if  User.current.logged?  %>
-              <%= link_to(
-                          l(:button_delete),
-                          {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
-                          :method => :get,
-                          :remote=>true,
-                          :class => 'fr newsGrey mr10',
-                          :data => {:confirm => l(:text_are_you_sure)},
-                          :title => l(:button_delete)
-                  ) if reply.user_id == User.current.id %>
-            </div>
-          </div>
-          <p id="reply_message_<%= reply.id%>"></p>
-        </div>
-        <div class="cl"></div>
-      </li>
-  <% end %>
-</ul>
-<div class="homepagePostReplyContainer borderBottomNone minHeight48">
-
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
-    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
-  </div>
-
-  <div class="homepagePostReplyInputContainer mb10">
-    <div nhname='new_message_<%= @issue.id %>' style="display:none;">
-      <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
-          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-          <!--<div class="cl"></div>-->
-          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-          <div nhname='toolbar_container_<%= @issue.id %>' ></div>
-          <div class="cl"></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
-          <div class="cl"></div>
-          <div class="mt5 fl">
-            <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
-          </div>
-          <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" class="blue_n_btn fr mt5" style="display:none;">发送</a>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
-    <div class="cl"></div>
-
-  </div>
-  <div class="cl"></div>
+<ul>
+  <% issue.journals.reorder("created_on desc").each do |reply| %>
+      <script type="text/javascript">
+          $(function(){
+              showNormalImage('reply_content_<%= reply.id %>');
+          });
+      </script>
+      <% replies_all_i=replies_all_i + 1 %>
+      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
+        <div class="homepagePostReplyPortrait" >
+          <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+        </div>
+        <div class="homepagePostReplyDes">
+          <div class="homepagePostReplyPublisher mt-4">
+            <% if reply.try(:user).try(:realname) == ' ' %>
+                <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+            <% else %>
+                <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+            <% end %>
+            <%#= format_time(reply.created_on) %>
+          </div>
+          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+            <% if reply.details.any? %>
+                <% details_to_strings(reply.details).each do |string| %>
+                    <p><%= string %></p>
+                <% end %>
+            <% end %>
+            <P><%= reply.notes.html_safe %></P>
+          </div>
+          <div style="margin-top: 7px">
+            <%= format_time(reply.created_on) %>
+            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+              <%= link_to(
+                          l(:button_reply),
+                          {:controller => 'issues', :action => 'reply', :user_id => reply.user_id, :id => issue.id, :journal_id => reply.id},
+                          :remote => true,
+                          :method => 'get',
+                          :class => 'fr newsBlue',
+                          :title => l(:button_reply)) if  User.current.logged?  %>
+              <%= link_to(
+                          l(:button_delete),
+                          {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
+                          :method => :get,
+                          :remote=>true,
+                          :class => 'fr newsGrey mr10',
+                          :data => {:confirm => l(:text_are_you_sure)},
+                          :title => l(:button_delete)
+                  ) if reply.user_id == User.current.id %>
+            </div>
+          </div>
+          <p id="reply_message_<%= reply.id%>"></p>
+        </div>
+        <div class="cl"></div>
+      </li>
+  <% end %>
+</ul>
+<div class="homepagePostReplyContainer borderBottomNone minHeight48">
+
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+  </div>
+
+  <div class="homepagePostReplyInputContainer mb10">
+    <div nhname='new_message_<%= @issue.id %>' style="display:none;">
+      <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
+          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+          <!--<div class="cl"></div>-->
+          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+          <div nhname='toolbar_container_<%= @issue.id %>' ></div>
+          <div class="cl"></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
+          <div class="cl"></div>
+          <div class="mt5 fl">
+            <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
+          </div>
+          <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
+          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr mt5" style="display:none;">发送</a>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
+    <div class="cl"></div>
+
+  </div>
+  <div class="cl"></div>
 </div>

app/views/issues/_issue_reply_ke_form.html.erb

@@ -1,27 +1,27 @@
-<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
-
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
-    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
-  </div>
-
-  <div class="ReplyToMessageInputContainer mb10">
-    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
-      <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
-          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-          <!--<div class="cl"></div>-->
-          <input type="hidden" name="quote" value=""/>
-          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
-          <div class="cl"></div>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
-          <div class="cl"></div>
-          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
-    <div class="cl"></div>
-
-  </div>
+<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
+
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
+  </div>
+
+  <div class="ReplyToMessageInputContainer mb10">
+    <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+      <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+          <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+          <!--<div class="cl"></div>-->
+          <input type="hidden" name="quote" value=""/>
+          <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+          <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+          <div class="cl"></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+          <div class="cl"></div>
+          <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
+          <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+      <% end %>
+    </div>
+    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
+    <div class="cl"></div>
+
+  </div>
 </div>