kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
This commit is contained in:
Jean-Philippe Lang 2007-01-08 19:21:59 +00:00
parent 31bc6054a3
commit 220641909c
80 changed files with 179 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/application_helper.rb
View File

@ -50,6 +50,14 @@ module ApplicationHelper
link_to user.display_name, :controller => 'account', :action => 'show', :id => user link_to user.display_name, :controller => 'account', :action => 'show', :id => user
end 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) def format_date(date)
l_date(date) if date l_date(date) if date
end end
@ -145,7 +153,7 @@ module ApplicationHelper
end end
def calendar_for(field_id) 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' });") javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
end end
end end

4
app/helpers/sort_helper.rb
View File

@ -96,10 +96,10 @@ module SortHelper
key, order = session[@sort_name][:key], session[@sort_name][:order] key, order = session[@sort_name][:key], session[@sort_name][:order]
if key == column if key == column
if order.downcase == 'asc' if order.downcase == 'asc'
icon = 'sort_asc' icon = 'sort_asc.png'
order = 'desc' order = 'desc'
else else
icon = 'sort_desc' icon = 'sort_desc.png'
order = 'asc' order = 'asc'
end end
else else

2
app/views/account/login.rhtml
View File

@ -1,6 +1,6 @@
<center> <center>
<div class="box login"> <div class="box login">
<h2><%= image_tag 'login' %>&nbsp;&nbsp;<%=l(:label_please_login)%></h2> <h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
<%= start_form_tag({:action=> "login"}, :class => "tabular") %> <%= start_form_tag({:action=> "login"}, :class => "tabular") %>
<p><label for="login"><%=l(:field_login)%>:</label> <p><label for="login"><%=l(:field_login)%>:</label>

33
app/views/admin/index.rhtml
View File

@ -1,50 +1,41 @@
<h2><%=l(:label_administration)%></h2> <h2><%=l(:label_administration)%></h2>
<p> <p class="icon22 icon22-projects">
<%= image_tag "projects" %>
<%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> | <%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
<%= link_to l(:label_new), :controller => 'projects', :action => 'add' %> <%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
</p> </p>
<p> <p class="icon22 icon22-users">
<%= image_tag "users" %>
<%= link_to l(:label_user_plural), :controller => 'users' %> | <%= link_to l(:label_user_plural), :controller => 'users' %> |
<%= link_to l(:label_new), :controller => 'users', :action => 'add' %> <%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
</p> </p>
<p> <p class="icon22 icon22-role">
<%= image_tag "role" %>
<%= link_to l(:label_role_and_permissions), :controller => 'roles' %> <%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
</p> </p>
<p> <p class="icon22 icon22-tracker">
<%= image_tag "tracker" %>
<%= link_to l(:label_tracker_plural), :controller => 'trackers' %> | <%= 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_issue_status_plural), :controller => 'issue_statuses' %> |
<%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %> <%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %>
</p> </p>
<p> <p class="icon22 icon22-workflow">
<%= image_tag "options" %> <%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
</p>
<p class="icon22 icon22-options">
<%= link_to l(:label_enumerations), :controller => 'enumerations' %> <%= link_to l(:label_enumerations), :controller => 'enumerations' %>
</p> </p>
<p> <p class="icon22 icon22-notifications">
<%= image_tag "mailer" %>
<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %> <%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %>
</p> </p>
<p> <p class="icon22 icon22-authent">
<%= image_tag "login" %>
<%= link_to l(:label_authentication), :controller => 'auth_sources' %> <%= link_to l(:label_authentication), :controller => 'auth_sources' %>
</p> </p>
<p> <p class="icon22 icon22-info">
<%= image_tag "help" %>
<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %> <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
</p> </p>

6
app/views/admin/projects.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_project_plural)%></h2> <h2><%=l(:label_project_plural)%></h2>
@ -18,8 +18,8 @@
<tr class="<%= cycle("odd", "even") %>"> <tr class="<%= cycle("odd", "even") %>">
<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %> <td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
<td><%=h project.description %> <td><%=h project.description %>
<td align="center"><%= image_tag 'true' if project.is_public? %> <td align="center"><%= image_tag 'true.png' if project.is_public? %>
<td align="center"><%= project.projects_count %> <td align="center"><%= project.children_count %>
<td align="center"><%= format_date(project.created_on) %> <td align="center"><%= format_date(project.created_on) %>
<td align="center"> <td align="center">
<%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %> <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>

