From 879e93beb99746389b00d46735bc31c60095c659 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Mon, 15 Sep 2014 16:04:06 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E3=80=81=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B9=B6=E6=B7=BB=E5=8A=A0js=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/enabled_module.rb       | 3 ++-
 app/views/welcome/contest.html.erb | 5 +++++
 app/views/welcome/index.html.erb   | 3 ++-
 public/javascripts/welcome.js      | 5 +++++
 public/stylesheets/welcome.css     | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb
index 94539ec00..fe668e02c 100644
--- a/app/models/enabled_module.rb
+++ b/app/models/enabled_module.rb
@@ -22,7 +22,6 @@ class EnabledModule < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => :project_id
 
   after_create :module_enabled
-
   private
 
   # after_create callback used to do things when a module is enabled
@@ -35,4 +34,6 @@ class EnabledModule < ActiveRecord::Base
       end
     end
   end
+
+
 end
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 3554f85dd..a3cc9f6e9 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -111,6 +111,11 @@
 
     fixedBar('backTopBtn' , {autoHidden: true, top : 186});
     fixedBar('identifier-pannel' , {autoHidden: false , top : 956 , show : true});
+    //修改微信扫码样式布局后添加微信扫码跟随滚动处理
+    $(window).scroll(function(){
+         var vtop=$(document).scrollTop();
+         $("#identifier-pannel").css('top',vtop+"px");
+    })
     }
 })();
 </script>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b73f0970f..4fd01d319 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -29,7 +29,8 @@
 </script>
 
 <div class='top_bar'>
-	<div id="identifier-pannel" style="display:none">
+
+	<div id="identifier-pannel" style="display:none;">
 		<%= link_to image_tag('/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" ), home_path %>
 		<div class="weixin-content">微信扫码</div>
 	</div>
diff --git a/public/javascripts/welcome.js b/public/javascripts/welcome.js
index a0166bb3f..13466edd0 100644
--- a/public/javascripts/welcome.js
+++ b/public/javascripts/welcome.js
@@ -60,5 +60,10 @@
 
 		fixedBar('backTopBtn' , {autoHidden: true, top : 186});
 		fixedBar('identifier-pannel' , {autoHidden: false , top : 956 , show : true});
+        //修改微信扫码样式布局后添加微信扫码跟随滚动处理
+        $(window).scroll(function(){
+            var vtop=$(document).scrollTop();
+            $("#identifier-pannel").css('top',vtop+"px");
+        })
 	}
 })();
\ No newline at end of file
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index c6bdd1ab5..3e333d231 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -340,7 +340,7 @@ a.attachments_list_color {
 }
 
 #identifier-pannel{
-    position:fixed;
+    position:absolute;
     left: 50%;
     bottom:0;
     z-index:9999;

From a0d90e1697c840094b187eebee29a097118991cf Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Mon, 15 Sep 2014 16:33:40 +0800
Subject: [PATCH 02/29] =?UTF-8?q?IE=E4=B8=AD=E2=80=9C=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E2=80=9D=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/stores/index.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index 6984169d7..5df6ecca8 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -2,9 +2,9 @@
   <%= render 'search_bar' %>
 <% end %>
 
-<div class="resource_sum">
+<div class="resource_sum" id="IE_resource_sum_css">
 <% @attach_array.each do |k|%>
-	<div class="line_block">
+	<div class="line_block" >
 		<p>
 			<%= @str_arr.shift %>
 		</p>
@@ -64,5 +64,8 @@
 				$(this).find('img').attr("src", "/images/button/download.png")
 			});
 		});
+        if(navigator.appName=="Microsoft Internet Explorer"){
+            $("#IE_resource_sum_css").children(".line_block").css("width","45%");
+        }
 	});
 </script>
\ No newline at end of file

From 2478cac7d1528dea17b9c75175f5340d157041cf Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Mon, 15 Sep 2014 16:55:14 +0800
Subject: [PATCH 03/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E6=9F=90=E6=83=85=E5=86=B5=E4=B8=8B=E6=97=A0=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/words/_feedback.html.erb b/app/views/words/_feedback.html.erb
index 774ee3b64..48460e449 100644
--- a/app/views/words/_feedback.html.erb
+++ b/app/views/words/_feedback.html.erb
@@ -22,7 +22,7 @@
             <% if User.current.logged? %>
                   <% if journal.user_id==User.current.id|| User.current.admin? %>
                       <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id, :project_id=>@project.id, :page=>@page},
-                                  :remote => true, :title => l(:button_delete)) %>
+                                  :remote => true, :title => l(:button_delete), :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete") %>
                   <% end %>
               <% end %>
 			</span>

From c55c6156d8b7803a3bea5fe9644efcdaef5c7a58 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Mon, 15 Sep 2014 17:32:46 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?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/controllers/my_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 32ae2efc2..1e58c53f1 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -75,6 +75,7 @@ class MyController < ApplicationController
   # Edit user's account
   def account
     @user = User.current
+    lg=@user.login
     @pref = @user.pref
     diskfile = disk_filename('User', @user.id)
     diskfile1 = diskfile + 'temp'
@@ -137,7 +138,7 @@ class MyController < ApplicationController
         if File.exist?(diskfile1)
           File.delete(diskfile1)
         end
-        @user
+        @user.login = lg
       end
     else
       # 确保文件被删除

From 3dca2185beba966e81ba5df66c92eeb6176d4f63 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 08:56:45 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=80=9A=E5=91=8A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E3=80=82=E5=8E=9F=E5=9B=A0=E6=9C=AA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0layout=EF=BC=8C=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8Alayout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/contest_notification_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/contest_notification_controller.rb b/app/controllers/contest_notification_controller.rb
index 8c6e51bd5..461b62457 100644
--- a/app/controllers/contest_notification_controller.rb
+++ b/app/controllers/contest_notification_controller.rb
@@ -1,4 +1,5 @@
 class ContestNotificationController < ApplicationController
+  layout 'contest_base'
   def show
     @notification = ContestNotification.find(params[:id])
   end

From ffa4ec193ebaba698ee6a0f99608ffdfd8a90d57 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 09:22:27 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E6=9F=A5=E7=9C=8B=E7=BB=86=E8=8A=82?=
 =?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?=EF=BC=8C=E5=8E=9F=E5=9B=A0=EF=BC=9A=E4=B8=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?layout=EF=BC=8C=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=8A=A0=E4=B8=8Alay?=
 =?UTF-8?q?out?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/journals_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 28505a047..77ee9d648 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -54,6 +54,11 @@ class JournalsController < ApplicationController
     end
     (render_404; return false) unless @issue && @detail
     @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
+    respond_to do |format|
+      format.html {
+        render :layout => 'project_base'
+      }
+    end
   end
 
   def new

From 6b4e2ae37b55b1fcdcecef67e3655cf693ae288c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 09:33:27 +0800
Subject: [PATCH 07/29] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=86=E7=B1=BB=E4=B8=8B=E6=8B=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=89=E9=A1=B9=202.=E4=BF=AE=E6=94=B9=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E6=A0=87=E9=A2=98=E4=B8=BA=E5=85=A8=E9=83=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E4=BF=AE=E6=94=B9=E6=80=9D=E8=B7=AF=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_newcontest.html.erb    |  2 +-
 .../20140916005319_update_works_categories.rb | 26 +++++++++++++++
 db/schema.rb                                  | 32 +++++++++----------
 3 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 db/migrate/20140916005319_update_works_categories.rb

diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 9fef1e3e6..c8e78d7f5 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -65,7 +65,7 @@
 												<td>
 													<table>
 														<tr>
-															<td class="info_font" title="<%= @contest.name%>"><%= link_to h(truncate(@contest.name, length: 13, omission: '...')), show_contest_contest_path(@contest) %></td>
+															<td class="info_font" title="<%= @contest.name%>"><%= link_to @contest.name, show_contest_contest_path(@contest) %></td>
 														</tr>
 														<% if User.current.login? %>
 														<tr colspan='3'>
diff --git a/db/migrate/20140916005319_update_works_categories.rb b/db/migrate/20140916005319_update_works_categories.rb
new file mode 100644
index 000000000..e4cf812bf
--- /dev/null
+++ b/db/migrate/20140916005319_update_works_categories.rb
@@ -0,0 +1,26 @@
+# -*coding:utf-8 -*-
+class UpdateWorksCategories < ActiveRecord::Migration
+  def up
+    WorksCategory.all.each do |wc|
+      wc.destroy
+    end
+
+    workscategory1 = WorksCategory.new
+    workscategory1.category = "开源软件"
+    workscategory1.save
+
+    workscategory2 = WorksCategory.new
+    workscategory2.category = "移动APP"
+    workscategory2.save
+
+    workscategory3 = WorksCategory.new
+    workscategory3.category = "其他"
+    workscategory3.save
+  end
+
+  def down
+    WorksCategory.all.each do |wc|
+      wc.destroy
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 95c52cca3..ebf24f547 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140826072838) do
+ActiveRecord::Schema.define(:version => 20140916005319) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -878,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"
@@ -976,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|
@@ -1085,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"
@@ -1144,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 e3889ed6aa9405b983befc7c57c37f72fe1c7647 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 09:49:57 +0800
Subject: [PATCH 08/29] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E=E7=AB=9E=E8=B5=9B=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 4f8350fa2..73c09c6ec 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -155,10 +155,17 @@
 
 	<div style="clear:both"></div>
 
-
 <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'}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;">
+        <% if User.current.logged? %>
+            <% unless User.current.user_extensions.identity == 1 %>
+                <%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %>
+            <% end %>
+        <% end %>
+      &nbsp;&nbsp;
+      <%= 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]) %>
@@ -169,7 +176,6 @@
 				</div>
 
 				<div style="float: left; margin-left: 12px; margin-top: 10px; margin-bottom: -4px; width: 380px;">
