Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
This commit is contained in:
commit
28296f3f9b
|
|
@ -17,7 +17,7 @@
|
|||
class UsersController < ApplicationController
|
||||
layout 'base_users'
|
||||
|
||||
before_filter :require_admin, :except => [:show, :index,:tag_save]
|
||||
before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments]
|
||||
before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments]
|
||||
accept_api_auth :index, :show, :create, :update, :destroy
|
||||
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@
|
|||
|
||||
<li id="issue-<%= issue.id %>" class="hascontextmenu <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
|
||||
<% column_content = ( query.inline_columns.map {|column| "<li class=\"#{column.css_classes}\">#{column_content(column, issue)}</li>"}) %>
|
||||
<%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
|
||||
<ul class="issue_list">
|
||||
<%= raw column_content[0] %>
|
||||
<%= raw column_content[4] %>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<div id="footer" style="margin-left:-5px;padding-top: 10px;clear: both;">
|
||||
<div class="bgl"><div class="bgr">
|
||||
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> © 2006-2013 Jean-Philippe Lang
|
||||
</div></div>
|
||||
</div>
|
||||
|
|
@ -119,9 +119,11 @@
|
|||
<%= call_hook :view_layouts_base_content %>
|
||||
<div style="clear:both;"></div>
|
||||
<%= render_flash_messages %>
|
||||
|
||||
</div>
|
||||
<%=render :partial => 'layouts/base_footer'%>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="ajax-indicator" style="display:none;">
|
||||
<span><%= l(:label_loading) %></span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -18,16 +18,8 @@
|
|||
<body class="<%= h body_css_classes %>">
|
||||
<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>
|
||||
|
||||
<div id="wrapper3">
|
||||
<%=render :partial => 'layouts/base_header'%>
|
||||
<div id="main" class="">
|
||||
<!--user page-->
|
||||
<div id="sidebar">
|
||||
|
|
@ -139,9 +131,12 @@
|
|||
<%= call_hook :view_layouts_base_content %>
|
||||
<div style="clear:both;"></div>
|
||||
<%= render_flash_messages %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<%=render :partial => 'layouts/base_footer'%>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div id="ajax-indicator" style="display:none;">
|
||||
<span><%= l(:label_loading) %></span>
|
||||
</div>
|
||||
|
|
@ -150,6 +145,7 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= call_hook :view_layouts_base_body_bottom %>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -137,9 +137,7 @@
|
|||
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</p>
|
||||
<p>
|
||||
<%= user.changesets.count == 0 ? '' : "#{l(:label_total_commit, :total_commit => user.changesets.count)}" %> | managed 7 projects | Most experience in c++
|
||||
<%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %>
|
||||
</p>
|
||||
</div>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<td colspan="2" valign="top"><strong> <%= content_tag('span', h(e.project), :class => 'project') %></strong> <span class="font_lighter">有了最新动态</span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" width="580" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td>
|
||||
<td colspan="2" width="580" ><p class="font_description"><%= textilizable e.event_description %></p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left"><a class="font_lighter"></a></td>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
|
|
@ -1103,7 +1103,9 @@ a.project {
|
|||
float: left;
|
||||
margin-top: 0px;
|
||||
width: 908px;
|
||||
height: 148px;
|
||||
min-height: 120px;
|
||||
height: auto;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
a.root {
|
||||
|
|
@ -1118,7 +1120,7 @@ a.root {
|
|||
margin-right: auto;
|
||||
margin-bottom: 10px;
|
||||
width: 908px;
|
||||
height: 250px;
|
||||
height: auto;
|
||||
padding-top: 10px;
|
||||
padding-left: 10px;
|
||||
padding-bottom: 10px;
|
||||
|
|
@ -1191,9 +1193,11 @@ a.img-tag3{
|
|||
}
|
||||
|
||||
.add-info {
|
||||
margin-top: 160px;
|
||||
float: left;
|
||||
margin-top: 0px;
|
||||
height: 20px;
|
||||
width: 908px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.main-language {
|
||||
float: left;
|
||||
|
|
@ -1247,8 +1251,8 @@ a.tag {
|
|||
div.well {
|
||||
color: black;
|
||||
min-height: 20px;
|
||||
height: 110px;
|
||||
padding: 19px;
|
||||
height: auto;
|
||||
padding: 19px 19px 6px 19px;
|
||||
margin-bottom: 20px;
|
||||
background-color: #f5f5f5;
|
||||
border: 1px solid #eee;
|
||||
|
|
@ -1400,6 +1404,7 @@ div.issue-note .description {
|
|||
*/
|
||||
|
||||
div.autoscroll ul.issue_list {
|
||||
margin-left: 30px;
|
||||
|
||||
}
|
||||
div.autoscroll ul {
|
||||
|
|
@ -1415,9 +1420,10 @@ div.autoscroll li.hascontextmenu{
|
|||
position: relative;
|
||||
display: block;
|
||||
margin-bottom: -1px;
|
||||
margin-left: 10px;
|
||||
padding: 8px 10px 10px 10px;/*by young*/
|
||||
border: 1px solid rgb(229,229,229);
|
||||
width: 650px;/*by young*/
|
||||
width: 600px;/*by young*/
|
||||
}
|
||||
|
||||
div.autoscroll li.id {
|
||||
|
|
@ -1434,12 +1440,12 @@ div.autoscroll li.id a {
|
|||
|
||||
div.autoscroll li.subject {
|
||||
margin:0px 60px 0px 0px;
|
||||
font-size: 15px;
|
||||
font-size: small;
|
||||
line-height: 1.3;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
div.autoscroll li.subject a{
|
||||
color: rgb(0, 0, 0);
|
||||
color: rgb(51, 51, 51);
|
||||
}
|
||||
div.autoscroll ul.list-group-item-meta{
|
||||
font-size: 11px;
|
||||
|
|
@ -1454,10 +1460,17 @@ div.autoscroll ul.list-group-item-meta li {
|
|||
}
|
||||
|
||||
div.autoscroll li.tracker, div.autoscroll li.status, div.autoscroll li.priority{
|
||||
color: rgb(17, 102, 153);
|
||||
color: rgb(51, 51, 51);
|
||||
font: 10px/1.4 Helvetica,arial,freesans,clean,sans-serif;
|
||||
}
|
||||
|
||||
|
||||
li.issue img.img-tag-issues {
|
||||
float: left;
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue