qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改了base_user base_project application.css 

整理了sidebar布局
This commit is contained in:
huangjingquan 2013-08-01 21:26:40 +08:00
parent bf1f9b8e19
commit 94f559e7ba
12 changed files with 74 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@
</tr>
<tr>
<td>
<span ><img src="/images/sidebar/stop.png" width="11" height="11"/></span><%=link_to "取消关注" %>
</td>
</tr>
</table></td>
@ -48,7 +48,7 @@
<div class="tags">
<!-- added by william -for tag -->
<div id="tags">
<%= tag('img', {:src => "../images/user.png"}, false, false) %>
<%= tag('img', {:src => "../images/sidebar/tags.png"}, false, false) %>
<%= render :partial => 'layouts/tag', :locals => {:obj => @project,:object_flag => "2"}%>
</div>
</div>
@ -74,40 +74,41 @@
<!--描述-->
<div class="inf_user_context">
<div class="font_title_left">
概述
<span ><img src="/images/sidebar/tag_title.png" width="18" height="18"/></span>概述
</div>
<div >
<div class="user_underline"></div>
<div class="font_lighter_sidebar">
<%= textilizable @project.description %>
</div>
<div style="padding-bottom: 5px">
<strong>创建时间：</strong><%= @project.created_on %>
<strong style="color: #31a0d5">创建时间：</strong><%= @project.created_on %>
</div>
</div>
<div class="user_underline"></div>
<!--项目推荐-->
<!--工具-->
<div class="tool">
<div class="font_title_left">
工具
<span ><img src="/images/sidebar/tag_title.png" width="18" height="18"/></span>工具
</div>
<div class="user_underline"></div>
<ul>
<li>
<%= link_to l(:project_module_documents),project_documents_path(@project) %>
</li>
<li>
<%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
</li>
<li>
<%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
</li>
<li>
<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
</li>
</ul>
<table class="font_tool">
<tr><td align="center" width="230px" valign="center">
<img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_documents),project_documents_path(@project) %></td></tr>
<tr><td align="center">
<img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_wiki),project_wiki_path(@project) %>
</td></tr>
<tr><td align="center">
<img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_calendar),project_calendar_path(@project) %>
</td></tr>
<tr><td align="center">
<img src="/images/sidebar/tool_tag.png" width="15" height="15"/><%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
</td></tr>
<tr><td align="right" width="240px"><img src="/images/sidebar/tag_title_right.png" width="18" height="18"/></td></tr>
</table>
</div>
<div class="user_underline"></div>
</div>
</div>

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

@ -19,14 +19,7 @@
<div id="wrapper">
<div id="wrapper2">
<div id="wrapper3">
<div id="top-menu" style="background-color: #FFFFFF">
<div id="account">
<div id="top-menu" style="background-color: #FFFFFF">
<%= render_menu :account_menu -%>
</div>
<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
<%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
</div>
<%=render :partial => 'layouts/base_header'%>
<div id="main" class="">
<!--user page-->
@ -44,15 +37,15 @@
<td class="info_font"><%= h @user.name%></td>
</tr>
<tr>
<td align="center"><% unless User.current == @user %>
<td align="left"><% unless User.current == @user %>
<%= watcher_link(@user, User.current) %>
<% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %></td>
<% else %><span ><img src="/images/sidebar/stop.png" width="11" height="11"/></span><span><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %></span></td>
</tr>
</table></td>
</tr>
</table>
<div>
关注 (<%= link_to User.watched_by(@user.id).count, home_path %>) &nbsp;粉丝 (<%= link_to @user.watcher_users.count, home_path %>)
<strong class="font_small_watch">关注</strong> (<span style="color: #0099cc"><%= User.watched_by(@user.id).count %></span>) &nbsp;<strong class="font_small_watch">粉丝 </strong>(<span style="color: #0099cc"><%= @user.watcher_users.count %></span>)
</div>
</div>
<div class="user_underline"></div>
@ -60,13 +53,13 @@
<div class="inf_user_context">
<table style="font-family:微软雅黑">
<tr>
<td class="font_lighter_sidebar">加入时间：</td><td><%= format_date(@user.created_on) %></td>
<td valign="bottom"><img src="/images/sidebar/tool_tag.png" width="13" height="13"/></td><td class="font_lighter_sidebar">加入时间：</td><td><%= format_date(@user.created_on) %></td>
</tr>
<tr>
<td class="font_lighter_sidebar">最近登录：</td><td><%= format_date(@user.last_login_on) %></td>
<td valign="bottom"><img src="/images/sidebar/tool_tag.png" width="13" height="13"/></td><td class="font_lighter_sidebar">最近登录：</td><td><%= format_date(@user.last_login_on) %></td>
</tr>
<tr>
<td class="font_lighter_sidebar">邮件地址：</td><td><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
<td valign="bottom"><img src="/images/sidebar/tool_tag.png" width="13" height="13"/></td><td class="font_lighter_sidebar">邮件地址：</td><td style="color: #0099cc"><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
</tr>
</table>
</div>
@ -82,20 +75,20 @@
<!--关注-->
<div class="user_fans">
<div class="font_title_left">
<strong>关注(<%= link_to User.watched_by(@user.id).count, home_path %>)</strong>
<span ><img src="/images/sidebar/tag_title.png" width="18" height="18"/></span><strong>关注(<span style="color: #0099cc"><%= User.watched_by(@user.id).count %></span>)</strong>
</div>
<div class="left_wf">
<table>
<tr>
<td style="padding-top: 5px">
<td style="padding-top: 5px width:240px">
<% for user in User.watched_by(@user.id)%>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %>
<% end%>
</td>
</tr>
<tr>
<td align="right">...</td>
<tr>
<td align="right" width="240px"><img src="/images/sidebar/tag_title_right.png" width="18" height="18"/></td>
</tr>
</table>
</div>
@ -104,31 +97,28 @@
<!--粉丝-->
<div class="user_fans">
<div class="font_title_left">
<strong>粉丝(<%= link_to @user.watcher_users.count, home_path %>)</strong>
<span ><img src="/images/sidebar/tag_title.png" width="18" height="18"/></span><strong>粉丝(<span style="color: #0099cc"><%= @user.watcher_users.count %></span>)</strong>
</div>
<!-- <div class="user_underline"></div> -->
<div class="left_wf">
<table>
<tr>
<td style="padding-top: 5px">
<td style="padding-top: 5px width:240px">
<% for user in @user.watcher_users %>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %>
<% end%>
</td>
</tr>
<tr>
<td align="right">...</td>
</tr>
<tr>
<td align="right" width="240px"><img src="/images/sidebar/tag_title_right.png" width="18" height="18"/></td>
</tr>
</table>
</div>
</div>
<div class="user_underline"></div>
<!--扩充 y有待增加-->
<!--扩充 y有待增加-->
</div>
</div>
</div>
<div id="content" style="padding-top: 0px;">
@ -145,9 +135,7 @@
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-modal" style="display:none;"></div>
</div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>

BIN
files/2013/08/130801211050_L3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
files/2013/08/130801211151_L3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

6
lib/redmine.rb
View File

@ -201,9 +201,9 @@ Redmine::MenuManager.map :top_menu do |menu|
menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
menu.push :requirement, {:controller => 'bids', :action => 'index'}
menu.push :developer, {:controller => 'users', :action => 'index'}
# menu.push :investor, :home_path
# menu.push :theme, :home_path
# menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
menu.push :investor, :home_path
menu.push :theme, :home_path
menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
# menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
# menu.push :help, Redmine::Info.help_url, :last => true
end

BIN
public/images/sidebar/add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
public/images/sidebar/go.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
public/images/sidebar/stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
public/images/sidebar/tag_title_right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
public/images/sidebar/tags.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

50
public/stylesheets/application.css
View File

@ -15,13 +15,12 @@ h4 {border-bottom: 1px dotted #bbb;}
padding-right: 30px;
}
ul.tool{margin:0px; padding-left:0em;}
ul.tool li{list-style-type:none;
height:auto;}
.font_index{
font-size:24px;
font-size:20px;
font-family: 微软雅黑;
color:#03a7dd;
color:#5c5c5c;
font-weight: bold;
}
.font_content{
font-size:14px;
@ -62,6 +61,13 @@ ul.tool li{list-style-type:none;
height:auto;
background-color: #d0d9e0;
}
.left_wf{
padding-left:8px;
}
.main_context{
padding-bottom: 5px;
}
.font_title_left{
font-family:微软雅黑;
font-weight:bold;
@ -69,19 +75,14 @@ ul.tool li{list-style-type:none;
padding-top:3px;
padding-bottom:3px;
font-size:16px;
color:#5c5c5c;
/*color:#00aaf8;*/
}
.left_wf{
padding-left:8px;
}
.main_context{
padding-bottom: 5px;
}
.info_font{
font-family:微软雅黑;
font-weight:bold;
font-size:18px;
color:#4d4d4d;
color:#5c5c5c;
}
.font_lighter{
font-family:微软雅黑;
@ -89,20 +90,29 @@ ul.tool li{list-style-type:none;
font-size:12px;
}
.font_lighter_sidebar{
padding-left:8px;
padding-right:5px;
font-family:微软雅黑;
color:#919294;
font-size:13px;
color:#737272;
font-size:12px;
}
.font_description{
font-size:14px;
line-height: 22px;
}
.font_small_watch{
font-family:微软雅黑;
color:#5C5C5C;
font-weight:bold;
}
.font_tool{
font-family:微软雅黑;
font-size:16px;
color: 1a1a1a;
color:# 1a1a1a;
line-height: 30px;
font-weight:bold;
}
.spaceleft{float:left; width:240px;}
.spaceright{float:left; width:620px;}
@ -140,11 +150,12 @@ ul.tool li{list-style-type:none;
background-color:#fff;
}
.inf_user_context{
padding-left:8px;
padding-left:0px;
margin:5px 0px 0px 0px;
padding-top:2px;
background-color:#fff;
height: auto;
/*color:#fff; */
}
.tool{
@ -343,10 +354,7 @@ ul.context_projects li {list-style-type:none;
font-size:12px;
font-weight:bold;
text-decoration:;
color:#116699;
color:#116699;
}
.lbadding h3{
color: #1c5c76;