-					<!-- <%= link_to(contest.name, contest.event_url, :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %> -->
 					<%= link_to(contest.name, contest_contestnotifications_path(contest.id), :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %>
 					<% if contest.id == 2 or contest.id == 3 or contest.id == 6 %>
 						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("#{contest.projects.where('is_public=1').count}"+l(:label_work_quantity), show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>

From d1435e07d407fcb6660de09de902fa4c84ff2c32 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 09:54:55 +0800
Subject: [PATCH 09/29] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81=20#1152?=
 =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E5=B0=86?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81=E4=BD=9C=E4=B8=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=8B=AC=E7=AB=8B=E7=9A=84=E8=BF=9E=E6=8E=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=9A=90=E8=97=8F=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/index.html.erb   | 12 ------------
 app/views/welcome/_wei_xin.html.erb |  4 ++++
 app/views/welcome/contest.html.erb  |  5 +----
 app/views/welcome/course.html.erb   |  5 +----
 app/views/welcome/index.html.erb    |  9 +++------
 5 files changed, 9 insertions(+), 26 deletions(-)
 create mode 100644 app/views/welcome/_wei_xin.html.erb

diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index 60608fd89..c166f73ab 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -7,10 +7,6 @@
 			<td rowspan="2">
 			<% if User.current.logged? %>
                 <% unless User.current.user_extensions.identity == 1 %>
-                 <!--
-                    modified by longjun
-                    <%=link_to l(:label_newtype_contest), :controller => 'contests', :action => 'new_contest' %>
-                -->
                     <%= link_to(l(:label_newtype_contest), contest_new_contest_path, :class => 'icon icon-add', :target => "_blank") %>
                 <!-- end longjun -->
                   <% end %>
@@ -27,20 +23,12 @@
 		<tr>
 			<td style="padding-left: 8px">
               <a>
-                <!--
-                    modified by longjun
-                    <%=link_to request.host()+"/contests", :controller => 'contests', :action => 'index' %>
-                -->
                 <%= link_to request.host()+"/contests", contests_path %>
                 <!-- end longjun  -->
               </a>
             </td>
 	        <td >
               <%=link_to l(:field_homepage), home_path %> >
-              <!--
-                    modified by longjun
-                    <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-                -->
               <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
                 <!-- end longjun -->
             </td>
diff --git a/app/views/welcome/_wei_xin.html.erb b/app/views/welcome/_wei_xin.html.erb
new file mode 100644
index 000000000..39902cf89
--- /dev/null
+++ b/app/views/welcome/_wei_xin.html.erb
@@ -0,0 +1,4 @@
+<div id="identifier-pannel" style="display:none">
+  <%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
+  <div class="weixin-content">微信扫码</div>
+</div>
\ No newline at end of file
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 73c09c6ec..dbc2d8f1b 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -120,10 +120,7 @@
 })();
 </script>
 <div class='top_bar'>
-	<div id="identifier-pannel" style="display:none">
-		<%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
-		<div class="weixin-content"><%=l(:label_weixin)%></div>
-	</div>
+  <%#= render partial: 'wei_xin' %>
 	<div class="main-content-bar" id="main-content-bar">
 	<!--文字-->
 		<div style="float: left;padding-left:15px;">
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 9ec745f87..a94998639 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -32,10 +32,7 @@
 </script>
 
 <div class='top_bar'>
-  <div id="identifier-pannel" style="display:none">
-    <%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
-    <div class="weixin-content">微信扫码</div>
-  </div>
+  <%#= render partial: 'wei_xin' %>
   <div class="main-content-bar" id="main-content-bar">
     <div style="float: left;padding-left:15px">
       <%= image_tag(@logoLink, width:@course_page.image_width,height: @course_page.image_height) %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b73f0970f..83d1fef28 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -29,10 +29,7 @@
 </script>
 
 <div class='top_bar'>
-	<div id="identifier-pannel" style="display:none">
-		<%= link_to image_tag('/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" ), home_path %>
-		<div class="weixin-content">微信扫码</div>
-	</div>
+  <%#= render partial: 'wei_xin' %>
 	<div class="main-content-bar" id="main-content-bar">
 		<div style="float: left;padding-left:15px ">
           <!-- <#%= image_tag(get_project_avatar(@first_page), size: "75x75") %>  -->
@@ -42,7 +39,7 @@
               <%= image_tag '/images/transparent.png', width:@first_page.image_width,height: @first_page.image_height %>
           <% end %>
 
-		</div>		
+		</div>
 	<div class="welcome_left" id="welcome_left">
       <% unless @first_page.nil? %>
 		<!-- <span class="font_welcome_trustie"><#%= @first_page.title %></span> <span class="font_welcome_tdescription">, <#%= @first_page.description %></span> -->
@@ -50,7 +47,7 @@
       <% end %>
 	</div>
 	<div class="search-bar" id="search-bar">
-		<%= render :partial => "search_project", :locals => {:project_type => 0}%>	
+		<%= render :partial => "search_project", :locals => {:project_type => 0}%>
 	</div>
 	<div style="clear: both;"></div>
 	</div>

From 8cc14546f89d2af0dba81270e88fd59001c286bd Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 10:27:20 +0800
Subject: [PATCH 10/29] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E4=B9=9F=E5=8F=AF=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E6=A0=87=E7=AD=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 2 +-
 app/helpers/projects_helper.rb            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 4525176ac..62bef8fb1 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -361,7 +361,7 @@ private
 
   def login_without_softapplication
     referer = request.headers['Referer']
-    require_login unless referer =~ /softapplication/
+    require_login unless referer =~ /softapplication/ || referer =~ /memos/
   end
 
   def  renderTag
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index dfacff864..47f33f34a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -181,7 +181,7 @@ module ProjectsHelper
           # unless project.is_public == 1
 
           if project.is_public != 1
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end
@@ -197,7 +197,7 @@ module ProjectsHelper
 
           if !project.is_public
           # end longjun
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end

From 1b97361ec6943599f4252bc4c1342daa2d583914 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 10:42:17 +0800
Subject: [PATCH 11/29] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E=E5=A4=8D=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8D=A2=E5=8F=B7=202.=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb |  4 --
 app/views/messages/_form.html.erb        | 67 +++++++++++++-----------
 app/views/welcome/_more_course.html.erb  |  2 +-
 app/views/welcome/contest.html.erb       |  2 +-
 app/views/welcome/course.html.erb        |  2 +-
 config/locales/zh.yml                    |  7 ++-
 6 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index a11107a9b..2b834cf0a 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -173,10 +173,6 @@
       <%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %>
     </div>
 <% end %>
-
-
-
-
 <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 6581a5b11..ddd55bc96 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -1,39 +1,46 @@
+<script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 
 <div class="box ph10_5">
-<!--[form:message]-->
-  <% unless replying %>
-      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
-      </p>
-  <% else %>
-      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
-      </p>
-  <% end %>
-  <p>
-<% unless replying %>
-  <% if @message.safe_attribute? 'sticky' %>
-    <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-  <% end %>
-  <% if @message.safe_attribute? 'locked' %>
-    <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %>
-  <% end %>
-<% end %>
-</p>
-  <p><label for="message_subject"><%= l(:field_description) %><span class="required"> *&nbsp;&nbsp;</span></label>
-  <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>
-<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>
+    <!--[form:message]-->
+      <% unless replying %>
+          <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+            <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
+          </p>
+      <% else %>
+          <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+            <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
+          </p>
+      <% end %>
+      <p>
+      <% unless replying %>
+          <% if @message.safe_attribute? 'sticky' %>
+            <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+          <% end %>
+          <% if @message.safe_attribute? 'locked' %>
+            <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %>
+          <% end %>
+    <% end %>
+    </p>
+    <p>
+    <label for="message_subject"><%= l(:field_description) %>
+      <span class="required"> *&nbsp;&nbsp;</span></label>
+      <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>
+    <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>
 
-<!--[eoform:message]-->
+    <!--[eoform:message]-->
 
-<p><%= l(:label_attachment_plural) %><br />
-<%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %></p>
+    <p>
+      <%= l(:label_attachment_plural) %>
+      <br />
+      <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+    </p>
 </div>
 
 
diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb
index 54d8ec6ef..c871e7f97 100644
--- a/app/views/welcome/_more_course.html.erb
+++ b/app/views/welcome/_more_course.html.erb
@@ -5,4 +5,4 @@
     <% end %>
 <% end %>
 &nbsp;&nbsp;&nbsp;&nbsp;
-<%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => school_id} %>
\ No newline at end of file
+<%= link_to l(:label_more), {:controller => 'courses', :action => 'index', :school_id => school_id} %>
\ No newline at end of file
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index dbc2d8f1b..251ade0b3 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -161,7 +161,7 @@
             <% end %>
         <% end %>
       &nbsp;&nbsp;
-      <%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index'}, :target => "_blank" %>
+      <%= link_to l(:label_more), {:controller => 'contests', :action => 'index'}, :target => "_blank" %>
     </span>
 	<div class="d-p-projectlist-box">
 		<div class="d-p-projectlist">
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index a94998639..f57bc97d7 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -75,7 +75,7 @@
 
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-  <h3><strong>新开课程</strong></h3>
+  <h3><strong><%= l(:lable_hot_course)%></strong></h3>
   <% if @school_id %>
       <% school_course = find_miracle_course(10,7, @school_id) %>
   <% else %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2333ea674..3bd25ceef 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -231,9 +231,6 @@ zh:
   mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
   mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
-
-
-
   field_name: 名称
   #added by huang
   field_tea_name: 教师
@@ -2122,4 +2119,6 @@ zh:
   label_my_school: 我的学校
   label_all_schol: 全部学校
   label_select_province: 请选择省份
-  label_search_conditions_not_null: 搜索条件不能为空
\ No newline at end of file
+  label_search_conditions_not_null: 搜索条件不能为空
+
+  lable_hot_course: 活跃课程
\ No newline at end of file

From ed81275d17b0f605e540ddb88b0e45a414e4d3f1 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 10:50:49 +0800
Subject: [PATCH 12/29] =?UTF-8?q?#1256=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E7=9A=84=E6=8C=89=E9=92=AE=E6=98=AF=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=80=8C=E5=BC=95=E7=94=A8=E5=92=8C=E5=88=A0=E9=99=A4=E9=83=BD?=
 =?UTF-8?q?=E6=98=AF=E6=96=87=E5=AD=97=EF=BC=8C=E5=B0=86=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B9=9F=E6=94=B9=E4=B8=BA=E6=96=87=E5=AD=97=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 9b68e80fc..577c3ff7f 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -23,7 +23,8 @@
 				)if !@memo.locked? && User.current.logged? %>			
 
 			<%= link_to(
-				image_tag('edit.png'),
+				#image_tag('edit.png'),
+                l(:button_edit),
 				{:action => 'edit', :id => @memo},
 				:method => 'get',
 				:title => l(:button_edit)

From 8530abf7694fab45c8b85203e8cfef113c7aa6cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 11:11:40 +0800
Subject: [PATCH 13/29] =?UTF-8?q?1.=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=202.=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=85=A5=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=BA=BA=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=9A=84=E5=90=8D=E5=AD=97=E4=BB=8D?=
 =?UTF-8?q?=E6=98=AF"=E6=88=91"=E7=9A=84BUG=20#1251=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E5=92=8C=E5=BD=93=E5=89=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95Id=E6=98=AF=E4=B8=8D=E6=98=AF=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 490 ++++++++++++++++++++++------------
 1 file changed, 318 insertions(+), 172 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 551f7e724..bc485325c 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,61 +1,72 @@
-    <% if User.current.id == @user.id %>
-        <div class="menu-div">
-          <div class="menu">
-            <span style="color: #000; font-weight: bold;"><%= "#{@user.name}的动态" %></span>
-            <ul><%#链接绑定在页面最下方的jQuery%>
-              <li mode='all' class="<%= "on" if @state.eql?(0) %>"><%= l :label_user_all_activity %></li>
-              <li mode='myself' class="<%= "on" if @state.eql?(1) %>"><%= l :label_user_activity_myself %></li>
-              <li mode='respond' class="<%= "on" if @state.eql?(2) %>"><%= l :label_user_all_respond %></li>
-            </ul>
-          </div>
-          <script type="text/javascript">
-
-          </script>
+<% if User.current.id == @user.id %>
+    <div class="menu-div">
+      <div class="menu">
+        <span style="color: #000; font-weight: bold;"><%= "#{@user.name}的动态" %></span>
+        <ul><%#链接绑定在页面最下方的jQuery%>
+          <li mode='all' class="<%= "on" if @state.eql?(0) %>"><%= l :label_user_all_activity %></li>
+          <li mode='myself' class="<%= "on" if @state.eql?(1) %>"><%= l :label_user_activity_myself %></li>
+          <li mode='respond' class="<%= "on" if @state.eql?(2) %>"><%= l :label_user_all_respond %></li>
+        </ul>
+      </div>
+      <script type="text/javascript">
+      </script>
+    </div>
+    <div style="height:20px"></div>
+    <%= form_tag(:controller => 'users', :action => "show") do %>
+        <div class="user-search-block hidden" style="float:right;margin-top:-55px">
+          <table width="100%" valign="center">
+            <tr>
+              <td align="right">
+                <div class="project-search">
+                  <%= text_field_tag 'user', params[:user], :size => 30 %>
+                  <%= submit_tag l(:label_search_by_user), :class => "small", :name => nil %>
+                </div>
+              </td>
+            </tr>
+          </table>
         </div>
-        <div style="height:20px"></div>
-        <%= form_tag(:controller => 'users', :action => "show") do %>
-            <div class="user-search-block hidden" style="float:right;margin-top:-55px">
-              <table width="100%" valign="center">
-                <tr>
-                  <td align="right">
-                    <div class="project-search">
-                      <%= text_field_tag 'user', params[:user], :size => 30 %>
-                      <%= submit_tag l(:label_search_by_user), :class => "small", :name => nil %>
-                    </div>
-                  </td>
-                </tr>
-              </table>
-            </div>
-        <% end %>
     <% end %>
+<% end %>
 
-    <% unless @state == 2 %>
-        <% unless @activity.empty? %>
-            <div id="activity">
-            <% @activity.each do |e| %>
-                <%# 以下一行代码解决有未知的活动无法转换成Model报错%>
-                <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
-                <% act = e.act %>
-                <% unless act.nil? %>
-                    <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%>
-                        <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
-                            <tr>
-                            <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
-                            <td>
+<% unless @state == 2 %>
+    <% unless @activity.empty? %>
+        <div id="activity">
+        <% @activity.each do |e| %>
+            <%# 以下一行代码解决有未知的活动无法转换成Model报错%>
+            <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
+            <% act = e.act %>
+            <% unless act.nil? %>
+                <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%>
+                    <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
+                    <tr>
+                        <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
+                        <td>
                             <table width="580" border="0" class="info-break">
-                            <% case e.act_type %>
+                                <% case e.act_type %>
                             <% when 'JournalsForMessage' %>
                                 <tr>
                                   <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_have_feedback) %>
