From 9ac53e5a0bf3ccf66199e0e8cb3c34bda467caf5 Mon Sep 17 00:00:00 2001
From: zhanghaitao <562681745@qq.com>
Date: Thu, 14 Aug 2014 15:58:32 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E5=87=BA=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_tag_name.html.erb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 531ed6966..5713e9a2e 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -72,11 +72,12 @@
 	         <% end %>
 
 	    <% when '6' %>
-		    <% if (User.current.logged? &&
+		    <%# if (User.current.logged? &&
                     User.current.admin?
             # && (@project && User.current.member_of?(@project))
             )
             %>
+          <% if obj.author_id == User.current.id || User.current.admin?%>
 		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                                :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 			<% end %>
@@ -94,14 +95,8 @@
                                           :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 	     <% end %>
 	    <% end %>
-      <!--添加的删除标签（0814添加）  -->
-      <!--<%# if obj.author_id == User.current.id %>
 
-	          <span class='del'> <%#= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
-                                             :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
-	         <%# end %>
-	         -->
     </span>
 
             </div>

From 20f183799f5e0bcb5ee530513d2e4facc9437ebd Mon Sep 17 00:00:00 2001
From: zhanghaitao <562681745@qq.com>
Date: Thu, 14 Aug 2014 16:19:40 +0800
Subject: [PATCH 02/20] =?UTF-8?q?#828=20=E5=88=A0=E9=99=A4=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=9A=84=E6=96=87=E4=BB=B6=E4=B8=8D=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_links.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index cdd1fdd2f..b9d91d5b5 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -30,7 +30,7 @@
                                          :data => {:confirm => l(:text_are_you_sure)},
                                          :method => :delete,
                                          :class => 'delete',
-                                         :remote => true,
+                                         #:remote => true,
                                          #:id => "attachments_" + attachment.id.to_s,
                                          :title => l(:button_delete) %>
   	<% end %>

From 4a0f11dfcef8dde0657932cb0b2d7ba459defa2b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 14 Aug 2014 16:33:43 +0800
Subject: [PATCH 03/20] =?UTF-8?q?#1130=20=E9=A1=B9=E7=9B=AE=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E5=9B=9E=E5=A4=8D=E5=AF=B9=E9=9D=9E=E6=B1=89?=
 =?UTF-8?q?=E5=AD=97=E8=87=AA=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_project_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 0bae1a761..0c0c21b91 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -160,7 +160,7 @@
             <tr>
 
               <td class="comments">
-                <div class="wiki">
+                <div class="wiki" style="width: 100%;word-break: break-all;">
                   <%= textAreailizable message,:content,:attachments => message.attachments %>
                   <%#= message.content.html_safe  %>
                 </div>

From 5f559fcb67a93ef8dc8953d285b2b14730ab3a66 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 14 Aug 2014 16:39:07 +0800
Subject: [PATCH 04/20] =?UTF-8?q?#1309=20=E9=A1=B9=E7=9B=AE=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E9=A1=B9=E7=9B=AE=E4=B8=8B=E6=8B=89=E6=A1=86=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 86b6742d6..5c4610856 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -1,3 +1,11 @@
+<script type="text/javascript">
+  window.onready = function()
+  {
+      $("#issue_project_id").css("width","300px");
+      $("#issue_project_id").css("overflow ","hidden");
+      //issue_project_id
+  }
+</script>
 <%= labelled_fields_for :issue, @issue do |f| %>
 <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
 

From b92f3852024d473449c2d28062d9208a3c09cda0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 14 Aug 2014 16:40:12 +0800
Subject: [PATCH 05/20] =?UTF-8?q?#1309=20=E9=A1=B9=E7=9B=AE=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E9=A1=B9=E7=9B=AE=E4=B8=8B=E6=8B=89=E6=A1=86=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 5c4610856..c19096f99 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -1,7 +1,7 @@
 <script type="text/javascript">
   window.onready = function()
   {
-      $("#issue_project_id").css("width","300px");
+      $("#issue_project_id").css("width","100%");
       $("#issue_project_id").css("overflow ","hidden");
       //issue_project_id
   }

From e923fd1e5b634fbf6666c9b170800126f11da580 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 Aug 2014 08:38:02 +0800
Subject: [PATCH 06/20] =?UTF-8?q?1.=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb |  2 +-
 app/views/issues/index.html.erb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 4c2a63844..616e2323d 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -38,7 +38,7 @@
 				<% end -%>
 				<ul class="list-group-item-meta">
 					<div class="issue-list-description">
-                      <div class="wiki">
+                      <div class="wiki" style="width: 100%;word-break: break-all;">
                         <%= textilizable issue, :description %>
                       </div>
 						<!-- <#%= l(:field_description)%>:&nbsp;<#%= issue.short_description %> -->
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 67b3d46c4..804b52d68 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><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>
                 </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 7b14be73104936e9d5767e531fafbffc330e3b98 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 15 Aug 2014 08:54:19 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E6=96=B0=E5=BB=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AAred=5Fproject=5Fscores=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/trackers_controller.rb |  3 ++-
 app/controllers/zipdown_controller.rb  |  2 +-
 db/schema.rb                           | 17 ++---------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 94131a2e0..de686493b 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -17,7 +17,7 @@
 
 class TrackersController < ApplicationController
   layout 'admin'
-
+  helper "project_score"
   before_filter :require_admin, :except => :index
   before_filter :require_admin_or_api_request, :only => :index
   accept_api_auth :index
@@ -38,6 +38,7 @@ class TrackersController < ApplicationController
     @tracker ||= Tracker.new(params[:tracker])
     @trackers = Tracker.sorted.all
     @projects = Project.all
+    @courses = Course.all
   end
 
   def create
diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index a5506be93..10aa39df2 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -54,7 +54,7 @@ class ZipdownController < ApplicationController
     end
 
   rescue => e
-    render file: 'public/file_not_found.html'
+    render file: 'public/file_not_found.html' , :layout => 'course_base'
   end
 
   private
diff --git a/db/schema.rb b/db/schema.rb
index 525cfb745..a49ef688e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -441,10 +441,10 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.datetime "created_at",                    :null => false
     t.datetime "updated_at",                    :null => false
     t.integer  "sort_type"
-    t.integer  "show_course",  :default => 1
-    t.integer  "show_contest", :default => 1
     t.integer  "image_width",  :default => 107
     t.integer  "image_height", :default => 63
+    t.integer  "show_course",  :default => 1
+    t.integer  "show_contest", :default => 1
   end
 
   create_table "forums", :force => true do |t|
@@ -907,19 +907,6 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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

From 33b5f821c4688d0795e122b01225d59c97bf9a38 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 15 Aug 2014 11:21:11 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/tags/_tag_name.html.erb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index f5057aba3..7ecb25a9e 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -70,7 +70,14 @@
                                              :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 				
 	         <% end %>
