Merge branch 'szzh' into develop

app/controllers/application_controller.rb

@@ -257,12 +257,12 @@ class ApplicationController < ActionController::Base
   def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
     if @attachment.container_type == "Memo"
       allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
-    elsif  @attachment.container_type == "Project"
-        return true
-    elsif @attachment.container_type == "course"
-        return true
+    elsif  @attachment.container_type == "Message" && !@project.nil?
+      allowed = User.current.allowed_to?(:projects_attachments_download,@project,:global => false)
+    elsif @attachment.container_type == "Message" && !@course.nil?
+      allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
     elsif @attachment.container_type == "contest"
-        return true
+      return true
     else
       return true
     end

app/controllers/attachments_controller.rb

@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
   before_filter :delete_authorize, :only => :destroy
   before_filter :authorize_global, :only => :upload
   before_filter :authorize_attachment_download, :only => :download
-  before_filter :login_without_softapplication, only: [:download]
+  #before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
   require 'iconv'
 
@@ -68,12 +68,20 @@ class AttachmentsController < ApplicationController
     elsif  @attachment.container.is_a?(Project)
       project = @attachment.container
       candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
+    elsif (@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
+        @attachment.container.board.project
+      project = @attachment.container.board.project
+      candown = User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
     elsif (@attachment.container.has_attribute?(:course) ||@attachment.container.has_attribute?(:course_id) ) && @attachment.container.course
       course = @attachment.container.course
       candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
     elsif @attachment.container.is_a?(Course)
       course = @attachment.container
       candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
+    elsif (@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
+        @attachment.container.board.course
+      course = @attachment.container.board.course
+      candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
     elsif @attachment.container.class.to_s=="HomeworkAttach" && @attachment.container.bid.reward_type == 3
       candown = true
     else
@@ -321,8 +329,11 @@ private
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
     if @attachment.container_type == 'Course'
       @course = @attachment.course
-    elsif  !@attachment.container.nil? && (@attachment.container.has_attribute?(:course) || @attachment.container.has_attribute?(:course)) && @attachment.container.course
+    elsif  !@attachment.container.nil? && (@attachment.container.has_attribute?(:course) || @attachment.container.has_attribute?(:course_id)) && @attachment.container.course
       @course = @attachment.container.course
+    elsif !@attachment.container.nil? && ((@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
+        @attachment.container.board.course)
+      @course = @attachment.container.board.course
     else
       unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication'
         @project = @attachment.project

app/controllers/my_controller.rb

@@ -130,7 +130,7 @@ class MyController < ApplicationController
         @user.pref.save
         @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
         set_language_if_valid @user.language
-        flash[:notice] = l(:notice_account_updated)
+        flash.now[:notice] = l(:notice_account_updated)
         redirect_to user_path(@user)
         return
       else
@@ -160,7 +160,7 @@ class MyController < ApplicationController
       @user.destroy
       if @user.destroyed?
         logout_user
-        flash[:notice] = l(:notice_account_deleted)
+        flash.now[:notice] = l(:notice_account_deleted)
       end
       redirect_to home_path
     end
@@ -170,7 +170,7 @@ class MyController < ApplicationController
   def password
     @user = User.current
     unless @user.change_password_allowed?
-      flash[:error] = l(:notice_can_t_change_password)
+      flash.now[:error] = l(:notice_can_t_change_password)
       redirect_to my_account_path
       return
     end

app/controllers/users_controller.rb

@@ -226,7 +226,14 @@ class UsersController < ApplicationController
       end
     end
   
-    membership = @user.coursememberships.all#@user.coursememberships.all(:conditions => Course.visible_condition(User.current))
+    #@user.coursememberships.all(:conditions => Course.visible_condition(User.current))
+
+    if User.current == @user || User.current.admin?
+      membership = @user.coursememberships.all
+    else
+      membership = @user.coursememberships.all(:conditions => Course.visible_condition(User.current))
+    end
+
     membership.sort! {|older, newer| newer.created_on <=> older.created_on }
     @memberships = []
     membership.collect { |e| 
@@ -235,9 +242,9 @@ class UsersController < ApplicationController
     ## 判断课程是否过期 [需封装]
     @memberships_doing = []
     @memberships_done  = []
-    now_time = Time.now.year
+    #now_time = Time.now.year
     @memberships.map { |e|
-      end_time = e.course.get_time.year
+      #end_time = e.course.get_time.year
       isDone = course_endTime_timeout?(e.course)
       if isDone
         @memberships_done.push e

app/controllers/zipdown_controller.rb

@@ -17,6 +17,7 @@ class ZipdownController < ApplicationController
         @project = obj.courses[0]
     end
   end
+
   def assort
     obj_class = params[:obj_class]
     obj_id = params[:obj_id]
@@ -76,18 +77,18 @@ class ZipdownController < ApplicationController
 
     homeattaches = bid.homeworks
     #记录所有作业是不是有附件，有一个附件就改为true
-    has_file = false
+    #has_file = false
     # 得到每一个人所有文件打包的zip文件
     # 并将每一个人的zip打包为一个并返回路径
     user_zip_paths = homeattaches.map do |homeattach|
       if homeattach.attachments.count > 0
         zip_homework_by_user homeattach
-        has_file = true unless has_file
+        #has_file = true unless has_file
       end
     end
-    unless has_file
-      render file: 'public/no_file_fond.html' , :layout => 'course_base'
-    end
+    #unless has_file
+    #  render file: 'public/no_file_fond.html' , :layout => 'course_base'
+    #end
     zipping "#{Time.now.to_i}_#{bid.name}.zip", user_zip_paths, OUTPUT_FOLDER
 
     #@paths = homeworks_attach_path

app/helpers/welcome_helper.rb

@@ -303,27 +303,27 @@ module WelcomeHelper
       str << content_tag("span", "发表了") << 
         content_tag("span", find_all_event_type(event)) << 
         ':&nbsp;'.html_safe << 
-        link_to(truncate(strip_tags(event.event_description).gsub(/&nbsp;/,''), length: 30, omission:'...'), event.event_url)
+        link_to(strip_tags(event.event_description).gsub(/&nbsp;/,''), event.event_url)
     when 'issue', 'message' , 'bid' , 'wiki-page' , 'document'
       str << content_tag("span", "发表了") <<
              content_tag("span", find_all_event_type(event)) << 
              ':&nbsp;'.html_safe << 
-             link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url)
+             link_to(event.event_title, event.event_url)
     when 'reply' ,'Reply', 'Memo'
       str << content_tag("span", "发表了") << 
         content_tag("span", find_all_event_type(event)) << 
         ':&nbsp;'.html_safe << 
-        link_to(truncate(strip_tags(event.event_description).gsub(/&nbsp;/,''), length: 30, omission:'...'), event.event_url)
+        link_to(strip_tags(event.event_description).gsub(/&nbsp;/,''), event.event_url)
     when 'attachment'
       str << content_tag('span', '上传了') << 
         content_tag('span', find_all_event_type(event)) << 
         ':&nbsp;'.html_safe << 
-        link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) << 
+        link_to(event.event_title, event.event_url) <<
         link_to(('&nbsp;['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container.project), :class => "attachments_list_color")
     else
       str << content_tag("span", "更新了") << 
         content_tag("span", find_all_event_type(event)) << 
-        ':&nbsp;'.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url)
+        ':&nbsp;'.html_safe << link_to(event.event_title, event.event_url)
     end
     str
   rescue Exception => e
@@ -405,7 +405,8 @@ module WelcomeHelper
       "show_bids" => true,
       "show_contest" => true
     }
-    activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news', 'contestnotification'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
+    activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news', 'contestnotification'].include?(t) ?
+        nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
     activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'})
   end
 

app/models/attachment.rb

@@ -411,6 +411,17 @@ class Attachment < ActiveRecord::Base
     end
   end
 
+  # Finds an attachment that matches the given token
+  def self.find_by_token_only(token)
+    if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/
+      attachment_id, attachment_digest = $1, $2
+      attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first
+      if attachment
+        attachment
+      end
+    end
+  end
+
   # Bulk attaches a set of files to an object
   #
   # Returns a Hash of the results:

app/views/admin/users.html.erb

@@ -26,7 +26,7 @@
      
 
     <div class="autoscroll">
-      <table class="list" style="width: 100%;table-layout: fixed">
+      <table class="list" style="width: 100%;table-layout: fixed;">
         <thead>
         <tr >
           <%= sort_header_tag('login', :caption => l(:field_login)) %>

app/views/attachments/_form.html.erb

@@ -5,7 +5,7 @@
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
       <%= if attachment.id.nil?
         #待补充代码
       else

app/views/attachments/_form_course.html.erb

@@ -7,7 +7,8 @@
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
           link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
@@ -18,7 +19,8 @@
       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
                   link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>

app/views/bids/_homework_list.html.erb

@@ -78,7 +78,7 @@
                         <% end %>
                     </td>
                     <td rowspan="4" style="text-align: center;vertical-align: middle;width: 30px">
-                      <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %>
+                      <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
                           <span class="required">迟交</span>
                       <% end %>
                     </td>

app/views/calendars/show.html.erb

@@ -2,38 +2,35 @@
 
 <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
              :method => :get, :id => 'query_form') do %>
