From ad099780203c6ca68f794fba68f389b251ea3270 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 08:55:58 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=20->=20?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B4=A2=E5=BC=95,=20=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_stores.html.erb | 4 ++--
 app/views/stores/search.html.erb       | 2 +-
 config/locales/zh.yml                  | 1 +
 lib/redmine.rb                         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_stores.html.erb b/app/views/layouts/base_stores.html.erb
index 00760263b..7020f8e23 100644
--- a/app/views/layouts/base_stores.html.erb
+++ b/app/views/layouts/base_stores.html.erb
@@ -25,7 +25,7 @@
 						<div class="top-content">							
 							<table>
 								<tr>
-									<td class="info_font" style="width: 240px; color: #15bccf"><%=t(:label_course_file)%></td>
+									<td class="info_font" style="width: 240px; color: #15bccf"><%=t(:label_stores_index)%></td>
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 										<div class="top-content-search" style="display:none;">
@@ -39,7 +39,7 @@
 								</tr>
 								<tr>
 									<td style="padding-left: 8px"><%= link_to stores_url , stores_url %></td>
-									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_course_file),stores_url %> </p></td>
+									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_stores_index),stores_url %> </p></td>
 								</tr>
 							</table>							
 						</div>
diff --git a/app/views/stores/search.html.erb b/app/views/stores/search.html.erb
index 1bc63e783..f285fcb67 100644
--- a/app/views/stores/search.html.erb
+++ b/app/views/stores/search.html.erb
@@ -27,7 +27,7 @@
       <span class="gray blue-color">
         下载:<%= result.downloads%>| 
         大小:<%= number_to_human_size(result.filesize) %>|
-        共享者：<a class="gray" ><%= link_to result.author, user_path(result.author), target: "_blank"%></a>|
+        共享者：<a class="gray" ><%= link_to result.author, user_path(result.author), target: "_blank" unless result.author.blank? %></a>|
         上传时间:<%= format_time(result.created_on) %>
       </span> 
       <div style="display: none"></div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c90a45656..0d2536c0c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1646,6 +1646,7 @@ zh:
   label_course_student: 学生
   label_homework: 课程作业
   label_course_file: 资源库 #资料共享
+  label_stores_index: 资源索引
   label_course_new_homework: 新建作业
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
diff --git a/lib/redmine.rb b/lib/redmine.rb
index cd13fddd0..a013ebaca 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -204,7 +204,7 @@ Redmine::MenuManager.map :top_menu do |menu|
   menu.push :contest_innovate, {:controller => 'bids', :action => 'contest', :project_type => 1}
   menu.push :requirement_enterprise, {:controller => 'bids', :action => 'index'}
   menu.push :project_module_forums, :forums_path
-  menu.push :course_file, :stores_path
+  menu.push :stores_index, :stores_path
   
  
   # menu.push :investor, :home_path

From 41ed28c6b746d15001346415eba70f5e5d90dce8 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 09:10:15 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=B7=B3=E5=87=BA?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index 5b20e5fbc..ecdc3c290 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -27,7 +27,7 @@
 					<td class="filename" style="width:62%;"><%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %> </td>
 					<td style="width:19%; text-align: center;"><%= c1.downloads %> </td>
 					<td class="filename download_icon" style="width:19%; text-align: center;">