+            <% when '5' %>
+          <% if Forum.find(params[:id]) %>
+	          <% if Forum.find(params[:id]).creator_id == User.current.id %>
+	         <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
+                                            :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 
+	         <% end %>
+                   <% end %>
 	    <% when '6' %>
 		    <% if (User.current.logged? &&
                     User.current.admin?

From 19c5ebf4506b537f68a5c872d008a03f13d3798b Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 15 Aug 2014 14:07:13 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9C=89=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E5=90=8E?=
 =?UTF-8?q?=E6=B2=A1=E5=88=B7=E6=96=B0=E7=9A=84bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/tags_helper.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 8e9e6bbb9..17b68c3f6 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -12,6 +12,8 @@ module TagsHelper
       @obj = Issue.find_by_id(obj_id)
     when '4'
       @obj = Bid.find_by_id(obj_id)
+      when '5'
+        @obj = Forum.find_by_id(obj_id)
     when '6'
       @obj = Attachment.find_by_id(obj_id)
     when '7'
@@ -44,6 +46,8 @@ module TagsHelper
       if user.id == obj_id
         @result = true
       end
+      when '5'
+        @result = is_forum_manager?(user.id,obj_id)
     when '7'
       if user.id == obj_id
         @result = true
@@ -56,6 +60,17 @@ module TagsHelper
 
 end
 
+# 判断用户是否是贴吧的管理员
+# add by chenmin
+def is_forum_manager?(user_id,forum_id)
+  @result = false
+  @user_id = Forum.find(forum_id).creator_id;
+  if @user_id == user.id
+    @result = true
+  end
+  return @result
+end
+
 def tagname_val
   ("#tag_name_name").value
 end
\ No newline at end of file

From 2b6a376d315091fa2df31bbe4084ca8b9c45dbeb Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 15 Aug 2014 14:30:01 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E4=B8=BA=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81=E6=97=B6?=
 =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84=E9=83=A8=E5=88=86bug?=
 =?UTF-8?q?=E3=80=81=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb |  6 ++
 app/controllers/welcome_controller.rb     |  9 +--
 app/views/layouts/_base_header.html.erb   |  4 +-
 app/views/welcome/contest.html.erb        |  4 +-
 app/views/welcome/course.html.erb         |  4 +-
 db/schema.rb                              | 82 +++++------------------
 lib/redmine.rb                            |  2 +-
 7 files changed, 34 insertions(+), 77 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f47ba446e..178a82d17 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -725,6 +725,12 @@ class ApplicationController < ActionController::Base
   #查找首页相关信息
   def find_first_page
     @first_page = FirstPage.where("page_type = 'project'").first
+    if @first_page.nil?
+      @first_page = FirstPage.new
+      @first_page.page_type = 'project'
+      @first_page.description = ""
+      @first_page.save()
+    end
     @show_course = @first_page.show_course
     @show_contest = @first_page.show_contest
   end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 80b4e3576..4e7cf0ce9 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -20,11 +20,12 @@ class WelcomeController < ApplicationController
   include WelcomeHelper
   helper :project_score
   caches_action :robots
+  before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
-    @first_page = FirstPage.where("page_type = 'project'").first
+    #@first_page = FirstPage.where("page_type = 'project'").first
     #@show_course = @first_page.show_course
     if @first_page.nil? ||  @first_page.sort_type.nil?
       @projects = find_miracle_project(10, 3,"score desc")
@@ -76,7 +77,7 @@ class WelcomeController < ApplicationController
    logo = get_avatar?(@course_page)
     id = params[:school_id]
     logo_link = ""
-    if id.nil? && User.current.user_extensions.school.nil?
+    if id.nil? && (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?)
       if logo
         logo_link = url_to_avatar(@course_page)
       else
@@ -148,8 +149,8 @@ class WelcomeController < ApplicationController
   private
   # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法
   def entry_select
-    @first_page = FirstPage.where("page_type = 'project'").first
-    url = request.original_url
+    #@first_page = FirstPage.where("page_type = 'project'").first
+    url = request.original_url.gsub('/','')
     if url.include?(Setting.host_course)
       if @first_page.show_course == 1
         course
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 3a7a6a8ee..3116a9a68 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -44,11 +44,11 @@
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
                  <% hasCourse=true%>
 
-				<li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
+				<li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
                     <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
                         <% if !course_endTime_timeout?(course) %>
-                            <li><%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %></li>
+                            <li><%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id} %></li>
                         <% end %>
                     <% end %>
                   </ul>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index d735e1013..8df19a280 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -153,7 +153,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" >
 <h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_hot_contest)%></strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index'}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<div class="d-p-projectlist">
 			<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
@@ -294,7 +294,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: left;">
 <h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_attendingcontest_work)%></strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index'}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<% if Softapplication.count > 0%>
 			<div class="d-p-projectlist">
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index c979807b9..c46df7777 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -42,7 +42,7 @@
 
     </div>
     <div class="course welcome_left" id="welcome_left">
