diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index fd9ac678f..c575a8871 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -10,7 +10,7 @@ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_public', 'user_leftside', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> - <%= javascript_include_tag "bootstrap","user"%> + <%= javascript_include_tag "bootstrap"%> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -51,12 +51,9 @@ <% end%>
-
+ - <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> - - <% end %>
<%= link_to "编辑资料", my_account_path, :class => "fr gz_btn mr10"%>
@@ -119,13 +116,19 @@
@@ -136,12 +139,19 @@
@@ -152,23 +162,7 @@
标签
- - 分布计算 - - x - - - - 2014春季学期 - - x - - - + 添加标签 - + <%= render :partial => 'tags/user_tag', :locals => {:obj => @user,:object_flag => "1"}%>
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css index 1f0612fc1..fa7fdddeb 100644 --- a/public/stylesheets/new_public.css +++ b/public/stylesheets/new_public.css @@ -9,6 +9,8 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;} a:hover,a:active{color:#000;} /*常用*/ +.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.break_word{ word-break:break-all; word-wrap: break-word;} select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; } .sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; background:#dbdbdb;} .sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} @@ -409,8 +411,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;} .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;} -.homepageImageName {font-size:16px; color:#484848; margin-left:15px; margin-right:8px; height:20px; float:left;} -.homepageImageSex {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} +.homepageImageName {font-size:16px; color:#484848; margin-left:15px; height:21px; float:left;max-width: 100px;} +.homepageImageSex {width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;} .homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;} .homepageImageNumber {font-size:12px; color:#484848;}