2
app/views/auth_sources/list.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_auth_source_plural)%></h2> <h2><%=l(:label_auth_source_plural)%></h2>

4
app/views/custom_fields/list.rhtml
View File

@ -16,8 +16,8 @@
<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td> <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(custom_field.type_name) %></td>
<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][: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.png' 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_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"><%= 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"> <td align="center">
<%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %> <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %>

10
app/views/documents/show.rhtml
View File

@ -1,6 +1,6 @@
<div class="contextual"> <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_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 => 'pic picDelete' %> <%= 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> </div>
<h2><%= @document.title %></h2> <h2><%= @document.title %></h2>
@ -15,7 +15,7 @@
<% for attachment in @attachments %> <% for attachment in @attachments %>
<li> <li>
<div class="contextual"> <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> </div>
<%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %> <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
(<%= human_size attachment.filesize %>)<br /> (<%= human_size attachment.filesize %>)<br />
@ -29,8 +29,8 @@
<% if authorize_for('documents', 'add_attachment') %> <% if authorize_for('documents', 'add_attachment') %>
<%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %> <%= 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)%>&nbsp; <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= link_to_function image_tag('add'), "addFileField()" %></label> <%= 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> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= submit_tag l(:button_add) %> <%= submit_tag l(:button_add) %>
<%= end_form_tag %> <%= end_form_tag %>

2
app/views/enumerations/list.rhtml
View File

@ -10,7 +10,7 @@
<li><%= link_to value.name, :action => 'edit', :id => value %></li> <li><%= link_to value.name, :action => 'edit', :id => value %></li>
<% end %> <% end %>
</ul> </ul>
<p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "pic picAdd" %></p>&nbsp; <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "icon icon-add" %></p>&nbsp;
<% else %> <% else %>
<h3><%= link_to l(name), :opt => option %></h3> <h3><%= link_to l(name), :opt => option %></h3>

6
app/views/issue_statuses/list.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_issue_status_plural)%></h2> <h2><%=l(:label_issue_status_plural)%></h2>
@ -15,8 +15,8 @@
<% for status in @issue_statuses %> <% for status in @issue_statuses %>
<tr class="<%= cycle("odd", "even") %>"> <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><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.png' 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_closed? %></td>
<td align="center"> <td align="center">
<%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %> <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
</td> </td>

16
app/views/issues/show.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2> <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
@ -46,9 +46,9 @@ end %>
<br /> <br />
<div class="contextual"> <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_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 => 'pic picMove' %> <%= 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 => 'pic picDelete' %> <%= 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> </div>
<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %> <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
@ -77,18 +77,18 @@ end %>
<table width="100%"> <table width="100%">
<% for attachment in @issue.attachments %> <% for attachment in @issue.attachments %>
<tr> <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><%= format_date(attachment.created_on) %></td>
<td><%= attachment.author.display_name %></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> </tr>
<% end %> <% end %>
</table> </table>
<br /> <br />
<% if authorize_for('issues', 'add_attachment') %> <% if authorize_for('issues', 'add_attachment') %>
<%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %> <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %>
<p id="attachments_p"><label><%=l(:label_attachment_new)%>&nbsp; <p id="attachments_p"><label><%=l(:label_attachment_new)%>
<%= link_to_function image_tag('add'), "addFileField()" %></label> <%= 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> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
<%= submit_tag l(:button_add) %> <%= submit_tag l(:button_add) %>
<%= end_form_tag %> <%= end_form_tag %>

18
app/views/layouts/base.rhtml
View File

@ -28,28 +28,28 @@
<div id="navigation"> <div id="navigation">
<ul> <ul>
<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></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 => "picUserPage" %></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 => "picProject" %></li> <li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
<% unless @project.nil? || @project.id.nil? %> <% 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 %> <% end %>
<% if loggedin? %> <% 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 %> <% end %>
<% if admin_loggedin? %> <% 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 %> <% 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? %> <% 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 %> <% 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 %> <% end %>
</ul> </ul>
</div> </div>

