jro_apps/redmine Commit - r762:f2a5304d648f

Sligth changes to wiki views....

Jean-Philippe Lang -

r762:f2a5304d648f

parent child

Context file:

r762:f2a5304d648f

Collapse all files

app/views/wiki/diff.rhtml 0 -1

             <div class="contextual">
             <%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %>
             <%= 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>
             <h2><%= @page.pretty_title %></h2>
             <p>
             <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'index', :page => @page.title, :version => @diff.content_from.version %>
             <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
             &#8594;
             <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'index', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %>
             <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
             </p>
             <hr />
             <%= html_diff(@diff) %>

app/views/wiki/edit.rhtml 0 -4

-            <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| %>
             <%= f.hidden_field :version %>
             <%= 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_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :complete => "location.href='#preview-top'"
                                    } %></p>
             <%= wikitoolbar_for 'content_text' %>
             <% end %>
             <a name="preview-top"></a>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
             <% set_html_title @page.pretty_title %>

app/views/wiki/export_multiple.rhtml +1 -1

             <!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>
+            <strong><%= l(:label_index_by_title) %></strong>
             <ul>
             <% @pages.each do |page| %>
                 <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
             <% end %>
             </ul>
             <% @pages.each do |page| %>
             <hr />
             <a name="<%= page.title %>" />
             <%= textilizable page.content.text, :wiki_links => :anchor %>
             <% end %>
             </body>
             </html>

app/views/wiki/history.rhtml 0 -4

-            <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>
             <% form_tag({:action => "diff"}, :method => :get) do %>
             <table class="list">
             <thead><tr>
                 <th>#</th>
                 <th></th>
                 <th></th>
                 <th><%= l(:field_updated_on) %></th>
                 <th><%= l(:field_author) %></th>
                 <th><%= l(:field_comments) %></th>
             </tr></thead>
             <tbody>
             <% show_diff = @versions.size > 1 %>
             <% line_num = 1 %>
             <% @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" width="1%"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
                 <td align="center" width="1%"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true || $('version_from').value > #{ver.version}) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
                 <td align="center"><%= format_time(ver.updated_on) %></td>
                 <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td>
                 <td><%=h ver.comments %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>
             </tbody>
             </table>
             <%= submit_tag l(:label_view_diff), :class => 'small' %>
             <%= pagination_links_full @version_pages, :page_param => :p %>
             [ <%= @version_pages.current.first_item %> - <%= @version_pages.current.last_item %> / <%= @version_count %> ]
             <% end %>

app/views/wiki/special_page_index.rhtml +3 -2

             <h2><%= l(:label_index_by_title) %></h2>
             <% if @pages.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <ul><% @pages.each do |page| %>
-                <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -
+                <li><%= link_to page.pretty_title, {:action => 'index', :page => page.title},
-                <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>
+                                                   :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) %>
+                </li>
             <% end %></ul>
             <% content_for :sidebar do %>
               <%= render :partial => 'sidebar' %>
             <% end %>
             <div class="contextual">
             <% unless @pages.empty? %>
             <%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>
             <% end %>
             </div>
             &nbsp;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages