diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 9b481fac5..4cae284f5 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -60,11 +60,10 @@ - <%= render :partial => 'organizations/org_logined_header' %> <% if @org_logo_attchment.blank? %> - + <% else %> <% end %> @@ -74,6 +73,7 @@ + <%= render :partial => 'organizations/org_logined_header' %> diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb index 22cf920e9..74e313f6a 100644 --- a/app/views/organizations/_org_logined_header.html.erb +++ b/app/views/organizations/_org_logined_header.html.erb @@ -1,37 +1,31 @@ <% if User.current.logged? %> - - - - - - <%= link_to "#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}".html_safe, user_activities_path(User.current.id) %> - <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %> - - - <%= link_to "修改资料", my_account_path, :class => "menuGrey"%> - - - <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> - - - <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%> - - - - <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%> - - + + + + <%= link_to "#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}".html_safe, user_activities_path(User.current.id) %> + <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %> + + + <%= link_to "修改资料", my_account_path, :class => "menuGrey"%> + + + <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> + + + <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%> + + + + <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%> - - + + <% else %> - - - 登录 | - 注册 - + + 登录 | + 注册 <% end %> diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index c2cf0a478..3d46a9296 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -47,6 +47,7 @@ a.sn-link-select {color:#809df9;} .sn-mt10 {margin-top:10px;} .sn-mt13 {margin-top:13px;} .sn-mt15 {margin-top:15px;} +.sn-mt23 {margin-top:23px;} .sn-mt28 {margin-top:28px;} .sn-mb20 {margin-bottom:20px;} .sn-mb40 {margin-bottom:40px;} @@ -65,7 +66,6 @@ a.sn-link-select {color:#809df9;} .sn-bg-white {background-color:#fff;} .sn-bg-blue {background-color:#24366e;} .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} -.sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;} .sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;} .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;} a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}