jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
huang 2016-05-17 09:52:51 +08:00
parent 326c3a84a0 76d1251546
commit 20e8627b02
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/base_org2.html.erb
View File

@ -60,11 +60,10 @@
<!--内容开始--> <!--内容开始-->
<header> <header>
<div class="sn-header"> <div class="sn-header">
<%= render :partial => 'organizations/org_logined_header' %>
<div class="sn-row sn-bg-white"> <div class="sn-row sn-bg-white">
<div class="sn-logo"> <div class="sn-logo">
<% if @org_logo_attchment.blank? %> <% if @org_logo_attchment.blank? %>
<img src="/images/org_new_style/logo.jpg" width="367" height="63" class="sn-mt13" alt=""/> <img src="/images/org_new_style/logo.jpg" width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
<% else %> <% else %>
<img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt=""> <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
<% end %> <% end %>
@ -74,6 +73,7 @@
<!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>--> <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
<!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />--> <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
<%= render :partial => 'organizations/org_logined_header' %>
</div> </div>
</div> </div>
<!--导航--> <!--导航-->

52
app/views/organizations/_org_logined_header.html.erb
View File

@ -1,37 +1,31 @@
<% if User.current.logged? %> <% if User.current.logged? %>
<div class="sn-row sn-bg-grey"> <div class="navHomepageProfile" id="navHomepageProfile">
<div class="sn-login2"> <ul>
<div class="navHomepageProfile sn-mt4" id="navHomepageProfile"> <li class="homepageProfileMenuIcon fr sn-mt23" id="homepageProfileMenuIcon">
<ul> <%= link_to "<div class='user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %>
<li class="homepageProfileMenuIcon fr" id="homepageProfileMenuIcon"> <%#= 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 "<div class='mt5 mb8 user-img' id='user_avatar'>#{image_tag(url_to_avatar(User.current), :class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe, user_activities_path(User.current.id) %> <ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;">
<%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %> <li>
<ul class="topnav_login_list none sn-f12" id="topnav_login_list" style="text-align:left;"> <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
<li> </li>
<%= link_to "修改资料", my_account_path, :class => "menuGrey"%> <li>
</li> <%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
<li> </li>
<%= link_to "我的组织", user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%> <li>
</li> <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
<li> </li>
<%= link_to "新建组织", new_organization_path, :class => "menuGrey"%> <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
</li> <li>
<!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>--> <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
<li>
<%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
</li>
</ul>
</li> </li>
</ul> </ul>
</div> </li>
</div> </ul>
</div> </div>
<% else %> <% else %>
<div class="sn-row sn-bg-grey"> <div class="sn-fr">
<div class="sn-login"> <a href="<%= signin_url_without_domain %>" class="sn-link-blue">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp;
<a href="<%= signin_url_without_domain %>" class="sn-link-blue">登录</a>&nbsp;&nbsp;|&nbsp;&nbsp; <a href="<%= register_url_without_domain %>" class="sn-link-blue">注册</a>
<a href="<%= register_url_without_domain %>" class="sn-link-blue">注册</a>
</div>
</div> </div>
<% end %> <% end %>

2
public/stylesheets/org2.css
View File

@ -47,6 +47,7 @@ a.sn-link-select {color:#809df9;}
.sn-mt10 {margin-top:10px;} .sn-mt10 {margin-top:10px;}
.sn-mt13 {margin-top:13px;} .sn-mt13 {margin-top:13px;}
.sn-mt15 {margin-top:15px;} .sn-mt15 {margin-top:15px;}
.sn-mt23 {margin-top:23px;}
.sn-mt28 {margin-top:28px;} .sn-mt28 {margin-top:28px;}
.sn-mb20 {margin-bottom:20px;} .sn-mb20 {margin-bottom:20px;}
.sn-mb40 {margin-bottom:40px;} .sn-mb40 {margin-bottom:40px;}
@ -65,7 +66,6 @@ a.sn-link-select {color:#809df9;}
.sn-bg-white {background-color:#fff;} .sn-bg-white {background-color:#fff;}
.sn-bg-blue {background-color:#24366e;} .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-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-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;} .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;} 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;}