-                                    <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %></span>
+                                    <% if User.current.login == e.user.try(:login) %>
+                                        <strong>
+                                          <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
+                                        </strong>
+                                        &nbsp;
+                                    <% else %>
+                                        <strong><%= link_to("#{e.user.name}", user_path(e.user_id)) %></strong>
+                                    <% end %>
+                                    <span class="font_lighter">
+                                        <%= l(:label_have_feedback) %>
+                                        <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
+                                    </span>
                                   </td>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580">
                                     <p class="font_description"> <%= textAreailizable act.notes %> </p>
                                     <div style="display: inline-block; float: right; margin-top: 0px">
-                                      <span><%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %></span>
+                                      <span>
+                                        <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %>
+                                      </span>
                                     </div>
                                   </td>
                                 </tr>
@@ -70,13 +81,41 @@
                             <% when 'Bid' %>
                                 <tr>
                                   <% if act.reward_type == 3 && @show_course == 1%>
-                                      <td colspan="2" valign="top">
-                                        <strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
-                                      </td>
+                                      <% if e.user == User.current %>
+                                          <td colspan="2" valign="top">
+                                            <strong>
+                                              <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
+                                            </strong>
+                                            <span class="font_lighter">
+                                                <%= l(:label_i_new_activity) %>
+                                            </span>
+                                            <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+                                          </td>
+                                      <% else %>
+                                          <td colspan="2" valign="top">
+                                            <strong>
+                                              <%= link_to(h(e.user), user_path(e.user_id)) %>
+                                            </strong>&nbsp;
+                                            <span class="font_lighter">
+                                                <%= l(:label_new_activity) %>
+                                            </span>&nbsp;
+                                            <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+                                          </td>
+                                      <% end %>
                                   <% else %>
-                                      <td colspan="2" valign="top">
-                                        <strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
-                                      </td>
+                                      <% if e.user == User.current %>
+                                          <td colspan="2" valign="top">
+                                            <strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>
+                                            <span class="font_lighter"><%= l(:label_i_new_activity) %></span>
+                                            <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+                                          </td>
+                                      <% else %>
+                                          <td colspan="2" valign="top">
+                                            <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                            <span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;
+                                            <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
+                                          </td>
+                                      <% end %>
                                   <% end %>
                                 </tr>
                                 <tr>
@@ -89,15 +128,30 @@
                                       <span class="font_lighter"> <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %></span>
                                     </div>
                                     <div style="display: inline-block; float: right; margin-top: 0px">
-                                      <span><%= link_to l(:label_find_all_comments), respond_path(e.act_id) %></span><a class="font_lighter"><%= l(:label_comments_count, :count => e.act.commit) %></a>
+                                      <span><%= link_to l(:label_find_all_comments), respond_path(e.act_id) %></span>
+                                      <a class="font_lighter"><%= l(:label_comments_count, :count => e.act.commit) %></a>
                                     </div>
                                   </td>
                                 </tr>
                             <% when 'Journal' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
-                                  </td>
+                                  <% if e.user == User.current %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;
+                                        <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %>
+                                        <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
+                                                    {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;
+                                        <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.identifier)) %>
+                                        <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
+                                                    {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <% if act.notes.nil? %>
@@ -118,9 +172,29 @@
                                 </tr>
                             <% when 'Changeset' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %></span>
-                                  </td>
+                                  <% if e.user == User.current %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title(act.title),
+                                                    {:controller => 'repositories',
+                                                     :action => 'revision',
+                                                     :id => act.repository.project,
+                                                     :repository_id => act.repository.identifier_param,
+                                                     :rev => act.identifier} %>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title(act.title),
+                                                    {:controller => 'repositories',
+                                                     :action => 'revision',
+                                                     :id => act.repository.project,
+                                                     :repository_id => act.repository.identifier_param,
+                                                     :rev => act.identifier} %>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580">
@@ -132,15 +206,38 @@
                                       <span class="font_lighter"> <%= format_time(e.act.committed_on) %></span>
                                     </div>
                                     <div style="display: inline-block; float: right; margin-top: 0px">
-                                      <span><%= link_to l(:label_find_all_comments), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %></span><a class="font_lighter"><%= l(:label_comments_count, :count => e.act.count) %></a>
+                                      <span><%= link_to l(:label_find_all_comments),
+                                                        {:controller => 'repositories',
+                                                         :action => 'revision',
+                                                         :id => act.repository.project,
+                                                         :repository_id => act.repository.identifier_param,
+                                                         :rev => act.identifier} %>
+                                      </span>
+                                      <a class="font_lighter"><%= l(:label_comments_count, :count => e.act.count) %></a>
                                     </div>
                                   </td>
                                 </tr>
                             <% when 'Message' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
-                                  </td>
+                                  <% if e.user == User.current %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
+                                                    {:controller => 'messages',
+                                                     :action => 'show',
+                                                     :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
+                                                    {:controller => 'messages',
+                                                     :action => 'show',
+                                                     :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580">
@@ -157,9 +254,17 @@
                                 </tr>
                             <% when 'Principal' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_user) %></span>
-                                  </td>
+                                  <% if e.user == User.current %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_user) %></span>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_user) %></span>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580"><p class="font_description"></p></td>
@@ -174,9 +279,19 @@
                                 </tr>
                             <% when 'News' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
-                                  </td>
+                                  <% if e.user == User.current %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580">
@@ -188,21 +303,44 @@
                                       <span class="font_lighter"> <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %></span>
                                     </div>
                                     <div style="display: inline-block; float: right; margin-top: 0px">
-                                      <span><%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %></span><a class="font_lighter"><%= l(:label_comments_count, :count => e.act.comments_count) %></a>
+                                      <span>
+                                        <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %>
+                                      </span>
+                                      <a class="font_lighter">
+                                        <%= l(:label_comments_count, :count => e.act.comments_count) %>
+                                      </a>
                                     </div>
                                   </td>
                                 </tr>
                             <% when 'Issue' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
-                                    </strong>&nbsp;
-                                    <span class="font_lighter">
-                                      <%= l(:label_i_new_activity) %>
-                                    </span>&nbsp;
-                                    <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %>
-                                  </td>
+                                  <% if e.user == User.current %>
+                                      <td colspan="2" valign="top">
+                                        <strong>
+                                          <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
+                                        </strong>&nbsp;
+                                        <span class="font_lighter">
+                                          <%= l(:label_i_new_activity) %>
+                                        </span>&nbsp;
+                                        <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
+                                                    {:controller => 'issues',
+                                                     :action => 'show',
+                                                     :id => act.id} %>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong>
+                                          <%= link_to(h(e.user), user_path(e.user_id)) %>
+                                        </strong>&nbsp;
+                                        <span class="font_lighter">
+                                          <%= l(:label_new_activity) %>
+                                        </span>&nbsp;
+                                        <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
+                                                    {:controller => 'issues',
+                                                     :action => 'show',
+                                                     :id => act.id} %>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
@@ -215,15 +353,26 @@
                                       <span class="font_lighter"> <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %></span>
                                     </div>
                                     <div style="display: inline-block; float: right; margin-top: 0px">
-                                      <span><%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %></span><a class="font_lighter"><%= l(:label_comments_count, :count => e.act.journals.count) %></a>
+                                      <span><%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %></span>
+                                      <a class="font_lighter"><%= l(:label_comments_count, :count => e.act.journals.count) %></a>
                                     </div>
                                   </td>
                                 </tr>
                             <% when 'Contest' %>
                                 <tr>
-                                  <td colspan="2" valign="top">
-                                    <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
-                                  </td>
+                                  <% if e.user == User.current && @show_contest == 1%>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
+                                      </td>
+                                  <% else %>
+                                      <td colspan="2" valign="top">
+                                        <strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;
+                                        <span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;
+                                        <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
+                                      </td>
+                                  <% end %>
                                 </tr>
                                 <tr>
                                   <td colspan="2" width="580"><p class="font_description"> <%= textAreailizable act, :description %> </p>
@@ -236,101 +385,98 @@
                                     </div>
                                 </tr>
                             <% else %>
-                                <%# f=1 %>
-                                <% end %><!-- < % #case end %> -->
+                        <% end %><!-- < % #case end %> -->
                             </table>
