Merge branch 'szzh' into dev_zanle

Conflicts:
	app/controllers/courses_controller.rb
	public/stylesheets/new_user.css

app/controllers/application_controller.rb

@@ -381,6 +381,11 @@ class ApplicationController < ActionController::Base
     if allowed
       true
     else
+      if params[:action] == 'show'
+        #更新申请结果反馈消息的状态
+        messages = CourseMessage.where("course_message_type =? and course_id =? and user_id =? and viewed =?", 'CourseRequestDealResult', @course.id, User.current.id, false)
+        messages.update_all(:viewed => true)
+      end
       if @course && @course.archived?
         render_403 :message => :notice_not_authorized_archived_project
       else

app/controllers/courses_controller.rb

@@ -36,6 +36,12 @@ class CoursesController < ApplicationController
         join = cs.join_course params,@user
         @state = join[:state]
         @course = join[:course]
+        Mailer.run.join_course_request(@course, User.current, params[:role])
+      # else
+      #   @course = Course.find_by_id params[:object_id]
+      #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
+      #   @state = 6
+      # end
     else
       @state = 5 #未登录
     end
@@ -283,14 +289,11 @@ class CoursesController < ApplicationController
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
-    # 如果是ie 需要转码
-    if(/trident/.match(request.env["HTTP_USER_AGENT"]) != nil)
-      filename= URI::encode(filename)
-    end
+   
     respond_to do |format|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{filename}.xls")
+                  :filename => filename_for_content_disposition("#{filename}.xls"))
       }
     end
   end
@@ -611,6 +614,10 @@ class CoursesController < ApplicationController
     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)
 
+    #更新申请结果反馈消息的状态
+    course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
+    course_request_messages.update_all(:viewed => true)
+
     course_activities = @course.course_activities
     @canShowRealName = User.current.member_of_course? @course
     @page = params[:page] ? params[:page].to_i + 1 : 0

app/controllers/gantts_controller.rb

@@ -42,8 +42,8 @@ class GanttsController < ApplicationController
 
     respond_to do |format|
       format.html { render :action => "show", :layout => 'base_projects' }#by young
-      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
-      format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") }
+      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => filename_for_content_disposition("#{basename}.png")) } if @gantt.respond_to?('to_image')
+      format.pdf  { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{basename}.pdf") ) }
     end
   end
 end

app/controllers/homework_attach_controller.rb

@@ -33,7 +33,7 @@ class HomeworkAttachController < ApplicationController
       format.js
       format.xls {
         send_data(homework_to_xls(@all_homework_list), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_not_rated)}).xls")
+                  :filename => filename_for_content_disposition("#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_not_rated)}).xls") )
       }
     end
   end
@@ -66,7 +66,7 @@ class HomeworkAttachController < ApplicationController
       format.js
       format.xls {
         send_data(homework_to_xls(all_homework_list), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_been_rated)}).xls")
+                  :filename => filename_for_content_disposition("#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}(#{l(:excel_been_rated)}).xls") )
       }
     end
   end
@@ -101,7 +101,7 @@ class HomeworkAttachController < ApplicationController
       format.js
       format.xls {
         send_data(homework_to_xls(all_homework_list), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}.xls")
+                  :filename => filename_for_content_disposition("#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@bid.name}#{l(:excel_homework_list)}.xls") )
       }
     end
   end

app/controllers/issues_controller.rb

@@ -151,7 +151,7 @@ class IssuesController < ApplicationController
     format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
     format.pdf  {
       pdf = issue_to_pdf(@issue, :journals => @journals)
-      send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
+      send_data(pdf, :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}-#{@issue.id}.pdf") )
     }
     end
   end

app/controllers/poll_controller.rb

@@ -413,7 +413,7 @@ class PollController < ApplicationController
     respond_to do |format|
       format.xls {
         send_data(poll_to_xls(poll_questions), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@poll.polls_name}.xls")
+                  :filename => filename_for_content_disposition("#{@poll.polls_name}.xls") )
       }
     end
   end

