From ac419cef871b8fd92e5dcd17d4fb4fb02d8f4b11 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 31 Aug 2015 17:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=BE=E7=A8=8B/=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=90=9C=E7=B4=A2=E5=88=97=E8=A1=A8=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/search.html.erb  |  8 ++++----
 app/views/projects/search.html.erb | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/views/courses/search.html.erb b/app/views/courses/search.html.erb
index c19f9821a..e7f344df2 100644
--- a/app/views/courses/search.html.erb
+++ b/app/views/courses/search.html.erb
@@ -20,12 +20,12 @@
                 <% end %>
             <% end %>
             </td>
-            <td rowspan="2" >
+            <!--<td rowspan="2" >
               <div class="project-search" style="float: right">
-                <%= text_field_tag 'name', params[:name], :size => 30 %>
-                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                <%#= text_field_tag 'name', params[:name], :size => 30 %>
+                <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
               </div>
-            </td>
+            </td>-->
             </tr>
         <tr>
           <td >
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index c5edc4667..fbb046171 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -17,13 +17,13 @@
 				    <% end %>
 				<% end %>	
 				</td>
-				<td rowspan="2" >	
+				<!--<td rowspan="2" >
 				<div class="project-search" style="float: right">
-				<%= text_field_tag 'name', params[:name], :size => 30 %>
-				<%= hidden_field_tag 'project_type', params[:project_type] %>
-				<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+				<%#= text_field_tag 'name', params[:name], :size => 30 %>
+				<%#= hidden_field_tag 'project_type', params[:project_type] %>
+				<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
 				</div>			
-				</td>
+				</td>-->
 			</tr>
 			<tr>
 				<td style="padding-left: 8px"><a><%= link_to request.host() + "/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> </a></td>
@@ -44,14 +44,14 @@
                             <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
                         <% end %>
 					</td>
-					<td rowspan="2" >
+					<!--<td rowspan="2" >
                         <script type="text/javascript">
                           function regexName()
                           {
                               var name = $.trim($("#name").val());
                               if(name.length == 0)
                               {
-                                  $("#project_name_span").text("<%= l(:label_search_conditions_not_null) %>");
+                                  $("#project_name_span").text("<%#= l(:label_search_conditions_not_null) %>");
                                   $("#project_name_span").css('color','#ff0000');
                                   $("#project_name_span").focus();
                                   return false;
@@ -69,16 +69,16 @@
                           }
                         </script>
                         <div class="project-search" style="float: right">
-                            <%= text_field_tag 'name', params[:name], :size => 30, :onkeyup => "regexName();" %>
-                            <%= hidden_field_tag 'project_type', params[:project_type] %>
-                            <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>  <!--修改项目搜索按钮的样式 -->
-                           <!-- <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
-                              <%= l(:label_search)%>
-                            </a> -->
+                            <%#= text_field_tag 'name', params[:name], :size => 30, :onkeyup => "regexName();" %>
+                            <%#= hidden_field_tag 'project_type', params[:project_type] %>
+                            <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>  &lt;!&ndash;修改项目搜索按钮的样式 &ndash;&gt;
+                           &lt;!&ndash; <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+                              <%#= l(:label_search)%>
+                            </a> &ndash;&gt;
                             <br />
                             <span id="project_name_span" style="float: left"></span>
                         </div>
-					</td>
+					</td>-->
 				</tr>
 				<tr>
 					<td style="padding-left: 8px">