-			<span class="font_welcome_school"> <% if @school_id.nil? and User.current.user_extensions.school.nil? %>
+			<span class="font_welcome_school"> <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
               <% else %>
 					<% if @school_id == "0" %>
                   <% else %>
@@ -58,7 +58,7 @@
       <% unless @course_page.nil? %>
         <span class="font_welcome_trustie"><%= @course_page.title %> </span>
 
-      <% if @school_id.nil? and User.current.user_extensions.school.nil? %>
+      <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
           <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
       <% else %>
           <% if @school_id == "0" %>
diff --git a/db/schema.rb b/db/schema.rb
index a49ef688e..e39644b3b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -177,58 +177,6 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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
@@ -872,18 +820,18 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :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"
@@ -957,11 +905,10 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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|
@@ -1067,8 +1014,8 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1126,6 +1073,9 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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|
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 4fa909325..64b39145e 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -408,7 +408,7 @@ Redmine::MenuManager.map :course_menu do |menu|
 end
 Redmine::MenuManager.map :user_menu do |menu|
   menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain }
-  menu.push :user_course, {:controller => 'users', :action => 'user_courses', :host => Setting.course_domain}
+  menu.push :user_course, {:controller => 'users', :action => 'user_courses'}
   #menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'} by huang
   menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain}  
   # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} by huang

From ae61ccaca91af2d2efbdaec3e50566153b898f83 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 Aug 2014 14:42:28 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 71bea9cfa..3ea5bad92 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -25,13 +25,9 @@
         </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;">
-                    <div class="issue-list-description">
-                      <div class="wiki">
-                        <%#= textilizable e.event_url,:description %>
-                      </div>
-                    </div>
-                    <%= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
+                  <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;">
+                    <%= textAreailizable e,:event_description %>
+                    <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
                   </div>
                   <div class="activity_status" style="position:relative; padding-top: 3px;">
                     <span class="font_lighter"> <%= l :label_activity_time %>

From e44ece80f6d29d6f05394063c7d2cac4814da469 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 15 Aug 2014 14:45:04 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E8=B4=B4=E5=AD=90=E4=B8=BB=E9=A2=98=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E8=BE=B9=E7=95=8Cbug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_project_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 3002cb769..1327f13e9 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="padding-top: 10px">
+<div style="width: 100%;word-break: break-all;">
   <% if @topics.any? %>
       <!-- <table class="list messages">
   <thead><tr>

From a420a41b7861a434c7a4c60ef38faa052659b586 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 15 Aug 2014 15:12:26 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=B6=85=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_project_show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 0c0c21b91..bb879e213 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -93,7 +93,7 @@
       <%= link_to @topic.author, user_path(@topic.author) %>
     </p>
   </div>
-  <div class="memo-section">
+  <div class="memo-section" style="width: 100%;word-break: break-all;">
     <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>">
       <% if @project %>
           <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project) %>

From bd56286b4e676d281f69e146bc4a574d47c045f2 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 15 Aug 2014 15:58:12 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=AD=A6=E6=97=B6=E5=A4=AA=E9=95=BFbug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_form.html.erb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 79db56aab..23a0caabd 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -14,6 +14,16 @@
     }
 </script>
 
+<script  type="text/javascript">
+    function check(){
+        var regex=/^\d*$/;
+        if (!regex.test($("#class_period").val())){
+            alert("学时只能为整数");
+        }
+        }
+    }
+</script>
+
 
 
 <% object = [] %>
@@ -67,11 +77,11 @@
     -->
     <% unless @course.nil?%>
         <p><table><tr><td><span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %><span class="required"> *&nbsp;&nbsp;</span></span>
-  <span class="info" style="width: 10px"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时" %></span> <span>&nbsp;<strong><%= l(:label_class_hour)%></strong></span>
+  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时",:maxlength=>5 %></span> <span>&nbsp;<strong><%= l(:label_class_hour)%></strong></span>
 </td></tr></table></p>
     <% else %>
         <p><table><tr><td><span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %><span class="required"> *&nbsp;&nbsp;</span></span>
