From 82b23da54bf34ed13cf92e1bd6b674693a66eaec Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 14:05:48 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0js=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_homework_form.html.erb | 13 ++-
 app/views/courses/new_homework.html.erb   | 53 +++++++++++-
 db/schema.rb                              | 99 ++++++++++++++++++-----
 3 files changed, 143 insertions(+), 22 deletions(-)

diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb
index bfecb5304..f93d57f90 100644
--- a/app/views/courses/_homework_form.html.erb
+++ b/app/views/courses/_homework_form.html.erb
@@ -22,15 +22,22 @@
 
 <%= error_messages_for 'bid' %>
 <p><%= l(:label_homeworks_form_new_description) %></p>
-<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
+<p>
+  <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onblur => "regexName();"  %>
 
-<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
+</p>
+<p><span id="bid_name_span"></span></p>
+
+<p><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
 <!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
 	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
 	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <% time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d') %>
-<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}",:readonly => "readonly") %><%= calendar_for('bid_deadline')%>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}", :onchange => "regexDeadLine();") %><%= calendar_for('bid_deadline')%>
+  <span id="bid_deadline_span">
+
+  </span>
 </p>
 <p><%= f.select :is_evaluation, is_evaluation_option %>
 </p>
diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb
index b3fff9e5f..e339db2d7 100644
--- a/app/views/courses/new_homework.html.erb
+++ b/app/views/courses/new_homework.html.erb
@@ -1,9 +1,60 @@
+<script type="text/javascript">
+    function regexName()
+    {
+        var name = $("#bid_name").val();
+
+        if(name=="")
+        {
+            $("#bid_name_span").text("名称不能为空");
+            $("#bid_name_span").css('color','#ff0000');
+            return false;
+        }
+        else
+        {
+            $("#bid_name_span").text("填写正确");
+            $("#bid_name_span").css('color','#008000');
+            return true;
+        }
+    }
+    function regexDeadLine()
+    {
+        var deadline = $("#bid_deadline").val();
+        var regex = /^\d{4}-\d{2}-\d{2}$/;
+        if(deadline=="")
+        {
+            $("#bid_deadline_span").text("截止日期不能为空");
+            $("#bid_deadline_span").css('color','#ff0000');
+            return false;
+        }
+        else if(regex.test(deadline))
+        {
+            $("#bid_deadline_span").text("填写正确");
+            $("#bid_deadline_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#bid_deadline_span").text("截止日期格式错误");
+            $("#bid_deadline_span").css('color','#ff0000');
+            return false;
+        }
+    }
+
+    function submitHomework()
+    {
+        if(regexDeadLine()&&regexName())
+        {
+            $("#new_bid").submit();
+        }
+    }
+</script>
+
 <h3><%=l(:label_course_new_homework)%></h3>
 
 <%= labelled_form_for @homework, :url => {:controller => 'bids', :action => 'create_homework',:course_id => "#{params[:id] || params[:course_id]}"} do |f| %>
 <div class="box tabular">
 	<%= render :partial => 'homework_form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create), :class => "enterprise" %>
+    <input type="button" onclick="submitHomework();" value="<%= l(:button_create)%>" class="enterprise">
 	<%= javascript_tag "$('#bid_name').focus();" %>
 	<% end %>
 </div>
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 82a6ad97b..e23fd19d2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -177,6 +177,58 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false
@@ -389,10 +441,10 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
     t.integer  "sort_type"
-    t.integer  "image_width",  :default => 107
-    t.integer  "image_height", :default => 63
     t.integer  "show_course",  :default => 1
     t.integer  "show_contest", :default => 1
+    t.integer  "image_width",  :default => 107
+    t.integer  "image_height", :default => 63
   end
 
   create_table "forums", :force => true do |t|
@@ -826,18 +878,18 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -861,6 +913,19 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -911,10 +976,11 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1020,8 +1086,8 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1079,9 +1145,6 @@ ActiveRecord::Schema.define(:version => 20140826072838) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
-    t.integer  "level"
-    t.integer  "file"
-    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|

From bcb9e8688c273ebc6ddb510cf55630aa00afb4cc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 14:39:09 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index f5018fc94..2446c4e3d 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -37,21 +37,21 @@
           <!--
           <fieldset class="collapsible collapsed">
             <legend onclick="toggleFieldset(this);">
