From 38c6a187e4080f8299cfc16263f6afd5314ed0d7 Mon Sep 17 00:00:00 2001
From: huangjingquan <huang@163.com>
Date: Sat, 10 Aug 2013 09:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=98=BE=E7=A4=BA=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8Aheader=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb       |   3 +-
 app/views/layouts/_base_header.html.erb       |   2 +-
 app/views/layouts/base_projects.html.erb      |  12 ++++----
 app/views/layouts/base_users.html.erb         |  18 ++++++------
 public/images/sidebar/male.png                | Bin 3453 -> 3381 bytes
 public/images/welcome/1.png                   | Bin 9781 -> 9688 bytes
 public/stylesheets/application.css            |  27 ++++++++++++++----
 .../stylesheets/application.css               |  14 +++++----
 8 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index 62d522a81..575368467 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -1,5 +1,6 @@
+
 <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
   	</div></div>
 </div>
\ No newline at end of file
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 16bf7c271..6a221f5b6 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -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">
 		<%= render_menu :account_menu -%>
 	</div>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 00ff23a0d..0750ce4a6 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -81,7 +81,7 @@
 											<%= textilizable @project.description %>
 										</div>
 										<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 class="user_underline"></div>
@@ -95,21 +95,21 @@
 									<div class="user_underline2"></div>
 									<table class="font_tool">
 										<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>
-											<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>
 										</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) %>
 											</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) %>
 											</td>
 										</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) %>
 											</td>
 										</tr>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 81b0c8743..8aa4e5803 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -47,12 +47,12 @@
 										</table>
 										
 										<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>
-											<%= l(:label_user_watcher) %> (<strong class="font_small_watch"><%= User.watched_by(@user.id).count %></strong>) &nbsp;
-											<%= l(:label_user_fans) %> (<strong class="font_small_watch"><%=  @user.watcher_users.count %></strong>) 
+										<div style="padding-left: 2px">
+											<%= 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"><%= link_to @user.watcher_users.count,:controller=>"users",:action=>"user_fanslist" %></strong>) 
 										</div>									
 									</div>
 									<div class="user_underline"></div>
@@ -60,13 +60,13 @@
 									<div class="inf_user_context">
 										<table style="font-family:微软雅黑">
 											<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>
-												<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>
-												<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>
 										</table>
 										
@@ -76,7 +76,7 @@
 									
 									<div class="user_fans">
 										<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 class="left_wf">
@@ -93,7 +93,7 @@
 									<!--fans-->
 									<div class="user_fans">
 										<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 class="left_wf">
 											<table>
diff --git a/public/images/sidebar/male.png b/public/images/sidebar/male.png
index 4be03451fecc1c5c0f17106d6dda01cfdbba4be0..f432062afbc883dec36636f25c48b4c8847d3732 100644
GIT binary patch
delta 643
zcmV-}0(|}b8nqg*z6yV0Nkl<Zc-oYcO-NKx6vzMPzWbbcCOM-c=`?<8eh{OgizuRf
zw2Fd)7D9_Q5=23?$`;Y4O$cqGS_ILyW#FoWD2f@KR4kPm(HK9*2FIB<Z{EA7#haHI
znbTdJd(Po^?m6dwsct-m|2c*EuTNw{{Y8?RB&lg2g4`=PKQ(`Qj&#`x$4RkiJ~xK?
zO#o22+za8a7$!{+0D!R@l8;UG%1GlYSyO%3i1v`@XT^{0Og3XDm#)CEV_+}<a$}0g
zYsdV&IOgkU9U(zG)L*GPcV-3&0y6`OnH{BM32@(kq-~^B6~&d*dncW~1KXa25D{^(
z`i9;ZJ}Y!h5D|aCKw)}rm<xpo5ekjT{Kv_5|3LIQ04U3L3W@11W3X=lk$SKGGJx{{
zVE@RbWuPkPz0MfyTL5rcXyNcn5*~dfS_=I2$Us$%vTO$c^p@s_o?pn?U^f61*Ef^K
zKy+rm6&JrPJp}-*%Bal8rg{ND2wiFb;H<AdDn}<OlevEec5SLWFbn{~>yIt#T{#eA
zs6Wfh3;-l$y$kWEKHrIQAo&mR01>$wvF&955US`7N(+T9mje-jzynZ8Gr8?&03htO
zjRXMbwSh=JK7D*Yh~C_I2>_gIZrfXga8ju=te8Q7|7iD{eEiekUI1q+w<UB<xLZnI
z_54&f9)o*1JAd2X(=iITvbI;#U!1kIyIi#1LX$08FgU6=96CnQ{S#L5`$R=k!^vF`
z05Ink?)f^~ZjvDSS36d6<#k0<_|&dBd4|8M{gxR|v=&#>i)<_PdlD;Vdvj~UOw3;R
d6951|2LKDP|JsdK`0fAz002ovPDHLkV1i1?DE9yW

delta 716
zcmV;-0yF)!8vPouz6yV;Nkl<Zc-oYdT}YE*6vuz(eYdu~&bDc8g{v?%14|=<3i_fb
zur3tzCh9_hBD$D&T?EyQU3N3Ff}(-~gOZ}?gQDmnN?Aq}R8s3hQ*&9m+T6$cZci6x
zWF*;hd3er`^FRMTNA&h6|MS$%Gdl^)Z^7a6P~h>RX}WF7&sTqr)u7vFlegknX16qk
zEC90U2l)I)q-?PlfLNb738Ff}e*ANfGPi28)HQo>7+{$Y>r1K58xcOeZy{%W#4@d4
zJ&DnTOvq8!Pi>Rh^`{6{7yzUaisUy7hfAl>rvWfBWU1u0j07tS`1C%lQppUNv83%M
zph?y>oyYCf)W?6<WAr?3BQbg!%N#({J-FNrlvVGSs^zoA7qBrrV5+WLYq7FX3Vpjo
zYicQCMO~i+D-HFstDhHLHPRUR`qw>mUcW0Vw{9RloKyENt&;jZ5de*%K&u2R4TgF%
zyy#js6#zh1Zr!L}MF#N9(g{|an5b*aSx^t4db+PjV<><2PmkX|-;c^8<u$dcBkTvz
zBrwm9%0qnk?6iWCO0@I2-^A<JaT=?~Cvm!UvT3lg(@LE*hO#O%mKoP!D;|fWzUP?X
z1pADI(@Jbd*eNcz1Ax5s89-A*y)i@sZ%OmC<QRoJD4t_yWXK{t_HcZX!M7Iyq-uG+
zy4*JZpOAm@+EzqEMV~#HFhXM_c2IqI`JIxWo$6H)b-Ar{N-2@sk7VJp0Ey8&{cl3Q
z_N2E*QP)mxku?oh@s{WezDui~?snqC$FZ{Su-S_+W;Rn+y;~}l7L&`N?p<h=P1_Gl
zg8Ynr14~w)lX;8W0GL@w#&b9f4Of8xFdECL$el#PvT6IFNsj$~PgF<P%dFBcrR8-}
y67=CTbj)mCeHl#BAMGU8yH6VSKK)bXj{yMw$P}PgtiX)`0000<MNUMnLSTY}=wllI

diff --git a/public/images/welcome/1.png b/public/images/welcome/1.png
index 44b9bc435603be83db4772fa3c40367331644980..bff3a17c8d5cd1540bf7b956dbb1f9a627dba462 100644
GIT binary patch
delta 6514
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
J7_Dp>`ajd82yp-a

delta 6629
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

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3b980fff9..ca1064e76 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -11,6 +11,16 @@ h4 {border-bottom: 1px dotted #bbb;}
 
 /*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;
 			  height:auto;
 			  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;
 				height:auto;}
 .font_index{
-	font-size:24px;
+	font-size:22px;
 	font-family: 微软雅黑;
-	color:#03a7dd;
+	color:#068d9c;
 }
 .font_content{
 	font-size:14px;
@@ -78,16 +88,16 @@ ul.tool li{list-style-type:none;
 .font_title_left{
 	font-family:微软雅黑;
 	font-weight:bold;
-	padding-left: 12px;
+	padding-left: 10px;
 	padding-top:3px;
 	padding-bottom:3px;	
 	font-size:16px;
-	/*color:#00aaf8;*/	
+	/*color:#05a8bb;*/	
 }
 .font_small_watch{
 	font-family:微软雅黑;
 	font-weight:bold;
-	color:#00aaf8;
+	color:#15bccf;
 }
 .left_wf{
 	padding-left:8px;
@@ -95,6 +105,11 @@ ul.tool li{list-style-type:none;
 .main_context{
 	padding-bottom: 5px;
 }
+.welcome_image{
+	height: 27px;
+	width: 30px;
+	
+}
 .font_welcome{
 	font-family:微软雅黑;
 	font-weight: bold;
@@ -230,7 +245,7 @@ ul.tool li{list-style-type:none;
 	padding:1;
 	width:240px;
 	height:1px;
-	background-color:#03a7dd;
+	background-color:#15bccf;
 	overflow:hidden	
 }
 .user_underline2{
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index d4f6ec1a8..4c8c5ec1d 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -364,8 +364,10 @@ ul.projects li.root
 
 #top-menu
 {
-	background-color:#000; /*顶层导航颜色*/
-	font-size:12px;
+	background-color:#fff; /*顶层导航颜色*/
+	color: #fff;
+	font-size:13px;
+	font-family: 微软雅黑;
 	position:relative;
 	padding:0;
 	height:1px;
@@ -380,15 +382,15 @@ ul.projects li.root
 #top-menu li,#top-menu #loggedas
 {
 	/*by young*/
-	color:#AAAAAA;
+	color:#fff;
 	line-height:21px;
 	margin-right:4px
 }
 
 #top-menu li a
 {
-	/*Modified by young*/
-	color:#00AAF8; 
+	/*by young*/
+	color:#fff; 
 	font-weight:6px;
 	padding:4px 5px
 }
@@ -473,7 +475,7 @@ ul.projects li.root
 
 #footer
 {
-	background-color:#EEE;   /*低端背景*/
+	background-color:#fff;   /*footer bg    add by huang*/
 	border:0;
 	clear:left;
 	color:#666;