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

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

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 %> &copy 2006-2007 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2007 Jean-Philippe Lang
 </div>
 </body>
 </html>

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>

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 %>
-<% end %>
-<% end %>
 </div>
+<% end %>
+<% end %>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>

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>
+&nbsp;
+
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'scm' %>
 <% end %>