-              <%= l(:label_options) %>
+              <%#= l(:label_options) %>
             </legend>
             <div style="display: none;">
               <table>
                 <tr>
-                  <td><%= l(:field_column_names) %></td>
-                  <td><%= render_query_columns_selection(@query) %></td>
+                  <td><%#= l(:field_column_names) %></td>
+                  <td><%#= render_query_columns_selection(@query) %></td>
                 </tr>
                 <tr>
                   <td><label for='group_by'><%= l(:field_group_by) %></label></td>
-                  <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
+                  <td><%#= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
                 </tr>
                 <tr>
-                  <td><%= l(:button_show) %></td>
-                  <td><%= available_block_columns_tags(@query) %></td>
+                  <td><%#= l(:button_show) %></td>
+                  <td><%#= available_block_columns_tags(@query) %></td>
                 </tr>
               </table>
             </div>

From 56a0ec336aacfdcef4c5fb0f4efff0319ef10130 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 14:55:25 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8F=8F=E8=BF=B0=E8=BF=87=E9=95=BF=E8=A2=AB?=
 =?UTF-8?q?=E6=8E=A9=E7=9B=96=E7=9A=84BUG=20#1145?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 616e2323d..90a51d031 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -37,12 +37,9 @@
 				</ul>
 				<% end -%>
 				<ul class="list-group-item-meta">
-					<div class="issue-list-description">
-                      <div class="wiki" style="width: 100%;word-break: break-all;">
-                        <%= textilizable issue, :description %>
-                      </div>
-						<!-- <#%= l(:field_description)%>:&nbsp;<#%= issue.short_description %> -->
-					</div>
+                  <div class="wiki" style="width: 100%;word-break: break-all;">
+                    <%= textilizable issue, :description %>
+                  </div>
 				</ul>
 				<ul class="list-group-item-meta">
 					<% unless issue.assigned_to_id.nil? %>

From 4711e638eb283439ed7bf8917507c1150cc9c14d Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 28 Aug 2014 15:40:34 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=9C=89=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=BC=BA=E9=99=B7=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88=E5=B1=8F=E8=94=BD=E6=8E=89=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb                  | 13 ++++++++-----
 app/views/attachments/_form.html.erb |  6 +++++-
 app/views/issues/new.html.erb        |  5 +++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 3a14d288d..6bbcd727f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -240,11 +240,14 @@ class Issue < ActiveRecord::Base
     self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
     self.status = issue.status
     self.author = User.current
-    unless options[:attachments] == false
-      self.attachments = issue.attachments.map do |attachement| 
-        attachement.copy(:container => self)
-      end
-    end
+    #赞不提供附件复制功能
+    #unless options[:attachments] == false
+      #self.attachments = issue.attachments.map do |attachement|
+      #  a = attachement.copy(:container => self)
+      #  #a.save
+      #  a
+      #end
+    #end
     @copied_from = issue
     @copy_options = options
     self
diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 097539888..bb043cd70 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -4,7 +4,11 @@
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
       <%= 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') %>
+      if attachment.id.nil?
+       else
+        link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+      end
+      %>
       <%#= 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')%>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 9f0743a18..4b0140b1c 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -11,8 +11,9 @@
 
     <% if @copy_from && @copy_from.attachments.any? %>
     <p>
-      <label for="copy_attachments"><%= l(:label_copy_attachments) %></label>
-      <%= check_box_tag 'copy_attachments', '1', @copy_attachments %>
+      <!-- 去除附件复制功能 -->
+      <!-- <label for="copy_attachments"><#%= l(:label_copy_attachments) %></label>
+      <#%= check_box_tag 'copy_attachments', '1', @copy_attachments %>  -->
     </p>
     <% end %>
     <% if @copy_from && !@copy_from.leaf? %>

From c6147347680417e27357d2f3fc01376c7166a86b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 16:18:25 +0800
Subject: [PATCH 05/14] =?UTF-8?q?#1508=20=20=20=E4=BF=AE=E5=A4=8D=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=A0=87=E7=AD=BE=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=8C=89=E9=92=AE=EF=BC=8C=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 19 +++++++++++++++++++
 app/views/tags/_tag_name.html.erb |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1f6091f12..f70e27de6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1555,6 +1555,25 @@ module ApplicationHelper
     date = time.strftime("%Y年%m月%d日")
   end
 
