From bd7542cf9815ce527996ed740925a7449c70ded9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang
Date: Mon, 7 Jan 2008 20:46:54 +0000
Subject: 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 | 4 ++--
app/views/layouts/base.rhtml | 4 ++--
app/views/news/_news.rhtml | 4 ++--
app/views/repositories/diff.rhtml | 4 ++--
app/views/wiki/show.rhtml | 13 +++++++------
5 files changed, 15 insertions(+), 14 deletions(-)
(limited to 'app')
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) %>
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()}" %>
<% end %>
-
<% 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) %>
-
-<%= 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' %>
-
-
<% if authorize_for('wiki', 'add_attachment') %>
<%= toggle_link l(:label_attachment_new), "add_attachment_form" %>
<% 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 %>
+
+<%= 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' %>
+
+
+
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'scm' %>
<% end %>
--
cgit v1.2.3