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

Slight improvements to the browser views. 

ApplicationHelper#set_html_title replaced by html_title with arguments and can be called several times in views to append elements to the title.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1032 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-01-02 22:41:53 +00:00
parent 636579b17d
commit 3e0acc0b7e
69 changed files with 107 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/application_helper.rb
View File

@ -145,16 +145,17 @@ module ApplicationHelper
links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
end
def set_html_title(text)
@html_header_title = text
end
def html_title
def html_title(*args)
if args.empty?
title = []
title << @project.name if @project
title << @html_header_title
title += @html_title if @html_title
title << Setting.app_title
title.compact.join(' - ')
else
@html_title ||= []
@html_title += args
end
end
ACCESSKEYS = {:edit => 'e',

2
app/helpers/repositories_helper.rb
View File

@ -55,7 +55,7 @@ module RepositoriesHelper
def with_leading_slash(path)
path ||= ''
path.starts_with?("/") ? "/#{path}" : path
path.starts_with?('/') ? path : "/#{path}"
end
def subversion_field_tags(form, repository)

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

@ -44,4 +44,4 @@
<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
</p>
<% set_html_title l(:label_administration) -%>
<% html_title(l(:label_administration)) -%>

2
app/views/admin/info.rhtml
View File

@ -24,4 +24,4 @@
</table>
<% end %>
<% set_html_title(l(:label_information_plural)) -%>
<% html_title(l(:label_information_plural)) -%>

2
app/views/admin/mail_options.rhtml
View File

@ -30,4 +30,4 @@
<%= submit_tag l(:button_save) %>
<% end %>
<% set_html_title(l(:field_mail_notification)) -%>
<% html_title(l(:field_mail_notification)) -%>

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

@ -47,4 +47,4 @@
<p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
<% set_html_title l(:label_project_plural) -%>
<% html_title(l(:label_project_plural)) -%>

2
app/views/common/403.rhtml
View File

@ -3,4 +3,4 @@
<p><%= l(:notice_not_authorized) %></p>
<p><a href="javascript:history.back()">Back</a></p>
<% set_html_title '403' %>
<% html_title '403' %>

2
app/views/common/404.rhtml
View File

@ -3,4 +3,4 @@
<p><%= l(:notice_file_not_found) %></p>
<p><a href="javascript:history.back()">Back</a></p>
<% set_html_title '404' %>
<% html_title '404' %>

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

@ -52,4 +52,4 @@
<%= javascript_tag "showTab('#{@tab}');" %>
<% set_html_title(l(:label_custom_field_plural)) -%>
<% html_title(l(:label_custom_field_plural)) -%>

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

@ -36,4 +36,4 @@
<% end %>
<% end %>
<% set_html_title l(:label_document_plural) -%>
<% html_title(l(:label_document_plural)) -%>

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

@ -35,4 +35,4 @@
<% end %>
<% end %>
<% set_html_title h(@document.title) -%>
<% html_title @document.title -%>

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

@ -25,4 +25,4 @@
<p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p>
<% end %>
<% set_html_title(l(:label_enumerations)) -%>
<% html_title(l(:label_enumerations)) -%>

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

@ -34,4 +34,4 @@
<p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
<% set_html_title(l(:label_issue_status_plural)) -%>
<% html_title(l(:label_issue_status_plural)) -%>

6
app/views/issues/index.rhtml
View File

@ -1,6 +1,6 @@
<% if @query.new_record? %>
<h2><%=l(:label_issue_plural)%></h2>
<% set_html_title l(:label_issue_plural) %>
<% html_title(l(:label_issue_plural)) %>
<% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
<%= hidden_field_tag('project_id', @project.id) if @project %>
@ -32,9 +32,9 @@
<% end %>
</div>
<h2><%= @query.name %></h2>
<h2><%=h @query.name %></h2>
<div id="query_form"></div>
<% set_html_title @query.name %>
<% html_title @query.name %>
<% end %>
<%= error_messages_for 'query' %>
<% if @query.valid? %>

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

@ -116,7 +116,7 @@ end %>
</div>
&nbsp;
<% set_html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<% content_for :sidebar do %>
<%= render :partial => 'issues/sidebar' %>

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

@ -45,4 +45,4 @@
<%= render :partial => 'sidebar' %>
<% end %>
<% set_html_title l(:label_my_account) -%>
<% html_title(l(:label_my_account)) -%>

2
app/views/my/page.rhtml
View File

@ -39,4 +39,4 @@
<div id="context-menu" style="display: none;"></div>
<%= javascript_tag 'new ContextMenu({})' %>
<% set_html_title l(:label_my_page) -%>
<% html_title(l(:label_my_page)) -%>

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

@ -33,4 +33,4 @@
<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<% end %>
<% set_html_title l(:label_news_plural) -%>
<% html_title(l(:label_news_plural)) -%>

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

@ -43,4 +43,4 @@
<% end %>
<% end %>
<% set_html_title(h(@news.title)) -%>
<% html_title @news.title -%>

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

@ -40,4 +40,4 @@
<% end %>
<% end %>
<% set_html_title l(:label_activity) -%>
<% html_title(l(:label_activity)) -%>

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

@ -39,4 +39,4 @@
<% end %>
<% end %>
<% set_html_title l(:label_calendar) -%>
<% html_title(l(:label_calendar)) -%>

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

@ -246,4 +246,4 @@ if Date.today >= @date_from and Date.today <= @date_to %>
<% end %>
<% end %>
<% set_html_title l(:label_gantt) -%>
<% html_title(l(:label_gantt)) -%>

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

@ -17,4 +17,4 @@
</div>
<% end %>
<% set_html_title l(:label_project_plural) -%>
<% html_title(l(:label_project_plural)) -%>

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

@ -43,4 +43,4 @@
</tbody>
</table>
<% set_html_title l(:label_attachment_plural) -%>
<% html_title(l(:label_attachment_plural)) -%>

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

@ -47,4 +47,4 @@
<% end %>
<% end %>
<% set_html_title l(:label_roadmap) %>
<% html_title(l(:label_roadmap)) %>

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

@ -15,4 +15,4 @@
<%= tab = params[:tab] ? h(params[:tab]) : project_settings_tabs.first[:name]
javascript_tag "showTab('#{tab}');" %>
<% set_html_title l(:label_settings) -%>
<% html_title(l(:label_settings)) -%>

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

@ -82,4 +82,4 @@
<%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
<% end %>
<% set_html_title l(:label_overview) -%>
<% html_title(l(:label_overview)) -%>

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

@ -1,10 +1,10 @@
<table class="list" id="browser">
<table class="list entries" id="browser">
<thead>
<tr id="root">
<th><%= l(:field_name) %></th>
<th><%= l(:field_filesize) %></th>
<th><%= l(:label_revision) %></th>
<th><%= l(:label_date) %></th>
<th><%= l(:label_age) %></th>
<th><%= l(:field_author) %></th>
<th><%= l(:field_comments) %></th>
</tr>

14
app/views/repositories/_dir_list_content.rhtml
View File

@ -1,8 +1,8 @@
<% @entries.each do |entry| %>
<% tr_id = Digest::MD5.hexdigest(entry.path)
depth = params[:depth].to_i %>
<tr id="<%= tr_id %>" class="<%= params[:parent_id] %>">
<td>
<tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry">
<td class="filename">
<%= 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 %>
</td>
<td align="right"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
<td align="right"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
<td align="center"><%= format_time(entry.lastrev.time) if entry.lastrev %></td>
<td align="center"><em><%=h(entry.lastrev.author) if entry.lastrev %></em></td>
<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
<td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
<td class="author"><%=h(entry.lastrev.author) if entry.lastrev %></td>
<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
<td><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
<td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
</tr>
<% end %>

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

@ -17,3 +17,5 @@ dirs.each do |dir|
<% end %>
<%= "@ #{revision}" if revision %>
<% html_title(with_leading_slash(path)) -%>

12
app/views/repositories/_revisions.rhtml
View File

@ -1,5 +1,5 @@
<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
<table class="list">
<table class="list changesets">
<thead><tr>
<th>#</th>
<th></th>
@ -12,17 +12,17 @@
<% show_diff = entry && entry.is_file? && revisions.size > 1 %>
<% line_num = 1 %>
<% revisions.each do |changeset| %>
<tr class="<%= cycle 'odd', 'even' %>">
<tr class="changeset <%= cycle 'odd', 'even' %>">
<td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></td>
<td class="checkbox"><%= 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) %></td>
<td class="checkbox"><%= 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) %></td>
<td align="center" style="width:15%"><%= format_time(changeset.committed_on) %></td>
<td align="center" style="width:15%"><em><%=h changeset.committer %></em></td>
<td align="left"><%= textilizable(changeset.comments) %></td>
<td class="committed_on"><%= format_time(changeset.committed_on) %></td>
<td class="author"><%=h changeset.committer %></td>
<td class="comments"><%= textilizable(changeset.comments) %></td>
</tr>
<% line_num += 1 %>
<% end %>
</tbody>
</table>
<%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %>
<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
<% end %>

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

@ -21,6 +21,8 @@
</table>
</div>
<% html_title(l(:button_annotate)) -%>
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'scm' %>
<% end %>

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

@ -17,4 +17,4 @@
<%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
<% set_html_title(h(@entry.name)) -%>
<% html_title(l(:label_change_plural)) -%>

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

@ -88,6 +88,8 @@
<% end %>
<% end %>
<% html_title(with_leading_slash(@path), 'Diff') -%>
<% content_for :header_tags do %>
<%= stylesheet_link_tag "scm" %>
<% end %>

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

@ -62,4 +62,4 @@
<%= stylesheet_link_tag "scm" %>
<% end %>
<% set_html_title("#{l(:label_revision)} #{@changeset.revision}") -%>
<% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>

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

@ -16,4 +16,4 @@
<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
<% end %>
<% set_html_title l(:label_revision_plural) -%>
<% html_title(l(:label_revision_plural)) -%>

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

@ -22,4 +22,4 @@
<%= stylesheet_link_tag "scm" %>
<% end %>
<% set_html_title l(:label_repository) -%>
<% html_title(l(:label_repository)) -%>

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

@ -9,3 +9,5 @@
</table>
<br />
<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
<% html_title(l(:label_repository), l(:label_statistics)) -%>

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

@ -33,4 +33,4 @@
<p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
<% set_html_title(l(:label_role_plural)) -%>
<% html_title(l(:label_role_plural)) -%>

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