-<%= hidden_field_tag 'set_filter', '1' %>
-<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
-  <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
-  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
-    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-  </div>
-</fieldset>
-
-<p style="float:right;">
-  <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
-</p>
-
-<p class="buttons">
-<%= label_tag('month', l(:label_month)) %>
-<%= select_month(@month, :prefix => "month", :discard_type => true) %>
-<%= label_tag('year', l(:label_year)) %>
-<%= select_year(@year, :prefix => "year", :discard_type => true) %>
-
-<%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
-<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
-</p>
+    <%= hidden_field_tag 'set_filter', '1' %>
+    <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+      <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
+      <div style="<%= @query.new_record? ? "" : "display: none;" %>">
+        <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+      </div>
+    </fieldset>
+    <p style="float:right;">
+      <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
+    </p>
+    <p class="buttons">
+        <%= label_tag('month', l(:label_month)) %>
+        <%= select_month(@month, :prefix => "month", :discard_type => true) %>
+        <%= label_tag('year', l(:label_year)) %>
+        <%= select_year(@year, :prefix => "year", :discard_type => true) %>
+
+        <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
+        <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
+    </p>
 <% end %>
 
 <%= error_messages_for 'query' %>
 <% if @query.valid? %>
-<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
-
-<p class="legend cal">
-  <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
-  <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
-  <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
-</p>
+    <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
+    <p class="legend cal">
+      <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
+      <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
+      <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
+    </p>
 <% end %>
 
 <% content_for :sidebar do %>