-  <span class="info" style="width: 10px"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时" %></span><strong><%= l(:label_class_hour)%></strong>
+  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时",:maxlength=>5 %></span><strong><%= l(:label_class_hour)%></strong>
 </td></tr></table></p>
     <% end %>
 

From ace256bea1352bccfc628a22bad455ca71762a4e Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Fri, 15 Aug 2014 16:06:41 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E6=8C=A1?=
 =?UTF-8?q?=E4=BD=8F=E5=8F=B3=E8=BE=B9=E5=9B=BE=E6=A0=87=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/show_contest.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/contests/show_contest.html.erb b/app/views/contests/show_contest.html.erb
index c379bc668..91279b7bb 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">
+		<div class="bid_description" style="width: 100%;word-break:break-all;">
 			<%= @contest.description %>
 			<!-- <%# if @contest.attachments.any?%>
 				<%# options = {:author => true} %>

From 746022506d9c88f56fe4ea383b0b3fa77a76618d Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 15 Aug 2014 17:43:10 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BE=97=E5=88=86=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb      | 8 ++++----
 app/views/layouts/base_projects.html.erb | 4 ++--
 app/views/welcome/index.html.erb         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index eaa96e82a..98b24bc12 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -295,8 +295,8 @@ class UsersController < ApplicationController
       # 活跃度排序, 就是所谓的得分情况
       @s_type = 1
       @users = scope.
-                joins("LEFT JOIN user_scores ON users.id = user_scores.user_id").
-                reorder('user_scores.active DESC')
+                joins("LEFT JOIN option_numbers ON users.id = option_numbers.user_id and option_numbers.score_type = 1").
+                reorder('option_numbers.total_score DESC')
     when '2'
       # 粉丝数排序
       @s_type = 2
@@ -308,8 +308,8 @@ class UsersController < ApplicationController
       # 默认活跃度排序
       @s_type = 1
       @users = scope.
-                joins("LEFT JOIN user_scores ON users.id = user_scores.user_id").
-                reorder('user_scores.active DESC')
+          joins("LEFT JOIN option_numbers ON users.id = option_numbers.user_id and option_numbers.score_type = 1").
+          reorder('option_numbers.total_score DESC')
     end
 
     # limit and offset
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index eea7a0f61..d8eb17acd 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -54,7 +54,7 @@
 						<div id="sidebar">
 							<div class="spaceleft">
 								<div class="inf_user_image">
-									<% @project = Project.find_by_id(@project.id)%>
+									<% #@project = Project.find_by_id(@project.id)%>
 									<table>
 										<tr>
 											<td><%= image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
@@ -66,7 +66,7 @@
 													
 													<% if @project.project_type == 0 %>
 														<%= l(:label_project_grade)%> : 