app/controllers/stores_controller.rb

@@ -84,7 +84,7 @@ class StoresController < ApplicationController
     respond_to do |format|
       format.xls {
         send_data(homework_to_xls(attachments), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{l(:label_file_lost_list)}.xls")
+                  :filename => filename_for_content_disposition("#{l(:label_file_lost_list)}.xls") )
       }
     end
   end

app/controllers/users_controller.rb

@@ -918,6 +918,12 @@ class UsersController < ApplicationController
   end
 
   def show
+    #更新用户申请成为课程老师或教辅消息的状态
+    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 =?",
+                                                 params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
+      join_course_messages.update_all(:viewed => true)
+    end
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"

app/controllers/wiki_controller.rb

@@ -82,14 +82,14 @@ class WikiController < ApplicationController
     @content = @page.content_for_version(params[:version])
     if User.current.allowed_to?(:export_wiki_pages, @project)
       if params[:format] == 'pdf'
-        send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
+        send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => filename_for_content_disposition("#{@page.title}.pdf") )
         return
       elsif params[:format] == 'html'
         export = render_to_string :action => 'export', :layout => false
-        send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
+        send_data(export, :type => 'text/html', :filename => filename_for_content_disposition("#{@page.title}.html"))
         return
       elsif params[:format] == 'txt'
-        send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
+        send_data(@content.text, :type => 'text/plain', :filename => filename_for_content_disposition("#{@page.title}.txt") )
         return
       end
     end
@@ -286,7 +286,7 @@ class WikiController < ApplicationController
         send_data(export, :type => 'text/html', :filename => "wiki.html")
       }
       format.pdf {
-        send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
+        send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => filename_for_content_disposition("#{@project.identifier}.pdf") )
       }
     end
   end

app/models/mailer.rb

@@ -1009,6 +1009,16 @@ class Mailer < ActionMailer::Base
     end
   end
 
+  def join_course_request(course, user, role)
+    @receive = User.find(course.tea_id)
+    @course = course
+    @user = user
+    @role = role
+    @subject = "#{@user.show_name} #{l(:label_apply_join_course)} #{@course.name} "
+    mail :to => @receive.mail,
+         :subject => @subject
+  end
+
 
 
   private
@@ -1066,4 +1076,5 @@ class Mailer < ActionMailer::Base
     1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
     return newpass
   end
+
 end

app/services/courses_service.rb

@@ -317,6 +317,7 @@ class CoursesService
             elsif current_user.allowed_to?(:as_teacher,course)
               @state = 3
             else
+              Mailer.run.join_course_request(course, User.current, params[:role])
               #如果加入角色为教师或者教辅
               CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
               @state = 6
@@ -340,6 +341,7 @@ class CoursesService
               if CourseMessage.where("course_message_type = 'JoinCourseRequest' and user_id = #{course.tea_id} and content = #{params[:role]} and course_message_id = #{User.current.id} and course_id = #{course.id} and status = 0").count != 0
                 @state = 7
               else
