From 29fd5b41e212487ab6be934a62f7272ec15e5944 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 25 Sep 2015 14:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/search.html.erb | 152 ++++++++++++++------------------
 1 file changed, 64 insertions(+), 88 deletions(-)

diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb
index a8401c406..f5287cbd4 100644
--- a/app/views/users/search.html.erb
+++ b/app/views/users/search.html.erb
@@ -1,94 +1,70 @@
-<script type="text/javascript">
-    function searchUser(){
-        var name = $("#name").val();
-        if(name == "")
-        {
-            alert("搜索条件不能为空");
-            return;
-        }
-        $("#search_user_form").submit();
-    }
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <div id="main" class="nosidebar">
+        <div id="content_">
+          <script type="text/javascript">
+              function searchUser(){
+                  var name = $("#name").val();
+                  if(name == "")
+                  {
+                      alert("搜索条件不能为空");
+                      return;
+                  }
+                  $("#search_user_form").submit();
+              }
 
-    function searchByChange()
-    {
-        $("#search_by_input").val($("#search_by").val());
-    }
-</script>
+              function searchByChange()
+              {
+                  $("#search_by_input").val($("#search_by").val());
+              }
+          </script>
 
-<div class="top-content">
-  <%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
-	<table width="940px">
-		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf " rowspan="2">
-              <%= l(:label_software_user ) %>
-            </td>
-			<td class="location-list">
-              <strong><%= l(:label_user_location) %> :</strong>
-            </td>
-			<td rowspan="2">				
-			</td>
-			<td rowspan="2" >	
-			<!--<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>
-	        <td >
-              <%=link_to l(:field_homepage), home_path %> >
-              <a><%= l(:label_software_user)%></a>
-            </td>
-		</tr>
-	</table>
-</div>
-<% end %>
-
-
-<div class="autoscroll">
-	<% if @users.size > 0 %>
-      <%= render :partial => 'user_show' %>
+          <div class="top-content">
+            <%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
+                <table width="940px">
+                  <tr>
+                    <td class="info_font" style="width: 220px; color: #15bccf " rowspan="2">
+                      <%= l(:label_software_user ) %>
+                    </td>
+                    <td class="location-list">
+                      <strong><%= l(:label_user_location) %> :</strong>
+                    </td>
+                    <td rowspan="2">
+                    </td>
+                    <td rowspan="2" >
+                    </td>
+                  </tr>
+                  <tr>
+                    <td >
+                      <%=link_to l(:field_homepage), home_path %> >
+                      <a><%= l(:label_software_user)%></a>
+                    </td>
+                  </tr>
+                </table>
+                </div>
+            <% end %>
 
-	  <!--
-          <%# @users.each do |user| -%>
-            <%# unless user.id == 1%>
-                <div class="well">
-                    <%#= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
-                    <%#= image_tag "/images/time_member.png", :class => "img_member_time"%>
-                    <div>
-                        <%#= image_tag(url_to_avatar(user), :class => 'avatar')  %>
-                        <%#= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-                    </div>
-                    <div style="margin-top: 20px;margin-left:66px">
-                        <%#= l(:label_has_fans,:count=>user.watcher_users.count)%>
-                        <%#= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
-                    </div>
 
-                    <div class="user-bottom">
-                        <%# unless user.memberships.empty? %>
-                            <%#= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
-                        <%# for member in user.memberships %>
-                            <%#= link_to_project(member.project) %><%#= (user.memberships.last == member) ? '' : '，' %>
-                        <%# end %>
-                        <%# end %>
-                        <%#= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %>
-                    </div>
-                </div>
-            <%# end -%>
-           <%# end -%>
-	   -->
-  <% else %>
-    <%= render :partial => "layouts/no_content"%>
-  <% end %>
-</div>
-<div class="pagination">
-	<ul>
-		<%= pagination_links_full @user_pages, @user_count %>
-	</ul>
+            <div class="autoscroll">
+              <% if @users.size > 0 %>
+                  <%= render :partial => 'user_show' %>
+              <% else %>
+                  <%= render :partial => "layouts/no_content"%>
+              <% end %>
+              <div class="cl"></div>
+              <div class="pagination">
+                <ul style="float: left;margin-bottom: 10px;margin-left: 10px;">
+                  <%= pagination_links_full @user_pages, @user_count %>
+                </ul>
+              </div>
+              <div class="cl"></div>
+            </div>
+            <% html_title(l(:label_user_plural)) -%>
+            <div class="cl"></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
-<% html_title(l(:label_user_plural)) -%>