Use the regular "icon icon-*" in other pages (#24313).

git-svn-id: http://svn.redmine.org/redmine/trunk@15978 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 files changed, 10 insertions, 9 deletions

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a56fe73a3..63218e1d3 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,7 +65,7 @@ module ProjectsHelper
   # Renders the projects index
   def render_project_hierarchy(projects)
     render_project_nested_lists(projects) do |project|
-      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'icon icon-fav my-project' : nil}")
       if project.description.present?
         s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
       end
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index b032a5939..1f58acdc8 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -36,7 +36,7 @@
   <tbody>
   <% @topics.each do |topic| %>
     <tr id="message-<%= topic.id %>" class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
+      <td class="subject icon <%= 'icon-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
       <td class="author"><%= link_to_user(topic.author) %></td>
       <td class="created_on"><%= format_time(topic.created_on) %></td>
       <td class="reply-count"><%= topic.replies_count %></td>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 473610cfd..fff258db5 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -31,11 +31,11 @@
       <fieldset><legend><%= l(:field_notes) %></legend>
       <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
       <%= wikitoolbar_for 'issue_notes' %>
-  
+
       <% if @issue.safe_attribute? 'private_notes' %>
       <%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label>
       <% end %>
-  
+
       <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
       </fieldset>
 
@@ -45,7 +45,7 @@
         <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
           <% @issue.attachments.each do |attachment| %>
           <span class="existing-attachment">
-            <%= text_field_tag '', attachment.filename, :class => "filename", :disabled => true %>
+            <%= text_field_tag '', attachment.filename, :class => "icon icon-attachment filename", :disabled => true %>
             <label>
               <%= check_box_tag 'issue[deleted_attachment_ids][]',
                                 attachment.id,
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index c93a1fc1f..ec7f262e3 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -40,6 +40,7 @@
       <span class="search_for_watchers">
       <%= link_to l(:label_search_for_watchers),
                   {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+                  :class => 'icon icon-add-bullet',
                   :remote => true,
                   :method => 'get' %>
       </span>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 0adf0f856..f1a4f9bbb 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -34,7 +34,7 @@
 <br />
 
 <% unless @replies.empty? %>
-<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
+<h3 class="comments icon icon-comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
 <% @replies.each do |message| %>
   <div class="message reply" id="<%= "message-#{message.id}" %>">
     <div class="contextual">
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index a223bde74..92ea54795 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -14,7 +14,7 @@
 
 <% if User.current.logged? %>
 <p style="text-align:right;">
-<span class="my-project"><%= l(:label_my_projects) %></span>
+<span class="icon icon-fav my-project"><%= l(:label_my_projects) %></span>
 </p>
 <% end %>
 
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index 31415f80e..fe1295d2c 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -17,7 +17,7 @@
   <% members.each do |member| %>
   <% next if member.new_record? %>
   <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-  <td class="name <%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+  <td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
   <td class="roles">
     <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
       <%= form_for(member,
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
index 59576d29b..8173433f6 100644
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -23,7 +23,7 @@
   <tbody>
 <% @versions.sort.each do |version| %>
     <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
-    <td class="name"><%= link_to_version version %></td>
+    <td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
     <td class="date"><%= format_date(version.effective_date) %></td>
     <td class="description"><%= version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>