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

主页显示以及header部分

This commit is contained in:
huangjingquan 2013-08-10 09:31:48 +08:00
parent 34bc46450f
commit 38c6a187e4
8 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/_base_footer.html.erb
View File

@ -1,5 +1,6 @@
<div id="footer" style="margin-left:-5px;padding-top: 10px;clear: both;"> <div id="footer" style="margin-left:-5px;padding-top: 10px;clear: both;">
<div class="bgl"><div class="bgr"> <div class="footer_color"><div class="bgr">
Powered by <%= "Trustie2 Team "%> &copy; 2013 Jack Powered by <%= "Trustie2 Team "%> &copy; 2013 Jack
</div></div> </div></div>
</div> </div>

2
app/views/layouts/_base_header.html.erb
View File

@ -1,4 +1,4 @@
<div id="top-menu" style="background-color: #FFFFFF;height:30px;margin-top: 10px;margin-bottom: 10px;"> <div id="top-menu" style="background-color: #15bccf;height:30px;margin-top: 10px;margin-bottom: 10px;">
<div id="account"> <div id="account">
<%= render_menu :account_menu -%> <%= render_menu :account_menu -%>
</div> </div>

12
app/views/layouts/base_projects.html.erb
View File

@ -81,7 +81,7 @@
<%= textilizable @project.description %> <%= textilizable @project.description %>
</div> </div>
<div class="created_on_project"> <div class="created_on_project">
<strong style="color: #31a0d5"><%= l(:label_create_time) %>：</strong><%= @project.created_on %> <strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= @project.created_on %>
</div> </div>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
@ -95,21 +95,21 @@
<div class="user_underline2"></div> <div class="user_underline2"></div>
<table class="font_tool"> <table class="font_tool">
<tr> <tr>
<td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/> <td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<%= link_to l(:project_module_documents),project_documents_path(@project) %></td> <%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
<td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/> <td align="left" width="60px" valign="center"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<%= link_to l(:project_module_wiki),project_wiki_path(@project) %></td> <%= link_to l(:project_module_wiki),project_wiki_path(@project) %></td>
</tr> </tr>
<tr> <tr>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/> <td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<%= link_to l(:project_module_calendar),project_calendar_path(@project) %> <%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
</td> </td>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/> <td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag.png" width="15" height="15"/> <td align="left" width="190px" valign="left"><img src="/images/sidebar/tool_tag2.png" width="15" height="15"/>
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %> <%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
</td> </td>
</tr> </tr>

18
app/views/layouts/base_users.html.erb
View File

@ -47,12 +47,12 @@
</table> </table>
<div id="praise_tread"> <div id="praise_tread">
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id => User.current.id}%> <div style="padding-left: 3px"><%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @user,:show_flag => false,:user_id => User.current.id}%></div>
</div> </div>
<div> <div style="padding-left: 2px">
<%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%= User.watched_by(@user.id).count %></strong>) &nbsp; <%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%= link_to User.watched_by(@user.id).count, :controller=>"users",:action=>"user_watchlist" %></strong>) &nbsp;
<%= l(:label_user_fans) %> (<strong class="font_small_watch"><%= @user.watcher_users.count %></strong>) <%= l(:label_user_fans) %> (<strong class="font_small_watch"><%= link_to @user.watcher_users.count,:controller=>"users",:action=>"user_fanslist" %></strong>)
</div> </div>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
@ -60,13 +60,13 @@
<div class="inf_user_context"> <div class="inf_user_context">
<table style="font-family:微软雅黑"> <table style="font-family:微软雅黑">
<tr> <tr>
<td class="font_lighter_sidebar"><%= l(:label_user_joinin) %></td><td><%= format_date(@user.created_on) %></td> <td style="padding-left: 8px"><%= l(:label_user_joinin) %></td><td class="font_lighter_sidebar"><%= format_date(@user.created_on) %></td>
</tr> </tr>
<tr> <tr>
<td class="font_lighter_sidebar"><%= l(:label_user_login) %></td><td><%= format_date(@user.last_login_on) %></td> <td style="padding-left: 8px"><%= l(:label_user_login) %></td><td class="font_lighter_sidebar"><%= format_date(@user.last_login_on) %></td>
</tr> </tr>
<tr> <tr>
<td class="font_lighter_sidebar"><%= l(:label_user_mail) %></td><td><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td> <td style="padding-left: 8px"><%= l(:label_user_mail) %></td><td class="font_lighter_sidebar"><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
</tr> </tr>
</table> </table>
@ -76,7 +76,7 @@
<div class="user_fans"> <div class="user_fans">
<div class="font_title_left"> <div class="font_title_left">
<strong><%= l(:label_user_watcher) %>(<%= link_to User.watched_by(@user.id).count, :controller=>"users",:action=>"user_watchlist" %>)</strong> <strong><%= l(:label_user_watcher) %></strong>
</div> </div>
<div class="left_wf"> <div class="left_wf">
@ -93,7 +93,7 @@
<!--fans--> <!--fans-->
<div class="user_fans"> <div class="user_fans">
<div class="font_title_left"> <div class="font_title_left">
<strong><%= l(:label_user_fans) %>(<%= link_to @user.watcher_users.count,:controller=>"users",:action=>"user_fanslist" %>)</strong> <strong><%= l(:label_user_fans) %></strong>
</div> </div>
<div class="left_wf"> <div class="left_wf">
<table> <table>

BIN
public/images/sidebar/male.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
public/images/welcome/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

27
public/stylesheets/application.css
View File

@ -11,6 +11,16 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/ /*new by huang*/
/**/ /**/
.footer_color{
background-image: -moz-linear-gradient(top,#BBBBBB,#FFFFEC);
background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#15bccf));
background-image: -webkit-linear-gradient(top,#ffffff,#15bccf);
background-image: -o-linear-gradient(top,#ffffff,#15bccf);
background-image: linear-gradient(to bottom,#ffffff,#15bccf);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)
}
ul.list_watch{list-style-type:none; ul.list_watch{list-style-type:none;
height:auto; height:auto;
border-bottom: 1px dashed rgb(204, 204, 204); border-bottom: 1px dashed rgb(204, 204, 204);
@ -26,9 +36,9 @@ ul.tool{margin:0px; padding-left:0em;}
ul.tool li{list-style-type:none; ul.tool li{list-style-type:none;
height:auto;} height:auto;}
.font_index{ .font_index{
font-size:24px; font-size:22px;
font-family: 微软雅黑; font-family: 微软雅黑;
color:#03a7dd; color:#068d9c;
} }
.font_content{ .font_content{
font-size:14px; font-size:14px;
@ -78,16 +88,16 @@ ul.tool li{list-style-type:none;
.font_title_left{ .font_title_left{
font-family:微软雅黑; font-family:微软雅黑;
font-weight:bold; font-weight:bold;
padding-left: 12px; padding-left: 10px;
padding-top:3px; padding-top:3px;
padding-bottom:3px; padding-bottom:3px;
font-size:16px; font-size:16px;
/*color:#00aaf8;*/ /*color:#05a8bb;*/
} }
.font_small_watch{ .font_small_watch{
font-family:微软雅黑; font-family:微软雅黑;
font-weight:bold; font-weight:bold;
color:#00aaf8; color:#15bccf;
} }
.left_wf{ .left_wf{
padding-left:8px; padding-left:8px;
@ -95,6 +105,11 @@ ul.tool li{list-style-type:none;
.main_context{ .main_context{
padding-bottom: 5px; padding-bottom: 5px;
} }
.welcome_image{
height: 27px;
width: 30px;
}
.font_welcome{ .font_welcome{
font-family:微软雅黑; font-family:微软雅黑;
font-weight: bold; font-weight: bold;
@ -230,7 +245,7 @@ ul.tool li{list-style-type:none;
padding:1; padding:1;
width:240px; width:240px;
height:1px; height:1px;
background-color:#03a7dd; background-color:#15bccf;
overflow:hidden overflow:hidden
} }
.user_underline2{ .user_underline2{

14
public/themes/redpenny-master/stylesheets/application.css
View File

@ -364,8 +364,10 @@ ul.projects li.root
#top-menu #top-menu
{ {
background-color:#000; /*顶层导航颜色*/ background-color:#fff; /*顶层导航颜色*/
font-size:12px; color: #fff;
font-size:13px;
font-family: 微软雅黑;
position:relative; position:relative;
padding:0; padding:0;
height:1px; height:1px;
@ -380,15 +382,15 @@ ul.projects li.root
#top-menu li,#top-menu #loggedas #top-menu li,#top-menu #loggedas
{ {
/*by young*/ /*by young*/
color:#AAAAAA; color:#fff;
line-height:21px; line-height:21px;
margin-right:4px margin-right:4px
} }
#top-menu li a #top-menu li a
{ {
/*Modified by young*/ /*by young*/
color:#00AAF8; color:#fff;
font-weight:6px; font-weight:6px;
padding:4px 5px padding:4px 5px
} }
@ -473,7 +475,7 @@ ul.projects li.root
#footer #footer
{ {
background-color:#EEE; /*低端背景*/ background-color:#fff; /*footer bg add by huang*/
border:0; border:0;
clear:left; clear:left;
color:#666; color:#666;