-						<%= link_to_attachment c1, {:text => image_tag("/images/button/download.png", width: "22px", alt: "l(:button_download)") }%>
+						<%= link_to_attachment c1, {:text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
 					</td>
 				</tr>
 			<% end %>
@@ -38,6 +38,7 @@
 </div>
 <script type='text/javascript'>
 	$(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")

From ebc307db07929749894b4fba08e9e2e4c9f920ff Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 09:42:03 +0800
Subject: [PATCH 03/11] remove 1111

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

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 17eec7392..5eb34dc99 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -77,7 +77,7 @@
 												<% else %>
 										
 													<%= join_in_course(@project, User.current) %></div>
-												<% end %> </div>1111
+												<% end %> </div>
 												<% unless User.current.member_of?(@project) %>
 												<!-- <%= image_tag "/images/fav.png" %> -->
 												<div style="padding-right: 10px">

From 7eb5317696ad80acdb9174738e2c7992894778ff Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 10:18:20 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/stores_controller.rb | 29 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index ac78b5a22..6e7bbdc93 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -8,19 +8,24 @@ class StoresController < ApplicationController
     name = params[:name] ||= ''
     redirect_to stores_path, :notice => l(:field_course_un) if name.blank?
     # 按文件名搜索
-    result = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{name}%").
+    resultSet = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{name}%").
               reorder("created_on DESC")
-    # result = result.to_a
-    result.map { |res|
-      if(res.container.nil? || 
-        (res.container.class.to_s=="Project" && res.container.is_public == false) ||
-        (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
-        (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
-        false
-        )
-        result.delete(res)
-      end
-    }
+    
+    result = resultSet.to_a.dup
+
+    # result.map { |res|
+    #   if(res.container.nil? || 
+    #     (res.container.class.to_s=="Project" && res.container.is_public == false) ||
+    #     (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
+    #     (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
+    #     false
+    #     )
+    #     logger.debug("=====================================#{result.include? res}")
+    #     logger.debug("=====================================#{res}")
+    #     result.delete(res)
+    #     logger.debug("=====================================#{result.include? res}")
+    #   end
+    # }
     @searched_attach = paginateHelper result
   end
 

From 48172599cc721c2889c9bf5fb1285f5f2abdf0de Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 10:19:18 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/stores_controller.rb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index 6e7bbdc93..84a9c95d6 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -13,19 +13,19 @@ class StoresController < ApplicationController
     
     result = resultSet.to_a.dup
 
-    # result.map { |res|
-    #   if(res.container.nil? || 
-    #     (res.container.class.to_s=="Project" && res.container.is_public == false) ||
-    #     (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
-    #     (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
-    #     false
-    #     )
-    #     logger.debug("=====================================#{result.include? res}")
-    #     logger.debug("=====================================#{res}")
-    #     result.delete(res)
-    #     logger.debug("=====================================#{result.include? res}")
-    #   end
-    # }
+    result.map { |res|
+      if(res.container.nil? || 
+        (res.container.class.to_s=="Project" && res.container.is_public == false) ||
+        (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
+        (res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
+        false
+        )
+        # logger.debug("=====================================#{result.include? res}")
+        # logger.debug("=====================================#{res}")
+        result.delete(res)
+        # logger.debug("=====================================#{result.include? res}")
+      end
+    }
     @searched_attach = paginateHelper result
   end
 

From fbd02dc026ac64ef45a9aa9a84dac58a99d01966 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 11:13:24 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=BA=E5=9D=9B?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/stores/index.html.erb  | 2 +-
 app/views/stores/search.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index ecdc3c290..e2d65c326 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -27,7 +27,7 @@
 					<td class="filename" style="width:62%;"><%= link_to c1.filename, (attachFromUrl c1), {:title => c1.filename, :target => "_blank"} %> </td>
 					<td style="width:19%; text-align: center;"><%= c1.downloads %> </td>
 					<td class="filename download_icon" style="width:19%; text-align: center;">
-						<%= link_to_attachment c1, {:text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
+						<%= link_to_attachment c1, {:download => true, :text => image_tag("/images/button/download.png", width: "22px", alt: l(:button_download)) }%>
 					</td>
 				</tr>
 			<% end %>
diff --git a/app/views/stores/search.html.erb b/app/views/stores/search.html.erb
index f285fcb67..ae152d478 100644
--- a/app/views/stores/search.html.erb
+++ b/app/views/stores/search.html.erb
@@ -19,7 +19,7 @@
       <div class="cb">
       	<span style=""><%= result.filename %></span>
       	<span style="margin-left: 4px;">
-        <%= link_to_attachment result, {:text => image_tag("/images/button/dl.png", width: "70px", alt: l(:button_download), :class => 'download_icon')}%>
+        <%= link_to_attachment result, {:download => true, :text => image_tag("/images/button/dl.png", width: "70px", alt: l(:button_download), :class => 'download_icon')}%>
         </span>
       </div>
       <%= result.description %> 

From 6cd160ec9bdec7d25a7446e9b35a345c0180fedc Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 11:15:56 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=A4=B4=E5=83=8F400*400?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/avatar_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index f691cafb5..93e2a58bb 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -55,8 +55,7 @@ class AvatarController < ApplicationController
    # saved = @avatar.save
    begin
      f = Magick::ImageList.new(diskfile)
-     proportion = (200.0/f[0].columns)
-     f.resize_to_fill!(200,200)
+     f.resize_to_fill!(400, 400)
      #f.scale!(50,50)
      f.write(diskfile)
    rescue Exception => e

From 189b60a152d3f2f5d930b1220b3f0f5a7ff7b953 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 12:15:12 +0800
Subject: [PATCH 08/11] avatar 400 ===> 200

---
 app/controllers/avatar_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index 93e2a58bb..f691cafb5 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -55,7 +55,8 @@ class AvatarController < ApplicationController
    # saved = @avatar.save
    begin
      f = Magick::ImageList.new(diskfile)
-     f.resize_to_fill!(400, 400)
+     proportion = (200.0/f[0].columns)
+     f.resize_to_fill!(200,200)
      #f.scale!(50,50)
      f.write(diskfile)
    rescue Exception => e

From f781742961a1f6a41d10ba92acc0c1b9b84884df Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 15:05:50 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/stores/_search_bar.html.erb | 6 ++++++
 app/views/stores/index.html.erb       | 7 +------
 app/views/stores/search.html.erb      | 7 +------
 3 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 app/views/stores/_search_bar.html.erb

diff --git a/app/views/stores/_search_bar.html.erb b/app/views/stores/_search_bar.html.erb
new file mode 100644
index 000000000..3221bd5b2
--- /dev/null
+++ b/app/views/stores/_search_bar.html.erb
@@ -0,0 +1,6 @@
+<div style="margin: 10px 5%;">
+	<%= form_tag( search_stores_path, method: 'post') do %>
+	<%= text_field_tag 'name', params[:name], size:"100", placeholder:'请输入要搜索的关键字', :class => 'blueinputbar', :required => true %>
+	<%= submit_tag l(:label_search), :class => "enterprise"%>
+	<% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index e2d65c326..a253ea330 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -1,10 +1,5 @@
 <% content_for :top_field do%>
-	<div style="margin: 10px 5%;vertical-align: bottom;">
-		<%= form_tag( search_stores_path, method: 'post') do %>
-		<%= text_field_tag 'name', nil, size:"100", placeholder:'请输入要搜索的关键字', :class => 'blueinputbar', :required => true %>
-		<%= submit_tag l(:label_search), :class => "enterprise"%>
-		<% end %>
-	</div>
+  <%= render 'search_bar' %>
 <% end %>
 
 <div class="resource_sum">
diff --git a/app/views/stores/search.html.erb b/app/views/stores/search.html.erb
index ae152d478..42cf0cd28 100644
--- a/app/views/stores/search.html.erb
+++ b/app/views/stores/search.html.erb
@@ -2,12 +2,7 @@
 
 </style>
 <% content_for :top_field do%>
-	<div style="margin: 10px 5%;">
-		<%= form_tag( search_stores_path, method: 'post') do %>
-		<%= text_field_tag 'name', nil, size:"100", placeholder:'请输入要搜索的关键字', :value => params[:name] , :class => 'blueinputbar', :required => true %>
-		<%= submit_tag l(:label_search), :class => "enterprise"%>
-		<% end %>
-	</div>
+  <%= render 'search_bar' %>
 <% end %>
 
 <% @searched_attach.each do |result| %>

From 8172516affc2ebf87792c089fe9d175c3e993839 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 15:37:57 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=90=9C0=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/stores_controller.rb  |  2 +-
 app/views/stores/_search_bar.html.erb |  2 +-
 app/views/stores/index.html.erb       | 17 ++++++++
 app/views/stores/search.html.erb      | 61 +++++++++++++++++----------
 config/locales/en.yml                 |  1 +
 config/locales/zh.yml                 |  3 +-
 6 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index 84a9c95d6..ad622096d 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -6,7 +6,7 @@ class StoresController < ApplicationController
 
   def search
     name = params[:name] ||= ''
-    redirect_to stores_path, :notice => l(:field_course_un) if name.blank?
+    (redirect_to stores_path, :notice => l(:label_sumbit_empty);return) if name.blank?
     # 按文件名搜索
     resultSet = Attachment.where("attachments.container_type IS NOT NULL AND filename LIKE :like ", like: "%#{name}%").
               reorder("created_on DESC")
diff --git a/app/views/stores/_search_bar.html.erb b/app/views/stores/_search_bar.html.erb
index 3221bd5b2..32caa11a8 100644
--- a/app/views/stores/_search_bar.html.erb
+++ b/app/views/stores/_search_bar.html.erb
@@ -1,6 +1,6 @@
 <div style="margin: 10px 5%;">
 	<%= form_tag( search_stores_path, method: 'post') do %>
-	<%= text_field_tag 'name', params[:name], size:"100", placeholder:'请输入要搜索的关键字', :class => 'blueinputbar', :required => true %>
+	<%= text_field_tag 'name', params[:name], size:"100", placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar'%>
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/stores/index.html.erb b/app/views/stores/index.html.erb
index a253ea330..4df1b8239 100644
--- a/app/views/stores/index.html.erb
+++ b/app/views/stores/index.html.erb
@@ -32,6 +32,23 @@
 <% reset_cycle; end %>
 </div>
 <script type='text/javascript'>
+ function validate_required(field,alerttxt)
+  {
+    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(){
diff --git a/app/views/stores/search.html.erb b/app/views/stores/search.html.erb
index 42cf0cd28..f3e2085b9 100644
--- a/app/views/stores/search.html.erb
+++ b/app/views/stores/search.html.erb
@@ -34,32 +34,49 @@
 <div class="pagination"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %></div>
 <script type='text/javascript'>
   jQuery.fn.highlight = function(pat) {
-  function innerHighlight(node, pat) {
-    var skip = 0;
-    if (node.nodeType == 3) {
-      var pos = node.data.toUpperCase().indexOf(pat);
-      if (pos >= 0) {
-        var spannode = document.createElement('span');
-        spannode.className = 'highlight';
-        var middlebit = node.splitText(pos);
-        var endbit = middlebit.splitText(pat.length);
-        var middleclone = middlebit.cloneNode(true);
-        spannode.appendChild(middleclone);
-        middlebit.parentNode.replaceChild(spannode, middlebit);
-        skip = 1;
+    function innerHighlight(node, pat) {
+      var skip = 0;
+      if (node.nodeType == 3) {
+        var pos = node.data.toUpperCase().indexOf(pat);
+        if (pos >= 0) {
+          var spannode = document.createElement('span');
+          spannode.className = 'highlight';
+          var middlebit = node.splitText(pos);
+          var endbit = middlebit.splitText(pat.length);
+          var middleclone = middlebit.cloneNode(true);
+          spannode.appendChild(middleclone);
+          middlebit.parentNode.replaceChild(spannode, middlebit);
+          skip = 1;
+        }
       }
-    }
-    else if (node.nodeType == 1 && node.childNodes && !/(script|style)/i.test(node.tagName)) {
-      for (var i = 0; i < node.childNodes.length; ++i) {
-        i += innerHighlight(node.childNodes[i], pat);
+      else if (node.nodeType == 1 && node.childNodes && !/(script|style)/i.test(node.tagName)) {
+        for (var i = 0; i < node.childNodes.length; ++i) {
+          i += innerHighlight(node.childNodes[i], pat);
+        }
       }
+      return skip;
+    }
+    return this.each(function() {
+      innerHighlight(this, pat.toUpperCase());
+    });
+  };
+  function validate_required(field,alerttxt)
+  {
+    with (field)
+    {
+      if (value==null||value=="")
+        {alert(alerttxt);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}
     }
-    return skip;
   }
-  return this.each(function() {
-    innerHighlight(this, pat.toUpperCase());
-  });
-};
   $(document).ready(function($) {
    $('.cb span').highlight('<%=params[:name]%>');
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4d3b9395f..81954b8a5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1585,5 +1585,6 @@ en:
   label_tags_forum: Call forum
   label_memo_locked: 'Topic is locked'
   label_downloads_list: enter file list.
+  label_sumbit_empty: search bar need container.
 
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 0d2536c0c..8c669e218 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1789,4 +1789,5 @@ zh:
   label_joined_contest: 参与了竞赛
   label_contest_user: 参赛人：
   label_contest_reason: 参赛宣言：
-  label_notification: 通知
\ No newline at end of file
+  label_notification: 通知
+  label_sumbit_empty: 搜索内容不能为空
\ No newline at end of file

From 63782feeac3747a58d1889bb424d3f4286b9bbf5 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 17 Jan 2014 16:13:05 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E9=98=B2=E6=8A=84=E8=A2=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/stores_controller.rb b/app/controllers/stores_controller.rb
index ad622096d..8225697d2 100644
--- a/app/controllers/stores_controller.rb
+++ b/app/controllers/stores_controller.rb
@@ -13,7 +13,7 @@ class StoresController < ApplicationController
     
     result = resultSet.to_a.dup
 
-    result.map { |res|
+    resultSet.to_a.map { |res|
       if(res.container.nil? || 
         (res.container.class.to_s=="Project" && res.container.is_public == false) ||
         (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||