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

top-menu背景颜色；项目配置tab样式；content上方横线；用户列表分页框样式

Browse Source
exceptionHandle
zhangyang 12 years ago
parent cafdfa67af
commit 4eb9a0950e
10 changed files with 171 additions and 35 deletions
Show Stats Download Patch File Download Diff File

2
app/helpers/members_helper.rb
Unescape View File

@ -30,6 +30,6 @@ module MembersHelper
link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
}
s + content_tag('div', content_tag('ul', links), :class => 'pagination')
s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
end
end

6
app/views/layouts/_base_header.html.erb
Unescape View File

@ -1,7 +1,9 @@
<div id="top-menu" style="background-color: #FFFFFF">
<div id="top-menu" style="background-color: #EEEEEE;height:30px;margin-top: 10px;margin-bottom: 10px;">
<div id="account">
<%= 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>
</div>
<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:483px;margin-bottom: 5px;"></div>

2
app/views/layouts/base_bids.html.erb
Unescape View File

@ -123,7 +123,7 @@
</div>
<div id="content">
<% if display_main_menu?(@bid) %>
<div class="tabs">
<div class="tabs_new">
<%= render_menu :bid_menu %>
</div>
<% end %>

2
app/views/layouts/base_projects.html.erb
Unescape View File

@ -111,7 +111,7 @@
</div>
<div id="content">
<div class="tabs">
<div class="tabs_new">
<%= render_main_menu(@project) %>
</div>
<%= yield %>

2
app/views/layouts/base_users.html.erb
Unescape View File

@ -107,7 +107,7 @@
</div>
<div id="content" style="padding-top: 0px;">
<div class="tabs">
<div class="tabs_new">
<%= render_menu :user_menu %>
</div>
<%= yield %>

40
app/views/projects/settings/_members.html.erb
Unescape View File

@ -1,30 +1,30 @@
<%= error_messages_for 'member' %>
<% roles = Role.find_all_givable
members = @project.member_principals.includes(:roles, :principal).all.sort %>
<!--Modified by young-->
<div class="splitcontent">
<% if roles.any? %>
<%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
<fieldset><legend><%=l(:label_member_new)%></legend>
<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
<div id="principals_for_new_member">
<%= render_principals_for_new_members(@project) %>
</div>
<p><%= l(:label_role_plural) %>:
<% roles.each do |role| %>
<label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
<% end %></p>
<p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
</fieldset>
<% if roles.any? %>
<%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
<fieldset><legend><%=l(:label_member_new)%></legend>
<div class="splitcontentleft">
<p style="width:80%;"><span><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></span></p>
<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
<div id="principals_for_new_member">
<%= render_principals_for_new_members(@project) %>
</div>
<p style="margin-bottom:5px;margin-top:5px;"><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
</div>
<div class="splitcontentright" style="width:30%;margin-top: 60px;">
<p><%= l(:label_role_plural) %>:
<% roles.each do |role| %>
<label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
<% end %></p>
</div>
</fieldset>
<% end %>
<% end %>
</div>
<!--ended by young-->
<div class="splitcontent">
<% if members.any? %>
<table class="list members">

1
config/locales/zh.yml
Unescape View File

@ -751,6 +751,7 @@ zh:
label_search_titles_only: 仅在标题中搜索
label_user_mail_option_all: "收取我的项目的所有通知"
#huang
label_file_new: 下载
label_user_edit: "修改资料"
label_user_info: "个人简介" #huang 添加
label_user_watcher: "关注" # huang添加的

2
lib/redmine.rb
Unescape View File

@ -258,7 +258,7 @@ Redmine::MenuManager.map :project_menu do |menu|
# :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
# menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
# :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id
menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil },
:if => Proc.new { |p| p.repository && !p.repository.new_record? }
menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true

82
public/stylesheets/application.css
Unescape View File

