diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-12 17:59:02 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-12 17:59:02 +0000 |
commit | 027bf93849e82ef3c60e4a3024db49d65f0fb3c9 (patch) | |
tree | c6bc438fcd50370944b94f605b3f34fe54b73248 /app/views/wiki | |
parent | 071f8e18d02f789149071abb8e052bae7ad01003 (diff) | |
download | redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.tar.gz redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.zip |
added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
-rw-r--r-- | app/views/wiki/_preview.rhtml | 6 | ||||
-rw-r--r-- | app/views/wiki/edit.rhtml | 86 | ||||
-rw-r--r-- | app/views/wiki/export.rhtml | 28 | ||||
-rw-r--r-- | app/views/wiki/export_multiple.rhtml | 52 | ||||
-rw-r--r-- | app/views/wiki/history.rhtml | 54 | ||||
-rw-r--r-- | app/views/wiki/show.rhtml | 58 | ||||
-rw-r--r-- | app/views/wiki/special_page_index.rhtml | 24 |
7 files changed, 154 insertions, 154 deletions
diff --git a/app/views/wiki/_preview.rhtml b/app/views/wiki/_preview.rhtml index c17200ab1..7865d9159 100644 --- a/app/views/wiki/_preview.rhtml +++ b/app/views/wiki/_preview.rhtml @@ -1,3 +1,3 @@ -<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
-<%= textilizable @text %>
-</fieldset>
+<fieldset class="preview"><legend><%= l(:label_preview) %></legend> +<%= textilizable @text %> +</fieldset> diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml index 1fc79bdc4..48025b368 100644 --- a/app/views/wiki/edit.rhtml +++ b/app/views/wiki/edit.rhtml @@ -1,44 +1,44 @@ -<div class="contextual">
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
-<h2><%= @page.pretty_title %></h2>
-
-<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
-<%= error_messages_for 'content' %>
-<div class="contextual">
-<%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
- :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
-</div>
-<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit' %></p>
-<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
-<p><%= submit_tag l(:button_save) %>
- <%= link_to_remote l(:label_preview),
- { :url => { :controller => 'wiki', :action => 'preview', :id => @project },
- :method => 'get',
- :update => 'preview',
- :with => "Form.serialize('wiki_form')",
- :loading => "Element.show('indicator')",
- :loaded => "Element.hide('indicator')"
- } %>
- <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
-</p>
-
-<% end %>
-
-<% if Setting.text_formatting == 'textile' %>
-<%= javascript_include_tag 'jstoolbar' %>
-<script type="text/javascript">
-//<![CDATA[
-if (document.getElementById) {
- if (document.getElementById('content_text')) {
- var commentTb = new jsToolBar(document.getElementById('content_text'));
- commentTb.draw();
- }
-}
-//]]>
-</script>
-<% end %>
-
+<div class="contextual"> +<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %> +</div> + +<h2><%= @page.pretty_title %></h2> + +<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %> +<%= error_messages_for 'content' %> +<div class="contextual"> +<%= l(:setting_text_formatting) %>: +<%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' }, + :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %> +</div> +<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit' %></p> +<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p> +<p><%= submit_tag l(:button_save) %> + <%= link_to_remote l(:label_preview), + { :url => { :controller => 'wiki', :action => 'preview', :id => @project }, + :method => 'get', + :update => 'preview', + :with => "Form.serialize('wiki_form')", + :loading => "Element.show('indicator')", + :loaded => "Element.hide('indicator')" + } %> + <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span> +</p> + +<% end %> + +<% if Setting.text_formatting == 'textile' %> +<%= javascript_include_tag 'jstoolbar' %> +<script type="text/javascript"> +//<![CDATA[ +if (document.getElementById) { + if (document.getElementById('content_text')) { + var commentTb = new jsToolBar(document.getElementById('content_text')); + commentTb.draw(); + } +} +//]]> +</script> +<% end %> + <div id="preview" class="wiki"></div>
\ No newline at end of file diff --git a/app/views/wiki/export.rhtml b/app/views/wiki/export.rhtml index c31568246..561e9b000 100644 --- a/app/views/wiki/export.rhtml +++ b/app/views/wiki/export.rhtml @@ -1,14 +1,14 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<title><%=h @page.pretty_title %></title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<style>
-body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
-</style>
-</head>
-<body>
-<%= textilizable @content.text, :wiki_links => :local %>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<title><%=h @page.pretty_title %></title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<style> +body { font:80% Verdana,Tahoma,Arial,sans-serif; } +h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; } +</style> +</head> +<body> +<%= textilizable @content.text, :wiki_links => :local %> +</body> +</html> diff --git a/app/views/wiki/export_multiple.rhtml b/app/views/wiki/export_multiple.rhtml index cecb40b42..fe3e87e7f 100644 --- a/app/views/wiki/export_multiple.rhtml +++ b/app/views/wiki/export_multiple.rhtml @@ -1,26 +1,26 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<title><%=h @wiki.project.name %></title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<style>
-body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
-</style>
-</head>
-<body>
-
-<strong><%= l(:label_page_index) %></strong>
-<ul>
-<% @pages.each do |page| %>
- <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
-<% end %>
-</ul>
-
-<% @pages.each do |page| %>
-<hr />
-<%= textilizable page.content.text, :wiki_links => :anchor %>
-<% end %>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<title><%=h @wiki.project.name %></title> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<style> +body { font:80% Verdana,Tahoma,Arial,sans-serif; } +h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; } +</style> +</head> +<body> + +<strong><%= l(:label_page_index) %></strong> +<ul> +<% @pages.each do |page| %> + <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li> +<% end %> +</ul> + +<% @pages.each do |page| %> +<hr /> +<%= textilizable page.content.text, :wiki_links => :anchor %> +<% end %> + +</body> +</html> diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml index e44a08168..dd9e590be 100644 --- a/app/views/wiki/history.rhtml +++ b/app/views/wiki/history.rhtml @@ -1,28 +1,28 @@ -<div class="contextual">
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
-<h2><%= @page.pretty_title %></h2>
-
-<h3><%= l(:label_history) %></h3>
-
-<table class="list">
-<thead><tr>
- <th>#</th>
- <th><%= l(:field_updated_on) %></th>
- <th><%= l(:field_author) %></th>
- <th><%= l(:field_comment) %></th>
-</tr></thead>
-<tbody>
-<% @versions.each do |ver| %>
-<tr class="<%= cycle("odd", "even") %>">
- <th align="center"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th>
- <td align="center"><%= format_time(ver.updated_on) %></td>
- <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td>
- <td><%=h ver.comment %></td>
-</tr>
-<% end %>
-</tbody>
-</table>
-
+<div class="contextual"> +<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %> +</div> + +<h2><%= @page.pretty_title %></h2> + +<h3><%= l(:label_history) %></h3> + +<table class="list"> +<thead><tr> + <th>#</th> + <th><%= l(:field_updated_on) %></th> + <th><%= l(:field_author) %></th> + <th><%= l(:field_comment) %></th> +</tr></thead> +<tbody> +<% @versions.each do |ver| %> +<tr class="<%= cycle("odd", "even") %>"> + <th align="center"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th> + <td align="center"><%= format_time(ver.updated_on) %></td> + <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td> + <td><%=h ver.comment %></td> +</tr> +<% end %> +</tbody> +</table> + <p><%= link_to l(:button_back), :action => 'index', :page => @page.title %></p>
\ No newline at end of file diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml index e0369ed30..2e8ee4089 100644 --- a/app/views/wiki/show.rhtml +++ b/app/views/wiki/show.rhtml @@ -1,30 +1,30 @@ -<div class="contextual">
-<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
-<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
-<% if @content.version != @page.content.version %>
- <p>
- <%= link_to(('« ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
- <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %> -
- <%= link_to((l(:label_next) + ' »'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
- <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
- <br />
- <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
- <%=h @content.comment %>
- </p>
- <hr />
-<% end %>
-
-<div class="wiki">
-<% cache "wiki/show/#{@page.id}/#{@content.version}" do %>
-<%= textilizable @content.text %>
-<% end %>
-</div>
-
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
-<%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
+<div class="contextual"> +<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %> +<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> +<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %> +</div> + +<% if @content.version != @page.content.version %> + <p> + <%= link_to(('« ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %> + <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %> - + <%= link_to((l(:label_next) + ' »'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %> + <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %> + <br /> + <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br /> + <%=h @content.comment %> + </p> + <hr /> +<% end %> + +<div class="wiki"> +<% cache "wiki/show/#{@page.id}/#{@content.version}" do %> +<%= textilizable @content.text %> +<% end %> +</div> + +<div class="contextual"> +<%= l(:label_export_to) %> +<%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>, +<%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %> </div>
\ No newline at end of file diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml index e6e3e7020..ba3cfeed1 100644 --- a/app/views/wiki/special_page_index.rhtml +++ b/app/views/wiki/special_page_index.rhtml @@ -1,13 +1,13 @@ -<div class="contextual">
-<% unless @pages.empty? %>
-<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>
-<% end %>
-</div>
-
-<h2><%= l(:label_page_index) %></h2>
-
-<% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-<ul><% @pages.each do |page| %>
- <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -
- <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>
+<div class="contextual"> +<% unless @pages.empty? %> +<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %> +<% end %> +</div> + +<h2><%= l(:label_page_index) %></h2> + +<% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %> +<ul><% @pages.each do |page| %> + <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> - + <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li> <% end %></ul>
\ No newline at end of file |