diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ca7c2ddf5..de8427b0d 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -38,7 +38,7 @@ - + <%=link_to "取消关注" %> @@ -48,7 +48,7 @@
- <%= 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"}%>
@@ -74,40 +74,41 @@
- 概述 + 概述
-
+
+
<%= textilizable @project.description %>
- 创建时间：<%= @project.created_on %> + 创建时间：<%= @project.created_on %>
-
+
- +
- 工具 + 工具
- + + + + + + +
+ <%= link_to l(:project_module_documents),project_documents_path(@project) %>
+ <%= link_to l(:project_module_wiki),project_wiki_path(@project) %> +
+ <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> +
+ <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> +
- +
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5621f8d39..f7b0c4158 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -19,14 +19,7 @@
-
-
-
- <%= render_menu :account_menu -%> -
- <%= 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? -%> -
+ <%=render :partial => 'layouts/base_header'%>
@@ -44,15 +37,15 @@ <%= h @user.name%> - <% unless User.current == @user %> + <% 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 %> + <% else %><%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %>
- 关注 (<%= link_to User.watched_by(@user.id).count, home_path %>)  粉丝 (<%= link_to @user.watcher_users.count, home_path %>) + 关注 (<%= User.watched_by(@user.id).count %>)  粉丝 (<%= @user.watcher_users.count %>)
@@ -60,13 +53,13 @@
- + - + - +
加入时间：<%= format_date(@user.created_on) %>加入时间：<%= format_date(@user.created_on) %>
最近登录：<%= format_date(@user.last_login_on) %>最近登录：<%= format_date(@user.last_login_on) %>
邮件地址：<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>邮件地址：<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
@@ -82,20 +75,20 @@
- 关注(<%= link_to User.watched_by(@user.id).count, home_path %>) + 关注(<%= User.watched_by(@user.id).count %>)
- - - + +
+ <% for user in User.watched_by(@user.id)%> <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %> <% end%>
...
@@ -104,31 +97,28 @@
- 粉丝(<%= link_to @user.watcher_users.count, home_path %>) + 粉丝(<%= @user.watcher_users.count %>)
- - - - + + +
+ <% for user in @user.watcher_users %> <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %> <% end%>
...
- - +
-
-
@@ -145,9 +135,7 @@ - - - +
<%= call_hook :view_layouts_base_body_bottom %> diff --git a/files/2013/08/130801211050_L3.png b/files/2013/08/130801211050_L3.png new file mode 100644 index 000000000..6cf2afb17 Binary files /dev/null and b/files/2013/08/130801211050_L3.png differ diff --git a/files/2013/08/130801211151_L3.png b/files/2013/08/130801211151_L3.png new file mode 100644 index 000000000..6cf2afb17 Binary files /dev/null and b/files/2013/08/130801211151_L3.png differ diff --git a/lib/redmine.rb b/lib/redmine.rb index 3ff390676..6784225b0 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -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 diff --git a/public/images/sidebar/add.png b/public/images/sidebar/add.png new file mode 100644 index 000000000..71d0ae53f Binary files /dev/null and b/public/images/sidebar/add.png differ diff --git a/public/images/sidebar/go.png b/public/images/sidebar/go.png new file mode 100644 index 000000000..357ae8d8b Binary files /dev/null and b/public/images/sidebar/go.png differ diff --git a/public/images/sidebar/male.png b/public/images/sidebar/male.png new file mode 100644 index 000000000..4be03451f Binary files /dev/null and b/public/images/sidebar/male.png differ diff --git a/public/images/sidebar/stop.png b/public/images/sidebar/stop.png new file mode 100644 index 000000000..175eafd0a Binary files /dev/null and b/public/images/sidebar/stop.png differ diff --git a/public/images/sidebar/tag_title_right.png b/public/images/sidebar/tag_title_right.png new file mode 100644 index 000000000..5ce6d6bb2 Binary files /dev/null and b/public/images/sidebar/tag_title_right.png differ diff --git a/public/images/sidebar/tags.png b/public/images/sidebar/tags.png new file mode 100644 index 000000000..32d3ea8c4 Binary files /dev/null and b/public/images/sidebar/tags.png differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fbc30bd05..777024844 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -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;