+                Mailer.run.join_course_request(course, User.current, params[:role])
                 CourseMessage.create(:user_id => course.tea_id, :course_id => course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest',:status=>0)
                 @state = 6
               end

app/views/courses/_join_private_course.html.erb

@@ -4,33 +4,33 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>快速进入课程通道</title>
   <style>
-      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-      div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
-      div,img,tr,td{ border:0;}
-      table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-      ul,li{ list-style-type:none}
-      .cl{ clear:both; overflow:hidden; }
-      a{ text-decoration:none; }
-      a:hover{}
+      #popbox{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      #popbox div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+      #popbox div,img,tr,td{ border:0;}
+      #popbox table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+      #popbox ul,li{ list-style-type:none}
+      #popbox .cl{ clear:both; overflow:hidden; }
+      #popbox a{ text-decoration:none; }
+      #popbox a:hover{}
 
       .alert_box {width:488px;height:550px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
       #popbox{width:488px;height:368px;}
       .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px;  }
-      .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; }
-      .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
-      .C_top p{ color:#a9aaaa; line-height:22px;}
-      .C_form{ margin:20px 0 0 60px;}
-      .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; }
-      .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
-      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:97px;}
-      .width190{ width:190px; height:26px; border-color:#e1e1e1;}
-      .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
-      .C_form a:hover{ text-decoration:underline;}
-      .C_form a.btn_join{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#269ac9; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
-      .C_form a.btn_join:hover{ background:#297fb8; text-decoration: none;}
-      .C_form a.btn_cancel{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#c1c1c1; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
-      .C_form a.btn_cancel:hover{ background:#717171; text-decoration: none;}
-      .IDType {border:1px solid #e1e1e1; outline: none; width: 65px; height: 25px;}
+      #popbox .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; }
+      #popbox .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
+      #popbox .C_top p{ color:#a9aaaa; line-height:22px;}
+      #popbox .C_form{ margin:20px 0 0 60px;}
+      #popbox .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; }
+      #popbox .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
+      #popbox .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:97px;}
+      #popbox .width190{ width:190px; height:26px; border-color:#e1e1e1;}
+      #popbox .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
+      #popbox .C_form a:hover{ text-decoration:underline;}
+      #popbox .C_form a.btn_join{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#269ac9; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      #popbox .C_form a.btn_join:hover{ background:#297fb8; text-decoration: none;}
+      #popbox .C_form a.btn_cancel{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#c1c1c1; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      #popbox .C_form a.btn_cancel:hover{ background:#717171; text-decoration: none;}
+      #popbox .IDType {border:1px solid #e1e1e1; outline: none; width: 65px; height: 25px;}
   </style>
   <script type="text/javascript">
       function submit_form(obj)

app/views/layouts/new_base_user.html.erb

@@ -105,7 +105,21 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <%=link_to "", new_course_path(:host=> Setting.host_course), :class => "homepageMenuSetting fr", :title => "新建课程"%>
+                  <div class="courseMenu" id="courseMenu">
+                    <ul>
+                      <li class="courseMenuIcon" id="courseMenuIcon">
+                        <ul class="topnav_course_menu" id="topnav_course_menu">
+                          <li>
+                            <%= link_to "新建课程", new_course_path(:host=> Setting.host_course), :class => "menuGrey"%>
+                          </li>
+                          <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
+                          <li>
+                            <%= link_to "加入课程",join_private_courses_courses_path,:remote => true,:class => "menuGrey",:method => "post"%>
+                          </li>
+                        </ul>
+                      </li>
+                    </ul>
+                  </div>
               <% else%>
                   <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true, :title => "加入课程"%>
               <% end%>
@@ -203,5 +217,13 @@
     <div class="cl"></div>
   </div><!--floatbox end-->
 </div>
+<script type="text/javascript">
+    $("#courseMenu").mouseenter(function(){
+        $("#topnav_course_menu").show();
+    });
+    $("#courseMenu").mouseleave(function(){
+        $("#topnav_course_menu").hide();
+    });
+</script>
 </body>
 </html>

app/views/mailer/join_course_request.html.erb

@@ -0,0 +1,4 @@
+<p>
+  <%= @user.show_name %>申请成为课程<%= @course.name %>的<%= @role.eql?('9') ? '老师': '教辅' %>
+    <%=link_to user_message_url(@receive),user_message_url(@receive)%>
+</p>

app/views/mailer/join_course_request.text.erb

@@ -0,0 +1,4 @@
+<%= @user.show_name %>申请成为课程<%= @course.name %>的<%= @role.eql?('9') ? '老师': '教辅' %>
+<%=link_to user_message_url(@receive),user_message_url(@receive)%>
+
+

app/views/messages/_course_show.html.erb

@@ -115,7 +115,7 @@
                     <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                 <% end %>
               </div>
-              <div class="homepagePostReplyContent upload_img break_word" id="reply_message_description_<%= reply.id %>">
+              <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
               </div>
               <div style="margin-top: -7px; margin-bottom: 5px">

app/views/student_work/_work_attachments.html.erb

@@ -2,7 +2,7 @@
     <div id="attachment_<%= attachment.id%>">
       <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
-      <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
+      <span class="postAttSize fl ">(<%= number_to_human_size attachment.filesize %>)</span>
       <div class="cl"></div>
     </div>
 <% end -%>

app/views/users/_course_homework.html.erb

@@ -43,7 +43,7 @@
 
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <%= activity.description.html_safe %>
         </div>
@@ -52,6 +52,10 @@
       <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>
+        <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
+        <div class="cl"></div>
+      </div>
       <%# if is_teacher%>
           <!--<div class="homepagePostSetting">
             <ul>
@@ -119,7 +123,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                   </div>
                   <div class="cl"></div>

app/views/users/_course_journalsformessage.html.erb

@@ -67,7 +67,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                     <% fetch_user_leaveWord_reply(comment).each do |reply| unless fetch_user_leaveWord_reply(comment).nil? %>
                         <script type="text/javascript">
@@ -94,7 +94,7 @@
                                 <% end %>
                                 <%= format_time reply.created_on %>
                               </div>
-                            <div class="homepagePostReplyContent break_word list_style upload_img" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
+                            <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" style="max-width: 580px;" id="reply_to_content_<%= reply.id %>">
                               <%= reply.notes.html_safe %></div>
                               <div class="cl"></div>
                           </div>

app/views/users/_course_message.html.erb

@@ -30,7 +30,7 @@
       <div class="homepagePostDate">
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <% if activity.parent_id.nil? %>
               <%= activity.content.to_s.html_safe%>
@@ -104,7 +104,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>
                     </div>
                   </div>

app/views/users/_course_news.html.erb

@@ -18,7 +18,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <%= activity.description.html_safe %>
         </div>
@@ -71,7 +71,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>

app/views/users/_course_poll.html.erb

@@ -29,7 +29,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <%= activity.polls_description.html_safe %>
         </div>

app/views/users/_project_issue.html.erb

@@ -33,7 +33,7 @@
           <%=format_time(activity.created_on) %>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <% if activity.description? %>
               <%= textAreailizable activity, :description, :attachments => activity.attachments %>
@@ -48,19 +48,26 @@
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
                 <div class="break_word">
+                  <span class="fl">
                   <span title="<%= attachment.filename %>" id="attachment_">
-                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
+                    <%= link_to_short_attachment attachment,:length=> 58, :class => 'link_file_a fl newsBlue', :download => true -%>
                   </span>
                   <% if attachment.is_text? %>
                       <%= link_to image_tag('magnifier.png'),
                                   :controller => 'attachments',
                                   :action => 'show',
                                   :id => attachment,
+                                  :class => 'fl',
                                   :filename => attachment.filename %>
                   <% end %>
+                  </span>
                   <span class="postAttSize">(
                     <%= number_to_human_size attachment.filesize %>)
                   </span>
+                  <span class="author" title="<%= attachment.author%>">
+                    <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+                    <%= format_time(attachment.created_on) %>
+                  </span>
                 </div>
             <% end %>
         <% end %>
@@ -107,7 +114,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <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>

app/views/users/_project_message.html.erb

@@ -26,7 +26,7 @@
       <div class="homepagePostDate">
         时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
           <% if activity.parent_id.nil? %>
               <%= activity.content.to_s.html_safe%>
@@ -85,7 +85,7 @@
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>

app/views/users/_user_homework_detail.html.erb

@@ -43,7 +43,7 @@
           <%= l(:label_end_time)%>：<%= homework_common.end_time%>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="homework_description_<%= homework_common.id%>">
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
         <div id="intro_content_<%= homework_common.id%>">
           <%= homework_common.description.html_safe %>
         </div>
@@ -127,7 +127,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= comment.id %>">
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>
                   </div>
                   <div class="cl"></div>