ActionItem8: updating templates and translation files

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@460 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem8: updating templates and translation files
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@460 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 9a1619fe
Showing 6 changed files with 27 additions and 19 deletions Show diff stats
app/helpers/application_helper.rb
app/views/account/index.rhtml
app/views/cms/_page_list_item.rhtml
app/views/cms/index.rhtml
app/views/content_viewer/view_page.rhtml
po/pt_BR/noosfero.po
@@ -99,10 +99,11 @@ module ApplicationHelper
     link_to text, { :profile => profile }.merge(url), options
   end
-  def link_to_document(doc)
+  def link_to_document(doc, text = nil)
+    text ||= doc.title
     path = doc.full_path.split(/\//)
     profile = path.shift
-    link_to doc.title, homepage_path(:profile => profile , :page => path)
+    link_to text, homepage_path(:profile => profile , :page => path)
   end
   # TODO: add the actual links
@@ -5,13 +5,10 @@
 <%= _('It is a good idea to change your password from times to times.') %>
 </p>
-<%# FIXME: to be implemented %>
-<!--
 <p>
-<%= link_to _('Edit Personal details.'), :action => 'edit_details' %>
+<%= link_to_myprofile _('Edit Personal details.'), :controller => 'profile_editor' %>
 <%= _('You can change your personal details.') %>
 </p>
--->
 <p>
 <%= link_to _('Logout.'), :action => 'logout' %>
@@ -12,10 +12,10 @@
 <%
 # Create the page-level links...
 links = []
-links << link_to(pluralize(page.versions.length, 'revision', 'revisions'), :action=>'versions', :id=>page) if page.versions.length > 0
-links << link_to('add child page', {:action=>'new', :parent=>page}, :title=> _("Add a child to '%s'") % page.title, :class=>'add-page')
-links << link_to_function('reorder children', "ComatoseList.toggle_reorder('page_list_#{page.id}',this,#{page.id}, '%s', '%s')" % [_('reorder children'), _('finished reordering')], :title=> _("Reorder children of '%s'") % page.title, :class=>'reorder-children', :href=>url_for(:action=>'reorder', :id=>page)) if !page.children.empty? and page.children.length > 1
-links << link_to('delete', {:action=>'delete', :id=>page}, :confirm=> _('This will delete this page, and any children. Are you sure?'), :title=> _("Delete page '%s' and all it's children") % page.title, :class=>'delete-page', :method=>'post', :onmouseover=>"ComatoseList.item_hover('page_#{page.id}', 'over', true)", :onmouseout=>"ComatoseList.item_hover('page_#{page.id}', 'out', true)") unless @root_pages.include? page
+links << link_to((page.versions.length == 1 ? _('%d revision') : _('%d revisions')) % page.versions.length, :action=>'versions', :id=>page) if page.versions.length > 0
+links << link_to(_('add child document'), {:action=>'new', :parent=>page}, :title=> _("Add a child to '%s'") % page.title, :class=>'add-page')
+links << link_to_function(_('reorder children'), "ComatoseList.toggle_reorder('page_list_#{page.id}',this,#{page.id}, '%s', '%s')" % [_('reorder children'), _('finished reordering')], :title=> _("Reorder children of '%s'") % page.title, :class=>'reorder-children', :href=>url_for(:action=>'reorder', :id=>page)) if !page.children.empty? and page.children.length > 1
+links << link_to(_('delete'), {:action=>'delete', :id=>page}, :confirm=> _('This will delete this page, and any children. Are you sure?'), :title=> _("Delete page '%s' and all it's children") % page.title, :class=>'delete-page', :method=>'post', :onmouseover=>"ComatoseList.item_hover('page_#{page.id}', 'over', true)", :onmouseout=>"ComatoseList.item_hover('page_#{page.id}', 'out', true)") unless @root_pages.include? page
 # Level check, one, two, three...
 collapse_children = (level >= Comatose.config.default_tree_level)
 %>
 <div class="action">
-  <%= link_to 'Clear Page Cache', :controller=>controller.controller_name, :action=>'expire_page_cache' %>
+  <%= link_to _('Clear Page Cache'), :controller=>controller.controller_name, :action=>'expire_page_cache' %>
 </div>
 <h1>
 <h1><%= @page.title %></h2>
+<% if @page.parent %>
+  <%= link_to_document(@page.parent, _('Up')) %>
+  <hr/>
+<% end %>
+
 <%= @page.to_html %>
+
+<% unless @page.children.empty? %>
+  <hr/>
+  <ul>
+  <% @page.children.each do |item| %>
+    <li><%= link_to_document(item) %></li>
+  <% end %>
+<% end %>
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.1.0~rc1\n"
 "POT-Creation-Date: 2007-09-12 02:25-0300\n"
-"PO-Revision-Date: 2007-09-12 02:22-0300\n"
+"PO-Revision-Date: 2007-09-12 02:28-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1076,18 +1076,16 @@ msgid &quot;New Page&quot;
 msgstr "Nova Página"
 #: app/views/cms/_page_list_item.rhtml:6
-#, fuzzy
 msgid "%d revision"
-msgstr "Uma revisão"
+msgstr "%d revisão"
 #: app/views/cms/_page_list_item.rhtml:6
-#, fuzzy
 msgid "%d revisions"
-msgstr "Uma revisão"
+msgstr "%d revisões"
 #: app/views/cms/_page_list_item.rhtml:7
 msgid "add child document"
-msgstr ""
+msgstr "adicionar document filho"
 #: app/views/cms/_page_list_item.rhtml:7
 msgid "Add a child to '%s'"
@@ -1106,9 +1104,8 @@ msgid &quot;Reorder children of &#39;%s&#39;&quot;
 msgstr "Reordenar filhos de '%s'"
 #: app/views/cms/_page_list_item.rhtml:9
-#, fuzzy
 msgid "delete"
-msgstr "Excluir"
+msgstr "excluir"
 #: app/views/cms/_page_list_item.rhtml:9
 msgid "This will delete this page, and any children. Are you sure?"
1	<div class="action">	1	<div class="action">
2	- <%= link_to 'Clear Page Cache', :controller=>controller.controller_name, :action=>'expire_page_cache' %>	2	+ <%= link_to _('Clear Page Cache'), :controller=>controller.controller_name, :action=>'expire_page_cache' %>
3	</div>	3	</div>
4		4
5	<h1>	5	<h1>
1	<h1><%= @page.title %></h2>	1	<h1><%= @page.title %></h2>
2		2
		3	+<% if @page.parent %>
		4	+ <%= link_to_document(@page.parent, _('Up')) %>
		5	+ <hr/>
		6	+<% end %>
		7	+
3	<%= @page.to_html %>	8	<%= @page.to_html %>
		9	+
		10	+<% unless @page.children.empty? %>
		11	+ <hr/>
		12	+ <ul>
		13	+ <% @page.children.each do \|item\| %>
		14	+ <li><%= link_to_document(item) %></li>
		15	+ <% end %>
		16	+<% end %>