From 8ee5381e44286856c2eb443f9736262fbf7e21d1 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 4 Nov 2013 16:07:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 214 ++++++++++++++------------ public/stylesheets/application.css | 18 ++- 2 files changed, 136 insertions(+), 96 deletions(-) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index c6af670f3..f1b72ab6f 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -19,13 +19,37 @@
-
- <%=render :partial => 'layouts/base_header'%> +
+ <%= render :partial => 'layouts/base_header'%>
-
-

创客主页

forge.trustie.net

 -

- +
+ + + +
+
+ + + + + + + +
创客主页
forge.trustie.net
+
+
+ + + + + + + +
当前位置
主页》软件创客》<%= @user.name %>
+
+
+ das +
@@ -114,34 +136,32 @@ <%= l(:label_user_mail) %><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %> - + - - - - <% unless @user.user_extensions.nil? %> - <% unless @user.user_extensions.identity == 2 %> - + + <% unless @user.user_extensions.nil? %> + <% unless @user.user_extensions.identity == 2 %> + <%= l(:field_occupation) %>:<%= @user.user_extensions.occupation %> - <% end %> - + + <% end %> + <%= l(:label_location) %>:<%= @user.user_extensions.location %><%= @user.user_extensions.location_city %> - - - - <% if @user.user_extensions.identity == 0 %> - <%= l(:label_technical_title) %>:<%= @user.user_extensions.technical_title %> - <% end %> - - <% else%> - - <%= l(:field_occupation) %>: - - - <%= l(:label_location) %>: - + + + <% if @user.user_extensions.identity == 0 %> + <%= l(:label_technical_title) %>:<%= @user.user_extensions.technical_title %> <% end %> + <% else%> + + <%= l(:field_occupation) %>: + + + <%= l(:label_location) %>: + + <% end %> + @@ -149,28 +169,30 @@ <% if User.current.logged? %> - <% if User.current.admin?||User.current.login==@user.login%> -
+ <% if User.current.admin?||User.current.login==@user.login%> +
- - -
-
- <%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%> -
-
- <% end %> + + +
+
+ <%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%> +
+
+ <% end %> <% end %> - - + + -
+
<%= l(:label_user_watcher) %> <% if show_more_watchers?(@user) %> -
<%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%>
+
+ <%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%> +
<% end %>
@@ -188,7 +210,9 @@
<%= l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count) %> <% if show_more_fans?(@user) %> -
<%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%>
+
+ <%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%> +
<% end %>
@@ -212,14 +236,14 @@ <%= render_menu :user_menu %> <% end %>
- + <%= yield %> <%= call_hook :view_layouts_base_content %>
<%= render_flash_messages %>
- + <%= render :partial => 'layouts/base_footer'%>
-
- <%= call_hook :view_layouts_base_body_bottom %> +
+ <%= call_hook :view_layouts_base_body_bottom %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 4da7d831f..773c30566 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -13,8 +13,24 @@ h4 {border-bottom: 1px dotted #bbb;} /**/ .top-content{ background-color: rgb(226, 244, 255); - height: 40px; + height: 50px; width: 940px; +} + +.top-content-home{ + background-color: rgb(226, 244, 255); + width: 25%; + +} + +.top-content-search{ + float: right + +} + +.top-content-location{ + margin-left: 260px; + } .enterprise{