##// END OF EJS Templates
jro_apps » redmine
RSS
Use the regular "icon icon-*" in other pages (#24313)....
Jean-Philippe Lang -
r15596:8aa647addb9a
parent child
Show More
Side by Side Unified
Context file:
r15596:8aa647addb9a Loading diff...:
Show file before | Show file after | Hide comments
@@ -65,7 +65,7 module ProjectsHelper
65 # Renders the projects index
65 # Renders the projects index
66 def render_project_hierarchy(projects)
66 def render_project_hierarchy(projects)
67 render_project_nested_lists(projects) do |project|
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 if project.description.present?
69 if project.description.present?
70 s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
70 s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
71 end
71 end
Show file before | Show file after | Hide comments
@@ -36,7 +36,7
36 <tbody>
36 <tbody>
37 <% @topics.each do |topic| %>
37 <% @topics.each do |topic| %>
38 <tr id="message-<%= topic.id %>" class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
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-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
40 <td class="author"><%= link_to_user(topic.author) %></td>
40 <td class="author"><%= link_to_user(topic.author) %></td>
41 <td class="created_on"><%= format_time(topic.created_on) %></td>
41 <td class="created_on"><%= format_time(topic.created_on) %></td>
42 <td class="reply-count"><%= topic.replies_count %></td>
42 <td class="reply-count"><%= topic.replies_count %></td>
Show file before | Show file after | Hide comments
@@ -45,7 +45,7
45 <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
45 <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
46 <% @issue.attachments.each do |attachment| %>
46 <% @issue.attachments.each do |attachment| %>
47 <span class="existing-attachment">
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 <label>
49 <label>
50 <%= check_box_tag 'issue[deleted_attachment_ids][]',
50 <%= check_box_tag 'issue[deleted_attachment_ids][]',
51 attachment.id,
51 attachment.id,
Show file before | Show file after | Hide comments
@@ -40,6 +40,7
40 <span class="search_for_watchers">
40 <span class="search_for_watchers">
41 <%= link_to l(:label_search_for_watchers),
41 <%= link_to l(:label_search_for_watchers),
42 {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
42 {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
43 :class => 'icon icon-add-bullet',
43 :remote => true,
44 :remote => true,
44 :method => 'get' %>
45 :method => 'get' %>
45 </span>
46 </span>
Show file before | Show file after | Hide comments
@@ -34,7 +34,7
34 <br />
34 <br />
35
35
36 <% unless @replies.empty? %>
36 <% unless @replies.empty? %>
37 <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
37 <h3 class="comments icon icon-comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
38 <% @replies.each do |message| %>
38 <% @replies.each do |message| %>
39 <div class="message reply" id="<%= "message-#{message.id}" %>">
39 <div class="message reply" id="<%= "message-#{message.id}" %>">
40 <div class="contextual">
40 <div class="contextual">
Show file before | Show file after | Hide comments
@@ -14,7 +14,7
14
14
15 <% if User.current.logged? %>
15 <% if User.current.logged? %>
16 <p style="text-align:right;">
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 </p>
18 </p>
19 <% end %>
19 <% end %>
20
20
Show file before | Show file after | Hide comments
@@ -17,7 +17,7
17 <% members.each do |member| %>
17 <% members.each do |member| %>
18 <% next if member.new_record? %>
18 <% next if member.new_record? %>
19 <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
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 <td class="roles">
21 <td class="roles">
22 <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
22 <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
23 <%= form_for(member,
23 <%= form_for(member,
Show file before | Show file after | Hide comments
@@ -23,7 +23,7
23 <tbody>
23 <tbody>
24 <% @versions.sort.each do |version| %>
24 <% @versions.sort.each do |version| %>
25 <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
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 <td class="date"><%= format_date(version.effective_date) %></td>
27 <td class="date"><%= format_date(version.effective_date) %></td>
28 <td class="description"><%= version.description %></td>
28 <td class="description"><%= version.description %></td>
29 <td class="status"><%= l("version_status_#{version.status}") %></td>
29 <td class="status"><%= l("version_status_#{version.status}") %></td>
Show file before | Show file after | Hide comments
@@ -13,10 +13,10 function addFile(inputEl, file, eagerUpload) {
13 if (!param) {param = 'attachments'};
13 if (!param) {param = 'attachments'};
14
14
15 fileSpan.append(
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 $('<input>', { type: 'text', 'class': 'description', name: param + '[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
17 $('<input>', { type: 'text', 'class': 'description', name: param + '[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
18 $('<input>', { type: 'hidden', 'class': 'token', name: param + '[' + attachmentId + '][token]'} ),
18 $('<input>', { type: 'hidden', 'class': 'token', name: param + '[' + attachmentId + '][token]'} ),
19 $('<a>&nbsp</a>').attr({ href: "#", 'class': 'remove-upload' }).click(removeFile).toggle(!eagerUpload)
19 $('<a>&nbsp</a>').attr({ href: "#", 'class': 'icon-only icon-del remove-upload' }).click(removeFile).toggle(!eagerUpload)
20 ).appendTo(attachmentsFields);
20 ).appendTo(attachmentsFields);
21
21
22 if ($(inputEl).data('description') == 0) {
22 if ($(inputEl).data('description') == 0) {
Show file before | Show file after | Hide comments
@@ -221,17 +221,16 table.files tr.file td.digest { font-size: 80%; }
221 table.members td.roles, table.memberships td.roles { width: 45%; }
221 table.members td.roles, table.memberships td.roles { width: 45%; }
222
222
223 tr.message { height: 2.6em; }
223 tr.message { height: 2.6em; }
224 tr.message td.subject { padding-left: 20px; }
225 tr.message td.created_on { white-space: nowrap; }
224 tr.message td.created_on { white-space: nowrap; }
226 tr.message td.last_message { font-size: 80%; white-space: nowrap; }
225 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; }
226 tr.message.sticky td.subject { font-weight: bold; }
228 tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
229
227
230 tr.version.closed, tr.version.closed a { color: #999; }
228 tr.version.closed, tr.version.closed a { color: #999; }
231 tr.version td.name { padding-left: 20px; }
229 tr.version td.name { padding-left: 20px; }
232 tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
233 tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
230 tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
234
231
232 tr.member td.icon-user {background:transparent;}
233
235 tr.user td {width:13%;white-space: nowrap;}
234 tr.user td {width:13%;white-space: nowrap;}
236 td.username, td.firstname, td.lastname, td.email {text-align:left !important;}
235 td.username, td.firstname, td.lastname, td.email {text-align:left !important;}
237 tr.user td.email { width:18%; }
236 tr.user td.email { width:18%; }
@@ -275,7 +274,7 a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat:
275 a.sort.asc { background-image: url(../images/sort_asc.png); }
274 a.sort.asc { background-image: url(../images/sort_asc.png); }
276 a.sort.desc { background-image: url(../images/sort_desc.png); }
275 a.sort.desc { background-image: url(../images/sort_desc.png); }
277
276
278 table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
277 table.boards a.board { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
279 table.boards td.last-message {text-align:left;font-size:80%;}
278 table.boards td.last-message {text-align:left;font-size:80%;}
280
279
281 div.table-list.boards .table-list-cell.name {width: 30%;}
280 div.table-list.boards .table-list-cell.name {width: 30%;}
@@ -319,7 +318,7 td.center {text-align:center;}
319 span#watchers_inputs {overflow:auto; display:block;}
318 span#watchers_inputs {overflow:auto; display:block;}
320 span.search_for_watchers {display:block;}
319 span.search_for_watchers {display:block;}
321 span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
320 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%; }
321 span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
323
322
324
323
325 .highlight { background-color: #FCFD8D;}
324 .highlight { background-color: #FCFD8D;}
@@ -482,7 +481,6 ul.projects li {list-style-type:none;}
482 #projects-index ul.projects li.root {margin-bottom: 1em;}
481 #projects-index ul.projects li.root {margin-bottom: 1em;}
483 #projects-index ul.projects li.child {margin-top: 1em;}
482 #projects-index ul.projects li.child {margin-top: 1em;}
484 #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; }
483 #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
484
487 #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
485 #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
488
486
@@ -657,13 +655,13 span.required {color: #bb0000;}
657
655
658 .attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;}
656 .attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;}
659 .attachments_fields>span, #existing-attachments>span {display:block; white-space:nowrap;}
657 .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;}
658 .attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; }
661 .tabular input.filename {max-width:75% !important;}
659 .tabular input.filename {max-width:75% !important;}
662 .attachments_fields input.filename {height:1.8em;}
660 .attachments_fields input.filename {height:1.8em;}
663 .attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
661 .attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
664 .attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
662 .attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
665 .attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
663 .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;}
664
667 a.remove-upload:hover {text-decoration:none !important;}
665 a.remove-upload:hover {text-decoration:none !important;}
668 .existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;}
666 .existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;}
669
667
@@ -703,9 +701,6 select.bool_cf {width:auto !important;}
703 #users_for_watcher {height: 200px; overflow:auto;}
701 #users_for_watcher {height: 200px; overflow:auto;}
704 #users_for_watcher label {display: block;}
702 #users_for_watcher label {display: block;}
705
703
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 input#principal_search, input#user_search {width:90%}
704 input#principal_search, input#user_search {width:90%}
710 .roles-selection label {display:inline-block; width:210px;}
705 .roles-selection label {display:inline-block; width:210px;}
711
706
@@ -1151,12 +1146,12 div.wiki img {vertical-align:middle; max-width:100%;}
1151 .icon-fav { background-image: url(../images/fav.png); }
1146 .icon-fav { background-image: url(../images/fav.png); }
1152 .icon-fav-off { background-image: url(../images/fav_off.png); }
1147 .icon-fav-off { background-image: url(../images/fav_off.png); }
1153 .icon-reload { background-image: url(../images/reload.png); }
1148 .icon-reload { background-image: url(../images/reload.png); }
1154 .icon-lock { background-image: url(../images/locked.png); }
1149 .icon-lock, .icon-locked { background-image: url(../images/locked.png); }
1155 .icon-unlock { background-image: url(../images/unlock.png); }
1150 .icon-unlock { background-image: url(../images/unlock.png); }
1156 .icon-checked { background-image: url(../images/toggle_check.png); }
1151 .icon-checked { background-image: url(../images/toggle_check.png); }
1157 .icon-details { background-image: url(../images/zoom_in.png); }
1152 .icon-details { background-image: url(../images/zoom_in.png); }
1158 .icon-report { background-image: url(../images/report.png); }
1153 .icon-report { background-image: url(../images/report.png); }
1159 .icon-comment { background-image: url(../images/comment.png); }
1154 .icon-comment, .icon-comments { background-image: url(../images/comment.png); }
1160 .icon-summary { background-image: url(../images/lightning.png); }
1155 .icon-summary { background-image: url(../images/lightning.png); }
1161 .icon-server-authentication { background-image: url(../images/server_key.png); }
1156 .icon-server-authentication { background-image: url(../images/server_key.png); }
1162 .icon-issue { background-image: url(../images/ticket.png); }
1157 .icon-issue { background-image: url(../images/ticket.png); }
@@ -1164,7 +1159,7 div.wiki img {vertical-align:middle; max-width:100%;}
1164 .icon-zoom-out { background-image: url(../images/zoom_out.png); }
1159 .icon-zoom-out { background-image: url(../images/zoom_out.png); }
1165 .icon-magnifier { background-image: url(../images/magnifier.png); }
1160 .icon-magnifier { background-image: url(../images/magnifier.png); }
1166 .icon-passwd { background-image: url(../images/textfield_key.png); }
1161 .icon-passwd { background-image: url(../images/textfield_key.png); }
1167 .icon-test { background-image: url(../images/bullet_go.png); }
1162 .icon-arrow-right, .icon-test, .icon-sticky { background-image: url(../images/bullet_go.png); }
1168 .icon-email { background-image: url(../images/email.png); }
1163 .icon-email { background-image: url(../images/email.png); }
1169 .icon-email-disabled { background-image: url(../images/email_disabled.png); }
1164 .icon-email-disabled { background-image: url(../images/email_disabled.png); }
1170 .icon-email-add { background-image: url(../images/email_add.png); }
1165 .icon-email-add { background-image: url(../images/email_add.png); }
@@ -1179,7 +1174,7 div.wiki img {vertical-align:middle; max-width:100%;}
1179 .icon-close { background-image: url(../images/close.png); }
1174 .icon-close { background-image: url(../images/close.png); }
1180 .icon-close:hover { background-image: url(../images/close_hl.png); }
1175 .icon-close:hover { background-image: url(../images/close_hl.png); }
1181 .icon-settings { background-image: url(../images/changeset.png); }
1176 .icon-settings { background-image: url(../images/changeset.png); }
1182 .icon-group { background-image: url(../images/group.png); }
1177 .icon-group, .icon-groupnonmember, .icon-groupanonymous { background-image: url(../images/group.png); }
1183 .icon-roles { background-image: url(../images/database_key.png); }
1178 .icon-roles { background-image: url(../images/database_key.png); }
1184 .icon-issue-edit { background-image: url(../images/ticket_edit.png); }
1179 .icon-issue-edit { background-image: url(../images/ticket_edit.png); }
1185 .icon-workflows { background-image: url(../images/ticket_go.png); }
1180 .icon-workflows { background-image: url(../images/ticket_go.png); }
@@ -1194,6 +1189,8 div.wiki img {vertical-align:middle; max-width:100%;}
1194 .icon-wiki-page { background-image: url(../images/wiki_edit.png); }
1189 .icon-wiki-page { background-image: url(../images/wiki_edit.png); }
1195 .icon-document { background-image: url(../images/document.png); }
1190 .icon-document { background-image: url(../images/document.png); }
1196 .icon-project { background-image: url(../images/projects.png); }
1191 .icon-project { background-image: url(../images/projects.png); }
1192 .icon-add-bullet { background-image: url(../images/bullet_add.png); }
1193 .icon-shared { background-image: url(../images/link.png) };
1197
1194
1198 .icon-file { background-image: url(../images/files/default.png); }
1195 .icon-file { background-image: url(../images/files/default.png); }
1199 .icon-file.text-plain { background-image: url(../images/files/text.png); }
1196 .icon-file.text-plain { background-image: url(../images/files/text.png); }
General Comments 0
You need to be logged in to leave comments. Login now