diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-08 19:21:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-01-08 19:21:59 +0000 |
| commit | 220641909ca6b6a3a5789868dab780b342517910 (patch) | |
| tree | 47b773b20c4f6876fbaca30863c2da4f863d0472 | |
| parent | 31bc6054a36a08d43a640531648ed3f1dbebac7e (diff) | |
| download | redmine-220641909ca6b6a3a5789868dab780b342517910.tar.gz redmine-220641909ca6b6a3a5789868dab780b342517910.zip | |
* all icons replaced (new icons are based on GPL icon set: "KDE Crystal Diamond 2.5" -by paolino- and "kNeu! Alpha v0.1" -by Pablo Fabregat-)
* fixed: subprojects count is always 0 on projects list
git-svn-id: http://redmine.rubyforge.org/svn/trunk@157 e93f8b46-1217-0410-a6f0-8f06a7374b81
80 files changed, 179 insertions, 158 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ccfc5d502..0f0d577ee 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -50,6 +50,14 @@ module ApplicationHelper link_to user.display_name, :controller => 'account', :action => 'show', :id => user
end
+ def image_to_function(name, function, html_options = {})
+ html_options.symbolize_keys!
+ tag(:input, html_options.merge({
+ :type => "image", :src => image_path(name),
+ :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
+ }))
+ end
+
def format_date(date)
l_date(date) if date
end
@@ -145,7 +153,7 @@ module ApplicationHelper end
def calendar_for(field_id)
- image_tag("calendar", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
+ image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
end
end diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index ec14ecbe1..300fbfe54 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -96,10 +96,10 @@ module SortHelper key, order = session[@sort_name][:key], session[@sort_name][:order] if key == column if order.downcase == 'asc' - icon = 'sort_asc' + icon = 'sort_asc.png' order = 'desc' else - icon = 'sort_desc' + icon = 'sort_desc.png' order = 'asc' end else diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index 74c075516..8f092b525 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -1,6 +1,6 @@ <center>
<div class="box login">
-<h2><%= image_tag 'login' %> <%=l(:label_please_login)%></h2> +<h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2> <%= start_form_tag({:action=> "login"}, :class => "tabular") %>
<p><label for="login"><%=l(:field_login)%>:</label>
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index d937e287c..901134c27 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -1,50 +1,41 @@ <h2><%=l(:label_administration)%></h2>
-<p>
-<%= image_tag "projects" %>
+<p class="icon22 icon22-projects">
<%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
<%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
</p>
-<p>
-<%= image_tag "users" %>
+<p class="icon22 icon22-users">
<%= link_to l(:label_user_plural), :controller => 'users' %> |
<%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
</p>
-<p>
-<%= image_tag "role" %>
+<p class="icon22 icon22-role">
<%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
</p>
-<p>
-<%= image_tag "tracker" %>
+<p class="icon22 icon22-tracker">
<%= link_to l(:label_tracker_plural), :controller => 'trackers' %> |
-<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
-</p>
-
-<p>
-<%= image_tag "workflow" %>
<%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |
<%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %>
</p>
-<p>
-<%= image_tag "options" %>
+<p class="icon22 icon22-workflow">
+<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
+</p>
+
+<p class="icon22 icon22-options">
<%= link_to l(:label_enumerations), :controller => 'enumerations' %>
</p>
-<p>
-<%= image_tag "mailer" %>
+<p class="icon22 icon22-notifications">
<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %>
</p>
-<p>
-<%= image_tag "login" %>
+<p class="icon22 icon22-authent">
<%= link_to l(:label_authentication), :controller => 'auth_sources' %>
</p>
-<p>
-<%= image_tag "help" %>
+<p class="icon22 icon22-info">
<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
</p>
\ No newline at end of file diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index ecfff0357..b30cf2af5 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'pic picAdd' %> +<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_project_plural)%></h2> @@ -18,8 +18,8 @@ <tr class="<%= cycle("odd", "even") %>">
<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
<td><%=h project.description %>
- <td align="center"><%= image_tag 'true' if project.is_public? %> - <td align="center"><%= project.projects_count %>
+ <td align="center"><%= image_tag 'true.png' if project.is_public? %> + <td align="center"><%= project.children_count %>
<td align="center"><%= format_date(project.created_on) %>
<td align="center"> <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>
diff --git a/app/views/auth_sources/list.rhtml b/app/views/auth_sources/list.rhtml index d65e56d96..f486f45b7 100644 --- a/app/views/auth_sources/list.rhtml +++ b/app/views/auth_sources/list.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_auth_source_plural)%></h2> diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml index eef3e8631..982e66aab 100644 --- a/app/views/custom_fields/list.rhtml +++ b/app/views/custom_fields/list.rhtml @@ -16,8 +16,8 @@ <td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
<td align="center"><%= l(custom_field.type_name) %></td> <td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
- <td align="center"><%= image_tag 'true' if custom_field.is_required? %></td>
- <td align="center"><%= image_tag 'true' if custom_field.is_for_all? %></td>
+ <td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>
+ <td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td> <td align="center"> <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %> diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index 923701dd2..dab360eda 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -1,6 +1,6 @@ <div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'pic picEdit' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</div>
<h2><%= @document.title %></h2>
@@ -15,7 +15,7 @@ <% for attachment in @attachments %> <li>
<div class="contextual">
- <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+ <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</div>
<%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
(<%= human_size attachment.filesize %>)<br />
@@ -29,8 +29,8 @@ <% if authorize_for('documents', 'add_attachment') %>
<%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %>
- <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
- <%= link_to_function image_tag('add'), "addFileField()" %></label>
+ <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+ <%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= submit_tag l(:button_add) %>
<%= end_form_tag %>
diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 6c448fdc7..18508125f 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -10,7 +10,7 @@ <li><%= link_to value.name, :action => 'edit', :id => value %></li>
<% end %>
</ul>
- <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "pic picAdd" %></p>
+ <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "icon icon-add" %></p>
<% else %>
<h3><%= link_to l(name), :opt => option %></h3>
diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index c81c88127..bde9b1e23 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_issue_status_plural)%></h2> @@ -15,8 +15,8 @@ <% for status in @issue_statuses %> <tr class="<%= cycle("odd", "even") %>"> <td><div class="square" style="background:#<%= status.html_color %>;"></div> <%= link_to status.name, :action => 'edit', :id => status %></td>
- <td align="center"><%= image_tag 'true' if status.is_default? %></td>
- <td align="center"><%= image_tag 'true' if status.is_closed? %></td>
+ <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>
+ <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>
<td align="center"> <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
</td> diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 208e5be12..f7b8cda4b 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -1,5 +1,5 @@ <div class="contextual">
-<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'pic picPdf' %>
+<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
</div>
<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
@@ -46,9 +46,9 @@ end %> <br />
<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'pic picEdit' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'pic picMove' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</div>
<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
@@ -77,18 +77,18 @@ end %> <table width="100%">
<% for attachment in @issue.attachments %>
<tr>
-<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon attachment' %> (<%= human_size(attachment.filesize) %>)</td>
+<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= human_size(attachment.filesize) %>)</td>
<td><%= format_date(attachment.created_on) %></td>
<td><%= attachment.author.display_name %></td>
-<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %></div></td>
+<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %></div></td>
</tr>
<% end %> </table>
<br />
<% if authorize_for('issues', 'add_attachment') %>
<%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %>
- <p id="attachments_p"><label><%=l(:label_attachment_new)%>
- <%= link_to_function image_tag('add'), "addFileField()" %></label>
+ <p id="attachments_p"><label><%=l(:label_attachment_new)%>
+ <%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= submit_tag l(:button_add) %>
<%= end_form_tag %>
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index cb81f55db..85f41e327 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -28,28 +28,28 @@ <div id="navigation">
<ul>
- <li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></li>
- <li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "picUserPage" %></li>
- <li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "picProject" %></li>
+ <li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "icon icon-home" %></li>
+ <li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
+ <li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
<% unless @project.nil? || @project.id.nil? %>
- <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "picProject", :onmouseover => "buttonMouseover(event, 'menuProject');" %></li>
+ <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');" %></li>
<% end %>
<% if loggedin? %>
- <li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "picUser" %></li>
+ <li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>
<% end %>
<% if admin_loggedin? %>
- <li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "picAdmin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
+ <li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
<% end %>
- <li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "picHelp" %></li>
+ <li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>
<% if loggedin? %>
- <li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>
+ <li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>
<% else %>
- <li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>
+ <li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
<% end %>
</ul>
</div>
diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml index e57a790cb..dfff5b78a 100644 --- a/app/views/my/blocks/_calendar.rhtml +++ b/app/views/my/blocks/_calendar.rhtml @@ -29,11 +29,11 @@ while day <= @date_to @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
day_issues.each do |i| %>
<%= if day == i.start_date and day == i.due_date
- image_tag('arrow_bw')
+ image_tag('arrow_bw.png')
elsif day == i.start_date
- image_tag('arrow_from')
+ image_tag('arrow_from.png')
elsif day == i.due_date
- image_tag('arrow_to')
+ image_tag('arrow_to.png')
end %>
<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
<% end %>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml index 03245f2ad..c3661b1f8 100644 --- a/app/views/news/show.rhtml +++ b/app/views/news/show.rhtml @@ -1,6 +1,6 @@ <div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'pic picEdit' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</div>
<h2><%=h @news.title %></h2>
@@ -12,12 +12,12 @@ <br />
<div id="comments" style="margin-bottom:16px;">
-<h3 class="icon comment"><%= l(:label_comment_plural) %></h3>
+<h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
<% @news.comments.each do |comment| %>
<% next if comment.new_record? %>
<h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
<div class="contextual">
- <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+ <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</div>
<%= simple_format(auto_link(h comment.comment))%>
<% end if @news.comments_count > 0 %>
diff --git a/app/views/projects/add_document.rhtml b/app/views/projects/add_document.rhtml index 37e0b7d60..b570eabbd 100644 --- a/app/views/projects/add_document.rhtml +++ b/app/views/projects/add_document.rhtml @@ -4,8 +4,8 @@ <%= render :partial => 'documents/form' %> <div class="box">
-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%> -<%= link_to_function image_tag('add'), "addFileField()" %></label> +<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%> +<%= image_to_function "add.png", "addFileField();return false" %></label> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p> </div> diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml index 5ae6dde29..baffbe8e8 100644 --- a/app/views/projects/add_file.rhtml +++ b/app/views/projects/add_file.rhtml @@ -7,8 +7,8 @@ <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
<%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
-<%= link_to_function image_tag('add'), "addFileField()" %></label>
+<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
</div>
<%= submit_tag l(:button_add) %>
diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml index 88be854c2..951b53bb9 100644 --- a/app/views/projects/add_issue.rhtml +++ b/app/views/projects/add_issue.rhtml @@ -25,8 +25,8 @@ <p><%= custom_field_tag_with_label @custom_value %></p> <% end %>
-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%> -<%= link_to_function image_tag('add'), "addFileField()" %></label> +<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%> +<%= image_to_function "add.png", "addFileField();return false" %></label> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p> </div> diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index 8bd970fe6..b750b0b54 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -47,11 +47,11 @@ while day <= @date_to @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
day_issues.each do |i| %>
<%= if day == i.start_date and day == i.due_date
- image_tag('arrow_bw')
+ image_tag('arrow_bw.png')
elsif day == i.start_date
- image_tag('arrow_from')
+ image_tag('arrow_from.png')
elsif day == i.due_date
- image_tag('arrow_to')
+ image_tag('arrow_to.png')
end %>
<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
<% end %>
@@ -64,6 +64,6 @@ end %> </tbody>
</table>
-<%= image_tag 'arrow_from' %> <%= l(:text_tip_task_begin_day) %><br />
-<%= image_tag 'arrow_to' %> <%= l(:text_tip_task_end_day) %><br />
-<%= image_tag 'arrow_bw' %> <%= l(:text_tip_task_begin_end_day) %><br />
\ No newline at end of file +<%= image_tag 'arrow_from.png' %> <%= l(:text_tip_task_begin_day) %><br />
+<%= image_tag 'arrow_to.png' %> <%= l(:text_tip_task_end_day) %><br />
+<%= image_tag 'arrow_bw.png' %> <%= l(:text_tip_task_begin_end_day) %><br />
\ No newline at end of file diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index 33d87e6dc..615d8323d 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -1,6 +1,6 @@ <div class="contextual">
<%= l(:label_export_to) %>
-<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'pic picPdf' %>
+<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'icon icon-pdf' %>
</div>
<h2><%= l(:label_gantt) %></h2>
@@ -21,14 +21,14 @@ </td>
<td align="right">
<%= if @zoom < 4
- link_to image_tag('zoom_in'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months}
+ link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months}
else
- image_tag 'zoom_in_g'
+ image_tag 'zoom_in_g.png'
end %>
<%= if @zoom > 1
- link_to image_tag('zoom_out'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months
+ link_to image_tag('zoom_out.png'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months
else
- image_tag 'zoom_out_g'
+ image_tag 'zoom_out_g.png'
end %>
</td>
</tr>
@@ -179,13 +179,12 @@ top = headers_heigth + 12 i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
- i_left = ((i_start_date - @date_from)*zoom).floor
- i_width = ((i_end_date - i_start_date + 1)*zoom).floor
- d_width = ((i_done_date - i_start_date)*zoom).floor
- l_width = ((i_late_date - i_start_date+1)*zoom).floor if i_late_date
- l_width ||= 0
+ i_left = ((i_start_date - @date_from)*zoom).floor
+ i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders)
+ d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
+ l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
%>
- <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task"> </div>
+ <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo"> </div>
<% if l_width > 0 %>
<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late"> </div>
<% end %>
diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml index c24785f69..ab48badae 100644 --- a/app/views/projects/list_documents.rhtml +++ b/app/views/projects/list_documents.rhtml @@ -1,5 +1,5 @@ <div class="contextual">
-<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'pic picAdd' %>
+<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'icon icon-add' %>
</div>
<h2><%=l(:label_document_plural)%></h2>
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml index d2173bae1..660d8bb07 100644 --- a/app/views/projects/list_files.rhtml +++ b/app/views/projects/list_files.rhtml @@ -1,5 +1,5 @@ <div class="contextual">
-<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'pic picAdd' %>
+<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
</div>
<h2><%=l(:label_attachment_plural)%></h2>
@@ -19,7 +19,7 @@ <tbody>
<% for version in @versions %>
<% unless version.attachments.empty? %>
- <tr><th colspan="7" align="left"><%= image_tag 'package' %> <b><%= version.name %></b></th></tr>
+ <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
<% for file in version.attachments %> <tr class="<%= cycle("odd", "even") %>">
<td></td>
@@ -31,7 +31,7 @@ <% if delete_allowed %>
<td align="center">
<div class="contextual">
- <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+ <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</div>
</td>
<% end %> diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml index e71a7b2d3..2d7fc1f54 100644 --- a/app/views/projects/list_issues.rhtml +++ b/app/views/projects/list_issues.rhtml @@ -12,9 +12,9 @@ { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
:update => "content",
:with => "Form.serialize('query_form')"
- }, :class => 'pic picCheck' %>
+ }, :class => 'icon icon-edit' %>
- <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'pic picDelete' %>
+ <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'icon icon-del' %>
<% if authorize_for('projects', 'add_query') %>
<%= link_to_remote l(:button_save),
@@ -22,7 +22,7 @@ :method => 'get',
:update => "content",
:with => "Form.serialize('query_form')"
- }, :class => 'pic picEdit' %>
+ }, :class => 'icon icon-save' %>
<% end %>
</div>
<br />
@@ -30,8 +30,8 @@ <div class="contextual">
<%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
<% if authorize_for('projects', 'add_query') %>
- <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'pic picEdit' %>
- <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+ <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
+ <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
<% end %>
</div>
<h2><%= @query.name %></h2>
@@ -71,8 +71,8 @@ </table>
<div class="contextual">
<%= l(:label_export_to) %>
-<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon file' %>,
-<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'pic picPdf' %>
+<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
+<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
</div>
<p><%= submit_tag l(:button_move), :class => "button-small" %>
diff --git a/app/views/projects/list_news.rhtml b/app/views/projects/list_news.rhtml index 8d8f99668..6cdf75c4a 100644 --- a/app/views/projects/list_news.rhtml +++ b/app/views/projects/list_news.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to_if_authorized l(:label_news_new), {:controller => 'projects', :action => 'add_news', :id => @project}, :class => 'pic picAdd' %> +<%= link_to_if_authorized l(:label_news_new), {:controller => 'projects', :action => 'add_news', :id => @project}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_news_plural)%></h2> diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml index 6c2e53cdb..605946576 100644 --- a/app/views/projects/settings.rhtml +++ b/app/views/projects/settings.rhtml @@ -27,7 +27,7 @@ <% end %> </td>
<td> - <%= link_to_if_authorized l(:button_delete), {:controller => 'members', :action => 'destroy', :id => member}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'members', :action => 'destroy', :id => member}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> </td>
</tr>
<% end %>
@@ -57,8 +57,8 @@ <td width="100"><%= format_date(version.effective_date) %></td>
<td><%=h version.description %></td> <td> - <%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'pic picEdit' %> - <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> </td>
</tr>
<% end %>
@@ -87,7 +87,7 @@ <% end %>
</td>
<td> - <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> </td>
</tr>
<% end %>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index 212e10f99..4c9e4e04a 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -16,7 +16,7 @@ <div class="contextual">
<%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
</div>
- <h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3>
+ <h3 class="icon22 icon22-tracker"><%=l(:label_tracker_plural)%></h3>
<ul>
<% for tracker in @trackers %>
<li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
@@ -32,7 +32,7 @@ <div class="splitcontentright">
<div class="box">
- <h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>
+ <h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
<% for member in @members %>
<%= link_to_user member.user %> (<%= member.role.name %>)<br />
<% end %>
@@ -40,7 +40,7 @@ <% if @subprojects %>
<div class="box">
- <h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>
+ <h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>
<% for subproject in @subprojects %>
<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
<% end %>
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml index 4c20d86ff..3b73a9d7a 100644 --- a/app/views/queries/_filters.rhtml +++ b/app/views/queries/_filters.rhtml @@ -78,7 +78,7 @@ function toggle_multi_select(field) { <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
<%= options_for_select options[:values], query.values_for(field) %>
</select>
- <%= link_to_function image_tag('expand'), "toggle_multi_select('#{field}');" %>
+ <%= link_to_function image_tag('expand.png'), "toggle_multi_select('#{field}');" %>
<% when :date, :date_past %>
<%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
<% when :text %>
diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml index bceaafa09..31d670761 100644 --- a/app/views/reports/issue_report.rhtml +++ b/app/views/reports/issue_report.rhtml @@ -2,7 +2,7 @@ <h3><%= l(:label_query_plural) %></h3>
<div class="contextual">
-<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'pic picAdd' %>
+<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'icon icon-add' %>
</div>
<% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>
@@ -13,19 +13,19 @@ </ul>
<div class="splitcontentleft">
-<h3><%=l(:field_tracker)%> <%= link_to image_tag('zoom_in'), :detail => 'tracker' %></h3>
+<h3><%=l(:field_tracker)%> <%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
<br />
-<h3><%=l(:field_author)%> <%= link_to image_tag('zoom_in'), :detail => 'author' %></h3>
+<h3><%=l(:field_author)%> <%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
<br />
</div>
<div class="splitcontentright">
-<h3><%=l(:field_priority)%> <%= link_to image_tag('zoom_in'), :detail => 'priority' %></h3>
+<h3><%=l(:field_priority)%> <%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
<br />
-<h3><%=l(:field_category)%> <%= link_to image_tag('zoom_in'), :detail => 'category' %></h3>
+<h3><%=l(:field_category)%> <%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
<br />
</div>
diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml index 7b80c5f1f..717802b4a 100644 --- a/app/views/repositories/_dir_list.rhtml +++ b/app/views/repositories/_dir_list.rhtml @@ -10,7 +10,7 @@ <% total_size = 0
@entries.each do |entry| %>
<tr class="<%= cycle 'odd', 'even' %>">
-<td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => "icon " + (entry.is_dir? ? 'folder' : 'file') %></td>
+<td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => ("icon " + (entry.is_dir? ? 'icon-folder' : 'icon-file')) %></td>
<td align="right"><%= human_size(entry.size) unless entry.is_dir? %></td>
<td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>
<td align="center"><em><%=h entry.lastrev.author %></em></td>
diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index 0e8109c8b..141d75873 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_role_plural)%></h2> diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 188562684..644b1324e 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_tracker_plural)%></h2> diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml index ccf2111a6..709aeb7a3 100644 --- a/app/views/users/_memberships.rhtml +++ b/app/views/users/_memberships.rhtml @@ -9,7 +9,7 @@ <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
</select>
<%= submit_tag l(:button_change), :class => "button-small" %>
- <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+ <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
</p>
<%= end_form_tag %>
<% end %>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index 5eafda62e..8e660329c 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -1,5 +1,5 @@ <div class="contextual"> -<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'pic picAdd' %> +<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %> </div> <h2><%=l(:label_user_plural)%></h2> @@ -23,8 +23,8 @@ <td><%= user.firstname %></td>
<td><%= user.lastname %></td>
<td><%= user.mail %></td>
- <td align="center"><%= image_tag 'true' if user.admin? %></td>
- <td align="center"><%= image_tag 'locked' if user.locked? %><%= image_tag 'user_new' if user.registered? %></td>
+ <td align="center"><%= image_tag 'true.png' if user.admin? %></td>
+ <td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>
<td align="center"><%= format_time(user.created_on) %></td>
<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
<td align="center">
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml index 422c94e7a..d32771c0f 100644 --- a/app/views/welcome/index.rhtml +++ b/app/views/welcome/index.rhtml @@ -10,7 +10,7 @@ <div class="splitcontentright">
<div class="box">
- <h3><%=l(:label_project_latest)%></h3>
+ <h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
<ul> <% for project in @projects %>
<li>
diff --git a/public/images/22x22/authent.png b/public/images/22x22/authent.png Binary files differnew file mode 100644 index 000000000..d2b29945f --- /dev/null +++ b/public/images/22x22/authent.png diff --git a/public/images/22x22/comment.png b/public/images/22x22/comment.png Binary files differnew file mode 100644 index 000000000..c5186abd9 --- /dev/null +++ b/public/images/22x22/comment.png diff --git a/public/images/22x22/file.png b/public/images/22x22/file.png Binary files differnew file mode 100644 index 000000000..96c56a2b5 --- /dev/null +++ b/public/images/22x22/file.png diff --git a/public/images/22x22/info.png b/public/images/22x22/info.png Binary files differnew file mode 100644 index 000000000..cf54e2c6a --- /dev/null +++ b/public/images/22x22/info.png diff --git a/public/images/22x22/notifications.png b/public/images/22x22/notifications.png Binary files differnew file mode 100644 index 000000000..972f4a24d --- /dev/null +++ b/public/images/22x22/notifications.png diff --git a/public/images/22x22/options.png b/public/images/22x22/options.png Binary files differnew file mode 100644 index 000000000..48da1516c --- /dev/null +++ b/public/images/22x22/options.png diff --git a/public/images/22x22/projects.png b/public/images/22x22/projects.png Binary files differnew file mode 100644 index 000000000..4f023bedb --- /dev/null +++ b/public/images/22x22/projects.png diff --git a/public/images/22x22/role.png b/public/images/22x22/role.png Binary files differnew file mode 100644 index 000000000..4de98edd4 --- /dev/null +++ b/public/images/22x22/role.png diff --git a/public/images/22x22/tracker.png b/public/images/22x22/tracker.png Binary files differnew file mode 100644 index 000000000..f51394186 --- /dev/null +++ b/public/images/22x22/tracker.png diff --git a/public/images/22x22/users.png b/public/images/22x22/users.png Binary files differnew file mode 100644 index 000000000..92f396207 --- /dev/null +++ b/public/images/22x22/users.png diff --git a/public/images/22x22/workflow.png b/public/images/22x22/workflow.png Binary files differnew file mode 100644 index 000000000..9d1b9d8b9 --- /dev/null +++ b/public/images/22x22/workflow.png diff --git a/public/images/32x32/file.png b/public/images/32x32/file.png Binary files differnew file mode 100644 index 000000000..1662b5302 --- /dev/null +++ b/public/images/32x32/file.png diff --git a/public/images/add.png b/public/images/add.png Binary files differindex 6541a6814..db59058e5 100644 --- a/public/images/add.png +++ b/public/images/add.png diff --git a/public/images/admin.png b/public/images/admin.png Binary files differindex 0c190984f..c98330ca1 100644 --- a/public/images/admin.png +++ b/public/images/admin.png diff --git a/public/images/alert.png b/public/images/alert.png Binary files differindex ba107e83b..7cc6e4aee 100644 --- a/public/images/alert.png +++ b/public/images/alert.png diff --git a/public/images/calendar.png b/public/images/calendar.png Binary files differindex aa269da38..619172a99 100644 --- a/public/images/calendar.png +++ b/public/images/calendar.png diff --git a/public/images/check.png b/public/images/check.png Binary files differdeleted file mode 100644 index c348be65e..000000000 --- a/public/images/check.png +++ /dev/null diff --git a/public/images/comment.png b/public/images/comment.png Binary files differdeleted file mode 100644 index a67d5d422..000000000 --- a/public/images/comment.png +++ /dev/null diff --git a/public/images/csv.png b/public/images/csv.png Binary files differnew file mode 100644 index 000000000..405863116 --- /dev/null +++ b/public/images/csv.png diff --git a/public/images/delete.png b/public/images/delete.png Binary files differindex 5f2cee539..108a3fc97 100644 --- a/public/images/delete.png +++ b/public/images/delete.png diff --git a/public/images/edit.png b/public/images/edit.png Binary files differindex dea7c92ea..0275d91e4 100644 --- a/public/images/edit.png +++ b/public/images/edit.png diff --git a/public/images/file.png b/public/images/file.png Binary files differindex 7a0871941..f387dd305 100644 --- a/public/images/file.png +++ b/public/images/file.png diff --git a/public/images/folder.png b/public/images/folder.png Binary files differindex 5ad357419..563d3c944 100644 --- a/public/images/folder.png +++ b/public/images/folder.png diff --git a/public/images/help.png b/public/images/help.png Binary files differindex da8feb993..af4e6ff46 100644 --- a/public/images/help.png +++ b/public/images/help.png diff --git a/public/images/home.png b/public/images/home.png Binary files differindex 7a12add6a..21ee5470e 100644 --- a/public/images/home.png +++ b/public/images/home.png diff --git a/public/images/issues.png b/public/images/issues.png Binary files differdeleted file mode 100644 index e6948bff7..000000000 --- a/public/images/issues.png +++ /dev/null diff --git a/public/images/locked.png b/public/images/locked.png Binary files differindex 5199dfe22..c2789e35c 100644 --- a/public/images/locked.png +++ b/public/images/locked.png diff --git a/public/images/login.png b/public/images/login.png Binary files differdeleted file mode 100644 index 7e0c62d9c..000000000 --- a/public/images/login.png +++ /dev/null diff --git a/public/images/mailer.png b/public/images/mailer.png Binary files differdeleted file mode 100644 index 8008bb84b..000000000 --- a/public/images/mailer.png +++ /dev/null diff --git a/public/images/move.png b/public/images/move.png Binary files differindex ee6e9486b..32fdb846d 100644 --- a/public/images/move.png +++ b/public/images/move.png diff --git a/public/images/package.png b/public/images/package.png Binary files differindex 634d13d9f..ff629d117 100644 --- a/public/images/package.png +++ b/public/images/package.png diff --git a/public/images/pdf.png b/public/images/pdf.png Binary files differindex 8c2a80aaf..68c9bada8 100644 --- a/public/images/pdf.png +++ b/public/images/pdf.png diff --git a/public/images/projects.png b/public/images/projects.png Binary files differindex b42347a92..244c896f0 100644 --- a/public/images/projects.png +++ b/public/images/projects.png diff --git a/public/images/role.png b/public/images/role.png Binary files differdeleted file mode 100644 index ad36d1ca8..000000000 --- a/public/images/role.png +++ /dev/null diff --git a/public/images/save.png b/public/images/save.png Binary files differnew file mode 100644 index 000000000..7c499b932 --- /dev/null +++ b/public/images/save.png diff --git a/public/images/options.png b/public/images/task_done.png Binary files differindex a907c20f1..2a4c81e9d 100644 --- a/public/images/options.png +++ b/public/images/task_done.png diff --git a/public/images/task_late.png b/public/images/task_late.png Binary files differnew file mode 100644 index 000000000..2e8a40d6e --- /dev/null +++ b/public/images/task_late.png diff --git a/public/images/task_todo.png b/public/images/task_todo.png Binary files differnew file mode 100644 index 000000000..43c1eb9b9 --- /dev/null +++ b/public/images/task_todo.png diff --git a/public/images/tracker.png b/public/images/tracker.png Binary files differdeleted file mode 100644 index f29cfb2af..000000000 --- a/public/images/tracker.png +++ /dev/null diff --git a/public/images/true.png b/public/images/true.png Binary files differindex 9afc0b52a..929c605ff 100644 --- a/public/images/true.png +++ b/public/images/true.png diff --git a/public/images/user.png b/public/images/user.png Binary files differindex 89d591c0b..5f55e7e49 100644 --- a/public/images/user.png +++ b/public/images/user.png diff --git a/public/images/user_new.png b/public/images/user_new.png Binary files differindex c7c718822..aaa430dea 100644 --- a/public/images/user_new.png +++ b/public/images/user_new.png diff --git a/public/images/user_page.png b/public/images/user_page.png Binary files differindex 940a7b8e1..78144862c 100644 --- a/public/images/user_page.png +++ b/public/images/user_page.png diff --git a/public/images/users.png b/public/images/users.png Binary files differindex 3b9fc5aa9..f3a07c3f7 100644 --- a/public/images/users.png +++ b/public/images/users.png diff --git a/public/images/workflow.png b/public/images/workflow.png Binary files differdeleted file mode 100644 index 868332fed..000000000 --- a/public/images/workflow.png +++ /dev/null diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9663491c8..ea033c558 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -27,7 +27,7 @@ background-color:inherit; a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
a img{border:none;}
-p{padding:0 0 1em 0;}
+p{margin:0 0 1em 0;}
p form{margin-top:0; margin-bottom:20px;}
img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
@@ -124,34 +124,57 @@ text-decoration:none; background-color: #80b0da;
}
-/**************** Icons links *******************/
-.picHome { background: url(../images/home.png) no-repeat 4px 50%; }
-.picUser { background: url(../images/user.png) no-repeat 4px 50%; }
-.picUserPage { background: url(../images/user_page.png) no-repeat 4px 50%; }
-.picAdmin { background: url(../images/admin.png) no-repeat 4px 50%; }
-.picProject { background: url(../images/projects.png) no-repeat 4px 50%; }
-.picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
-.picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
-
-.picEdit { background: url(../images/edit.png) no-repeat 4px 50%; }
-.picDelete { background: url(../images/delete.png) no-repeat 4px 50%; }
-.picAdd { background: url(../images/add.png) no-repeat 4px 50%; }
-.picMove { background: url(../images/move.png) no-repeat 4px 50%; }
-.picCheck { background: url(../images/check.png) no-repeat 4px 70%; }
-.picPdf { background: url(../images/pdf.png) no-repeat 4px 50%;}
-
-.pic { padding-left: 18px; margin-left: 3px; }
-
+/**************** Icons *******************/
.icon {
- background-position: 0% 40%;
- background-repeat: no-repeat;
- padding-left: 20px;
+background-position: 0% 40%;
+background-repeat: no-repeat;
+padding-left: 20px;
+padding-top: 2px;
+padding-bottom: 3px;
+vertical-align: middle;
}
-.folder { background-image: url(../images/folder.png); }
-.file { background-image: url(../images/file.png); }
-.attachment { background-image: url(../images/attachment.png); }
-.comment { background-image: url(../images/comment.png); }
+#navigation .icon {
+background-position: 4px 50%;
+}
+
+.icon22 {
+background-position: 0% 40%;
+background-repeat: no-repeat;
+padding-left: 24px;
+line-height: 22px;
+vertical-align: middle;
+}
+
+.icon-add { background-image: url(../images/add.png); }
+.icon-edit { background-image: url(../images/edit.png); }
+.icon-del { background-image: url(../images/delete.png); }
+.icon-move { background-image: url(../images/move.png); }
+.icon-save { background-image: url(../images/save.png); }
+.icon-pdf { background-image: url(../images/pdf.png); }
+.icon-csv { background-image: url(../images/csv.png); }
+.icon-file { background-image: url(../images/file.png); }
+.icon-folder { background-image: url(../images/folder.png); }
+.icon-package { background-image: url(../images/package.png); }
+.icon-home { background-image: url(../images/home.png); }
+.icon-user { background-image: url(../images/user.png); }
+.icon-mypage { background-image: url(../images/user_page.png); }
+.icon-admin { background-image: url(../images/admin.png); }
+.icon-projects { background-image: url(../images/projects.png); }
+.icon-logout { background-image: url(../images/logout.png); }
+.icon-help { background-image: url(../images/help.png); }
+.icon-attachment { background-image: url(../images/attachment.png); }
+
+.icon22-projects { background-image: url(../images/22x22/projects.png); }
+.icon22-users { background-image: url(../images/22x22/users.png); }
+.icon22-tracker { background-image: url(../images/22x22/tracker.png); }
+.icon22-role { background-image: url(../images/22x22/role.png); }
+.icon22-workflow { background-image: url(../images/22x22/workflow.png); }
+.icon22-options { background-image: url(../images/22x22/options.png); }
+.icon22-notifications { background-image: url(../images/22x22/notifications.png); }
+.icon22-authent { background-image: url(../images/22x22/authent.png); }
+.icon22-info { background-image: url(../images/22x22/info.png); }
+.icon22-comment { background-image: url(../images/22x22/comment.png); }
/**************** Content styles ****************/
@@ -220,6 +243,7 @@ input.button-small label {
font-weight: bold;
font-size: 1em;
+ color: #505050;
}
fieldset {
@@ -265,10 +289,10 @@ margin: 0; }
ul.documents li {
-background-image: url(../images/file.png);
+background-image: url(../images/32x32/file.png);
background-repeat: no-repeat;
-background-position: 0 .4em;
-padding-left: 20px;
+background-position: 0 1px;
+padding-left: 36px;
margin-bottom: 10px;
margin-left: -37px;
}
@@ -499,6 +523,8 @@ img.calendar-trigger { .contextual {
float: right;
font-size: 0.8em;
+line-height: 16px;
+padding: 2px;
}
.contextual select, .contextual input {
@@ -528,8 +554,9 @@ font-size: 1em; line-height:0.8em;
}
-.task_late { background:#f66; }
-.task_done { background:#66f; }
+.task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
+.task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
+.task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
/***** CSS FORM ******/
.tabular p{
diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index 2108bcab4..76e0eae0b 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -1,7 +1,3 @@ -#header, #navigation, #subcontent, #footer {
-display:none;
-}
-
-.menu {
-display:none;
-}
+#header, #navigation, #subcontent, #footer { display:none; }
+.menu { display:none; }
+.contextual { display:none; }
\ No newline at end of file |
