<%= pagination_links_full @project_pages, @project_count %>
-<% set_html_title l(:label_project_plural) -%> +<% html_title(l(:label_project_plural)) -%> diff --git a/app/views/common/403.rhtml b/app/views/common/403.rhtml index d2d03f81..d1173a18 100644 --- a/app/views/common/403.rhtml +++ b/app/views/common/403.rhtml @@ -3,4 +3,4 @@<%= l(:notice_not_authorized) %>
-<% set_html_title '403' %> +<% html_title '403' %> diff --git a/app/views/common/404.rhtml b/app/views/common/404.rhtml index 080b0484..753e716c 100644 --- a/app/views/common/404.rhtml +++ b/app/views/common/404.rhtml @@ -3,4 +3,4 @@<%= l(:notice_file_not_found) %>
-<% set_html_title '404' %> +<% html_title '404' %> diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml index bbdfeffb..4fd381a1 100644 --- a/app/views/custom_fields/list.rhtml +++ b/app/views/custom_fields/list.rhtml @@ -52,4 +52,4 @@ <%= javascript_tag "showTab('#{@tab}');" %> -<% set_html_title(l(:label_custom_field_plural)) -%> +<% html_title(l(:label_custom_field_plural)) -%> diff --git a/app/views/documents/index.rhtml b/app/views/documents/index.rhtml index a7cefb73..ff58c2b2 100644 --- a/app/views/documents/index.rhtml +++ b/app/views/documents/index.rhtml @@ -36,4 +36,4 @@ <% end %> <% end %> -<% set_html_title l(:label_document_plural) -%> +<% html_title(l(:label_document_plural)) -%> diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index 8f53f1ab..599ac389 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -35,4 +35,4 @@ <% end %> <% end %> -<% set_html_title h(@document.title) -%> +<% html_title @document.title -%> diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 2e069f39..9de9bf37 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -25,4 +25,4 @@<%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %>
<% end %> -<% set_html_title(l(:label_enumerations)) -%> +<% html_title(l(:label_enumerations)) -%> diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index a45f5d4d..e3591181 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -34,4 +34,4 @@<%= pagination_links_full @issue_status_pages %>
-<% set_html_title(l(:label_issue_status_plural)) -%> +<% html_title(l(:label_issue_status_plural)) -%> diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml index c298b9bc..48697c50 100644 --- a/app/views/issues/index.rhtml +++ b/app/views/issues/index.rhtml @@ -1,6 +1,6 @@ <% if @query.new_record? %>| <%= l(:field_name) %> | <%= l(:field_filesize) %> | <%= l(:label_revision) %> | -<%= l(:label_date) %> | +<%= l(:label_age) %> | <%= l(:field_author) %> | <%= l(:field_comments) %> | ||||
|---|---|---|---|---|---|---|---|---|---|---|
| + | ||||||||||
| <%= if entry.is_dir? link_to_remote h(entry.name), {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id}, @@ -22,11 +22,11 @@ else :style => "margin-left: #{18 * depth}px;" end %> | -<%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %> | -<%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> | -<%= format_time(entry.lastrev.time) if entry.lastrev %> | -<%=h(entry.lastrev.author) if entry.lastrev %> | +<%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %> | +<%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %> | +<%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %> | +<%=h(entry.lastrev.author) if entry.lastrev %> | <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %> -<%=h truncate(changeset.comments, 50) unless changeset.nil? %> | +<%=h truncate(changeset.comments, 50) unless changeset.nil? %> |
| # | @@ -12,17 +12,17 @@ <% show_diff = entry && entry.is_file? && revisions.size > 1 %> <% line_num = 1 %> <% revisions.each do |changeset| %> - | |||||||
|---|---|---|---|---|---|---|---|---|
| <%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %> | <%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %> | <%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %> | -<%= format_time(changeset.committed_on) %> | -<%=h changeset.committer %> | -<%= textilizable(changeset.comments) %> | +<%= format_time(changeset.committed_on) %> | +<%=h changeset.committer %> | +<%= textilizable(changeset.comments) %> |
<%= link_to l(:button_back), :action => 'show', :id => @project %>
\ No newline at end of file +<%= link_to l(:button_back), :action => 'show', :id => @project %>
+ +<% html_title(l(:label_repository), l(:label_statistics)) -%> diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index fabc5edc..202fdf41 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -33,4 +33,4 @@<%= link_to l(:label_permissions_report), :action => 'report' %>
-<% set_html_title(l(:label_role_plural)) -%> +<% html_title(l(:label_role_plural)) -%> diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml index 02f1b48a..0f08b0d2 100644 --- a/app/views/roles/workflow.rhtml +++ b/app/views/roles/workflow.rhtml @@ -55,4 +55,4 @@ <% end %> -<% set_html_title(l(:label_workflow)) -%> +<% html_title(l(:label_workflow)) -%> diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml index 9f156cbe..29c604a2 100644 --- a/app/views/search/index.rhtml +++ b/app/views/search/index.rhtml @@ -42,4 +42,4 @@ <% end %> -<% set_html_title(l(:label_search)) -%> +<% html_title(l(:label_search)) -%> diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml index b1db0e7a..b1762a0e 100644 --- a/app/views/settings/edit.rhtml +++ b/app/views/settings/edit.rhtml @@ -102,4 +102,4 @@ <%= submit_tag l(:button_save) %> <% end %> -<% set_html_title(l(:label_settings)) -%> +<% html_title(l(:label_settings)) -%> diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 44750721..9ccfda38 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -32,4 +32,4 @@<%= pagination_links_full @tracker_pages %>
-<% set_html_title(l(:label_tracker_plural)) -%> +<% html_title(l(:label_tracker_plural)) -%> diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index fbac1e8e..50054c98 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -57,4 +57,4 @@<%= pagination_links_full @user_pages, @user_count %>
-<% set_html_title(l(:label_user_plural)) -%> +<% html_title(l(:label_user_plural)) -%> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index a7c4f2b3..1c2a0be4 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -11,4 +11,4 @@ <%= render :partial => 'versions/overview', :locals => {:version => @version} %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -<% set_html_title h(@version.name) %> +<% html_title @version.name %> diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml index 94581104..32acbfff 100644 --- a/app/views/wiki/edit.rhtml +++ b/app/views/wiki/edit.rhtml @@ -28,4 +28,4 @@ <%= stylesheet_link_tag 'scm' %> <% end %> -<% set_html_title @page.pretty_title %> +<% html_title @page.pretty_title %> diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index d2349171..6f1df124 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -47,4 +47,4 @@ <%= render :partial => 'sidebar' %> <% end %> -<% set_html_title @page.pretty_title %> +<% html_title @page.pretty_title %> diff --git a/lang/bg.yml b/lang/bg.yml index 635ead5a..916e8926 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/cs.yml b/lang/cs.yml index 89cc177b..db2055f6 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/de.yml b/lang/de.yml index faa99293..2d4a95c2 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/en.yml b/lang/en.yml index 36c060d3..2419b05d 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -458,6 +458,7 @@ label_registration_activation_by_email: account activation by email label_registration_manual_activation: manual account activation label_registration_automatic_activation: automatic account activation label_display_per_page: 'Per page: %s' +label_age: Age button_login: Login button_submit: Submit diff --git a/lang/es.yml b/lang/es.yml index 6ec8db0f..717d4014 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -555,3 +555,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/fr.yml b/lang/fr.yml index c13500e0..394865a2 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -458,6 +458,7 @@ label_registration_activation_by_email: activation du compte par email label_registration_manual_activation: activation manuelle du compte label_registration_automatic_activation: activation automatique du compte label_display_per_page: 'Par page: %s' +label_age: Age button_login: Connexion button_submit: Soumettre diff --git a/lang/he.yml b/lang/he.yml index 09070bd8..322b10b7 100644 --- a/lang/he.yml +++ b/lang/he.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/it.yml b/lang/it.yml index 8c87a8b3..561215f7 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ja.yml b/lang/ja.yml index 150c6228..eb30edb2 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -553,3 +553,4 @@ label_issues_by: %s別の問題 field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ko.yml b/lang/ko.yml index 001ddd39..d0e03b36 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/nl.yml b/lang/nl.yml index 0c8085ba..74eff69e 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -553,3 +553,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/pl.yml b/lang/pl.yml index c086cce6..f1513ac9 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -552,3 +552,4 @@ label_issues_by: Zagadnienia wprowadzone przez %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 564ee4b0..33719d11 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/pt.yml b/lang/pt.yml index aaab55a5..c042589e 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ro.yml b/lang/ro.yml index 6fdce208..e615472a 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/ru.yml b/lang/ru.yml index 1be4615b..d4037978 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -552,3 +552,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/sr.yml b/lang/sr.yml index a4bed33e..6e571d6e 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -553,3 +553,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/sv.yml b/lang/sv.yml index fd84f2a5..dd411711 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -553,3 +553,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml index 6bc341cb..889f86a1 100644 --- a/lang/zh-tw.yml +++ b/lang/zh-tw.yml @@ -552,3 +552,4 @@ enumeration_activities: 活動 (time tracking) field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/lang/zh.yml b/lang/zh.yml index 31e8b239..c758f549 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -555,3 +555,4 @@ label_issues_by: Issues by %s field_searchable: Searchable label_display_per_page: 'Per page: %s' setting_per_page_options: Objects per page options +label_age: Age diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 37bddbc0..eaef2ae8 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -77,6 +77,16 @@ tr.issue td.subject, tr.issue td.category { white-space: normal; } tr.issue td.subject { text-align: left; } tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;} +tr.entry { border: 1px solid #f8f8f8; } +tr.entry td { white-space: nowrap; } +tr.entry td.filename { width: 30%; } +tr.entry td.size { text-align: right; font-size: 90%; } +tr.entry td.revision, tr.entry td.author { text-align: center; } +tr.entry td.age { text-align: right; } + +tr.changeset td.author { text-align: center; width: 15%; } +tr.changeset td.committed_on { text-align: center; width: 15%; } + tr.message { height: 2.6em; } tr.message td.last_message { font-size: 80%; } tr.message.locked td.subject a { background-image: url(../images/locked.png); }