6
app/views/my/blocks/_calendar.rhtml
View File

@ -29,11 +29,11 @@ while day <= @date_to
@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
day_issues.each do |i| %> day_issues.each do |i| %>
<%= if day == i.start_date and day == i.due_date <%= if day == i.start_date and day == i.due_date
image_tag('arrow_bw') image_tag('arrow_bw.png')
elsif day == i.start_date elsif day == i.start_date
image_tag('arrow_from') image_tag('arrow_from.png')
elsif day == i.due_date elsif day == i.due_date
image_tag('arrow_to') image_tag('arrow_to.png')
end %> 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 /> <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 %> <% end %>

8
app/views/news/show.rhtml
View File

@ -1,6 +1,6 @@
<div class="contextual"> <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_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 => 'pic picDelete' %> <%= 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> </div>
<h2><%=h @news.title %></h2> <h2><%=h @news.title %></h2>
@ -12,12 +12,12 @@
<br /> <br />
<div id="comments" style="margin-bottom:16px;"> <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| %> <% @news.comments.each do |comment| %>
<% next if comment.new_record? %> <% next if comment.new_record? %>
<h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4> <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
<div class="contextual"> <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> </div>
<%= simple_format(auto_link(h comment.comment))%> <%= simple_format(auto_link(h comment.comment))%>
<% end if @news.comments_count > 0 %> <% end if @news.comments_count > 0 %>

4
app/views/projects/add_document.rhtml
View File

@ -4,8 +4,8 @@
<%= render :partial => 'documents/form' %> <%= render :partial => 'documents/form' %>
<div class="box"> <div class="box">
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp; <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= link_to_function image_tag('add'), "addFileField()" %></label> <%= 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> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
</div> </div>

4
app/views/projects/add_file.rhtml
View File

@ -7,8 +7,8 @@
<p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label> <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> <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp; <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= link_to_function image_tag('add'), "addFileField()" %></label> <%= 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> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
</div> </div>
<%= submit_tag l(:button_add) %> <%= submit_tag l(:button_add) %>

4
app/views/projects/add_issue.rhtml
View File

@ -25,8 +25,8 @@
<p><%= custom_field_tag_with_label @custom_value %></p> <p><%= custom_field_tag_with_label @custom_value %></p>
<% end %> <% end %>
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp; <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= link_to_function image_tag('add'), "addFileField()" %></label> <%= 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> <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
</div> </div>

12
app/views/projects/calendar.rhtml
View File

@ -47,11 +47,11 @@ while day <= @date_to
@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
day_issues.each do |i| %> day_issues.each do |i| %>
<%= if day == i.start_date and day == i.due_date <%= if day == i.start_date and day == i.due_date
image_tag('arrow_bw') image_tag('arrow_bw.png')
elsif day == i.start_date elsif day == i.start_date
image_tag('arrow_from') image_tag('arrow_from.png')
elsif day == i.due_date elsif day == i.due_date
image_tag('arrow_to') image_tag('arrow_to.png')
end %> 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 /> <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 %> <% end %>
@ -64,6 +64,6 @@ end %>
</tbody> </tbody>
</table> </table>
<%= image_tag 'arrow_from' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br /> <%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
<%= image_tag 'arrow_to' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br /> <%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
<%= image_tag 'arrow_bw' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br /> <%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />

19
app/views/projects/gantt.rhtml
View File

@ -1,6 +1,6 @@
<div class="contextual"> <div class="contextual">
<%= l(:label_export_to) %> <%= 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> </div>
<h2><%= l(:label_gantt) %></h2> <h2><%= l(:label_gantt) %></h2>
@ -21,14 +21,14 @@
</td> </td>
<td align="right"> <td align="right">
<%= if @zoom < 4 <%= 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 else
image_tag 'zoom_in_g' image_tag 'zoom_in_g.png'
end %> end %>
<%= if @zoom > 1 <%= 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 else
image_tag 'zoom_out_g' image_tag 'zoom_out_g.png'
end %> end %>
</td> </td>
</tr> </tr>
@ -180,12 +180,11 @@ top = headers_heigth + 12
i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today 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_left = ((i_start_date - @date_from)*zoom).floor
i_width = ((i_end_date - i_start_date + 1)*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 d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
l_width = ((i_late_date - i_start_date+1)*zoom).floor if i_late_date l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
l_width ||= 0
%> %>
<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task">&nbsp;</div> <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
<% if l_width > 0 %> <% if l_width > 0 %>
<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div> <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
<% end %> <% end %>

2
app/views/projects/list_documents.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_document_plural)%></h2> <h2><%=l(:label_document_plural)%></h2>

6
app/views/projects/list_files.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_attachment_plural)%></h2> <h2><%=l(:label_attachment_plural)%></h2>
@ -19,7 +19,7 @@
<tbody> <tbody>
<% for version in @versions %> <% for version in @versions %>
<% unless version.attachments.empty? %> <% 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 %> <% for file in version.attachments %>
<tr class="<%= cycle("odd", "even") %>"> <tr class="<%= cycle("odd", "even") %>">
<td></td> <td></td>
@ -31,7 +31,7 @@
<% if delete_allowed %> <% if delete_allowed %>
<td align="center"> <td align="center">
<div class="contextual"> <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> </div>
</td> </td>
<% end %> <% end %>

14
app/views/projects/list_issues.rhtml
View File

@ -12,9 +12,9 @@
{ :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
:update => "content", :update => "content",
:with => "Form.serialize('query_form')" :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') %> <% if authorize_for('projects', 'add_query') %>
<%= link_to_remote l(:button_save), <%= link_to_remote l(:button_save),
@ -22,7 +22,7 @@
:method => 'get', :method => 'get',
:update => "content", :update => "content",
:with => "Form.serialize('query_form')" :with => "Form.serialize('query_form')"
}, :class => 'pic picEdit' %> }, :class => 'icon icon-save' %>
<% end %> <% end %>
</div> </div>
<br /> <br />
@ -30,8 +30,8 @@
<div class="contextual"> <div class="contextual">
<%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %> <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
<% if authorize_for('projects', 'add_query') %> <% if authorize_for('projects', 'add_query') %>
<%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'pic picEdit' %> <%= 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 => 'pic picDelete' %> <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
<% end %> <% end %>
</div> </div>
<h2><%= @query.name %></h2> <h2><%= @query.name %></h2>
@ -71,8 +71,8 @@
</table> </table>
<div class="contextual"> <div class="contextual">
<%= l(:label_export_to) %> <%= l(:label_export_to) %>
<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon file' %>, <%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'pic picPdf' %> <%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
</div> </div>
<p><%= submit_tag l(:button_move), :class => "button-small" %> <p><%= submit_tag l(:button_move), :class => "button-small" %>
&nbsp; &nbsp;

2
app/views/projects/list_news.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_news_plural)%></h2> <h2><%=l(:label_news_plural)%></h2>

8
app/views/projects/settings.rhtml
View File

@ -27,7 +27,7 @@
<% end %> <% end %>
</td> </td>
<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> </td>
</tr> </tr>
<% end %> <% end %>
@ -57,8 +57,8 @@
<td width="100"><%= format_date(version.effective_date) %></td> <td width="100"><%= format_date(version.effective_date) %></td>
<td><%=h version.description %></td> <td><%=h version.description %></td>
<td> <td>
<%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'pic picEdit' %> <%= 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 => 'pic picDelete' %> <%= 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> </td>
</tr> </tr>
<% end %> <% end %>
@ -87,7 +87,7 @@
<% end %> <% end %>
</td> </td>
<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> </td>
</tr> </tr>
<% end %> <% end %>

6
app/views/projects/show.rhtml
View File