@ -1254,25 +1254,24 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
#roadmap table.progress td { height: 1.2em; }
/***** Tabs *****/
#content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em;}
#content .tabs ul li {
float:left;
list-style-type:none;
white-space:nowrap;
margin-right:4px;
margin-right:0px;
background:#fff;
position:relative;
margin-bottom:-1px;
margin-bottom:5px;
}
#content .tabs ul li a{
display:block;
font-size: 0.9em;
text-decoration:none;
line-height:1.3em;
padding:4px 6px 4px 6px;
padding:2px 6px 2px 6px;
border: 1px solid #ccc;
border-bottom: 1px solid #bbbbbb;
background-color: #f6f6f6;
background-color:#DEEBF0;
color:#999;
font-weight:bold;
border-top-left-radius:3px;
@ -1287,11 +1286,11 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
#content .tabs ul li a.selected {
background-color: #fff;
border: 1px solid #bbbbbb;
border-bottom: 1px solid #fff;
border-bottom: 1px solid #BBBBBB;
color:#111;
}
#content .tabs ul li a.selected:hover {background-color: #fff;}
#content .tabs ul li a.selected:hover {background-color: #E5DFC7;}
div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
@ -1318,7 +1317,74 @@ button.tab-right {
background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
border-top-right-radius:3px;
}
/*added by young*/
/***** Settings Tabs *****/
#content .tabs_new {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
#content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
#content .tabs_new ul li {
float:left;
list-style-type:none;
white-space:nowrap;
margin-right:4px;
background:#fff;
position:relative;
margin-bottom:-1px;
}
#content .tabs_new ul li a{
display:block;
font-size: 0.9em;
text-decoration:none;
line-height:1.3em;
padding:4px 6px 4px 6px;
border: 1px solid #ccc;
border-bottom: 1px solid #bbbbbb;
background-color: #f6f6f6;
color:#999;
font-weight:bold;
border-top-left-radius:3px;
border-top-right-radius:3px;
}
#content .tabs_new ul li a:hover {
background-color: #cacbcb;
text-decoration:none;
}
#content .tabs_new ul li a.selected {
background-color: #fff;
border: 1px solid #bbbbbb;
border-bottom: 1px solid #fff;
color:#111;
}
#content .tabs_new ul li a.selected:hover {background-color: #fff;}
div.tabs_new-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
button.tab_new-left, button.tab_new-right {
font-size: 0.9em;
cursor: pointer;
height:24px;
border: 1px solid #ccc;
border-bottom: 1px solid #bbbbbb;
position:absolute;
padding:4px;
width: 20px;
bottom: -1px;
}
button.tab_new-left {
right: 20px;
background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
border-top-left-radius:3px;
}
button.tab_new-right {
right: 0;
background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
border-top-right-radius:3px;
}
/*end by young*/
/***** Diff *****/
.diff_out { background: #fcc; }
.diff_out span { background: #faa; }

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

@ -1364,7 +1364,74 @@ div.pagination span.current-page {
div.pagination a:hover, div.pagination span.current-page {
background-color: rgb(245, 245, 245);
}
/*added by young*/
div.pagination_new {
margin: 10px 0px;
height: 36px;
text-align: center;
font-size: 10px;
}
div.pagination_new ul {
border-radius: 2px 2px 2px 2px;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.05);
list-style: disc outside none;
padding: 0px;
margin-left: 0px;
margin-top: 0px;
}
div.pagination_new li {
display: inline;
line-height: 18px;
padding: 0px;
margin: 0px;
}
div.pagination_new li:first-child a {
border-left-width: 1px;
border-radius: 3px 0px 0px 3px;
}
div.pagination_new a {
float: left;
padding: 0px 10px;
line-height: 24px;
text-decoration: none;
border-width: 1px 1px 1px 0px;
border-style: solid;
border-color: rgb(221, 221, 221);
-moz-border-top-colors: none;
-moz-border-right-colors: none;
-moz-border-left-colors: none;
-moz-border-bottom-colors: none;
border-image: none;
}
div.pagination_new span {
float: left;
padding: 0px 10px;
line-height: 24px;
text-decoration: none;
border-width: 1px 1px 1px 0px;
border-style: solid;
border-color: rgb(221, 221, 221);
-moz-border-top-colors: none;
-moz-border-right-colors: none;
-moz-border-left-colors: none;
-moz-border-bottom-colors: none;
border-image: none;
}
}
div.pagination_new span.current-page {
color: rgb(153, 153, 153);
cursor: default;
}
div.pagination_new a:hover, div.pagination_new span.current-page {
background-color: rgb(245, 245, 245);
}
/*ended by young*/
/*
* Designed for activity.
* Added by Nie.

Write Preview
Loading…
Cancel
Save