+  #当TAG数量过多时，更多链接
+  #1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求 9代表课程
+  def more_tags id,object_flag
+    a= 1
+    case object_flag
+      when "1"
+        s = link_to l(:label_more_tags),:controller => "users", :action => "show", :id => id
+      when "2"
+        s = link_to l(:label_more_tags),:controller => "projects", :action => "show", :id => id
+      when "3"
+        s = link_to l(:label_more_tags),:controller => "issues", :action => "show", :id => id
+      when "4"
+        s = link_to l(:label_more_tags),:controller => "bids", :action => "show", :id => id
+      when "9"
+        s = link_to l(:label_more_tags),:controller => "courses", :action => "show", :id => id
+    end
+    s
+  end
+
   private
 
   def wiki_helper
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 01889f1f3..6996e8891 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -22,7 +22,7 @@
             <% i += 1 %>
         <% end %>
 
-        <%= link_to l(:label_more_tags),:controller => "tags", :action => "show", :id => obj.id %>
+        <%= more_tags(obj.id,object_flag)%>
 
     <% else %>
 

From fbb19480f5802848cb02aa73a5ae915445148286 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 17:30:08 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=8B=90?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/autocomplete.js.erb | 2 +-
 app/views/boards/_project_show.html.erb   | 2 +-
 app/views/contests/show_contest.html.erb  | 2 +-
 app/views/courses/show.html.erb           | 2 +-
 app/views/issues/_list.html.erb           | 2 +-
 app/views/journals/diff.html.erb          | 2 +-
 app/views/layouts/base_courses.html.erb   | 2 +-
 app/views/layouts/base_projects.html.erb  | 2 +-
 app/views/layouts/base_users.html.erb     | 2 +-
 app/views/memos/show.html.erb             | 2 +-
 app/views/messages/_course_show.html.erb  | 2 +-
 app/views/messages/_form.html.erb         | 2 +-
 app/views/messages/_project_show.html.erb | 5 +++--
 app/views/messages/edit.html.erb          | 2 +-
 app/views/projects/show.html.erb          | 4 ++--
 app/views/users/_course_form.html.erb     | 2 +-
 app/views/users/user_projects.html.erb    | 2 +-
 app/views/welcome/contest.html.erb        | 4 ++--
 app/views/welcome/index.html.erb          | 2 +-
 app/views/wiki/diff.html.erb              | 2 +-
 20 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/views/attachments/autocomplete.js.erb b/app/views/attachments/autocomplete.js.erb