@ -16,7 +16,7 @@
<div class="contextual"> <div class="contextual">
<%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %> <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
</div> </div>
<h3><%= image_tag "tracker" %> <%=l(:label_tracker_plural)%></h3> <h3 class="icon22 icon22-tracker"><%=l(:label_tracker_plural)%></h3>
<ul> <ul>
<% for tracker in @trackers %> <% for tracker in @trackers %>
<li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
@ -32,7 +32,7 @@
<div class="splitcontentright"> <div class="splitcontentright">
<div class="box"> <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 %> <% for member in @members %>
<%= link_to_user member.user %> (<%= member.role.name %>)<br /> <%= link_to_user member.user %> (<%= member.role.name %>)<br />
<% end %> <% end %>
@ -40,7 +40,7 @@
<% if @subprojects %> <% if @subprojects %>
<div class="box"> <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 %> <% for subproject in @subprojects %>
<%= link_to subproject.name, :action => 'show', :id => subproject %><br /> <%= link_to subproject.name, :action => 'show', :id => subproject %><br />
<% end %> <% end %>

2
app/views/queries/_filters.rhtml
View File

@ -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;"> <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) %> <%= options_for_select options[:values], query.values_for(field) %>
</select> </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 %> <% 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) %> <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
<% when :text %> <% when :text %>

10
app/views/reports/issue_report.rhtml
View File

@ -2,7 +2,7 @@
<h3><%= l(:label_query_plural) %></h3> <h3><%= l(:label_query_plural) %></h3>
<div class="contextual"> <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> </div>
<% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %> <% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>
@ -13,19 +13,19 @@
</ul> </ul>
<div class="splitcontentleft"> <div class="splitcontentleft">
<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'tracker' %></h3> <h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %> <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
<br /> <br />
<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'author' %></h3> <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %> <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
<br /> <br />
</div> </div>
<div class="splitcontentright"> <div class="splitcontentright">
<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'priority' %></h3> <h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
<br /> <br />
<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'category' %></h3> <h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3>
<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %> <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
<br /> <br />
</div> </div>

2
app/views/repositories/_dir_list.rhtml
View File

@ -10,7 +10,7 @@
<% total_size = 0 <% total_size = 0
@entries.each do |entry| %> @entries.each do |entry| %>
<tr class="<%= cycle 'odd', 'even' %>"> <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"><%= 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="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> <td align="center"><em><%=h entry.lastrev.author %></em></td>

2
app/views/roles/list.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_role_plural)%></h2> <h2><%=l(:label_role_plural)%></h2>

2
app/views/trackers/list.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_tracker_plural)%></h2> <h2><%=l(:label_tracker_plural)%></h2>

2
app/views/users/_memberships.rhtml
View File

@ -9,7 +9,7 @@
<%= options_from_collection_for_select @roles, "id", "name", membership.role_id %> <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
</select> </select>
<%= submit_tag l(:button_change), :class => "button-small" %> <%= 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> </p>
<%= end_form_tag %> <%= end_form_tag %>
<% end %> <% end %>

6
app/views/users/list.rhtml
View File

@ -1,5 +1,5 @@
<div class="contextual"> <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> </div>
<h2><%=l(:label_user_plural)%></h2> <h2><%=l(:label_user_plural)%></h2>
@ -23,8 +23,8 @@
<td><%= user.firstname %></td> <td><%= user.firstname %></td>
<td><%= user.lastname %></td> <td><%= user.lastname %></td>
<td><%= user.mail %></td> <td><%= user.mail %></td>
<td align="center"><%= image_tag 'true' if user.admin? %></td> <td align="center"><%= image_tag 'true.png' 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 '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.created_on) %></td>
<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td> <td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
<td align="center"> <td align="center">

2
app/views/welcome/index.rhtml
View File

@ -10,7 +10,7 @@
<div class="splitcontentright"> <div class="splitcontentright">
<div class="box"> <div class="box">
<h3><%=l(:label_project_latest)%></h3> <h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
<ul> <ul>
<% for project in @projects %> <% for project in @projects %>
<li> <li>

BIN
public/images/22x22/authent.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
public/images/22x22/comment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 520 B

BIN
public/images/22x22/file.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 432 B

BIN
public/images/22x22/info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 985 B

BIN
public/images/22x22/notifications.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
public/images/22x22/options.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 926 B

BIN
public/images/22x22/projects.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
public/images/22x22/role.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 991 B

BIN
public/images/22x22/tracker.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
public/images/22x22/users.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
public/images/22x22/workflow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 950 B

BIN
public/images/32x32/file.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 646 B

BIN
public/images/add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
public/images/admin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 716 B

After

Width:  |  Height:  |  Size: 595 B

BIN
public/images/alert.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 581 B

BIN
public/images/calendar.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 593 B

BIN
public/images/check.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 222 B

BIN
public/images/comment.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 985 B

BIN
public/images/csv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 333 B

BIN
public/images/delete.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 477 B

BIN
public/images/edit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
public/images/file.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 362 B

BIN
public/images/folder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 675 B

BIN
public/images/help.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 526 B

BIN
public/images/home.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
public/images/issues.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 356 B

BIN
public/images/locked.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 566 B

BIN
public/images/login.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/images/mailer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 294 B

BIN
public/images/move.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 435 B

BIN
public/images/package.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 530 B

BIN
public/images/pdf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 403 B

BIN
public/images/projects.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 690 B

BIN
public/images/role.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 293 B

BIN
public/images/save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 591 B

BIN
public/images/options.png → public/images/task_done.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 970 B

BIN
public/images/task_late.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 B

BIN
public/images/task_todo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 B

BIN
public/images/tracker.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 356 B

BIN
public/images/true.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 455 B

BIN
public/images/user.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 455 B

BIN
public/images/user_new.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 467 B

BIN
public/images/user_page.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 485 B

BIN
public/images/users.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 761 B

BIN
public/images/workflow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 285 B

89
public/stylesheets/application.css
View File

@ -27,7 +27,7 @@ background-color:inherit;
a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;} a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
a img{border:none;} a img{border:none;}
p{padding:0 0 1em 0;} p{margin:0 0 1em 0;}
p form{margin-top:0; margin-bottom:20px;} p form{margin-top:0; margin-bottom:20px;}
img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;} img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
@ -124,34 +124,57 @@ text-decoration:none;
background-color: #80b0da; background-color: #80b0da;
} }
/**************** Icons links *******************/ /**************** Icons *******************/
.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; }
.icon { .icon {
background-position: 0% 40%; background-position: 0% 40%;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-left: 20px; padding-left: 20px;
padding-top: 2px;
padding-bottom: 3px;
vertical-align: middle;
} }
.folder { background-image: url(../images/folder.png); } #navigation .icon {
.file { background-image: url(../images/file.png); } background-position: 4px 50%;
.attachment { background-image: url(../images/attachment.png); } }
.comment { background-image: url(../images/comment.png); }
.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 ****************/ /**************** Content styles ****************/
@ -220,6 +243,7 @@ input.button-small
label { label {
font-weight: bold; font-weight: bold;
font-size: 1em; font-size: 1em;
color: #505050;
} }
fieldset { fieldset {
@ -265,10 +289,10 @@ margin: 0;
} }
ul.documents li { ul.documents li {
background-image: url(../images/file.png); background-image: url(../images/32x32/file.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 0 .4em; background-position: 0 1px;
padding-left: 20px; padding-left: 36px;
margin-bottom: 10px; margin-bottom: 10px;
margin-left: -37px; margin-left: -37px;
} }
@ -499,6 +523,8 @@ img.calendar-trigger {
.contextual { .contextual {
float: right; float: right;
font-size: 0.8em; font-size: 0.8em;
line-height: 16px;
padding: 2px;
} }
.contextual select, .contextual input { .contextual select, .contextual input {
@ -528,8 +554,9 @@ font-size: 1em;
line-height:0.8em; line-height:0.8em;
} }
.task_late { background:#f66; } .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
.task_done { background:#66f; } .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 ******/ /***** CSS FORM ******/
.tabular p{ .tabular p{

10
public/stylesheets/print.css
View File

@ -1,7 +1,3 @@
#header, #navigation, #subcontent, #footer { #header, #navigation, #subcontent, #footer { display:none; }
display:none; .menu { display:none; }
} .contextual { display:none; }
.menu {
display:none;
}