-                            </td>
-                            </tr>
-
-                        </table>
-                    <% end %>
-                    <% end %><!-- < % #unless act.nil? end %> -->
-
-                <% end %><!-- < % #@activity.each do |e| end%> -->
-            </div>
-            <div class="pagination" style="float:left;">
-              <ul> <%= pagination_links_full @activity_pages %> </ul>
-            </div>
-        <% else %> <!-- < %#  unless @activity.empty?  %> -->
-            <% if @user == User.current %>
-                <%= l(:label_user_activities) %>
-            <% else %>
-                <p class="font_description">
-                  <%= l(:label_user_activities_other) %>
-                </p>
-            <% end %>
-        <% end %><!-- < %# unless @activity.empty? end %> -->
-
-    <% else %>
-        <% unless @message.empty? %>
-            <div id="activity">
-              <% @message.each do |e| -%>
-                  <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
-                    <tr>
-                      <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
-                      <td>
-                        <table width="580" border="0">
-                          <tr>
-                            <td colspan="2" valign="top">
-                              <strong> <%= link_to(h(e.user), user_path(e.user)) %></strong><span class="font_lighter">
-                                <% if e.instance_of?(JournalsForMessage) %>
-                                    <% if e.reply_id == User.current.id %>
-                                        <% if e.jour_type == 'Bid' %>
-                                            <%= l(:label_in_bids) %><%= link_to(e.jour.name, respond_path(e.jour)) %>&nbsp;<%= l(:label_quote_my_words) %>
-                                        <% elsif e.jour_type == 'User' %>
-                                            <%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %>&nbsp;<%= l(:label_quote_my_words) %>
-                                        <% elsif e.jour_type == 'Project' %>
-                                            <%= '在'<<l(:field_project) %><%= link_to(e.jour.name, feedback_path(e.jour)) %>&nbsp;<%= l(:label_reply_plural) %>
-                                        <% end %>
-                                    <% else %>
-                                        <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %>&nbsp;<%= l(:label_have_respond) %>
-                                    <% end %>
-                                <% else %>
-                                    <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %>
-                                        <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id)) %><%= l(:label_have_respond) %>
-
-                                    <% else %>
-                                        <%= l(:label_in_issues) %><%= link_to(e.issue.subject, issue_path(e.issue)) %><%= l(:label_quote_my_words) %>
-                                    <% end %>
-                                <% end %> </span>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td colspan="2" width="580"><p class="font_description"> <%= textAreailizable e.notes %> </p></td>
-                          </tr>
-                          <tr>
-                            <td align="left"><a class="font_lighter"></a></td>
-                            <td width="200" align="right" class="a">
-                              <span class="font_lighter"><%= format_time e.created_on %></span></td>
-                          </tr>
-                        </table>
-                      </td>
+                        </td>
                     </tr>
-                  </table>
-              <% end %>
-            </div>
-
-            <div class="pagination" style="float:left;">
-              <ul> <%= pagination_links_full @info_pages %> </ul>
-            </div>
-
+                    </table>
+                <% end %>
+            <% end %><!-- < % #unless act.nil? end %> -->
+        <% end %><!-- < % #@activity.each do |e| end%> -->
+        </div>
+        <div class="pagination" style="float:left;">
+          <ul> <%= pagination_links_full @activity_pages %> </ul>
+        </div>
+    <% else %> <!-- < %#  unless @activity.empty?  %> -->
+        <% if @user == User.current %>
+            <%= l(:label_user_activities) %>
         <% else %>
-            <p class="font_description"><%= l(:label_no_user_respond_you) %></p>
+            <p class="font_description">
+              <%= l(:label_user_activities_other) %>
+            </p>
         <% end %>
+    <% end %><!-- < %# unless @activity.empty? end %> -->
+
+<% else %>
+    <% unless @message.empty? %>
+        <div id="activity">
+          <% @message.each do |e| -%>
+              <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+                <tr>
+                  <td colspan="2" valign="top" width="50"><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
+                  <td>
+                    <table width="580" border="0">
+                      <tr>
+                        <td colspan="2" valign="top">
+                          <strong> <%= link_to(h(e.user), user_path(e.user)) %></strong><span class="font_lighter">
+							<% if e.instance_of?(JournalsForMessage) %>
+								<% if e.reply_id == User.current.id %>
+									<% if e.jour_type == 'Bid' %>
+										<%= l(:label_in_bids) %><%= link_to(e.jour.name, respond_path(e.jour)) %>&nbsp;<%= l(:label_quote_my_words) %>
+									<% elsif e.jour_type == 'User' %>
+										<%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %>&nbsp;<%= l(:label_quote_my_words) %>
+									<% elsif e.jour_type == 'Project' %>
+										<%= '在'<<l(:field_project) %><%= link_to(e.jour.name, feedback_path(e.jour)) %>&nbsp;<%= l(:label_reply_plural) %>
+									<% end %>
+								<% else %>
+									<%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %>&nbsp;<%= l(:label_have_respond) %>
+								<% end %>
+							<% else %>
+								<% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %>
+									<%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id)) %><%= l(:label_have_respond) %>
+
+								<% else %>
+									<%= l(:label_in_issues) %><%= link_to(e.issue.subject, issue_path(e.issue)) %><%= l(:label_quote_my_words) %>
+								<% end %>
+							<% end %> </span>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td colspan="2" width="580"><p class="font_description"> <%= textAreailizable e.notes %> </p></td>
+                      </tr>
+                      <tr>
+                        <td align="left"><a class="font_lighter"></a></td>
+                        <td width="200" align="right" class="a">
+                          <span class="font_lighter"><%= format_time e.created_on %></span></td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+          <% end %>
+        </div>
 
+        <div class="pagination" style="float:left;">
+          <ul> <%= pagination_links_full @info_pages %> </ul>
+        </div>
 
+    <% else %>
+        <p class="font_description"><%= l(:label_no_user_respond_you) %></p>
     <% end %>