app/views/common/_calendar.html.erb

@@ -1,32 +1,38 @@
-<table class="cal">
-<thead>
-<tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
-</thead>
-<tbody>
-<tr>
-<% day = calendar.startdt
-while day <= calendar.enddt %>
-<%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %>
-<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
-<p class="day-num"><%= day.day %></p>
-<% calendar.events_on(day).each do |i| %>
-  <% if i.is_a? Issue %>
-  <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
-  <%= h("#{i.project} -") unless @project && @project == i.project %>
-  <%= link_to_issue i, :truncate => 30 %>
-  <span class="tip"><%= render_issue_tooltip i %></span>
-  </div>
-  <% else %>
-  <span class="icon icon-package">
-    <%= h("#{i.project} -") unless @project && @project == i.project %>
-    <%= link_to_version i%>
-  </span>
-  <% end %>
-<% end %>
-</td>
-<%= '</tr><tr>'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
-<% day = day + 1
-end %>
-</tr>
-</tbody>
+<table class="cal" style="width: 100%;table-layout: fixed;">
+    <thead>
+        <tr>
+          <th scope="col" title="<%= l(:label_week) %>" class="week-number"></th>
+          <% 7.times do |i| %>
+              <th scope="col"  style='white-space: nowrap;overflow: hidden;text-overflow: ellipsis;'><%= day_name( (calendar.first_wday+i)%7 ) %></th>
+          <% end %>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <% day = calendar.startdt
+            while day <= calendar.enddt %>
+                <%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %>
+                <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>"
+                    style="word-break: break-all;word-wrap: break-word;">
+                <p class="day-num"><%= day.day %></p>
+                <% calendar.events_on(day).each do |i| %>
+                    <% if i.is_a? Issue %>
+                        <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
+                        <%= h("#{i.project} -") unless @project && @project == i.project %>
+                        <%= link_to_issue i, :truncate => 30 %>
+                        <span class="tip"><%= render_issue_tooltip i %></span>
+                        </div>
+                    <% else %>
+                         <span class="icon icon-package">
+                        <%= h("#{i.project} -") unless @project && @project == i.project %>
+                        <%= link_to_version i%>
+                        </span>
+                    <% end %>
+                <% end %>
+                </td>
+                <%= '</tr><tr>'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
+                <% day = day + 1
+            end %>
+        </tr>
+    </tbody>
 </table>