@ -55,4 +55,4 @@
<% end %>
<% set_html_title(l(:label_workflow)) -%>
<% html_title(l(:label_workflow)) -%>

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

@ -42,4 +42,4 @@
<% end %>
</center></p>
<% set_html_title(l(:label_search)) -%>
<% html_title(l(:label_search)) -%>

2
app/views/settings/edit.rhtml
View File

@ -102,4 +102,4 @@
<%= submit_tag l(:button_save) %>
<% end %>
<% set_html_title(l(:label_settings)) -%>
<% html_title(l(:label_settings)) -%>

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

@ -32,4 +32,4 @@
<p class="pagination"><%= pagination_links_full @tracker_pages %></p>
<% set_html_title(l(:label_tracker_plural)) -%>
<% html_title(l(:label_tracker_plural)) -%>

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

@ -57,4 +57,4 @@
<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
<% set_html_title(l(:label_user_plural)) -%>
<% html_title(l(:label_user_plural)) -%>

2
app/views/versions/show.rhtml
View File

@ -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 %>

2
app/views/wiki/edit.rhtml
View File

@ -28,4 +28,4 @@
<%= stylesheet_link_tag 'scm' %>
<% end %>
<% set_html_title @page.pretty_title %>
<% html_title @page.pretty_title %>

2
app/views/wiki/show.rhtml
View File

@ -47,4 +47,4 @@
<%= render :partial => 'sidebar' %>
<% end %>
<% set_html_title @page.pretty_title %>
<% html_title @page.pretty_title %>

1
lang/bg.yml
View File

@ -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

1
lang/cs.yml
View File

@ -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

1
lang/de.yml
View File

@ -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

1
lang/en.yml
View File

@ -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

1
lang/es.yml
View File

@ -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

1
lang/fr.yml
View File

@ -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

1
lang/he.yml
View File

@ -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

1
lang/it.yml
View File

@ -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

1
lang/ja.yml
View File

@ -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

1
lang/ko.yml
View File

@ -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

1
lang/nl.yml
View File

@ -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

1
lang/pl.yml
View File

@ -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

1
lang/pt-br.yml
View File

@ -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

1
lang/pt.yml
View File

@ -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

1
lang/ro.yml
View File

@ -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

1
lang/ru.yml
View File

@ -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

1
lang/sr.yml
View File

@ -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

1
lang/sv.yml
View File

@ -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

1
lang/zh-tw.yml
View File

@ -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

1
lang/zh.yml
View File

@ -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

10
public/stylesheets/application.css
View File

@ -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); }