-    <script type="text/javascript" language="javascript">
-        $(document).ready(function ($) {
-            $("#content .menu-div:first~ div").first().find("a").attr("target", "_blank");
-            $('[mode=all]').click(function (event) {
-                window.location.href = '<%=user_url(@user)%>';
-            });
-            $('[mode=myself]').click(function (event) {
-                window.location.href = '<%=user_url(@user, type: 1)%>';
-            });
-            $('[mode=respond]').click(function (event) {
-                window.location.href = '<%=user_url(@user, type: 2)%>';
-            });
+
+
+<% end %>
+<script type="text/javascript" language="javascript">
+    $(document).ready(function ($) {
+        $("#content .menu-div:first~ div").first().find("a").attr("target", "_blank");
+        $('[mode=all]').click(function (event) {
+            window.location.href = '<%=user_url(@user)%>';
+        });
+        $('[mode=myself]').click(function (event) {
+            window.location.href = '<%=user_url(@user, type: 1)%>';
+        });
+        $('[mode=respond]').click(function (event) {
+            window.location.href = '<%=user_url(@user, type: 2)%>';
         });
-    </script>
+    });
+</script>

From 5f7052a3488e08cb5ac231e13ee288e85bad8e50 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 11:21:06 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dforge=E5=92=8Ccourse?=
 =?UTF-8?q?=E7=BD=91=E7=AB=99=E7=9A=84=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA=E8=BE=B9?=
 =?UTF-8?q?=E7=95=8C=E7=9A=84BUG=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=EF=BC=9A=E5=BC=BA=E5=88=B6=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E6=98=BE=E7=A4=BA=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb     |  2 +-
 app/views/attachments/_links.html.erb | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef18793ab..1b0f25fcf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,7 +127,7 @@ module ApplicationHelper
   # * :text - Link text (default to attachment filename)
   # * :download - Force download (default: false)
   def link_to_attachment(attachment, options={})
-    text = options.delete(:text) || attachment.filename
+    text = h(truncate(options.delete(:text) || attachment.filename, length: 60, omission: '...'))
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
     html_options = options.slice!(:only_path)
     url = send(route_method, attachment, attachment.filename, options)
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index b9d91d5b5..4c4065d09 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -6,8 +6,10 @@
   </span>
   <% if attachment.is_text? %>
     <%= link_to image_tag('magnifier.png'),
-                :controller => 'attachments', :action => 'show',
-                :id => attachment, :filename => attachment.filename %>
+                :controller => 'attachments',
+                :action => 'show',
+                :id => attachment,
+                :filename => attachment.filename%>
   <% end %>
   <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
@@ -18,13 +20,6 @@
                                          :method => :delete,
                                          :class => 'delete',
                                          :title => l(:button_delete) %>
-    <%# elsif attachment.container_type == 'Softapplication'%>
-      <%#= link_to image_tag('delete.png'), delete_softapplications_attachments_path(:id => attachment.id),
-                  :data => {:confirm => l(:text_are_you_sure)},
-                  :method => :delete,
-                  :class => 'delete',
-                  :remote => true,
-                  :title => l(:button_delete) %>
     <% else %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                          :data => {:confirm => l(:text_are_you_sure)},

From 6a2e2693952b2a2bab2342dada969d32c22f4a2f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 11:27:49 +0800
Subject: [PATCH 15/29] =?UTF-8?q?1.=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=B8=96=E5=AD=90=E5=9B=9E=E5=A4=8D=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA=202.lable=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=94=B9=E4=B8=BA=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_form.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index ddd55bc96..8dafdf173 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -5,12 +5,12 @@
 <div class="box ph10_5">
     <!--[form:message]-->
       <% unless replying %>
-          <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-            <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
+          <p>
+            <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject" %><!--by young-->
           </p>
       <% else %>
-          <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-            <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
+          <p>
+            <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject", :readonly => true %>
           </p>
       <% end %>
       <p>
@@ -24,7 +24,7 @@
     <% end %>
     </p>
     <p>
-    <label for="message_subject"><%= l(:field_description) %>
+    <label for="message_subject"><%= l(:button_projects_feedback_respond) %>
       <span class="required"> *&nbsp;&nbsp;</span></label>
       <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' %>

From 56c31d6e2f11d1dc0d2de6c140d1c06a64a30d3c Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Tue, 16 Sep 2014 11:41:49 +0800
Subject: [PATCH 16/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E7=BD=91=E9=A1=B5=E6=A0=87=E9=A2=98Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 1 -
 app/helpers/application_helper.rb      | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c1593e320..3f6e3db58 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -555,7 +555,6 @@ class ProjectsController < ApplicationController
 
   # Show @project
   def show
-    
     @project_type = params[:project_type]
     
     # try to redirect to the requested menu item
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef18793ab..1112cebc6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -635,6 +635,11 @@ module ApplicationHelper
   end
 
   def html_title(*args)
+    #點擊項目版本庫 多觸發一次 字符串為"/"
+    #暫時解決方法 直接判斷
+    if(args == ["/"])
+      args = []
+    end
     first_page = FirstPage.where("page_type = 'project'").first
     if args.empty?
       title = @html_title || []

From c10eeb1c01eb09bd0c2ae3feb9f75ddd3b54927d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 11:52:05 +0800
Subject: [PATCH 17/29] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/projects_helper.rb   |  8 ++-----
 app/views/welcome/index.html.erb | 39 +++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index dfacff864..5ae2b0864 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -152,9 +152,9 @@ module ProjectsHelper
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
   end
   # Ended by young
-  
 
-  
+
+
 
   def parent_project_select_tag(project)
     selected = project.parent
@@ -175,18 +175,15 @@ module ProjectsHelper
     render_project_nested_lists(projects) do |project|
       #Modified by young
         if project.try(:project_type) == Project::ProjectType_course
-
           # modified by longjun
           # never use unless and else
           # unless project.is_public == 1
-
           if project.is_public != 1
             s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
           else
             s = "".html_safe
           end
           # end longjun
-
           # modified by Longjun
           s += link_to_project(project, {},
                                :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe
@@ -194,7 +191,6 @@ module ProjectsHelper
         else
           # modified by longjun
           # unless project.is_public
-
           if !project.is_public
           # end longjun
             s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 83d1fef28..025f24ab1 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -56,8 +56,15 @@
 	<div style="clear:both"></div>
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-<h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
+    <h3 style="margin-left: 5px; color: #e8770d;">
+      <strong>热门项目</strong>
+    </h3>
+	<span style="margin-top: -20px;float: right; display: block;">
+      <% if User.current.logged? %>
+        <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type =>( @project_type||=0)}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+      <% end %>
+      &nbsp;&nbsp;
+      <%= link_to l(:label_more), { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% #projects = find_miracle_project(10, 3) %>
@@ -98,20 +105,20 @@
 			<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank"  %></span>
 			<div class="user-message-box-list" style="margin-top: 10px;">
 				<%activities = find_all_activities%>
-			<% activities.each do |event| %>
-                  <!--<%# cache cache_key_for_event(event) do %> -->
-			<li style="display: block;height:60px; padding-bottom: 4px;">
-				<div class="inner-right" style="float: left; height: 100%; ">
-					<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
-				</div>
-				
-				<div class="inner-right" style="float: right; width:86%; height: 100%; ">
-				<span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank"  %></span><%= show_user_content event %>
-				<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
-				</div>
-			</li>
-                      <!--<%#end %> --><!-- cache -->
-			    <% end  %>	
+                <% activities.each do |event| %>
+                      <!--<%# cache cache_key_for_event(event) do %> -->
+                    <li style="display: block;height:60px; padding-bottom: 4px;">
+                        <div class="inner-right" style="float: left; height: 100%; ">
+                            <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
+                        </div>
+
+                        <div class="inner-right" style="float: right; width:86%; height: 100%; ">
+                        <span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank"  %></span><%= show_user_content event %>
+                        <p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
+                        </div>
+                    </li>
+                          <!--<%#end %> --><!-- cache -->
+                <% end  %>
 			</div>
 		</ul>
 	</div>

From 8f0fdbdb759ad3b024cc4b619d7ce9496a797cab Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 14:05:45 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb | 99 ++++++++++++++++++++------------
 config/locales/zh.yml            |  5 +-
 2 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 025f24ab1..c4f7f27a7 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -42,7 +42,6 @@
 		</div>
 	<div class="welcome_left" id="welcome_left">
       <% unless @first_page.nil? %>
-		<!-- <span class="font_welcome_trustie"><#%= @first_page.title %></span> <span class="font_welcome_tdescription">, <#%= @first_page.description %></span> -->
           <%= @first_page.description.html_safe %>
       <% end %>
 	</div>
@@ -57,14 +56,23 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
     <h3 style="margin-left: 5px; color: #e8770d;">
-      <strong>热门项目</strong>
+      <strong><%= l(:lable_hot_projects)%></strong>
     </h3>
 	<span style="margin-top: -20px;float: right; display: block;">
       <% if User.current.logged? %>
-        <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type =>( @project_type||=0)}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+        <%= link_to(l(:label_project_new), {:controller => 'projects',
+                                            :action => 'new',
+                                            :course => 0,
+                                            :project_type =>( @project_type||=0)},
+                    :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
       <% end %>
       &nbsp;&nbsp;
-      <%= link_to l(:label_more), { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank"  %></span>
+      <%= link_to l(:label_more), { :controller => 'projects',
+                                    :action => 'index',
+                                    :project_type => 0,
+                                    :host => Setting.project_domain},
+                  :target => "_blank"  %>
+    </span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% #projects = find_miracle_project(10, 3) %>
@@ -83,7 +91,9 @@
 					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			
 				</div>
 				<div  style=" float: left;margin:5px; margin-left: 10px; width: 380px;">
-					<span class='font_lighter' title ='<%=project.short_description%>'><%=project.description.truncate(100, omission: '...')%></span>
+					<span class='font_lighter' title ='<%=project.short_description%>'>
+                      <%=project.description.truncate(100, omission: '...')%>
+                    </span>
 				</div>
 				<div >
                   <%= content_tag "span", l(:label_project_score)+ ":" + red_project_scores(project).to_i.to_s,
@@ -101,8 +111,8 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
 		<ul class="user-welcome-message-list">
-			<h3 style="color: rgb(21, 188, 207)"><strong>用户动态</strong></h3>
-			<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank"  %></span>
+			<h3 style="color: rgb(21, 188, 207)"><strong><%= l(:lable_user_active)%></strong></h3>
+			<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank"  %></span>
 			<div class="user-message-box-list" style="margin-top: 10px;">
 				<%activities = find_all_activities%>
                 <% activities.each do |event| %>
@@ -113,11 +123,23 @@
                         </div>
 
                         <div class="inner-right" style="float: right; width:86%; height: 100%; ">
-                        <span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank"  %></span><%= show_user_content event %>
-                        <p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
+                          <span style="color: green;">
+                            <%= link_to event.event_author, (user_path(event.event_author) if event.event_author),
+                                        :style => "color:green;", :target => "_blank"  %>
+                          </span>
+                          <%= show_user_content event %>
+                        <p style="margin-top: 4px;">
+                          <span style="color: rgb(172, 174, 177)">
+                            <%= l(:field_updated_on) %>
+                            <%= time_tag_welcome event.event_datetime %>前
+                          </span>
+                          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                          <span style="float: right; color: rgb(172, 174, 177);">
+                            <%= show_event_reply event %>
+                          </span>
+                        </p>
                         </div>
                     </li>
-                          <!--<%#end %> --><!-- cache -->
                 <% end  %>
 			</div>
 		</ul>
@@ -128,35 +150,41 @@
       <!--<%# cache 'forum_links' do %> -->
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
 		  <h3 style="color: rgb(21, 188, 207);">
-			<strong>贴吧动态</strong>
-			<%= link_to "我要提问" , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-			<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
-			<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
+			<strong><%= l(:lable_bar_active)%></strong>
+			<%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+			<%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+          </h3>
+            <span style="margin-top: -30px;float: right; display: block;"><%= link_to l(:label_more), forums_path %></span>
 		</div>
-          <!--<%#end %> -->
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(7) %>
-		<% topics.includes(:forum, :last_reply, :author).each do |topic|%>
+		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
               <!--<%# cache cache_key_for_topic(topic) do %> -->
-			<li class="message-brief-intro">
-				<div class='memo_title text_nowrap'>
-					<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
-				</div>
-				<div class='memo_attr'>
-					<span class='memo_timestamp'>
-						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
-					</span>
-					<span class="memo_author">
-						楼主： <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
-					</span>
-					<span class="memo_last_person">
-						最后回复：<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %><%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%><% end %>
-					</span>
-					<span class="memo_reply">
-						回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
-					</span>
-				</div>
-			</li>
+                <li class="message-brief-intro">
+                    <div class='memo_title text_nowrap'>
+                      <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %>
+                      <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
+                    </div>
+                    <div class='memo_attr'>
+                        <span class='memo_timestamp'>
+                            <%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
+                        </span>
+                        <span class="memo_author">
+                          <%= l(:label_question_sponsor)%>：
+                          <%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %>
+                        </span>
+                        <span class="memo_last_person">
+                          <%= l(:label_final_reply)%>：
+                          <% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %>
+                              <%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%>
+                          <% end %>
+                        </span>
+                        <span class="memo_reply">
+                          <%= l(:label_reply)%>
+                          (<%= link_to topic.try(:replies_count), topic.event_url %>)
+                        </span>
+                    </div>
+                </li>
                   <!--<%#end %> --> <!-- cache -->
 		<% end %>
 		</div>
@@ -164,5 +192,4 @@
 </div> 
 
 <div class="clearfix"></div>
-
 <%= render partial: 'link_to_another' %>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3bd25ceef..9bf050113 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2121,4 +2121,7 @@ zh:
   label_select_province: 请选择省份
   label_search_conditions_not_null: 搜索条件不能为空
 
-  lable_hot_course: 活跃课程
\ No newline at end of file
+  lable_hot_course: 活跃课程
+  lable_hot_projects: 热门项目
+  lable_user_active: 用户动态
+  lable_bar_active: 贴吧动态
\ No newline at end of file

From bce403f6245ffb168504a87d0460dbda06d989c8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 14:06:49 +0800
Subject: [PATCH 19/29] =?UTF-8?q?#1242=20=E7=82=B9=E5=87=BB=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BE=97=E5=88=86=E5=9C=A8=E5=BC=B9=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E6=A1=86=E4=B8=AD=E7=82=B9=E5=87=BB=E5=90=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BE=97=E5=88=86=E6=98=8E=E7=BB=86=E5=8F=8D=E5=BA=94=E6=85=A2?=
 =?UTF-8?q?=E3=80=82=E5=8E=9F=E5=9B=A0=E9=9C=80=E8=A6=81=E5=90=91=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E3=80=82?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=9A=E4=BD=BF=E7=94=A8js=E5=9C=A8?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=A4=84=E7=90=86=E5=90=84=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E4=B8=8D=E5=9C=A8=E5=90=91=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        |  1 -
 .../projects/_issue_score_index.html.erb      | 10 ++---
 app/views/projects/_news_score_index.html.erb |  5 +--
 .../projects/_project_score_index.html.erb    |  8 ++--
 .../projects/_show_projects_score.html.erb    | 44 ++++++++++++++++---
 app/views/projects/show_projects_score.js.erb |  2 -
 6 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c1593e320..fc331e96d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -842,7 +842,6 @@ class ProjectsController < ApplicationController
     @project = nil
   end
 
-# added by bai  
   def show_projects_score
     render :layout => false
   end
diff --git a/app/views/projects/_issue_score_index.html.erb b/app/views/projects/_issue_score_index.html.erb
index 7353ce5a3..729369280 100644
--- a/app/views/projects/_issue_score_index.html.erb
+++ b/app/views/projects/_issue_score_index.html.erb
@@ -1,6 +1,4 @@
-<!-- added by bai -->
-<div><%= l(:label_issue_number) %> * 4 = <%= issue_num(@project) %> * 4 = <%= format("%.2f" , issue_num(@project) * 4).to_i %></div>
-<div><%= l(:label_issue_journal_number) %> * 1 = <%= issue_journal_num(@project) %> * 1 = <%= format("%.2f" , issue_journal_num(@project)).to_i %></div>
-<div><%= l(:label_issue_score) %> = <%= format("%.2f" , issue_num(@project) * 4).to_i %> + <%= format("%.2f" , issue_journal_num(@project)).to_i %>
-                                  = <%= format("%.2f" , issue_score(@project)).to_i %></div>
-<!-- end -->
\ No newline at end of file
+<div><%= l(:label_issue_number) %> * 4 = <%= issue_num(project) %> * 4 = <%= format("%.2f" , issue_num(project) * 4).to_i %></div>
+<div><%= l(:label_issue_journal_number) %> * 1 = <%= issue_journal_num(project) %> * 1 = <%= format("%.2f" , issue_journal_num(project)).to_i %></div>
+<div><%= l(:label_issue_score) %> = <%= format("%.2f" , issue_num(project) * 4).to_i %> + <%= format("%.2f" , issue_journal_num(project)).to_i %>
+                                  = <%= format("%.2f" , issue_score(project)).to_i %></div>
diff --git a/app/views/projects/_news_score_index.html.erb b/app/views/projects/_news_score_index.html.erb
index b3d66efeb..c936ece05 100644
--- a/app/views/projects/_news_score_index.html.erb
+++ b/app/views/projects/_news_score_index.html.erb
@@ -1,5 +1,2 @@
-<!-- added by bai -->
-
 <div><%= l(:label_new_number) %> * 1 = <%= news_num(@project) %> * 1 = <%= format("%.2f" , news_score(@project)).to_i %></div>
-<div><%= l(:label_news_score) %> = <%= format("%.2f" ,  news_score(@project)).to_i %></div>
-<!-- end -->
\ No newline at end of file
+<div><%= l(:label_news_score) %> = <%= format("%.2f" ,  news_score(@project)).to_i %></div>
\ No newline at end of file
diff --git a/app/views/projects/_project_score_index.html.erb b/app/views/projects/_project_score_index.html.erb
index 3cee4413c..7a3022f44 100644
--- a/app/views/projects/_project_score_index.html.erb
+++ b/app/views/projects/_project_score_index.html.erb
@@ -3,8 +3,8 @@
 <%= l(:label_projects_score) %> 
 <div> = <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> + 
 	  <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %></div>
-<div> = <%= format("%.2f" , issue_score(@project)).to_i %> + <%= format("%.2f" , news_score(@project)).to_i %> +
-	  <%= format("%.2f" , documents_score(@project)).to_i %> + <%= format("%.2f" , changesets_score(@project)).to_i %> +
-	  <%= format("%.2f" , board_message_score(@project)).to_i %></div>
-<div> = <%= format("%.2f" , project_scores(@project)).to_i %></div>
+<div> = <%= format("%.2f" , issue_score(project)).to_i %> + <%= format("%.2f" , news_score(project)).to_i %> +
+	  <%= format("%.2f" , documents_score(project)).to_i %> + <%= format("%.2f" , changesets_score(project)).to_i %> +
+	  <%= format("%.2f" , board_message_score(project)).to_i %></div>
+<div> = <%= format("%.2f" , project_scores(project)).to_i %></div>
 <!-- end -->
\ No newline at end of file
diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb
index 156e63f7b..57af1f138 100644
--- a/app/views/projects/_show_projects_score.html.erb
+++ b/app/views/projects/_show_projects_score.html.erb
@@ -21,35 +21,65 @@
 </table>
 </div>
 
+<script type="text/javascript">
+    function show_div(url)
+    {
+        if(url == 'project_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/project_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'issue_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/issue_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'news_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/news_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'file_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/file_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'code_submit_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/code_submit_score_index', :locals => {:project => @project}) %>');
+        }
+        else if(url == 'projects_topic_score_index')
+        {
+            $('#show_score_detail').html('<%= escape_javascript(render :partial => 'projects/projects_topic_score_index', :locals => {:project => @project}) %>');
+        }
+    }
+</script>
+
 <div class="tabs_new">
 	<ul>
 		<li>
-			<%= link_to l(:label_projects_score), {:controller => 'projects', :action => 'show_projects_score', :remote => true}%> : 
+			<%= link_to l(:label_projects_score),"javascript:void(0)", :onclick => "show_div('project_score_index')"%> :
 			<%= format("%.2f" , project_scores(@project) ).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_issue_score), {:controller => 'projects', :action => 'issue_score_index', :remote => true}%> : 
+			<%= link_to l(:label_issue_score), "javascript:void(0)", :onclick => "show_div('issue_score_index')"%> :
 			<%= format("%.2f" , issue_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_news_score), {:controller => 'projects', :action => 'news_score_index', :remote => true}%> :
+			<%= link_to l(:label_news_score),  "javascript:void(0)", :onclick => "show_div('news_score_index')"%> :
 			<%= format("%.2f" , news_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_file_score), {:controller => 'projects', :action => 'file_score_index', :remote => true}%> :
+			<%= link_to l(:label_file_score),  "javascript:void(0)", :onclick => "show_div('file_score_index')"%> :
 			<%= format("%.2f" , documents_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_code_submit_score), {:controller => 'projects', :action => 'code_submit_score_index', :remote => true}%> :
+			<%= link_to l(:label_code_submit_score), "javascript:void(0)", :onclick => "show_div('code_submit_score_index')" %> :
 			<%= format("%.2f" , changesets_score(@project)).to_i %>
 		</li>
 		<li>
-			<%= link_to l(:label_topic_score), {:controller => 'projects', :action => 'projects_topic_score_index', :remote => true}%> :
+			<%= link_to l(:label_topic_score),  "javascript:void(0)", :onclick => "show_div('projects_topic_score_index')"%> :
 			<%= format("%.2f" , board_message_score(@project)).to_i %>
 		</li>
 	</ul>
 </div>
 <div id="show_score_detail">
-	<%= render :partial => 'projects/project_score_index', :locals => {:index => 0 } %>
+	<%= render :partial => 'projects/project_score_index', :locals => {:project => @project } %>
 </div>
 <!-- end -->
\ No newline at end of file
diff --git a/app/views/projects/show_projects_score.js.erb b/app/views/projects/show_projects_score.js.erb
index 540db5395..bf84cbe73 100644
--- a/app/views/projects/show_projects_score.js.erb
+++ b/app/views/projects/show_projects_score.js.erb
@@ -1,5 +1,3 @@
-<!-- added by bai -->
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/show_projects_score') %>');
 showModal('ajax-modal', '400px');
 $('#ajax-modal').addClass('new-watcher');
-<!-- end -->
\ No newline at end of file

From aabd18329923131908f7834d0478911fb16f4c6e Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Tue, 16 Sep 2014 14:08:44 +0800
Subject: [PATCH 20/29] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A7=93=E6=B0=8F=E6=96=87=E6=9C=AC=E6=A1=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index d0f94b119..02163889b 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -110,6 +110,8 @@ class AccountController < ApplicationController
     @cache_city = params[:city]||""                          #城市
     @cache_enterprise_name =  params[:enterprise_name]||""   #企业
 
+    firstname_code = ""
+    lastname_code = ""
     (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration]
     if request.get?
       session[:auth_source_registration] = nil
@@ -119,6 +121,8 @@ class AccountController < ApplicationController
       @user = User.new
       @user.safe_attributes = user_params
       if params[:identity] == "2" #   2 企业
+        firstname_code = @user.firstname
+        lastname_code =  @user.lastname
         @user.firstname = params[:enterprise_name]
         @user.lastname = l(:field_enterprise)
       end
@@ -141,10 +145,18 @@ class AccountController < ApplicationController
         end
 
         if(@cache_identityy == "")
+          if params[:identity] == "2"
+            @user.firstname = firstname_code
+            @user.lastname = lastname_code
+          end
           flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty')
           return
         end
         if(@cache_city == "")
+          if params[:identity] == "2"
+            @user.firstname = firstname_code
+            @user.lastname = lastname_code
+          end
           flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty')
           return
         end
@@ -174,6 +186,10 @@ class AccountController < ApplicationController
         
       end
     end
+    if params[:identity] == "2"
+      @user.firstname = firstname_code
+      @user.lastname = lastname_code
+    end
   end
 
   # Token based account activation

From e9a72b56cbb1b50b4dc86a836a546a8793b9f25f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 14:15:52 +0800
Subject: [PATCH 21/29] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E5=9C=A8=E4=BB=BB=E4=BD=95=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E5=8F=91=E5=B8=83=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 0cf722851..2a240eeca 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -2,7 +2,7 @@
 	<%= l(:label_notification) %>
 </span>
 
-<% if User.current.logged? && User.current == @contest.author %>
+<% if User.current.logged? && (User.current.admin? ||User.current == @contest.author) %>
 <%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',

From 5ac7304858098f630c6cef8f106c5dec61093b12 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 14:23:13 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E4=BC=98=E5=8C=96view=E5=B1=82=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 2a240eeca..870c4cd4c 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,16 +1,12 @@
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
 	<%= l(:label_notification) %>
 </span>
-
 <% if User.current.logged? && (User.current.admin? ||User.current == @contest.author) %>
 <%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
 <% end %>
-
-
-
 <% if @contest %>
     <div id="add-contestnotifications" class="add_frame" style="display:none;">
       <%= labelled_form_for @contestnotification, :url => contest_contestnotifications_path(@contest),
@@ -31,7 +27,6 @@
       </p>
   <% else %>
       <% @contestnotificationss.each do |contestnotifications| %>
-
           <table class="content-text-list">
             <tr>
               <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %></td>

From 51a783c9a912c52ee1df752261071938f6a0d057 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 15:38:21 +0800
Subject: [PATCH 23/29] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=202.?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E9=A6=96=E9=A1=B5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=20=E8=A7=A3=E5=86=B3=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=EF=BC=9A=E6=9F=A5=E6=89=BE=E7=B3=BB=E7=BB=9F=E4=B8=AD?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84=E6=9C=80=E5=A4=9A5=E6=9D=A1?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9C=A8=E9=A6=96=E9=A1=B5=EF=BC=8C=E7=94=A8=E6=88=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=82=B9=E5=87=BB=E7=9B=B8=E5=BA=94=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=85=AC=E5=91=8A=E8=AF=A6=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb |  2 +-
 app/views/welcome/contest.html.erb    | 26 +++++++++++++++-----------
 config/locales/zh.yml                 |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index ca168ccb8..dee79bc31 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -110,7 +110,7 @@ class WelcomeController < ApplicationController
   
   def contest
     @contest_page = FirstPage.where("page_type = 'contest'").first
-    @contest_notifications = ContestNotification.order("id desc")
+    @contest_notifications = Contestnotification.order("created_at desc").limit(5)
   end
 
   def search
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 251ade0b3..b6fcdf8c9 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -166,14 +166,12 @@
 	<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]) %>
