Patch #24313 » 06_other_pages.patch
app/helpers/projects_helper.rb | ||
---|---|---|
65 | 65 |
# Renders the projects index |
66 | 66 |
def render_project_hierarchy(projects) |
67 | 67 |
render_project_nested_lists(projects) do |project| |
68 |
s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}") |
|
68 |
s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'icon icon-fav my-project' : nil}")
|
|
69 | 69 |
if project.description.present? |
70 | 70 |
s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description') |
71 | 71 |
end |
app/views/auth_sources/index.html.erb | ||
---|---|---|
20 | 20 |
<td><%= source.host %></td> |
21 | 21 |
<td><%= source.users.count %></td> |
22 | 22 |
<td class="buttons"> |
23 |
<%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-test' %>
|
|
23 |
<%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-arrow-right' %>
|
|
24 | 24 |
<%= delete_link auth_source_path(source) %> |
25 | 25 |
</td> |
26 | 26 |
</tr> |
app/views/boards/show.html.erb | ||
---|---|---|
36 | 36 |
<tbody> |
37 | 37 |
<% @topics.each do |topic| %> |
38 | 38 |
<tr id="message-<%= topic.id %>" class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"> |
39 |
<td class="subject"><%= link_to topic.subject, board_message_path(@board, topic) %></td> |
|
39 |
<td class="subject icon <%= 'icon-arrow-right' if topic.sticky? %> <%= 'icon-lock' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
|
|
40 | 40 |
<td class="author"><%= link_to_user(topic.author) %></td> |
41 | 41 |
<td class="created_on"><%= format_time(topic.created_on) %></td> |
42 | 42 |
<td class="reply-count"><%= topic.replies_count %></td> |
app/views/issues/_edit.html.erb | ||
---|---|---|
31 | 31 |
<fieldset><legend><%= l(:field_notes) %></legend> |
32 | 32 |
<%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %> |
33 | 33 |
<%= wikitoolbar_for 'issue_notes' %> |
34 |
|
|
34 | ||
35 | 35 |
<% if @issue.safe_attribute? 'private_notes' %> |
36 | 36 |
<%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label> |
37 | 37 |
<% end %> |
38 |
|
|
38 | ||
39 | 39 |
<%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %> |
40 | 40 |
</fieldset> |
41 | 41 | |
... | ... | |
45 | 45 |
<div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>"> |
46 | 46 |
<% @issue.attachments.each do |attachment| %> |
47 | 47 |
<span class="existing-attachment"> |
48 |
<%= text_field_tag '', attachment.filename, :class => "filename", :disabled => true %> |
|
48 |
<%= text_field_tag '', attachment.filename, :class => "icon icon-attachment filename", :disabled => true %>
|
|
49 | 49 |
<label> |
50 | 50 |
<%= check_box_tag 'issue[deleted_attachment_ids][]', |
51 | 51 |
attachment.id, |
app/views/issues/new.html.erb | ||
---|---|---|
40 | 40 |
<span class="search_for_watchers"> |
41 | 41 |
<%= link_to l(:label_search_for_watchers), |
42 | 42 |
{:controller => 'watchers', :action => 'new', :project_id => @issue.project}, |
43 |
:class => 'icon icon-add-bullet', |
|
43 | 44 |
:remote => true, |
44 | 45 |
:method => 'get' %> |
45 | 46 |
</span> |
app/views/messages/show.html.erb | ||
---|---|---|
34 | 34 |
<br /> |
35 | 35 | |
36 | 36 |
<% unless @replies.empty? %> |
37 |
<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
|
|
37 |
<h3 class="icon icon-comment"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
|
|
38 | 38 |
<% @replies.each do |message| %> |
39 | 39 |
<div class="message reply" id="<%= "message-#{message.id}" %>"> |
40 | 40 |
<div class="contextual"> |
app/views/projects/index.html.erb | ||
---|---|---|
14 | 14 | |
15 | 15 |
<% if User.current.logged? %> |
16 | 16 |
<p style="text-align:right;"> |
17 |
<span class="my-project"><%= l(:label_my_projects) %></span> |
|
17 |
<span class="icon icon-fav my-project"><%= l(:label_my_projects) %></span>
|
|
18 | 18 |
</p> |
19 | 19 |
<% end %> |
20 | 20 |
app/views/projects/settings/_members.html.erb | ||
---|---|---|
17 | 17 |
<% members.each do |member| %> |
18 | 18 |
<% next if member.new_record? %> |
19 | 19 |
<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member"> |
20 |
<td class="name <%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td> |
|
20 |
<td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
|
|
21 | 21 |
<td class="roles"> |
22 | 22 |
<span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span> |
23 | 23 |
<%= form_for(member, |
app/views/projects/settings/_versions.html.erb | ||
---|---|---|
23 | 23 |
<tbody> |
24 | 24 |
<% @versions.sort.each do |version| %> |
25 | 25 |
<tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>"> |
26 |
<td class="name"><%= link_to_version version %></td> |
|
26 |
<td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
|
|
27 | 27 |
<td class="date"><%= format_date(version.effective_date) %></td> |
28 | 28 |
<td class="description"><%= version.description %></td> |
29 | 29 |
<td class="status"><%= l("version_status_#{version.status}") %></td> |
public/javascripts/attachments.js | ||
---|---|---|
13 | 13 |
if (!param) {param = 'attachments'}; |
14 | 14 | |
15 | 15 |
fileSpan.append( |
16 |
$('<input>', { type: 'text', 'class': 'filename readonly', name: param +'[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name), |
|
16 |
$('<input>', { type: 'text', 'class': 'icon icon-attachment filename readonly', name: param +'[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name),
|
|
17 | 17 |
$('<input>', { type: 'text', 'class': 'description', name: param + '[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload), |
18 | 18 |
$('<input>', { type: 'hidden', 'class': 'token', name: param + '[' + attachmentId + '][token]'} ), |
19 |
$('<a> </a>').attr({ href: "#", 'class': 'remove-upload' }).click(removeFile).toggle(!eagerUpload) |
|
19 |
$('<a> </a>').attr({ href: "#", 'class': 'icon-only icon-del remove-upload' }).click(removeFile).toggle(!eagerUpload)
|
|
20 | 20 |
).appendTo(attachmentsFields); |
21 | 21 | |
22 | 22 |
if ($(inputEl).data('description') == 0) { |
... | ... | |
26 | 26 |
if(eagerUpload) { |
27 | 27 |
ajaxUpload(file, attachmentId, fileSpan, inputEl); |
28 | 28 |
} |
29 |
|
|
29 | ||
30 | 30 |
addAttachment.toggle(attachmentsFields.children().length < maxFiles); |
31 | 31 |
return attachmentId; |
32 | 32 |
} |
... | ... | |
112 | 112 |
contentType: 'application/octet-stream', |
113 | 113 |
beforeSend: function(jqXhr, settings) { |
114 | 114 |
jqXhr.setRequestHeader('Accept', 'application/js'); |
115 |
// attach proper File object
|
|
115 |
// attach proper File object |
|
116 | 116 |
settings.data = blob; |
117 | 117 |
}, |
118 | 118 |
xhr: function() { |
public/stylesheets/application.css | ||
---|---|---|
224 | 224 |
tr.message td.subject { padding-left: 20px; } |
225 | 225 |
tr.message td.created_on { white-space: nowrap; } |
226 | 226 |
tr.message td.last_message { font-size: 80%; white-space: nowrap; } |
227 |
tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; } |
|
228 |
tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; } |
|
227 |
tr.message.sticky td.subject { font-weight: bold; } |
|
229 | 228 | |
230 | 229 |
tr.version.closed, tr.version.closed a { color: #999; } |
231 | 230 |
tr.version td.name { padding-left: 20px; } |
232 |
tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; } |
|
233 | 231 |
tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; } |
234 | 232 | |
235 | 233 |
tr.user td {width:13%;white-space: nowrap;} |
... | ... | |
275 | 273 |
a.sort.asc { background-image: url(../images/sort_asc.png); } |
276 | 274 |
a.sort.desc { background-image: url(../images/sort_desc.png); } |
277 | 275 | |
278 |
table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
|
|
276 |
table.boards a.board { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; } |
|
279 | 277 |
table.boards td.last-message {text-align:left;font-size:80%;} |
280 | 278 | |
281 | 279 |
div.table-list.boards .table-list-cell.name {width: 30%;} |
... | ... | |
319 | 317 |
span#watchers_inputs {overflow:auto; display:block;} |
320 | 318 |
span.search_for_watchers {display:block;} |
321 | 319 |
span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;} |
322 |
span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
|
|
320 |
span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; } |
|
323 | 321 | |
324 | 322 | |
325 | 323 |
.highlight { background-color: #FCFD8D;} |
... | ... | |
482 | 480 |
#projects-index ul.projects li.root {margin-bottom: 1em;} |
483 | 481 |
#projects-index ul.projects li.child {margin-top: 1em;} |
484 | 482 |
#projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; } |
485 |
.my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; } |
|
486 | 483 | |
487 | 484 |
#notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;} |
488 | 485 | |
... | ... | |
657 | 654 | |
658 | 655 |
.attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;} |
659 | 656 |
.attachments_fields>span, #existing-attachments>span {display:block; white-space:nowrap;} |
660 |
.attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
|
|
657 |
.attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; } |
|
661 | 658 |
.tabular input.filename {max-width:75% !important;} |
662 | 659 |
.attachments_fields input.filename {height:1.8em;} |
663 | 660 |
.attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} |
664 | 661 |
.attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} |
665 | 662 |
.attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; } |
666 |
a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;} |
|
663 | ||
667 | 664 |
a.remove-upload:hover {text-decoration:none !important;} |
668 | 665 |
.existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;} |
669 | 666 | |
... | ... | |
703 | 700 |
#users_for_watcher {height: 200px; overflow:auto;} |
704 | 701 |
#users_for_watcher label {display: block;} |
705 | 702 | |
706 |
table.members td.name {padding-left: 20px;} |
|
707 |
table.members td.group, table.members td.groupnonmember, table.members td.groupanonymous {background: url(../images/group.png) no-repeat 0% 1px;} |
|
708 | ||
709 | 703 |
input#principal_search, input#user_search {width:90%} |
710 | 704 |
.roles-selection label {display:inline-block; width:210px;} |
711 | 705 | |
... | ... | |
1164 | 1158 |
.icon-zoom-out { background-image: url(../images/zoom_out.png); } |
1165 | 1159 |
.icon-magnifier { background-image: url(../images/magnifier.png); } |
1166 | 1160 |
.icon-passwd { background-image: url(../images/textfield_key.png); } |
1167 |
.icon-test { background-image: url(../images/bullet_go.png); }
|
|
1161 |
.icon-arrow-right { background-image: url(../images/bullet_go.png); }
|
|
1168 | 1162 |
.icon-email { background-image: url(../images/email.png); } |
1169 | 1163 |
.icon-email-disabled { background-image: url(../images/email_disabled.png); } |
1170 | 1164 |
.icon-email-add { background-image: url(../images/email_add.png); } |
... | ... | |
1179 | 1173 |
.icon-close { background-image: url(../images/close.png); } |
1180 | 1174 |
.icon-close:hover { background-image: url(../images/close_hl.png); } |
1181 | 1175 |
.icon-settings { background-image: url(../images/changeset.png); } |
1182 |
.icon-group { background-image: url(../images/group.png); } |
|
1176 |
.icon-group, .icon-groupnonmember, .icon-groupanonymous { background-image: url(../images/group.png); }
|
|
1183 | 1177 |
.icon-roles { background-image: url(../images/database_key.png); } |
1184 | 1178 |
.icon-issue-edit { background-image: url(../images/ticket_edit.png); } |
1185 | 1179 |
.icon-workflows { background-image: url(../images/ticket_go.png); } |
... | ... | |
1194 | 1188 |
.icon-wiki-page { background-image: url(../images/wiki_edit.png); } |
1195 | 1189 |
.icon-document { background-image: url(../images/document.png); } |
1196 | 1190 |
.icon-project { background-image: url(../images/projects.png); } |
1191 |
.icon-add-bullet { background-image: url(../images/bullet_add.png); } |
|
1192 |
.icon-shared { background-image: url(../images/link.png) }; |
|
1197 | 1193 | |
1198 | 1194 |
.icon-file { background-image: url(../images/files/default.png); } |
1199 | 1195 |
.icon-file.text-plain { background-image: url(../images/files/text.png); } |