-														<%= link_to(format("%.2f" , project_scores(@project)  ).to_i,  {:controller => 'projects',
+														<%= link_to(format("%.2f" ,project_scores(@project)  ).to_i,  {:controller => 'projects',
 																																			   :action => 'show_projects_score', 
 																																			   :remote => true, 
 																																			   :id => @project.id
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 31fb0432a..997b583c3 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -79,7 +79,7 @@
 					<span class='font_lighter' title ='<%=project.short_description%>'><%=project.description.truncate(100, omission: '...')%></span>
 				</div>
 				<div >
-                  <%= content_tag "span", l(:label_project_score)+ ":" + project_scores(project).to_s,
+                  <%= content_tag "span", l(:label_project_score)+ ":" + red_project_scores(project).to_i.to_s,
          	        :style => "cursor: pointer; display: inline-block; float: right; color: #ec6300;",
 			        :title => "项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度",
 			        :class => "tooltip",

From fcaeb866871a25d5e8bf1fb1b748509152d04b86 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Sat, 16 Aug 2014 10:49:27 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E2=80=98=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=20=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BABug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/members_helper.rb                 |  1 +
 app/views/members/autocomplete.js.erb         | 11 +++++++++++
 app/views/projects/settings/_members.html.erb | 14 ++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index ecfb097e9..6c11199fb 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -31,6 +31,7 @@ module MembersHelper
     }
 
     s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
+
   end
 
   # add by nwb
diff --git a/app/views/members/autocomplete.js.erb b/app/views/members/autocomplete.js.erb
index e7a52f7f3..5ef01c04d 100644
--- a/app/views/members/autocomplete.js.erb
+++ b/app/views/members/autocomplete.js.erb
@@ -3,3 +3,14 @@ $('#principals_for_new_member').html('<%= escape_javascript(render_principals_fo
  <% elsif @course%>
  $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_course_members(@course)) %>');
  <%end%>
+ var collection=$("#principals_for_new_member").children("#principals").children("label");
+ collection.css("text-overflow","ellipsis");
+ collection.css("white-space","nowrap");
+ collection.css("width","200px");
+ collection.css("overflow","hidden");
+ for(i=0;i<collection.length;i++){    //增加悬浮显示
+     var label=collection[i];
+     var text=$(label).text();
+     $(label).attr("title",text);
+ }
+
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index ab046bcb6..c1d63d03b 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -130,3 +130,17 @@
       <% end %>
   <% end %>
 </div>
+<script type="text/javascript">
+    $(document).ready(function () {
+        var collection=$("#principals_for_new_member").children("#principals").children("label");
+        collection.css("text-overflow","ellipsis");
+        collection.css("white-space","nowrap");
+        collection.css("width","200px");
+        collection.css("overflow","hidden");
+        for(i=0;i<collection.length;i++){    //增加悬浮显示
+            var label=collection[i];
+            var text=$(label).text();
+            $(label).attr("title",text);
+        }
+    });
+</script>
\ No newline at end of file

From 4cea972e5698caaa9cc7e29b6b9b1bd30902cdc6 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 16 Aug 2014 13:22:28 +0800
Subject: [PATCH 18/20] =?UTF-8?q?micro=E7=89=88=E5=9B=BE=E7=89=87=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_tools_expand.html.erb | 12 ++++++------
 public/stylesheets/nyan.css               |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index df6cd481b..b6910e56f 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -4,22 +4,22 @@
 
 <div class="tools ">
   <ul><h3>项目交流</h3>
-    <li><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project) %></li>
-    <li><%= link_to l(:project_module_files) ,project_files_path(@project) %></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= image_tag('sidebar/tool_tag_alpha.png') %><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_files) ,project_files_path(@project) %></li>
     <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %>
         <li><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>
     <% end %>
   </ul>
   <ul><h3>进度跟踪</h3>
-    <li><%= link_to l(:project_module_calendar),project_calendar_path(@project) %></li>
-    <li><%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %></li>
-    <li><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_calendar),project_calendar_path(@project) %></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %></li>
   </ul>
   <ul><h3>其他工具</h3>
     <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %>
         <li><%= link_to l(:label_module_share) ,share_show_path(@project) %></li>
     <% end %>
-    <li><%= link_to l(:project_module_documents), project_documents_path(@project) %></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_documents), project_documents_path(@project) %></li>
     <li></li>
   </ul>
 
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index 03a2349a2..2467af7a0 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -656,7 +656,7 @@ input[class='nyan-clean-gray']:active, .nyan-clean-gray:active {
 }
 
 .tools li {
-    background: url("/images/sidebar/tool_tag_alpha.png") 10px 30% no-repeat transparent;
+    /*background: url("/images/sidebar/tool_tag_alpha.png") 10px 30% no-repeat transparent;*/
     color: #3e3e3e;
     font-weight: 400;
     line-height: 1.5em;

From 6f5df31d14d61d39459c6e2a1707d53f57afaa59 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 16 Aug 2014 13:23:50 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_tools_expand.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index b6910e56f..7520bd4da 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -4,7 +4,7 @@
 
 <div class="tools ">
   <ul><h3>项目交流</h3>
-    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= image_tag('sidebar/tool_tag_alpha.png') %><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%></li>
+    <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%></li>
     <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_files) ,project_files_path(@project) %></li>
     <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %>
         <li><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>