-
 			<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>
-
 				<div style="float: left; margin-left: 12px; margin-top: 10px; margin-bottom: -4px; width: 380px;">
-					<%= link_to(contest.name, contest_contestnotifications_path(contest.id), :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %>
+					<%= link_to(contest.name.truncate(50, omission: '...'), contest_contestnotifications_path(contest.id), :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %>
 					<% if contest.id == 2 or contest.id == 3 or contest.id == 6 %>
 						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("#{contest.projects.where('is_public=1').count}"+l(:label_work_quantity), show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>
 					<% else %>
@@ -186,29 +184,35 @@
 				</div><br />
 
 				<div style="padding-left: 57px; clear: left;">
-
 					<span class="font_lighter"><%=l(:label_release_time)%>:&nbsp;<%=format_time contest.created_on %></span>
 				</div>
-
 			</li>
 			<% end; reset_cycle  %>
-
 		</div>
 	</div>
 </div>
 
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
-<h3 style="margin-left: 5px; color: rgb(21, 188, 207);">
+  <h3 style="margin-left: 5px; color: #e8770d;">
 	<strong><%=l(:label_notification)%></strong>
 </h3>
 
 <ul class="contest-notification-list">
 <% @contest_notifications.each do |notification| %>
 <li>
-<span class="title"><%= link_to notification.title, notification %></span>
-<span class="font_lighter content"><%= truncate(strip_tags(notification.content).gsub( '&nbsp;',' '), length:60) %></span>
-<span class="font_lighter time"><%=l(:label_release_time)%>:&nbsp;<%=format_time notification.created_at %></span>
+  <div class="inner-right" style="float: left; margin-top: 7px ">
+    <%= link_to image_tag(url_to_avatar(notification.author), :class => "avatar"), user_path(notification.author) %>
+  </div>
+  <div class="font_lighter" style="padding-top: 7px;padding-left: 55px;" title="<%= notification.title%>">
+    <span>
+      <strong><%= link_to_user(notification.author) %></strong>
+      <%= l(:label_project_notice) %>
+      <%= link_to notification.title.truncate(35, omission: '...'),  contest_contestnotifications_path(notification.contest_id) %>
+    </span>
+  </div>
+  <div class="font_lighter" style="padding-left: 55px;" title="<%= notification.description%>"><%= notification.description.truncate(30, omission: '...') %></div>
+  <div class="font_lighter" style="padding-left: 55px;"><%=l(:label_release_time)%>:&nbsp;<%=format_time notification.created_at %></div>
 </li>
 <% end %>
 </ul>
@@ -223,7 +227,7 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
-			<% find_new_forum_topics(8).each do |topic|%>
+			<% find_new_forum_topics(9 - @contest_notifications.count).each do |topic|%>
 			<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
 				<div  style="display: inline-block; width: 100%;">
 				  <span class="memo_activity text_nowrap"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9bf050113..f71241223 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2073,7 +2073,7 @@ zh:
   label_current_hot_contest: 最新热门竞赛
   label_current_attendingcontest_work: 最新参赛作品
   label_issue_feedback_activities: 问题和反馈动态
-  label_more_information: 更多...
+  label_more_information: 更多>>
   label_my_question: 我要提问
   label_my_feedback: 我要反馈
   label_release_time: 发布时间

From 245e0a858cac278938925242e6137cd637c1b8f4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 12:06:07 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=BF=9E=E6=8E=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/index.html.erb  | 2 +-
 app/views/welcome/contest.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index c166f73ab..2086bfe70 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -7,7 +7,7 @@
 			<td rowspan="2">
 			<% if User.current.logged? %>
                 <% unless User.current.user_extensions.identity == 1 %>
-                    <%= link_to(l(:label_newtype_contest), contest_new_contest_path, :class => 'icon icon-add', :target => "_blank") %>
+                    <%= link_to(l(:label_newtype_contest),  new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
                 <!-- end longjun -->
                   <% end %>
 			<% end %>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index b6fcdf8c9..8165cfb0a 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -157,7 +157,7 @@
 	<span style="margin-top: -20px;float: right; display: block;">
         <% if User.current.logged? %>
             <% unless User.current.user_extensions.identity == 1 %>
-                <%= link_to(l(:label_newtype_contest), {:controller => 'bids', :action => 'new_contest'}, :class => 'icon icon-add') %>
+                <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add') %>
             <% end %>
         <% end %>
       &nbsp;&nbsp;

From 98b6be61ba083000a7587096cf8d7695490ffb5f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 12:31:53 +0800
Subject: [PATCH 25/29] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E5=90=8E?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=8F=8A=E6=97=B6?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=9A=84BUG=202.=E4=BF=AE=E5=A4=8D=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=96=B0=E5=BB=BA=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E4=B8=BA=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84BUG=203.=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=90=8E=E6=8A=A5=E9=94=99=E7=9A=84BUg=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb |  2 +-
 app/views/messages/_form.html.erb   | 64 ++++++++++++++---------------
 config/routes.rb                    |  2 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 1e537ff75..aad575ee5 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -62,7 +62,7 @@ class MemosController < ApplicationController
         format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
         format.json { render json: @memo, status: :created, location: @memo }
       else
-        flash[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+        flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
         # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
         pre_count = REPLIES_PER_PAGE
 
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 8dafdf173..0856da976 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -3,44 +3,44 @@
 <% replying ||= false %>
 
 <div class="box ph10_5">
-    <!--[form:message]-->
-      <% unless replying %>
-          <p>
-            <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject" %><!--by young-->
-          </p>
-      <% else %>
-          <p>
-            <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject", :readonly => true %>
-          </p>
-      <% end %>
-      <p>
-      <% unless replying %>
-          <% if @message.safe_attribute? 'sticky' %>
+  <!--[form:message]-->
+  <% unless replying %>
+      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
+      </p>
+  <% else %>
+      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
+      </p>
+  <% end %>
+  <p>
+    <% unless replying %>
+        <% if @message.safe_attribute? 'sticky' %>
             <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-          <% end %>
-          <% if @message.safe_attribute? 'locked' %>
+        <% end %>
+        <% if @message.safe_attribute? 'locked' %>
             <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %>
-          <% end %>
+        <% end %>
     <% end %>
-    </p>
-    <p>
-    <label for="message_subject"><%= l(:button_projects_feedback_respond) %>
+  </p>
+  <p>
+    <label for="message_subject"><%= l(:field_description) %>
       <span class="required"> *&nbsp;&nbsp;</span></label>
-      <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>
-    <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>
+  <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>
+  <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>
 
-    <!--[eoform:message]-->
+  <!--[eoform:message]-->
 
-    <p>
-      <%= l(:label_attachment_plural) %>
-      <br />
-      <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
-    </p>
+  <p>
+    <%= l(:label_attachment_plural) %>
+    <br />
+    <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+  </p>
 </div>
 
 
diff --git a/config/routes.rb b/config/routes.rb
index be65d0eb4..a6b3c5421 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -724,7 +724,7 @@ RedmineApp::Application.routes.draw do
   # added by young
   match 'calls', :to => 'bids#index'
 
-  match 'calls/:id', :to => 'bid#show', :as => 'respond'
+  match 'calls/:id', :to => 'bids#show', :as => 'respond'
   # modified by longjun
   # bids#contests is not exist
   # match 'contest', :to => 'bids#contests', :as => 'contest' #modified @20140403

From 5824f70fe34dcc618b053458c3cec96a4fbea87c Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Wed, 17 Sep 2014 13:54:55 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/logger_helper.rb | 27 +++++++++++++++++++++++++++
 config/environment.rb        | 13 +++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 app/helpers/logger_helper.rb

diff --git a/app/helpers/logger_helper.rb b/app/helpers/logger_helper.rb
new file mode 100644
index 000000000..af04e38d3
--- /dev/null
+++ b/app/helpers/logger_helper.rb
@@ -0,0 +1,27 @@
+module LoggerHelper
+
+  #输出日志
+  def OutLogger
+    #日志输出级别
+    #Rails.logger.level = Logger::INFO
+
+    if(!File.exist?("database"))
+      Dir.mkdir("database")
+    end
+    if(!File.exist?("database/get"))
+      Dir.mkdir("database/get")
+    end
+    if(!File.exist?("database/sql"))
+      Dir.mkdir("database/sql")
+    end
+    if(!File.exist?("database/controller"))
+      Dir.mkdir("database/controller")
+    end
+
+    Rails.logger = Logger.new("database/get/#{Date.today.to_s}.log", "daily")
+    ActiveRecord::Base.logger = Logger.new("database/sql/#{Date.today.to_s}.log", "daily")
+    ActionController::Base.logger = Logger.new("database/controller/#{Date.today.to_s}.log", "daily")
+  end
+
+end
+
diff --git a/config/environment.rb b/config/environment.rb
index f44e25ae3..b105e8e25 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -13,3 +13,16 @@ end
 
 # Initialize the rails application
 RedmineApp::Application.initialize!
+
+#日志格式
+class Logger
+  def format_message(level, time, progname, msg)
+    "#{time.to_s(:db)} #{level} -- #{msg}\r\n"
+  end
+end
+
+#输出日志(database文件夹下get、sql、controller按照日期 分别输出路由信息、SQL语句、调用页面)[影响系统效率使用完请注释掉]
+#include LoggerHelper
+#LoggerHelper.OutLogger
+
+

From 0ab7bfcda979b8ff11b8c956e7a56689ba0a8eff Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 14:14:17 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E3=80=81=E6=96=87=E4=BB=B6=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E9=95=BF=E5=BA=A6=20#1252?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb     | 2 +-
 app/views/attachments/_links.html.erb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 38b97a501..b63f1071b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,7 +127,7 @@ module ApplicationHelper
   # * :text - Link text (default to attachment filename)
   # * :download - Force download (default: false)
   def link_to_attachment(attachment, options={})
-    text = h(truncate(options.delete(:text) || attachment.filename, length: 60, omission: '...'))
+    text = h(truncate(options.delete(:text) || attachment.filename, length: 25, omission: '...'))
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
     html_options = options.slice!(:only_path)
     url = send(route_method, attachment, attachment.filename, options)
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 4c4065d09..2b12b21d1 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -11,7 +11,9 @@
                 :id => attachment,
                 :filename => attachment.filename%>
   <% end %>
-  <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  <span title="<%= attachment.description%>">
+    <%= h(truncate(" - #{attachment.description}", length: 20, omission: '...')) unless attachment.description.blank? %>
+  </span>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:deletable] %>
   	<% if attachment.container_type == 'HomeworkAttach' %>

From 1976aa9c728c05eae9d88c7587c52744e950af94 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 14:55:36 +0800
Subject: [PATCH 28/29] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7--?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=B8=96=E5=AD=90=EF=BC=8C=E2=80=9C=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E2=80=9D=E4=B8=8E=E2=80=9C=E5=BC=95=E7=94=A8=E2=80=9D?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E9=87=8D=E5=8F=A0=E5=8F=8A=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E6=B7=B7=E6=8E=92=E9=97=AE=E9=A2=98=20#1258?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/edit.html.erb      |   3 +-
 app/views/memos/show.html.erb      |   9 ++-
 app/views/stores/index.html.erb    | 113 ++++++++++++++---------------
 config/locales/zh.yml              |   2 +-
 public/stylesheets/application.css |  16 ++++
 5 files changed, 79 insertions(+), 64 deletions(-)

diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index cf8770c8c..35543398f 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -27,8 +27,7 @@
     <p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p>
     <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>
     <br/>
-    <%= f.submit :value => l(:button_change) %>
+    <%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
   </div>
 <% end %>
-<%= link_to l(:button_back), back_url %>
 </div>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 577c3ff7f..5da3c5d63 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -43,11 +43,14 @@
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
 				) if @memo.destroyable_by?(User.current) %>
-			
-				
 		</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>&nbsp;</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/stores/index.html.erb b/app/views/stores/index.html.erb
index 5df6ecca8..47ea32b91 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -1,71 +1,68 @@
 <% content_for :top_field do%>
-  <%= render 'search_bar' %>
+    <%= render 'search_bar' %>
 <% end %>
 
-<div class="resource_sum" id="IE_resource_sum_css">
-<% @attach_array.each do |k|%>
-	<div class="line_block" >
-		<p>
-			<%= @str_arr.shift %>
-		</p>
+<div class="resource_sum">
+  <% @attach_array.each do |k|%>
+      <div class="line_block">
+        <p>
+          <%= @str_arr.shift %>
+        </p>
 
-		<div class="table1">
-			<div class='table_row1'>
-				<div class='table_cell1 filename1' style='text-align: center;'><%=l(:label_attachment)%></div>
-				<div class='table_cell1 filedown1'><%=l(:field_downloads)%></div>
-				<div class='table_cell1 downicon1'><%=l(:button_download)%></div>
-			</div>
-		</div>
+        <div class="table1">
+          <div class='table_row1'>
+            <div class='table_cell1 filename1' style='text-align: center;'><%=l(:label_attachment)%></div>
+            <div class='table_cell1 filedown1'><%=l(:field_downloads)%></div>
+            <div class='table_cell1 downicon1'><%=l(:button_download)%></div>
+          </div>
+        </div>
 
-		<div class="table1">
-		<% k.each do |c1|%>
-			<div class="table_row1 <%= cycle 'odd', 'even' %>">
-				<div class="filename table_cell1 filename1" >
-					<%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
-				</div>
-				<div  class="table_cell1 filedown1">
-					<%= c1.downloads %>
-				</div>
-				<div class="table_cell1 downicon1 filename download_icon" >
-					<%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
-				</div>
-			</div>
-		<% end -%>
-		</div>
+        <div class="table1">
+          <% k.each do |c1|%>
+              <div class="table_row1 <%= cycle 'odd', 'even' %>">
+                <div class="filename table_cell1 filename1" >
+                  <%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
+                </div>
+                <div  class="table_cell1 filedown1">
+                  <%= c1.downloads %>
+                </div>
+                <div class="table_cell1 downicon1 filename download_icon" >
+                  <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
+                </div>
+              </div>
+          <% end -%>
+        </div>
 
-	</div>
-<% end; reset_cycle %>
+      </div>
+  <% end; reset_cycle %>
 </div>
 <script type='text/javascript'>
- function validate_required(field,alerttxt)
-  {
-    with (field)
+    function validate_required(field,alerttxt)
     {
-      if (value==null||value=="")
-        {alert(alerttxt);$.find('form').attr("data-submitted",'');return false}
-      else {return true}
+        with (field)
+        {
+            if (value==null||value=="")
+            {alert(alerttxt);$.find('form').attr("data-submitted",'');return false}
+            else {return true}
+        }
     }
-  }
 
-  function validate_form(thisform) {
-    with (thisform)
-    {
-      if (validate_required(name,"name must be filled out!")==false)
-        {name.focus();return false}
-    }
-  }
-	$(document).ready(function($) {
-		$('.download_icon').find("a").attr("target", "_blank");
-		$('.download_icon').each(function(){
-			$(this).mouseenter(function(event) {
-				$(this).find('img').attr("src", "/images/button/download_focus.png")
-			});
-			$(this).mouseleave(function(event) {
-				$(this).find('img').attr("src", "/images/button/download.png")
-			});
-		});
-        if(navigator.appName=="Microsoft Internet Explorer"){
-            $("#IE_resource_sum_css").children(".line_block").css("width","45%");
+    function validate_form(thisform) {
+        with (thisform)
+        {
+            if (validate_required(name,"name must be filled out!")==false)
+            {name.focus();return false}
         }
-	});
+    }
+    $(document).ready(function($) {
+        $('.download_icon').find("a").attr("target", "_blank");
+        $('.download_icon').each(function(){
+            $(this).mouseenter(function(event) {
+                $(this).find('img').attr("src", "/images/button/download_focus.png")
+            });
+            $(this).mouseleave(function(event) {
+                $(this).find('img').attr("src", "/images/button/download.png")
+            });
+        });
+    });
 </script>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f71241223..fa8cf91f9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1936,7 +1936,7 @@ zh:
   label_forum_edit: 编辑讨论区
   label_memo_create: 发布
   label_memo_new: 新建主题
-  label_memo_edit: 修改主题label_board_new
+  label_memo_edit: 修改主题
   label_memo_new_from_forum: 发布帖子
   label_forum: 公共贴吧
   label_forum_new: 新建贴吧
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 72b379585..1fda63f93 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2794,3 +2794,19 @@ div.repos_explain{
 	padding-top: 20px;
 	padding-bottom: 20px;
 }
+
+.button-canel{
+    padding-bottom: 5px;
+    width: auto;
+    height: 25px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    color: #ffffff;
+    padding: 3px 9px;
+    background: #15bccf;
+    border-radius: 4px;
+    border: 1px solid #15bccf;
+    box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
+    cursor: pointer;
+}

From 0a02fbf10ea8c412a9331dec0c5d9bebeabbc3a2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 17 Sep 2014 15:04:41 +0800
Subject: [PATCH 29/29] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=20#1262=20=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E8=A7=A3=E6=9E=90=E6=96=B9=E6=B3=95=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb            |  14 ++-
 app/views/attachments/_app_link.html.erb     |   6 +-
 app/views/attachments/_links.html.erb        |   2 +-
 app/views/homework_attach/_app_link.html.erb |   6 +-
 app/views/stores/index.html.erb              | 113 ++++++++++---------
 5 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b63f1071b..f976918d8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -126,7 +126,7 @@ module ApplicationHelper
   # Options:
   # * :text - Link text (default to attachment filename)
   # * :download - Force download (default: false)
-  def link_to_attachment(attachment, options={})
+  def link_to_short_attachment(attachment, options={})
     text = h(truncate(options.delete(:text) || attachment.filename, length: 25, omission: '...'))
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
     html_options = options.slice!(:only_path)
@@ -134,6 +134,18 @@ module ApplicationHelper
     link_to text, url, html_options
   end
 
+  # Generates a link to an attachment.
+  # Options:
+  # * :text - Link text (default to attachment filename)
+  # * :download - Force download (default: false)
+  def link_to_attachment(attachment, options={})
+    text = options.delete(:text) || attachment.filename
+    route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
+    html_options = options.slice!(:only_path)
+    url = send(route_method, attachment, attachment.filename, options)
+    link_to text, url, html_options
+  end
+
   def link_to_attachment_img(attachment, options={})
     text = options.delete(:text) || attachment.filename
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
diff --git a/app/views/attachments/_app_link.html.erb b/app/views/attachments/_app_link.html.erb
index 6934b76e1..263f51dc8 100644
--- a/app/views/attachments/_app_link.html.erb
+++ b/app/views/attachments/_app_link.html.erb
@@ -3,13 +3,15 @@
     <% if attachments.count > 1 && attachment != attachments.first%>
         <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <% end %>
-    <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+    <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
     <% if attachment.is_text? %>
     <%= link_to image_tag('magnifier.png'),
                 :controller => 'attachments', :action => 'show',
                 :id => attachment, :filename => attachment.filename %>
   <% end %>
-  <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+    <span title="<%= attachment.description%>">
+    <%= h(truncate(" - #{attachment.description}", length: 20, omission: '...')) unless attachment.description.blank? %>
+  </span>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
 
   <% end -%>
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 2b12b21d1..de43dce4c 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -2,7 +2,7 @@
 <% for attachment in attachments %>
 <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
   <span title="<%= attachment.filename%>">
-    <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+    <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
   </span>
   <% if attachment.is_text? %>
     <%= link_to image_tag('magnifier.png'),
diff --git a/app/views/homework_attach/_app_link.html.erb b/app/views/homework_attach/_app_link.html.erb
index 48f116ce6..3aba96d27 100644
--- a/app/views/homework_attach/_app_link.html.erb
+++ b/app/views/homework_attach/_app_link.html.erb
@@ -2,12 +2,14 @@
     <% if attachments.count > 1 && attachment != attachments.first%>
         <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <% end %>
-    <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+    <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
     <% if attachment.is_text? %>
         <%= link_to image_tag('magnifier.png'),
                 :controller => 'attachments', :action => 'show',
                 :id => attachment, :filename => attachment.filename %>
     <% end %>
-    <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+    <span title="<%= attachment.description%>">
+        <%= h(truncate(" - #{attachment.description}", length: 20, omission: '...')) unless attachment.description.blank? %>
+    </span>
     <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% end -%>
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index 47ea32b91..5df6ecca8 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -1,68 +1,71 @@
 <% content_for :top_field do%>
-    <%= render 'search_bar' %>
+  <%= render 'search_bar' %>
 <% end %>
 
-<div class="resource_sum">
-  <% @attach_array.each do |k|%>
-      <div class="line_block">
-        <p>
-          <%= @str_arr.shift %>
-        </p>
+<div class="resource_sum" id="IE_resource_sum_css">
+<% @attach_array.each do |k|%>
+	<div class="line_block" >
+		<p>
+			<%= @str_arr.shift %>
+		</p>
 
-        <div class="table1">
-          <div class='table_row1'>
-            <div class='table_cell1 filename1' style='text-align: center;'><%=l(:label_attachment)%></div>
-            <div class='table_cell1 filedown1'><%=l(:field_downloads)%></div>
-            <div class='table_cell1 downicon1'><%=l(:button_download)%></div>
-          </div>
-        </div>
+		<div class="table1">
+			<div class='table_row1'>
+				<div class='table_cell1 filename1' style='text-align: center;'><%=l(:label_attachment)%></div>
+				<div class='table_cell1 filedown1'><%=l(:field_downloads)%></div>
+				<div class='table_cell1 downicon1'><%=l(:button_download)%></div>
+			</div>
+		</div>
 
-        <div class="table1">
-          <% k.each do |c1|%>
-              <div class="table_row1 <%= cycle 'odd', 'even' %>">
-                <div class="filename table_cell1 filename1" >
-                  <%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
-                </div>
-                <div  class="table_cell1 filedown1">
-                  <%= c1.downloads %>
-                </div>
-                <div class="table_cell1 downicon1 filename download_icon" >
-                  <%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
-                </div>
-              </div>
-          <% end -%>
-        </div>
+		<div class="table1">
+		<% k.each do |c1|%>
+			<div class="table_row1 <%= cycle 'odd', 'even' %>">
+				<div class="filename table_cell1 filename1" >
+					<%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %>
+				</div>
+				<div  class="table_cell1 filedown1">
+					<%= c1.downloads %>
+				</div>
+				<div class="table_cell1 downicon1 filename download_icon" >
+					<%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
+				</div>
+			</div>
+		<% end -%>
+		</div>
 
-      </div>
-  <% end; reset_cycle %>
+	</div>
+<% end; reset_cycle %>
 </div>
 <script type='text/javascript'>
-    function validate_required(field,alerttxt)
+ function validate_required(field,alerttxt)
+  {
+    with (field)
     {
-        with (field)
-        {
-            if (value==null||value=="")
-            {alert(alerttxt);$.find('form').attr("data-submitted",'');return false}
-            else {return true}
-        }
+      if (value==null||value=="")
+        {alert(alerttxt);$.find('form').attr("data-submitted",'');return false}
+      else {return true}
     }
+  }
 
-    function validate_form(thisform) {
-        with (thisform)
-        {
-            if (validate_required(name,"name must be filled out!")==false)
-            {name.focus();return false}
-        }
+  function validate_form(thisform) {
+    with (thisform)
+    {
+      if (validate_required(name,"name must be filled out!")==false)
+        {name.focus();return false}
     }
-    $(document).ready(function($) {
-        $('.download_icon').find("a").attr("target", "_blank");
-        $('.download_icon').each(function(){
-            $(this).mouseenter(function(event) {
-                $(this).find('img').attr("src", "/images/button/download_focus.png")
-            });
-            $(this).mouseleave(function(event) {
-                $(this).find('img').attr("src", "/images/button/download.png")
-            });
-        });
-    });
+  }
+	$(document).ready(function($) {
+		$('.download_icon').find("a").attr("target", "_blank");
+		$('.download_icon').each(function(){
+			$(this).mouseenter(function(event) {
+				$(this).find('img').attr("src", "/images/button/download_focus.png")
+			});
+			$(this).mouseleave(function(event) {
+				$(this).find('img').attr("src", "/images/button/download.png")
+			});
+		});
+        if(navigator.appName=="Microsoft Internet Explorer"){
+            $("#IE_resource_sum_css").children(".line_block").css("width","45%");
+        }
+	});
 </script>
\ No newline at end of file