app/views/files/_course_show_all_attachment.html.erb

@@ -13,14 +13,14 @@
   </colgroup>
   <thead>
   <tr>
-    <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
+    <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure" ,:class => "tableth") %>
     <%#= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
-    <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
-    <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
-    <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
-    <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense") %>
-    <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
-    <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
+    <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children",:class => "tableth") %>
+    <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype",:class => "tableth") %>
+    <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype",:class => "tableth") %>
+    <%= sort_header_tag('field_file_dense', :caption => l(:field_file_dense), :default_order => 'desc', :scope => "col", :id => "vzebra-field_file_dense",:class => "tableth") %>
+    <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action",:class => "tableth") %>
+    <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children",:class => "tableth") %>
     <!-- <%#= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
   </thead>

app/views/homework_attach/_comprehensive_evaluation.html.erb

@@ -1,55 +1,31 @@
 <% is_teacher = is_course_teacher User.current,homework.bid.courses.first %>
-<% if comprehensive_evaluation != nil && comprehensive_evaluation.count > 0 %>
-    <div style="height: <%= is_teacher ? 250 : 100%>px; padding-bottom: 10px">
-      <div style="font-size: 15px">
-        <strong>作业综评：</strong>
-        <% if teaher_score != "0.00" %>
-            <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
-        <% end %>
-      </div>
-      <div style="font-size: 14px;">
-        <div style="margin-left: 20px;margin-bottom: 10px;margin-top: 10px;"> <%= comprehensive_evaluation.first.notes%> </div>
+
+<div style="padding-bottom: 10px">
+  <div style="font-size: 15px">
+    <strong><%= l(:lable_teacher_evaluation)%>：</strong>
+    <% if teaher_score != "0.00" %>
+        <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
+    <% end %>
+    <div style="font-size: 14px;">
+      <div style="margin-left: 20px;margin-bottom: 10px;margin-top: 10px;">
+        <%= comprehensive_evaluation.first.notes if !comprehensive_evaluation.nil? && comprehensive_evaluation.count > 0%>
       </div>
-      <% if is_teacher %>
-          <%= render :partial => 'evaluation', :locals => {:homework => homework}  %>
-          <div>
-            <%= render :partial => 'evaluation_add_jour',
-                       :locals => {:homework_attach => homework,
-                                   :sta => 0,
-                                   :is_comprehensive_evaluation => 1,
-                                   :comprehensive_evaluation => comprehensive_evaluation.first.notes} %>
-          </div>
-      <% end %>
     </div>
-<% else %>
-    <% if is_teacher %>
-        <div style="height: 200px; padding-bottom: 10px">
-          <div style="font-size: 15px">
-            <strong>作业综评：</strong>
-            <% if teaher_score != "0.00" %>
-                <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
-            <% end %>
-          </div>
-          <%= render :partial => 'evaluation', :locals => {:homework => homework}  %>
-          <div>
-            <%= render :partial => 'evaluation_add_jour',
-                       :locals => {:homework_attach => homework,
-                                   :sta => 0,
-                                   :is_comprehensive_evaluation => 1,
-                                   :comprehensive_evaluation => nil} %>
-          </div>
-        </div>
-    <% else %>
-        <div style="height: 80px; padding-bottom: 10px">
-          <div style="font-size: 15px">
-            <strong>作业综评：</strong>
-            <% if teaher_score != "0.00" %>
-                <%= render :partial => 'show_score', locals: {:stars => teaher_score}  %>
-            <% end %>
-          </div>
-          <% if teaher_score == "0.00" %>
-              <div style="text-align: center;font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 15px; "><strong>老师还未进行评价！</strong></div>
-          <% end %>
-        </div>
+    <% if(teaher_score == "0.00"  && !(!comprehensive_evaluation.nil? && comprehensive_evaluation.count > 0))%>
+        <% if is_teacher %>
+            <%#= render :partial => 'teacher_evaluation',
+                       :locals => {:homework => homework, :comprehensive_evaluation => comprehensive_evaluation}  %>
+        <% else %>
+            <div style="text-align: center;font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 15px; ">
+              <strong><%= l(:lable_teacher_evaluation_no)  %></strong>
+            </div>
+        <% end %>
     <% end %>
-<% end %>
+  </div>
+</div>
+
+<div>
+  <% if is_teacher %>
+      <%= render :partial => 'teacher_evaluation',:locals => {:homework => homework}  %>
+  <% end %>
+</div>