From 9688a73aa10001c8e4ee274ee981d12058657748 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 16 Aug 2014 13:30:38 +0800
Subject: [PATCH 20/20] =?UTF-8?q?1.=E6=96=B0=E5=BB=BA=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=A2=9E=E5=8A=A0js=E9=AA=8C=E8=AF=81=202.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E8=B6=85=E8=BF=872=E5=BC=A0=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=A4=B1=E8=B4=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb          |  15 +--
 .../contests/_new_softapplication.html.erb    | 109 ++++++++++++++++--
 2 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 06bf45012..0677d324b 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -13,16 +13,17 @@
 <% end %>
 </span>
 <script type='text/javascript'>
-    function CompatibleSend()
-    {
-        var obj=document.getElementById("_file");
-        var file= $(obj).clone();
-        file.click();
-    }
+//    function CompatibleSend()
+//    {
+//        var obj=document.getElementById("_file");
+//        var file= $(obj).clone();
+//        file.click();
+//    }
 </script>
 <span class="add_attachment">
-<%= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()" %>
 <%= file_field_tag 'attachments[dummy][file]',
       :id => '_file',
       :class => 'file_selector',
diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
index c83bdf6e9..92fed47fe 100644
--- a/app/views/contests/_new_softapplication.html.erb
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -1,12 +1,98 @@
 <%#= error_messages_for 'softapplication'  %>
+
+<script type="text/javascript">
+    //验证作品名称
+    function regexName()
+   {
+       var name = $("#softapplication_name").val();
+       if(name.length ==0)
+       {
+           $("#spane_name_notice").text("作品名称不能为空");
+           $("#spane_name_notice").css('color','#ff0000');
+           $("#spane_name_notice").focus();
+           return false;
+       }
+       else if(name.length < 25)
+       {
+           $("#spane_name_notice").text("填写正确");
+           $("#spane_name_notice").css('color','#008000');
+           return true;
+       }
+       else
+       {
+           $("#spane_name_notice").text("作品名称超过25个汉字");
+           $("#spane_name_notice").css('color','#ff0000');
+           $("#spane_name_notice").focus();
+           return false;
+       }
+   }
+
+   //验证运行平台
+   function regexWorkdescription()
+   {
+       var workDescription = $("#softapplication_android_min_version_available").val();
+       if(workDescription.length ==0)
+       {
+           $("#spane_workdescription_notice").text("运行平台不能为空");
+           $("#spane_workdescription_notice").css('color','#ff0000');
+           return false;
+       }
+       if(workDescription.length < 125)
+       {
+           $("#spane_workdescription_notice").text("填写正确");
+           $("#spane_workdescription_notice").css('color','#008000');
+           return true;
+       }
+       else
+       {
+           $("#spane_workdescription_notice").text("运行平台超过125个汉字");
+           $("#spane_workdescription_notice").css('color','#ff0000');
+           return false;
+       }
+   }
+
+    //验证开发人员
+    function regexDevelopers()
+    {
+        var workDescription = $("#softapplication_application_developers").val();
+        if(workDescription.length ==0)
+        {
+            $("#span_softapplication_application_developers").text("开发人员不能为空");
+            $("#span_softapplication_application_developers").css('color','#ff0000');
+            return false;
+        }
+        if(workDescription.length < 125)
+        {
+            $("#span_softapplication_application_developers").text("填写正确");
+            $("#span_softapplication_application_developers").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#span_softapplication_application_developers").text("开发人员超过125个汉字");
+            $("#span_softapplication_application_developers").css('color','#ff0000');
+            return false;
+        }
+    }
+    //提交验证
+    function submit_new_softapplication()
+    {
+        if(regexName() && regexWorkdescription() && regexDevelopers())
+        {
+             alert("123123123123");
+            $("#new_softapplication").submit();
+        }
+    }
+</script>
+
 <%= form_for Softapplication.new, :url => softapplications_path do |f| %>
     <fieldset class="contes-new-box" style="padding-left: 36px; line-height: 8px; margin-left: 1px" >
       <%= hidden_field_tag 'contest_id', @contest.id %>
       <tr style="width:700px; margin-left: -10px;">
         <span><%= l(:label_work_name) %></span>
         <span class="contest-star"> * </span>:
-        <td><%= f.text_field :name, :required => true, :size => 60, :style => "width:350px;" %></td>
-        <span style="font-size: 10px">(<%= l(:label_workname_lengthlimit) %>)</span>
+        <td><%= f.text_field :name, :required => true, :size => 60, :style => "width:320px;", :onblur => "regexName();" %></td>
+        <span style="font-size: 10px;" id="spane_name_notice">(<%= l(:label_workname_lengthlimit) %>)</span>
       </tr>
       <br/>
       <br/>
@@ -16,9 +102,9 @@
         <span><%= l(:label_running_platform) %></span>
         <span class="contest-star"> * </span>:
         <td style="width: 100px">
-          <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:350px;" %>
+          <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:320px;", :onblur=>"regexWorkdescription();"%>
         </td>
-        <span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
+        <span style="font-size: 10px" id="spane_workdescription_notice">(<%= l(:label_workdescription_lengthlimit) %>)</span>
       </tr>
       <br/>
       <br/>
@@ -31,12 +117,12 @@
             <span>
               <%#= select_tag 'app_type_name', work_type_opttion, {:name => 'app_type_name',:style => "width:358px;"} %>
             </span>
-          <%= f.select :app_type_name,work_type_opttion, {},{:style => "width:358px;",:onchange => "selectChange(this)"}  %>
+          <%= f.select :app_type_name,work_type_opttion, {},{:style => "width:328px;",:onchange => "selectChange(this)"}  %>
           <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
         </td>
           <span style="font-size: 10px;display: none" id="other_span">
             <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;"  %>
-            <input type="text" style="width: 100px;" id="other_input" name = "other_input"/>
+            <input type="text" style="width: 120px;" id="other_input" name = "other_input"/>
           </span>
       </tr>
       <br/>
@@ -46,7 +132,7 @@
       <tr style="width:800px;">
         <span><%= l(:label_work_description) %></span>
         <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :description, :required => true, :size => 60, :style => "width:350px;" %></td>
+        <td style="width: 100px"><%= f.text_field :description, :required => true, :size => 60, :style => "width:320px;" %></td>
         <!--span style="font-size: 10px">(<%#= l(:label_workdescription_lengthlimit) %>)</span-->
       </tr>
       <br/>
@@ -56,8 +142,8 @@
       <tr style="width:800px;">
         <span><%= l(:label_softapplication_developers) %></span>
         <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:350px;" %></td>
-        <span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
+        <td style="width: 100px"><%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:320px;", :onblur => 'regexDevelopers();' %></td>
+        <span style="font-size: 10px" id="span_softapplication_application_developers">(<%= l(:label_workdescription_lengthlimit) %>)</span>
       </tr>
       <br/>
       <br/>
@@ -65,7 +151,7 @@
 
       <tr style="width:800px;">
         <span><%= l(:label_work_deposit_project) %>：</span>
-        <span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2',:style => "width:358px;" %></span>
+        <span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2',:style => "width:328px;" %></span>
         <span><%= link_to l(:label_create_new_projects),{:controller => 'projects',:action => 'new',course: 0, project_type: 0,host: Setting.project_domain}, :target => '_blank' %></span><!-- new_project_path(course: 0, project_type: 0) -->
       </tr>
       <br/>
@@ -90,7 +176,8 @@
       </fieldset>
     </fieldset></br>
     <div class="align-center" style="padding-top: -3px; padding-bottom: 8px">
-      <%= submit_tag l(:button_create) %>
+      <input type="button" class="enterprise" value="<%=l(:button_create) %>" onclick="submit_new_softapplication();" >
+      <%#= submit_tag l(:button_create) %>
       <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
                      :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
                      :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>