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] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD=E6=90=9C0?=
 =?UTF-8?q?=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