app/views/homework_attach/_teacher_evaluation.html.erb

@@ -0,0 +1,8 @@
+<%= render :partial => 'evaluation', :locals => {:homework => homework}  %>
+<div>
+  <%= render :partial => 'evaluation_add_jour',
+             :locals => {:homework_attach => homework,
+                         :sta => 0,
+                         :is_comprehensive_evaluation => 1,
+                         :comprehensive_evaluation => l(:label_leave_a_message)} %>
+</div>

app/views/layouts/base_courses.html.erb

@@ -189,7 +189,7 @@
       </div>
 
       <div style="padding-bottom: 8px">
-        <% if @course.description && @course.description.size>0 %>
+        <% if @course.description && @course.description.lstrip.rstrip.size>0 %>
             <div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-word;">
 
               <%= textilizable @course.description %>

app/views/messages/_form.html.erb

@@ -6,11 +6,11 @@
   <!--[form:message]-->
   <% unless replying %>
       <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
+        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :maxlength => 254 %><!--by young-->
       </p>
   <% else %>
       <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
+        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true     %>
       </p>
   <% end %>
   <p>

app/views/my/account.html.erb

@@ -12,8 +12,6 @@
     );
 </script>
 
-
-
 <script type="text/javascript">
     function get_options(value) {
         $.ajax({
@@ -21,17 +19,12 @@
             url: '/school/get_options/' + encodeURIComponent(value),
             data: 'text',
             success: function (data) {
-
                 $("#province").val(value)
                 $("#schoollist").html(data);
-
             }
-
         });
     }
 </script>
-
-
 <div class="contextual" style="padding-right: 10px;">
   <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
   <%= call_hook(:view_my_account_contextual, :user => @user) %>
@@ -39,9 +32,7 @@
 
 <h3 style="padding-left: 10px;"><%= l(:label_my_account) %></h3>
 <%= error_messages_for 'user' %>
-
 <fieldset class="box" style="margin:10px;">
