diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-07 20:46:54 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-07 20:46:54 +0000 |
| commit | bd7542cf9815ce527996ed740925a7449c70ded9 (patch) | |
| tree | dac0d48d8ce794e2eb7ad7e119e71f04bb962238 /app | |
| parent | a2c18b2037aae6f708a8a4ea5d5844deebdf47a5 (diff) | |
| download | redmine-bd7542cf9815ce527996ed740925a7449c70ded9.tar.gz redmine-bd7542cf9815ce527996ed740925a7449c70ded9.zip | |
Merged r1015, r1019, r1022 to r1025, r1045 and r1047 from trunk.
git-svn-id: http://redmine.rubyforge.org/svn/branches/0.6-stable@1048 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/_project_selector.rhtml | 4 | ||||
| -rw-r--r-- | app/views/layouts/base.rhtml | 4 | ||||
| -rw-r--r-- | app/views/news/_news.rhtml | 4 | ||||
| -rw-r--r-- | app/views/repositories/diff.rhtml | 4 | ||||
| -rw-r--r-- | app/views/wiki/show.rhtml | 13 |
5 files changed, 15 insertions, 14 deletions
diff --git a/app/views/layouts/_project_selector.rhtml b/app/views/layouts/_project_selector.rhtml index ce2f15e03..7a2803534 100644 --- a/app/views/layouts/_project_selector.rhtml +++ b/app/views/layouts/_project_selector.rhtml @@ -1,7 +1,7 @@ <% user_projects_by_root = User.current.projects.find(:all, :include => :parent).group_by(&:root) %> <select onchange="if (this.value != '') { window.location = this.value; }"> -<option selected><%= l(:label_jump_to_a_project) %></option> -<option disabled>---</option> +<option selected="selected"><%= l(:label_jump_to_a_project) %></option> +<option disabled="disabled">---</option> <% user_projects_by_root.keys.sort.each do |root| %> <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %> <% user_projects_by_root[root].sort.each do |project| %> diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index df7b2daf9..c98f2b45b 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <title><%=h html_title %></title> @@ -73,7 +73,7 @@ <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div> <div id="footer"> - Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> © 2006-2007 Jean-Philippe Lang + Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> © 2006-2007 Jean-Philippe Lang </div> </body> </html> diff --git a/app/views/news/_news.rhtml b/app/views/news/_news.rhtml index e48b81ac3..e26d2c4a7 100644 --- a/app/views/news/_news.rhtml +++ b/app/views/news/_news.rhtml @@ -1,6 +1,6 @@ <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %> <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %> -<%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></span> +<%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %> <br /> <% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %> -<span class="author"><%= authoring news.created_on, news.author %></p> +<span class="author"><%= authoring news.created_on, news.author %></span></p> diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml index c1c33a495..de6cdc50c 100644 --- a/app/views/repositories/diff.rhtml +++ b/app/views/repositories/diff.rhtml @@ -11,9 +11,9 @@ <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p> <% end %> -<div class="autoscroll"> <% cache(@cache_key) do %> <% @diff.each do |table_file| %> +<div class="autoscroll"> <% if @diff_type == 'sbs' %> <table class="filecontent CodeRay"> <thead> @@ -84,9 +84,9 @@ </tbody> </table> <% end %> +</div> <% end %> <% end %> -</div> <% content_for :header_tags do %> <%= stylesheet_link_tag "scm" %> diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index 8def56072..d23491711 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -24,12 +24,6 @@ <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %> -<div class="contextual"> -<%= l(:label_export_to) %> -<%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>, -<%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %> -</div> - <% if authorize_for('wiki', 'add_attachment') %> <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p> <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %> @@ -38,6 +32,13 @@ <% end %> <% end %> +<div class="contextual"> +<%= l(:label_export_to) %> +<%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>, +<%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %> +</div> + + <% content_for :header_tags do %> <%= stylesheet_link_tag 'scm' %> <% end %> |