index abe2c3757..691454feb 100644
--- a/app/views/attachments/autocomplete.js.erb
+++ b/app/views/attachments/autocomplete.js.erb
@@ -4,5 +4,5 @@ $('#relation_file').html('<%=render_attachments_for_new_project(@project, nil)%>
 <% elsif @course%>
 $('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>');
 <% end%>
-$('#attachments').children().css("width","100%").css("word-break","break-all");
+$('#attachments').children().css("width","100%").css("word-break","break-all").css("word-wrap", "break-word");
 
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 8cd46c35b..a14e32d6d 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -53,7 +53,7 @@
     </span>
   <% end %>
 </div>
-<div style="width: 100%;word-break: break-all;">
+<div style="width: 100%;word-break: break-all;word-wrap: break-word;">
   <% if @topics.any? %>
       <!-- <table class="list messages">
   <thead><tr>
diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index 91279b7bb..121f5e690 100644
--- a/app/views/contests/show_contest.html.erb
+++ b/app/views/contests/show_contest.html.erb
@@ -6,7 +6,7 @@
 		<p>		
 			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong>
 		</p>		
-		<div class="bid_description" style="width: 100%;word-break:break-all;">
+		<div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
 			<%= @contest.description %>
 			<!-- <%# if @contest.attachments.any?%>
 				<%# options = {:author => true} %>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index 366ec0c39..ff0a3e6e1 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -29,7 +29,7 @@
                                           <%= l(:label_new_activity) %> </span>
 
 
-                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;" %>
+                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;word-wrap: break-word;" %>
                             </td>
                           </tr>
                           <tr>
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 90a51d031..d65a93c6c 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -37,7 +37,7 @@
 				</ul>
 				<% end -%>
 				<ul class="list-group-item-meta">
-                  <div class="wiki" style="width: 100%;word-break: break-all;">
+                  <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
                     <%= textilizable issue, :description %>
                   </div>
 				</ul>
diff --git a/app/views/journals/diff.html.erb b/app/views/journals/diff.html.erb
index 6e67f0544..237cfea4f 100644
--- a/app/views/journals/diff.html.erb
+++ b/app/views/journals/diff.html.erb
@@ -1,7 +1,7 @@
 <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
 <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
 
-<div class="text-diff" style="word-break: break-all;width: 100%;">
+<div class="text-diff" style="word-break: break-all;width: 100%;word-wrap: break-word;">
 <%= simple_format_without_paragraph @diff.to_html %>
 </div>
 
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 01510865b..4554b0466 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -191,7 +191,7 @@
 
       <div style="padding-bottom: 8px">
         <% if @course.description && @course.description.size>0 %>
-            <div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-all;">
+            <div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-word;">
 
               <%= textilizable @course.description %>
             </div>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index c3ad0fe08..a3b8e267c 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -112,7 +112,7 @@
 									</div>
 
 									<div style="padding-bottom: 8px">
-										<div class="font_lighter_sidebar" style="word-break:break-all">
+										<div class="font_lighter_sidebar" style="word-break:break-all;word-wrap: break-word;">
 											<%= textilizable @project.description %>
 										</div>
 										<div class="created_on_project">
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index de10036de..380481fe2 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -116,7 +116,7 @@
 											</p>
 											<% end %>
 											<% unless @user.user_extensions.nil? %>
-											<p style="width: 100%;word-break: break-all">
+											<p style="width: 100%;word-break: break-all;word-wrap: break-word;">
 												<%= @user.user_extensions.brief_introduction %>
 											</p>
 											<% end %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 76e4990a5..9b68e80fc 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -46,7 +46,7 @@
 				
 		</div>
 
-		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
+		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
 		<%= textAreailizable(@memo,:content) %>
 			<p>							
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index c543601d3..aba16d620 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -156,7 +156,7 @@
             <tr>
 
               <td class="comments">
-                <div class="wiki" style="width: 100%;word-break: break-all;">
+                <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
                   <%= textAreailizable message,:content,:attachments => message.attachments %>
                   <%#= message.content.html_safe  %>
                 </div>
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index a8def56f5..55aa829c8 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -32,7 +32,7 @@
         <%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p>
     <% end %>
 <% end %>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all"></div>
+  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
 
   <%= text_area :quote,:quote,:style => 'display:none' %>
 <p>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 7f88816f5..ddb23fc95 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -37,6 +37,7 @@
         background-color: #F6F6F6;
         white-space: normal;
         word-break: break-all;
+        word-wrap: break-word;
         /*word-wrap: break-word;*/
     }
     .memo-timestamp {
@@ -94,7 +95,7 @@
       <%= link_to @topic.author, user_path(@topic.author) %>
     </p>
   </div>
-  <div class="memo-section" style="width: 100%;word-break: break-all;">
+  <div class="memo-section" style="width: 100%;word-break: break-all;word-wrap: break-word;">
     <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
       <% if @project %>
           <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
@@ -161,7 +162,7 @@
             </tr>
             <tr>
               <td class="comments">
-                <div class="wiki" style="width: 100%;word-break: break-all;">
+                <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
                   <%= textAreailizable message,:content,:attachments => message.attachments %>
                   <%#= message.content.html_safe  %>
                 </div>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 62d29ebd8..3d4b6a4d2 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -4,7 +4,7 @@
     <%= course_board_breadcrumb(@message) %>
 <% end %>
 
-<h3><%= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;"><%=h @topic.subject %></span></h3>
+<h3><%= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%=h @topic.subject %></span></h3>
 
 <%= form_for @message, {
                :as => :message,
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 47e3e8419..a08577c80 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -7,7 +7,7 @@
 
       <% @events_by_day.keys.sort.reverse.each do |day| %>
           <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
-              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-break: break-all;">
+              <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
                 <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
                   <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
                 </div>
@@ -24,7 +24,7 @@
                     </span>
                   <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
 
-                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;">
+                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
                     <%= textAreailizable e,:event_description %>
                     <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
                   </div>
diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb
index 055dd7d6b..892c2775e 100644
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@@ -30,7 +30,7 @@
                       </span></td>
                   </tr>
                   <tr>
-                    <td colspan="2" width="580"  style="word-break:break-all">
+                    <td colspan="2" width="580"  style="word-break:break-all;word-wrap: break-word;">
                       <p class="font_description">
                       <%= textilizable membership.course.short_description %>
                      </p>        
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index a1597e270..b312ed0d4 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -28,7 +28,7 @@
 													 <span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td>
 					</tr>
 					<tr>
-						<td colspan="2" width="580" style="word-break:break-all">
+						<td colspan="2" width="580" style="word-break:break-all;word-wrap: break-word;">
 						<p class="font_description">
 							<%= membership.project.short_description%>
 						</p></td>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 30395aa6f..69b272002 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -158,7 +158,7 @@
 		<div class="d-p-projectlist">
 			<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
 
-			<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'>
+			<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
 				<div class="avatar-4" style="float: left; margin-top: 7px">
 					<%= image_tag('/images/contest1.png')%>
 				</div>
@@ -197,7 +197,7 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
 	<div style="height: 167px; padding-top:6px;">
 		<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;">
-			<div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div>
+			<div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all;word-wrap: break-word; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div>
 			<div class="underline-contests_four"></div>
           <div id="up_zzjs">
             <div id="marqueebox">
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 997b583c3..d91019e53 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -66,7 +66,7 @@
 			<% #projects = find_miracle_project(10, 3) %>
 			<% @projects.map do |project| %>
 			<!--<%# cache cache_key_for_project(project) do %> -->
-			<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'>
+			<li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
 				<div style="float: left;">
 					<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
 				</div>
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index ef26c570c..c50051d20 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -22,6 +22,6 @@
       %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
 </p>
 
-<div class="text-diff" style=" width: 100%;word-break: break-all;">
+<div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
 <%= simple_format_without_paragraph @diff.to_html %>
 </div>

From 3919d0fd481870655b32c5e5ad20f4840f33b089 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 28 Aug 2014 17:51:41 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 2446c4e3d..f5018fc94 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -37,21 +37,21 @@
           <!--
           <fieldset class="collapsible collapsed">
             <legend onclick="toggleFieldset(this);">
-              <%#= l(:label_options) %>
+              <%= l(:label_options) %>
             </legend>
             <div style="display: none;">
               <table>
                 <tr>
-                  <td><%#= l(:field_column_names) %></td>
-                  <td><%#= render_query_columns_selection(@query) %></td>
+                  <td><%= l(:field_column_names) %></td>
+                  <td><%= render_query_columns_selection(@query) %></td>
                 </tr>
                 <tr>
                   <td><label for='group_by'><%= l(:field_group_by) %></label></td>
-                  <td><%#= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
+                  <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
                 </tr>
                 <tr>
-                  <td><%#= l(:button_show) %></td>
-                  <td><%#= available_block_columns_tags(@query) %></td>
+                  <td><%= l(:button_show) %></td>
+                  <td><%= available_block_columns_tags(@query) %></td>
                 </tr>
               </table>
             </div>

From dcde828e64457822f598483d37d6a3b371e84689 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 09:40:57 +0800
Subject: [PATCH 08/14] =?UTF-8?q?1.=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5--?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E3=80=81=E7=B2=89=E4=B8=9D=EF=BC=8C=E5=8D=B3?=
 =?UTF-8?q?=E4=BD=BF=E5=85=B3=E6=B3=A8=E8=80=85=E3=80=81=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=82=E5=8A=A0=E9=A1=B9=E7=9B=AE=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E4=BA=860=E4=B8=AA=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E2=80=9D=20#1211=202=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=85=B3=E6=B3=A8=E3=80=81?=
 =?UTF-8?q?=E7=B2=89=E4=B8=9D=E5=8F=82=E4=B8=8E=E8=AF=BE=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_fanslist.html.erb  | 27 +++++++++----------------
 app/views/users/user_watchlist.html.erb | 25 ++++++++++++-----------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 984cdf352..f16e6d397 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -20,27 +20,18 @@
                   <tr>
                     <!-- added by bai 区分了个人列表里的项目与课程 -->
                     <td colspan="2" width="580px"><p class="font_description">
-                      <% unless user.memberships.empty? %>
-                          <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
-                          <% memberships = user.memberships.all(:conditions => cond) %>
-                          <%= l(:label_x_contribute_to, :count => memberships.count) %>
-                          <% for member in memberships %>
-                              <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-                          <% end %>
-                      <% else %>
-                          <%= l(:label_x_contribute_to, :count => 0) %>
+                      <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
+                      <% memberships = user.memberships.all(:conditions => cond) %>
+                      <%= l(:label_x_contribute_to, :count => memberships.count) %>
+                      <% for member in memberships %>
+                          <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
                       <% end %>
 
                       <p class="font_description">
-                        <% unless user.memberships.empty? %>
-                            <% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
-                            <% memberships = user.memberships.all(:conditions => cond) %>
-                            <%= l(:label_x_course_contribute_to, :count => memberships.count) %>
-                            <% for member in memberships %>
-                                <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-                            <% end %>
-                        <% else %>
-                            <%= l(:label_x_course_contribute_to, :count => 0) %>
+                        <% user_courses = user_courses_list(user) %>
+                        <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+                        <% for course in user_courses %>
+                            <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
                         <% end %>
                       </p>
                     </td>
diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index bc4a655d8..e58e35d27 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -7,31 +7,32 @@
  <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
      <td><table width="580px" border="0">
       <tr>  <!-- modified by bai 增加了关注人的名字全称-->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
+        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
         </td>
         </tr>
       <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
         <td colspan="2" width="580px" ><p class="font_description">
-			<% unless user.memberships.empty? %>
+			<%# unless user.memberships.empty? %>
 			<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
 			<% memberships = user.memberships.all(:conditions => cond) %>
 			<%= l(:label_x_contribute_to, :count => memberships.count) %>
 			<% for member in memberships %>
 			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
 			<% end %>
-			<% end %>
+			<%# end %>
 			</p>
 			<p class="font_description">
-			<% unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
-			<% memberships = user.memberships.all(:conditions => cond) %>
-			<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
-			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<% end %>
+			<%# unless user.memberships.empty? %>
+              <% user_courses = user_courses_list(user) %>
+              <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
+              <% for course in user_courses %>
+                  <%# if course.name != nil %>
+                  <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host:  Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
+                  <%# end %>
+              <% end %>
+			<%# end %>
 			</p>
-			</td>
+		</td>
         </tr>
         <!-- end -->
         

From b50dac6a3621c5aec10c33e66c487f24da29a85c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 10:17:31 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8E=92=E5=BA=8F=E6=97=A0=E6=95=88=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 39 ++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 031f78277..ef6e20644 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -45,11 +45,45 @@ class FilesController < ApplicationController
                   'filename' => "#{Attachment.table_name}.filename",
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"
+    sort = ""
 
     if params[:project_id]
       @isproject = true
-      @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
-      @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+
+      if params[:sort]
+        params[:sort].split(",").each do |sort_type|
+          order_by = sort_type.split(":")
+
+          case order_by[0]
+            when "filename"
+              attribute = "filename"
+            when "size"
+              attribute = "filesize"
+            when "attach_type"
+              attribute = "attachtype"
+            when "content_type"
+              attribute = "created_on"
+            when "field_file_dense"
+              attribute = "is_public"
+            when "downloads"
+              attribute = "downloads"
+            when "created_on"
+              attribute = "created_on"
+          end
+
+          if order_by.count == 1
+            sort += "#{Attachment.table_name}.#{attribute} desc "
+          elsif order_by.count == 2
+            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+          end
+          if sort_type != params[:sort].split(",").last
+            sort += ","
+          end
+        end
+      end
+
+      @containers = [ Project.includes(:attachments).reorder(sort).find(@project.id)]
+      @containers += @project.versions.includes(:attachments).reorder(sort).all.sort
 
       show_attachments @containers
 
@@ -57,7 +91,6 @@ class FilesController < ApplicationController
     elsif params[:course_id]
       @isproject = false
 
-      sort = ""
       if params[:sort]
         params[:sort].split(",").each do |sort_type|
           order_by = sort_type.split(":")

From e3a7d365ea6e4c6d8d6c969219ce7784ef4046b8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 29 Aug 2014 11:21:45 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=AF=84=E5=AE=A1=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E6=98=BE=E7=9C=BC=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/file.html.erb | 5 +++--
 config/locales/en.yml               | 3 ++-
 config/locales/zh.yml               | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index 186b85c69..6c23c638f 100644
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -6,8 +6,9 @@
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
    <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
    <span class="size">
-     <% if @attachment!=nil&&@attachment.container_type == 'Document'&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
-          <%=    link = link_to(l(:button_add), {:controller => 'code_review',
+     <!-- &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') -->
+     <% if @attachment!=nil&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
+          <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
                                           :action => 'assign', :action_type => 'attachment',
                                           :id=>@attachment.project,
                                           :change_id => '', :attachment_id => @attachment.id,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ddae72799..89898409e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1808,4 +1808,5 @@ en:
   label_company_name: Company Name
   notice_account_invalid_creditentials_new: You have not to the mailbox activation
   lable_unknow_type: Unknow type
-  lable_score_less_than_zero: Score less than 0, revised to 0
\ No newline at end of file
+  lable_score_less_than_zero: Score less than 0, revised to 0
+  review_assignments: review assignments
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2fb7ef2bf..224190060 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2116,4 +2116,5 @@ zh:
   lable_forums_max_length: 贴吧描述最大长度为65535个字符
   lable_unknow_type: 未知类型
   lable_score_less_than_zero: 得分小于0，修正为0
+  review_assignments: 评审任务
   
\ No newline at end of file

From d8e04ae9741d92895cf5d57673c5cf1763607fd4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 11:40:00 +0800
Subject: [PATCH 11/14] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?js=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_form.html.erb         |  6 ++-
 app/views/news/_project_news.html.erb | 57 +++++++++++++++++++++++++-
 app/views/news/_project_show.html.erb | 59 +++++++++++++++++++++++++--
 3 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index f92559903..35d8da952 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -3,9 +3,11 @@
 	<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
 </div>
 <div class="box tabular">
-<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
+<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onblur => "regexTitle();" %></p>
+  <P><span id="title_notice_span">(60个字符以内)</span></P>
 <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
-<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
+<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onblur => "regexDescription();"  %></p>
+  <P><span id="description_notice_span"></span></P>
 <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>
 
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index cdef33e34..e9a912c5c 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -1,3 +1,56 @@
+<script type="text/javascript">
+    function regexTitle()
+    {
+        var name = $("#news_title").val();
+        if(name.length ==0)
+        {
+            $("#title_notice_span").text("标题不能为空");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+        else if(name.length <= 60)
+        {
+            $("#title_notice_span").text("填写正确");
+            $("#title_notice_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#title_notice_span").text("标题超过60个字符");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+    }
+
+    function regexDescription()
+    {
+        var name = $("#news_description").val();
+        if(name.length ==0)
+        {
+            $("#description_notice_span").text("描述不能为空");
+            $("#description_notice_span").css('color','#ff0000');
+            $("#description_notice_span").focus();
+            return false;
+        }
+        else
+        {
+            $("#description_notice_span").text("填写正确");
+            $("#description_notice_span").css('color','#008000');
+            return true;
+        }
+    }
+
+    function submitNews()
+    {
+        if(regexTitle() && regexDescription())
+        {
+            $("#news-form").submit();
+        }
+    }
+</script>
+
 <%
    if @project.project_type == Project::ProjectType_course
      btn_tips = l(:label_news_notice)
@@ -22,7 +75,9 @@
       <%= labelled_form_for @news, :url => project_news_index_path(@project),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>
           <%= render :partial => 'news/form', :locals => {:f => f} %>
-          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
+          <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  -->
+          <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :class => 'whiteButton m3p10' %>
+          |
           <%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
           |
           <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index c8a8c5767..ecae672b6 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -1,3 +1,55 @@
+<script type="text/javascript">
+    function regexTitle()
+    {
+        var name = $("#news_title").val();
+        if(name.length ==0)
+        {
+            $("#title_notice_span").text("标题不能为空");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+        else if(name.length <= 60)
+        {
+            $("#title_notice_span").text("填写正确");
+            $("#title_notice_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#title_notice_span").text("标题超过60个字符");
+            $("#title_notice_span").css('color','#ff0000');
+            $("#title_notice_span").focus();
+            return false;
+        }
+    }
+
+    function regexDescription()
+    {
+        var name = $("#news_description").val();
+        if(name.length ==0)
+        {
+            $("#description_notice_span").text("描述不能为空");
+            $("#description_notice_span").css('color','#ff0000');
+            $("#description_notice_span").focus();
+            return false;
+        }
+        else
+        {
+            $("#description_notice_span").text("填写正确");
+            $("#description_notice_span").css('color','#008000');
+            return true;
+        }
+    }
+
+    function submitNews()
+    {
+        if(regexTitle() && regexDescription())
+        {
+            $("#news-form").submit();
+        }
+    }
+</script>
 <div class="contextual">
   <%= watcher_link(@news, User.current) %>
   <%= link_to(l(:button_edit),
@@ -15,9 +67,10 @@
       <%= labelled_form_for :news, @news, :url => news_path(@news),
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'form', :locals => { :f => f } %>
-          <%= submit_tag l(:button_save) %>
-          <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => ''} %> |
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+          <%#= submit_tag l(:button_save) %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:class => 'whiteButton m3p10' %>
+          <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>

From 59fadeacf651a68345f76db78820ba0cdedf79ac Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 29 Aug 2014 11:45:37 +0800
Subject: [PATCH 12/14] =?UTF-8?q?wiki=3D=E3=80=8B=E5=8E=86=E5=8F=B2=3D?=
 =?UTF-8?q?=E3=80=8B=E8=BF=BD=E6=BA=AF=E4=B8=8D=E6=8D=A2=E8=A1=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/scm.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 29c90a673..403e4184f 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -97,7 +97,7 @@ table.annotate td.author {
     background: inherit;
 }
 
-table.annotate td.line-code { background-color: #fafafa; }
+table.annotate td.line-code { background-color: #fafafa; word-break: break-all;}
 
 div.action_M { background: #fd8 }
 div.action_D { background: #f88 }

From 8fc9e65e665befd99b68f357c66405abb845b60a Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 29 Aug 2014 14:54:29 +0800
Subject: [PATCH 13/14] =?UTF-8?q?wiki=E7=BC=96=E8=BE=91=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E8=BF=9B=E5=8E=BB=E7=9A=84=E6=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f70e27de6..807d851be 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -737,7 +737,7 @@ module ApplicationHelper
 
     text = text.dup
     macros = catch_macros(text)
-    text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr)
+    #text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr)
 
     @parsed_headings = []
     @heading_anchors = {}

From c743f5810443a915c82d01ac099e76be17912148 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 15:07:08 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E2=80=9C=E6=88=91=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E2=80=9D=20=E8=AE=A8=E8=AE=BA=E5=8C=BA=E4=B8=AD=20?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=86=85=E5=AE=B9=E6=A1=86=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=EF=BC=8C=E4=B8=94=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=20#1524?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_form.html.erb | 11 ++++++-----
 config/locales/zh.yml             |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 55aa829c8..047f7d660 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -27,14 +27,15 @@
   <p><label><%= l(:label_board) %></label><br />
     <%# modify by nwb%>
     <% if @message.project %>
-        <%= f.select :board_id, boards_options_for_select(@message.project.boards) %></p>
+        <%= f.select :board_id, boards_options_for_select(@message.project.boards) %>
     <% elsif @message.course %>
-        <%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p>
+        <%= f.select :board_id, boards_options_for_select(@message.course.boards) %>
     <% end %>
+  </p>
 <% end %>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-
-  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <p><label for="message_subject"><%= l(:field_description) %><span class="required"> *&nbsp;&nbsp;</span></label>
+    <%= text_area :quote,:quote,:style => 'display:none' %>
+  </p>
 <p>
 <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
 <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %></p>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 224190060..54585e314 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -276,6 +276,7 @@ zh:
   field_is_default: 默认值
   field_tracker: 跟踪
   field_subject: 主题
+  field_quote: 描述
   field_due_date: 计划完成日期
   field_assigned_to: 指派给
   field_priority: 优先级