-
 <%= labelled_form_for :user, @user,
                       :url => {:action => "account"},
                       :html => {:id => 'my_account_form',
@@ -70,7 +61,6 @@
 
     <div>
         <span id='name' style='display:none'>
-
             <p style="width:530px;padding-left: 26px;">
               <%= f.text_field :lastname, :required => true %>
               <span class='font_lighter'><%= l(:field_lastname_eg) %></span>
@@ -82,7 +72,8 @@
         </span>
         
         <span id='enterprise' style='display:none'>
-        <p style="width:400px;padding-left: 26px;"><%= l(:label_company_name)%><%= text_field_tag :enterprise_name, @user.firstname %>
+        <p style="width:400px;padding-left: 26px;">
+          <%= l(:label_company_name)%><%= text_field_tag :enterprise_name, @user.firstname %>
         </p>
         </span>
 
@@ -95,10 +86,10 @@
             </p>
         <% else %>
             <% if @user.user_extensions.gender == 0 %><!-- label_gender_male -->
-                  <p style="width:400px;padding-left: 26px;">
-                    <%= l(:label_gender) %>&nbsp;&nbsp;
-                    <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
-                  </p>
+              <p style="width:400px;padding-left: 26px;">
+                <%= l(:label_gender) %>&nbsp;&nbsp;
+                <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
+              </p>
             <% else %>
                 <p style="width:400px;padding-left: 26px;">
                   <%= l(:label_gender) %>&nbsp;&nbsp;
@@ -107,12 +98,11 @@
             <% end %>
         <% end %>
         </span>
-
       <!-- added by Wen -->
-
       <p style="padding-left: 26px;">
         <% if User.current.user_extensions.school.nil? %>
-            <%= l(:field_occupation) %>&nbsp;<span class="required">*</span>
+            <%= l(:field_occupation) %>&nbsp;
+            <span class="required">*</span>
             <input id="province" name="province" type="text" value="请单击选择省份及学校" readonly>
             <input id="occupation" name="occupation" type="hidden"/>
             <input id="occupation_name" type="text" readonly/>
@@ -126,8 +116,7 @@
 
       <div id="WOpenWindow">
         <a class="modal_close" href="#"></a>
-
-        <h2>学校列表</h2>
+        <h2><%= l(:lable_school_list)%></h2>
         &nbsp;&nbsp;
         <div class="pcontent">
           <ul id="provincelist" class="school_list">
@@ -234,39 +223,40 @@
 
 
       <% unless @user.user_extensions.identity == 2 %>
-      <p style="width:400px;padding-left: 26px;">
-        <%= l(:label_identity) %>
-        <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
-          <option value=""><%= l(:label_account_identity_choose) %></option>
-          <option value="0"><%= l(:label_account_identity_teacher) %></option>
-          <option value="1"><%= l(:label_account_identity_student) %></option>
-          <option value="3"><%= l(:label_account_identity_developer) %></option>
-
-        </select>
-        <span id='technical_title' style='display:none'>
-          <select name="technical_title" id="userTechnical_title"></select>
-        </span>
-        <span id='no' style='display:none'>
-          <!-- modified by fq -->
-          <% unless User.current.user_extensions.student_id.nil? %>
-          <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
-          <% else %>
-          <%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
-          <% end %>
-          <!-- end -->
-        </span>
-        <% else %>
-        <span style="display:none">
-          <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
-            <option value=""><%= l(:label_account_identity_choose) %></option>
-            <option value="0"><%= l(:label_account_identity_teacher) %></option>
-            <option value="1"><%= l(:label_account_identity_student) %></option>
-            <option value="2"><%= l(:label_account_identity_enterprise) %></option>
-            <option value="3"><%= l(:label_account_identity_developer) %></option>
-
-          </select>
-        </span>
-      </p>
+          <p style="width:400px;padding-left: 26px;">
+            <%= l(:label_identity) %>
+            <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
+              <option value=""><%= l(:label_account_identity_choose) %></option>
+              <option value="0"><%= l(:label_account_identity_teacher) %></option>
+              <option value="1"><%= l(:label_account_identity_student) %></option>
+              <option value="3"><%= l(:label_account_identity_developer) %></option>
+
+            </select>
+            <span id='technical_title' style='display:none'>
+              <select name="technical_title" id="userTechnical_title"></select>
+            </span>
+            <span id='no' style='display:none'>
+              <!-- modified by fq -->
+              <% unless User.current.user_extensions.student_id.nil? %>
+              <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %>
+              <% else %>
+              <%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
+              <% end %>
+              <!-- end -->
+            </span>
+          </p>
+      <% else %>
+          <p>
+            <span style="display:none">
+              <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
+                <option value=""><%= l(:label_account_identity_choose) %></option>
+                <option value="0"><%= l(:label_account_identity_teacher) %></option>
+                <option value="1"><%= l(:label_account_identity_student) %></option>
+                <option value="2"><%= l(:label_account_identity_enterprise) %></option>
+                <option value="3"><%= l(:label_account_identity_developer) %></option>
+              </select>
+            </span>
+          </p>
       <% end %>
     </div>
 

app/views/news/_course_news.html.erb

@@ -74,7 +74,6 @@
       <%= labelled_form_for @news, :url => course_news_index_path(@course),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>
           <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
-          <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  -->
           <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>|
           <%= preview_link preview_news_path(:course_id => @course), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
           |
@@ -90,26 +89,48 @@
       </p>
   <% else %>
       <% @newss.each do |news| %>
-
           <table class="content-text-list">
             <tr>
-              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
+              <td colspan="2" valign="top" width="50">
+                <%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %>
+              </td>
               <td>
                 <table width="580px" border="0">
                   <tr>
                     <td colspan="2" valign="top">
-                      <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
-                      <span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @couese) %> </span>
+                      <strong>
+                        <%= link_to_user(news.author) if news.respond_to?(:author) %>
+                      </strong>
+                      <span style="margin-left: 4px;" class="font_lighter">
+                        <%= l(:label_project_notice) %>
+                      </span>
+                      <span>
+                        <%= link_to h(news.title), news_path(news) %>
+                      </span>
+                      <span style="float: right">
+                        <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @couese) %>
+                      </span>
                     </td>
                   </tr>
                   <tr>
                     <td colspan="2" width="580px">
-                      <span class="font_description"><%= textilizable(news, :description) %></span></td>
+                      <span class="font_description">
+                        <%= textilizable(news, :description) %>
+                      </span>
+                    </td>
                   </tr>
                   <tr>
