From ad524f5a6c6aa43c68ac25c192ff050fa2d168cb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 25 Aug 2015 19:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AF=BE=E7=A8=8B=E3=80=81?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E8=B4=B4=E5=90=A7=E7=AD=89=E7=8B=AC?=
 =?UTF-8?q?=E8=87=AA=E7=9A=84=E6=90=9C=E7=B4=A2=E6=9D=A1=EF=BC=8C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E6=90=9C=E7=B4=A2=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/index.html.erb          |  8 ++++----
 app/views/layouts/base_courses.html.erb  | 26 ++++++++++++------------
 app/views/layouts/base_forums.html.erb   | 10 ++++-----
 app/views/layouts/base_projects.html.erb | 20 +++++++++---------
 app/views/users/search.html.erb          | 16 +++++++--------
 5 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 18ac7f752..85cab957a 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -19,10 +19,10 @@
 			</td>
 			<td rowspan="2" width="250px" >
 				<div class="top-content-search">
-					<%= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %>
-					<%= text_field_tag 'name', params[:name], :size => 20 %>
-					<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
-					<% end %>
+					<%#= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %>
+					<%#= text_field_tag 'name', params[:name], :size => 20 %>
+					<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+					<%# end %>
 				</div>
 			</td>
 		</tr>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 6e9c98b95..adec9e6fd 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -51,16 +51,16 @@
         <%= link_to @course.name, course_path(@course) %>
       </p>
     </div>
-    <div class="search fl">
-      <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %>
-          <input class="search_text fl" id="name" name="name" onkeyup="regexName('搜索条件不能为空');" placeholder="课程名称" type="text">
-          <a href="javascript:void(0)" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
-            <%= l(:label_search)%>
-          </a>
-          <div class="cl"></div>
-          <span id="project_name_span" style="float: left"></span>
-      <% end %>
-    </div>
+    <!--<div class="search fl">-->
+      <!--<%#= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %>-->
+          <!--<input class="search_text fl" id="name" name="name" onkeyup="regexName('搜索条件不能为空');" placeholder="课程名称" type="text">-->
+          <!--<a href="javascript:void(0)" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
+            <!--<%#= l(:label_search)%>-->
+          <!--</a>-->
+          <!--<div class="cl"></div>-->
+          <!--<span id="project_name_span" style="float: left"></span>-->
+      <!--<%# end %>-->
+    <!--</div>-->
   </div><!--TopBar end-->
   <div class="cl"></div>
   <div id="content">
@@ -185,9 +185,9 @@
   </div><!--Content end-->
 </div><!--Container end-->
 
-<div class="cl"></div>
-<%= render :partial => 'layouts/footer' %>
-<div class="cl"></div>
+    <div class="cl"></div>
+    <%= render :partial => 'layouts/footer' %>
+    <div class="cl"></div>
 
 <%= render :partial => 'layouts/new_feedback' %>
 <div id="ajax-indicator" style="display:none;">
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index de75f7e2f..7cd0022ea 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -40,11 +40,11 @@
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 										<div class="top-content-search">
-											<%= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %>
-											<%= text_field_tag 'name', params[:name], :size => 20 %>
-											<%= hidden_field_tag 'forum_id', params[:id] %>
-											<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-											<% end %>
+											<%#= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %>
+											<%#= text_field_tag 'name', params[:name], :size => 20 %>
+											<%#= hidden_field_tag 'forum_id', params[:id] %>
+											<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+											<%# end %>
 										</div>
 									</td>
 								</tr>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 544a04c3f..425b720d9 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -49,16 +49,16 @@
         <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
       </p>
     </div>
-    <div class="search fl">
-      <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>
-        <%= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
-        <a href="#" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
-          <%= l(:label_search)%>
-        </a>
-        <div class="cl"></div>
-        <span id="project_name_span" class="fl"></span>
-      <% end %>
-    </div>
+    <!--<div class="search fl">-->
+      <!--<%#= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>-->
+        <!--<%#= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>-->
+        <!--<a href="#" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
+          <!--<%#= l(:label_search)%>-->
+        <!--</a>-->
+        <!--<div class="cl"></div>-->
+        <!--<span id="project_name_span" class="fl"></span>-->
+      <!--<%# end %>-->
+    <!--</div>-->
   </div><!--TopBar end-->
 
   <div id="content">
diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index 13979f79f..a8401c406 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -28,14 +28,14 @@
 			<td rowspan="2">				
 			</td>
 			<td rowspan="2" >	
-			<div class="project-search" style="float: right">
-              <!--label for="user_browse_label"><%#= l(:label_user_search_type) %></label-->
-              <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();",:style=>'display:none;' )  %>
-			  <%= text_field_tag 'name', params[:name], :size => 30, :placeholder=>'昵称/姓名/邮箱' %>
-              <input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">
-            <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
-			<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-			</div>			
+			<!--<div class="project-search" style="float: right">-->
+              <!--&lt;!&ndash;label for="user_browse_label"><%#= l(:label_user_search_type) %></label&ndash;&gt;-->
+              <!--<%#= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();",:style=>'display:none;' )  %>-->
+			  <!--<%#= text_field_tag 'name', params[:name], :size => 30, :placeholder=>'昵称/姓名/邮箱' %>-->
+              <!--<input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">-->
+            <!--<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>-->
+			<!--<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>-->
+			<!--</div>			-->
 			</td>
 		</tr>
 		<tr>