-                    <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
-                      ：&nbsp;<%= format_time(news.created_on) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
+                    <td align="left">
+                      <span class="font_lighter">
+                        <%= l :label_update_time %>
+                        ：&nbsp;
+                        <%= format_time(news.created_on) %>
+                      </span>
+                    </td>
+                    <td width="350" align="right" class="a">
+                      <%= link_to l(:label_project_newother), news_path(news) %>
+                      <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %>
+                    </td>
                   </tr>
                 </table>
               </td>

app/views/news/_course_show.html.erb

@@ -123,9 +123,10 @@
               </tr>
               <tr>
                 <td colspan="2" width="580px" >
-                  <p class="font_description">
+                  <span class="font_description">
                     <%= textilizable(comment.comments) %>
-                  </p></td>
+                  </span>
+                </td>
               </tr>
               <tr>
                 <td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>

app/views/news/_project_news.html.erb

@@ -101,21 +101,29 @@
 
           <table class="content-text-list">
             <tr>
-              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
+              <td colspan="2" valign="top" width="50">
+                <%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %>
+              </td>
               <td>
                 <table width="580px" border="0">
                   <% if @project.project_type == 1 %>
                       <tr>
                         <td colspan="2" valign="top">
-                          <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
+                          <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong>
+                          <span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span>
+                          <span><%= link_to h(news.title), news_path(news) %></span>
                           <span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span>
                         </td>
                       </tr>
                   <% else %>
                       <tr>
                         <td colspan="2" valign="top">
-                          <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare) %></span><span> <%= link_to h(news.title), news_path(news) %></span>
-                          <span style="float: right" class='delete_icon'> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span>
+                          <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong>
+                          <span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare) %></span>
+                          <span> <%= link_to h(news.title), news_path(news) %></span>
+                          <span style="float: right" class='delete_icon'>
+                            <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %>
+                          </span>
                         </td>
                       </tr>
                   <% end %>

app/views/news/_project_show.html.erb

@@ -80,7 +80,9 @@
 <div id="comments" style="margin-bottom:16px;">
 
   <div style="margin:15px">
-    <span class="font_description"> <%= textilizable(@news, :description) %> </span>
+    <span class="font_description">
+      <%= textilizable(@news, :description) %>
+    </span>
     <br/>
     <%= link_to_attachments @news %>
     <br/>
@@ -115,22 +117,35 @@
       <% next if comment.new_record? %>
       <table width="660px" border="0" align="center">
         <tr>
-          <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
+          <td colspan="2" valign="top" width="50" >
+            <%= image_tag(url_to_avatar(comment.author), :class => "avatar")%>
+          </td>
           <td>
             <table width="580px" border="0">
               <tr>
-                <td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+                <td colspan="2" valign="top">
+                  <strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong>
+                  <span class="font_lighter"><%= l(:label_project_newadd) %></span>
+                  <%= l(:label_comment_plural) %>
+                </td>
               </tr>
               <tr>
                 <td colspan="2" width="580px" >
-                  <p class="font_description">
+                  <span class="font_description">
                     <%= textilizable(comment.comments) %>
-                  </p></td>
+                  </span>
+                </td>
               </tr>
               <tr>
-                <td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
-                <td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                                                  :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
+                <td align="left">
+                  <span class="font_lighter"> <%= format_time(comment.created_on) %></span>
+                </td>
+                <td width="200" align="right" class="a">
+                  <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+                                                                                  :data => {:confirm => l(:text_are_you_sure)},
+                                                                                  :method => :delete,
+                                                                                  :title => l(:button_delete) %>
+                </td>
               </tr>
             </table></td>
         </tr>

app/views/tags/_show_attachments.html.erb

@@ -4,7 +4,7 @@
 <hr />
 	<% attachments_results.each do |file| %>
 	<p class="font_description2">
-		<table border=0 cellSpacing=0 cellPadding=0>
+		<table border=0 cellSpacing=0 cellPadding=0 style="width: 100%;table-layout: fixed;">
 		  <tbody>
 		  <tr>
 		    <td class="r1">

app/views/tags/_show_bids.html.erb

@@ -6,7 +6,7 @@
 		<strong><%= l(:label_tags_bid) %>:<%= link_to "#{bid.name}",
 		               :controller => "bids",:action => "show",:id => bid.id %></strong>
 		<br />
-		<strong><%= l(:label_tags_bid_description) %>:</strong><%= bid.description %>
+		<strong><%= l(:label_tags_bid_description) %>:</strong><%= textilizable bid.description %>
 		<%= bid.updated_on %>
 	</p>
 	<div class="line_under"></div>