typo 4.0.3 → 4.1

data/app/views/admin/categories/_categories.rhtml

@@ -1,8 +1,8 @@
 <table>
   <tr>
-    <th>Category title</th>
-    <th>Articles</th>
-    <th>Delete</th>
+    <th><%= _("Category title")%></th>
+    <th><%= _("Articles")%></th>
+    <th><%= _("Delete")%></th>
   </tr>
   <% for category in @categories -%>
   <tr <%= alternate_class -%> id="category_<%= category.id -%>">

data/app/views/admin/categories/_form.rhtml

@@ -1,7 +1,7 @@
 <%= error_messages_for 'category' %>
 <!--[form:category]-->
 <p>
-  <label for="category_name">Name:</label> 
+  <label for="category_name"><%= _("Name")%>:</label> 
   <%= text_field 'category', 'name'  %>
 </p>
 <!--[eoform:cateogry]-->

data/app/views/admin/categories/_quick_post.rhtml

@@ -1,11 +1,11 @@
-<%= start_form_tag :action=>"new" %>
+<% form_tag :action=>"new" do %>
 
 <p>
-  <label for="category_name">Title:</label><br/>
-  <%= text_field 'category', 'name'  %>  
+  <label for="category_name"><%= _("Title")%>:</label><br/>
+  <%= text_field 'category', 'name'  %>
 </p>
 
 <div id="operations">
-  <%= save("Add category") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a>
+  <%= save(_("Add category")) %> <%= _("or")%> <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
 </div>
-<%= end_form_tag %>
+<% end %>

data/app/views/admin/categories/destroy.rhtml

@@ -1,10 +1,10 @@
-  <% @page_heading = 'Categories' %>
+  <% @page_heading = _('Categories') %>
 
   <% content_for('tasks') do %>
-    <%= task_show 'Show this category', @category.id %>
-  <% end %> 
+    <%= task_show _('Show this category'), @category.id %>
+  <% end %>
 
-  <p>Are you sure you want to delete the category '<%= @category.name %>'?</p>
-  <%= start_form_tag :action => "destroy", :id => @category.id %>
-  <%= confirm_delete("Delete this category") %>
-  <%= end_form_tag %>
+  <p><%= _("Are you sure you want to delete the category ")%> '<%= @category.name %>'?</p>
+  <% form_tag :action => "destroy", :id => @category.id do %>
+  <%= confirm_delete(_("Delete this category")) %>
+  <% end %>

data/app/views/admin/categories/edit.rhtml

@@ -1,13 +1,13 @@
-  <% @page_heading = 'Categories' %>
+  <% @page_heading = _('Categories') %>
 
-  <%= start_form_tag :action=>"edit", :id => @category.id %>
-  <h3>Editing category</h3>
-  <div class="form">	
+  <% form_tag :action=>"edit", :id => @category.id do %>
+  <h3><% _("Editing category")%></h3>
+  <div class="form">
     <%= render_partial "form" %>
   </div>
 
   <div id="operations">
-    <%= save %> or <%= cancel %>  
+    <%= save %> or <%= cancel %>
   </div>
 
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/categories/list.rhtml

@@ -1,9 +1,12 @@
-  <% @page_heading = 'Categories' %>
+  <% @page_heading = _('Manage Categories') %>
 
   <% content_for('tasks') do -%>
-    <%= task_quickpost('Create new category') -%>
-    <li><%= link_to_remote('Reorder', :update => 'category_container', :url => { :action => 'reorder' }) %></li>
-    <li><%= link_to_remote('Sort alphabetically', :update => 'category_container', :url => { :action => 'asort' }) -%></li>
+    <%= task_quickpost(_('Create new category')) -%>
+    <li><%= link_to_remote(_('Reorder'), :update => 'category_container', :url => { :action => 'reorder' }) %></li>
+    <li><%= link_to_remote(_('Sort alphabetically'), :update => 'category_container', :url => { :action => 'asort' }) -%></li>
+    <%= tab _("Manage Articles"), :controller=>"content", :action=>"list"%>
+	<%= tab _("Manage Pages"), :controller=>"pages", :action=>"list" %>
+	<%= tab _("Manage Resources"), :controller=>"resources", :action=>"list" %>
   <% end -%> 
 
   <div id="quick-post" style="display:none;position:absolute;">

data/app/views/admin/categories/reorder.rhtml

@@ -4,6 +4,6 @@
   <% end -%>
 </ul>
 
-<%= link_to_remote "(Done)", :update => "category_container", :url => { :action => "category_container" } %>
+<%= link_to_remote _("(Done)"), :update => "category_container", :url => { :action => "category_container" } %>
 
 <%= sortable_element "category_list", :url => { :action => "order" }, :complete => visual_effect(:highlight, "category_list") %>

data/app/views/admin/categories/show.rhtml

@@ -1,19 +1,19 @@
-  <% @page_heading = "Articles in #{h @category.name}" %>
+  <% @page_heading =  _("Articles in") + " #{h @category.name}" %>
 
   <% content_for('tasks') do %>
-    <%= task_edit 'Edit this category', @category.id %>
+    <%= task_edit _('Edit this category'), @category.id %>
   <% end %>
 
-  <%= start_form_tag :action=>"new" %>
+  <% form_tag :action=>"new" do %>
   <div class="list">
     <table cellspacing="1" cellpadding="0">
     <% for article in @category.articles -%>
     <tr  <%= alternate_class -%>>
-      <td><%= image_tag 'checked.gif' %> <%= link_to h(article.title), :controller => "content", :action => "show", :id => article.id %></td>
+      <td><%= image_tag 'checked.gif' %> <%= link_to h(article.title), :controller => "/admin/content", :action => "show", :id => article.id %></td>
       <td><%= distance_of_time_in_words_to_now article.published_at %> ago</td>
-      <td><%= link_to pluralize(article.comments.size, 'comment'), :controller => 'comments', :article_id => article, :action => 'list' %></td>
+      <td><%= link_to pluralize(article.comments.size, 'comment'), :controller => '/admin/comments', :article_id => article, :action => 'list' %></td>
     </tr>
     <% end -%>
     </table>
   </div>
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/comments/_form.rhtml

@@ -1,19 +1,19 @@
 <%= error_messages_for 'comment' %>
 <!--[form:comment]-->
 <p>
-  <label for="comment_author">Author:</label><br/>
+  <label for="comment_author"><%= _("Author")%>:</label><br/>
   <%= text_field 'comment', 'author'  %>
 </p>
 <p>
-  <label for="comment_url">Url:</label><br/>
+  <label for="comment_url"><%= _("Url") %>:</label><br/>
   <%= text_field 'comment', 'url'  %>
 </p>
 <p>
-  <label for="comment_email">Email:</label><br/>
+  <label for="comment_email"><%= _("Email")%>:</label><br/>
   <%= text_field 'comment', 'email'  %>
 </p>
 <p>
-  <label for="comment_body">Body:</label><br/>
+  <label for="comment_body"><%= _("Body")%>:</label><br/>
   <%= text_area 'comment', 'body'  %>
 </p>
 <!--[eoform:comment]-->

data/app/views/admin/comments/comments.rhtml

@@ -1,4 +1,4 @@
 <% for comment in @comments %>
-by <strong><%= comment.author %></strong> on <%= comment.created_at %>  <%= link_to '[x]', :action => 'comment_destroy', :id => comment.id %> <br />
+by <strong><%= comment.author %></strong> <%= _("on")%> <%= comment.created_at %>  <%= link_to '[x]', :action => 'comment_destroy', :id => comment.id %> <br />
 <%= comment.body %><br /><br />
 <% end %>

data/app/views/admin/comments/destroy.rhtml

@@ -1,11 +1,11 @@
-  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <%= task_show 'Show this comment', @comment.id %>
-  <% end %> 
+    <%= task_show _('Show this comment'), @comment.id %>
+  <% end %>
 
-  <p>Are you sure you want to delete this item?</p>
-  <%= start_form_tag %>
+  <p><%= _("Are you sure you want to delete this item?")%></p>
+  <% form_tag do %>
   <%= hidden_field "comment", "id" %>
   <%= confirm_delete %>
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/comments/edit.rhtml

@@ -1,18 +1,18 @@
-  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <li><%= comment_url_link 'View comment on your blog', @comment %></li>
-  <% end %> 
+    <li><%= link_to_permalink @comment, _('View comment on your blog') %></li>
+  <% end %>
 
-  <%= start_form_tag :action=>"edit", :id => @comment.id %>
+  <% form_tag :action=>"edit", :id => @comment.id do %>
 
-  <h3>Editing comment</h3>
-  <div class="form">	
+  <h3><%= _("Editing comment")%></h3>
+  <div class="form">
     <%= render_partial "form" %>
   </div>
 
   <div id="operations">
-    <%= save %> or <%= cancel %>  
+    <%= save %> or <%= cancel %>
   </div>
 
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/comments/list.rhtml

@@ -1,26 +1,26 @@
-  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <% content_for('tasks') do %>
-    <li><%= link_to 'Back to articles', :controller => 'content', :action => 'list' %></li>
-    <%= task_new('Create new comment') %>
+    <%= task_new('Write a comment') %>
+    <li><%= link_to _('Manage articles'), :controller => '/admin/content', :action => 'list' %></li>
   <% end %> 
 
   <div class="list">	
     <table>
     <tr>
-      <th>Author</th>
-      <th>Email</th>
-      <th>Body</th>
-      <th>IP</th>
-      <th>Posted date</th>
-      <th>Edit</th>
-      <th>Delete</th>
+      <th><%= _("Author")%></th>
+      <th><%= _("Email")%></th>
+      <th><%= _("Body")%></th>
+      <th><%= _("IP")%></th>
+      <th><%= _("Posted date")%></th>
+      <th><%= _("Edit")%></th>
+      <th><%= _("Delete")%></th>
     </tr>
     <% for comment in @comments -%>
     <tr>
       <td class="field"><%= image_tag 'checked.gif' %> <%=link_to_unless comment.url.blank?, h(comment.author), comment.url %></td>
       <td class="field"><%=h comment.email %></td>
-      <td class="field"><%=link_to truncate(strip_html(comment.body)), :action => 'show', :id => comment.id %> <%= comment_url_link image_tag('go'), comment %></td>
+      <td class="field"><%=link_to truncate((comment.body).strip_html), :action => 'show', :id => comment.id %> <%= link_to_permalink comment,image_tag('go.png') %></td>
       <td class="field"><%=h comment.ip %></td>
       <td class="field"><%=h distance_of_time_in_words_to_now(comment.created_at) %></td>
       <td class="operation"><%= link_to_edit comment %></td>

data/app/views/admin/comments/new.rhtml

@@ -1,15 +1,15 @@
-  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
-  <h3>Creating comment</h3>
-  
-  <%= start_form_tag :action=>"new" %>
+  <h3><%= _("Creating comment")%></h3>
 
-  <div class="form">	
+  <% form_tag :action=>"new" do %>
+
+  <div class="form">
     <%= render_partial "form" %>
   </div>
 
   <div id="operations">
-    <%= save %> or <%= cancel %>  
+    <%= save %> or <%= cancel %>
   </div>
 
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/comments/show.rhtml

@@ -1,10 +1,10 @@
-  <% @page_heading = "Comments for #{ link_to h(@article.title), :controller => 'content', :action => 'show', :id => @article }" %>
+  <% @page_heading = _("Comments for") + " #{ link_to h(@article.title), :controller => '/admin/content', :action => 'show', :id => @article }" %>
 
   <div class="form">	
-    <label>Author:</label> <span class="static"><%=h @comment.author %></span><br/>
-    <label>URL:</label> <span class="static"><%=h @comment.url %></span><br/>
-    <label>Email:</label> <span class="static"><%=h @comment.email %></span><br/>
-    <label>Body:</label> <span class="static"><%=h @comment.body %></span><br/>
-    <label>IP Address:</label> <span class="static"><%=h @comment.ip %></span><br/>
-    <label>Created at:</label> <span class="static"><%=h @comment.created_at %></span><br/>
+    <label><%= _("Author")%>:</label> <span class="static"><%=h @comment.author %></span><br/>
+    <label><%= _("URL")%>:</label> <span class="static"><%=h @comment.url %></span><br/>
+    <label><%= _("Email")%>:</label> <span class="static"><%=h @comment.email %></span><br/>
+    <label><%= _("Body")%>:</label> <span class="static"><%=h @comment.body %></span><br/>
+    <label><%= _("IP")%>:</label> <span class="static"><%=h @comment.ip %></span><br/>
+    <label><%= _("Posted date")%>:</label> <span class="static"><%=h @comment.created_at %></span><br/>
   </div>

data/app/views/admin/content/_articles.rhtml

@@ -1,18 +1,20 @@
 <table cellspacing="1" cellpadding="0">
 <tr>
-  <th>Post title</th>
-  <th>Posted</th>
-  <th>Comments</th>
-  <th>Trackbacks</th>
-  <th>Edit</th>
-  <th>Delete</th>
+  <th><%= _("Post title")%></th>
+  <th><%= _("Posted at")%></th>
+  <th><%= _("Comments")%></th>
+  <th><%= _("Trackbacks")%></th>
+  <th><%= _("Status")%></th>
+  <th colspan="3" style="text-align: center;">Action</th>
 </tr>
 <% for article in @articles %>
 <tr <%= alternate_class %>>
-  <td><%= (article.published?) ? image_tag('checked.gif') : image_tag('x-ed.gif') %> <%= link_to h(article.title), {:action => "show", :id => article.id} %> <%= article_link(image_tag('go'), article) %> </td>
-  <td><%= distance_of_time_in_words_to_now article.published_at %> ago</td>
-  <td><%= link_to pluralize(article.comments.size, 'comment'), :controller => 'comments', :article_id => article, :action => 'list' %></td>
-  <td><%= link_to pluralize(article.trackbacks.size, 'trackback'), :controller => 'trackbacks', :article_id => article, :action => 'list' %></td>
+  <td> <%= link_to_permalink article, h(article.title) %></td>
+  <td><%= article.published_at.strftime("%d/%m/%Y at %H:%M")%></td>
+  <td><%= link_to _(pluralize(article.comments.size, 'comment')), :controller => '/admin/comments', :article_id => article, :action => 'list' %></td>
+  <td><%= link_to _(pluralize(article.trackbacks.size, 'trackback')), :controller => '/admin/trackbacks', :article_id => article, :action => 'list' %></td>
+  <td class="operation"><%= (article.published?) ? image_tag('checked.png', :alt => "online", :title => _("Online")) : image_tag('cancel.png', :alt => "offline", :title => _("Offline")) %></td>
+  <td class="operation"><%= link_to image_tag('show.png', :alt => "View article", :title => "Preview article"), {:action => "show", :id => article.id} %></td>
   <td class="operation"><%= link_to_edit article %></td>
   <td class="operation"><%= link_to_destroy article %></td>
 </tr>

data/app/views/admin/content/_attachment.rhtml

@@ -1,17 +1,15 @@
-<% str = update_element_function('attachments', :position => :bottom) do -%>
-  <div id="attachment_<%= attachment_num -%>">
-    <%= file_field 'attachments', "filename_#{attachment_num}" -%>
-    <%= link_to_remote 'Remove',
-	:url => { :action => "attachment_box_remove", :id => attachment_num },
-	:update => "attachment_#{attachment_num}",
-	:confirm => "Really delete attachment #{attachment_num}?" -%>
-    <br />
-  </div>
-  <div id="attachment_<%= attachment_num.succ -%>">
-    <%= link_to_remote 'Add Another Attachment',
-	:url => { :action => "attachment_box_add", :id => attachment_num.succ },
-	:update => "attachment_#{attachment_num.succ}",
-	:asynchronus => false -%>
-  </div>
-<% end -%>
-<%= javascript_tag(str) -%>
+<div id="attachment_<%= attachment_num -%>"<% if hidden %> style="display: none;"<% end %>>
+  <%= file_field 'attachments', "filename_#{attachment_num}" -%>
+  <%= link_to_function(_("Remove"),
+      update_page do |page|
+        page << "if (confirm(_(Really delete attachment) +' #{attachment_num}?')){"
+        page.visual_effect(:toggle_appear, "attachment_#{attachment_num}", :afterFinish => "function(obj){Element.remove(obj.element);}")
+        page << "}"
+      end) -%>
+  <br />
+</div>
+<div id="attachment_add_<%= attachment_num.succ %>">
+  <%= link_to_remote _('Add Another Attachment'),
+    :url => { :action => "attachment_box_add", :id => attachment_num.succ },
+    :asynchronus => false -%>
+</div>

data/app/views/admin/content/_form.rhtml

@@ -1,52 +1,75 @@
 <%= error_messages_for 'article' %>
 <!--[form:articles]-->
-<p>
-  <label for="article_title">Title:</label><br />
-  <%= text_field 'article', 'title'  %>
-  (<%= link_to_function "&raquo; edit permalink", "Toggle.display('permalink')" %>)<br/>
-</p>
-<p id="permalink" style="display: none">
-  <label for="article_permalink">Permalink:</label><br />
-  <%= text_field 'article', 'permalink'  %>
-</p>
-<p>
-  <label for="article_body">Body:</label><br />
-  <%= text_area 'article', 'body', :rows => 25, :style => 'width: 48%;'  %>
-  <br/><%= markup_help_popup @article.text_filter, "Markup Help" %>
-</p>
-<p>
-  <label for="categories">Categories:</label><br />
-  <select id="categories" name="categories[]" multiple="multiple" size="10" style="width:250px;">
-  <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
-  </select>
-</p>
-<p>
-  <label for="article_keywords">Tags:</label><br/>
-  <%= text_field 'article', 'keywords'  %>
-</p>
-<p>
-  <a href="#" onclick="Element.toggle('extended'); return false">Add Extended Content</a><br />
-  <div id="extended" style="display:none;">
-  <label for="article_extended">Extended:</label><br />
-  <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 48%;'  %>
+<fieldset class="set admin" style="display: block">
+  <legend><%=_("Article Body")%></legend>
+  <iframe id="preview" class="post" style="display: none;"></iframe>
+  <div style="width: 48%; float: left;">
+     <ul>
+       <li>
+          <label for="article_title" class="block">Title:</label>
+          <%= text_field 'article', 'title', :style => 'width: 100%;' %>
+       </li>
+       <li>
+          <label for="article_body"><%= _("Article Content")%>:</label>
+          <%= markup_help_popup @article.text_filter, image_tag('help.png', :alt => "markup help", :title => "Markup Help") %>
+          <%= text_area 'article', 'body', :rows => 25, :style => 'width: 100%;'  %>
+       </li>
+       <li id="extended"<%- if @article.extended.blank? -%> style="display:none;"<%- end -%>>
+          <label for="article_extended"><%= _("Extended Content")%>:</label>
+          <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 100%;'  %>
+          <%= link_to_function "Toggle Extended Content (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.5) } %>
+       </li>
+       <li>
+          <label for="categories" class="block"><%= _("Categories")%>:</label>
+          <select id="categories" name="categories[]" multiple="multiple" size="10" style="width:250px;">
+             <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
+		  </select>
+       </li>
+       <li>
+          <label for="article_keywords"><%= _("Tags")%>:</label>
+          <%= text_field 'article', 'keywords', :style => 'width: 100%;' %>
+       </li>
+     </ul>
+     <p class="r"><%= save(_("Save")) %> or <%= cancel %></p>
   </div>
-</p>
+  <br style ="clear: both"/>
+</fieldset>
 
-<a href="#" onclick="Element.toggle('advanced'); return false;">Toggle Advanced Options (+/-)</a>
-<div id="advanced" style="display:none;">
-<label for="article_allow_comments">Allow comments: </label><%= check_box 'article', 'allow_comments'  %><br />
-<label for="article_allow_pings">Allow trackbacks: </label><%= check_box 'article', 'allow_pings'  %><br />
-<label for="article_published">Published:</label><%= check_box 'article', 'published'  %><br />
-<label for="article_text_filter">Textfilter: </label><%= select 'article', 'text_filter', text_filter_options %><br />
-<label for="article_published_at">Publish at:</label><%= datetime_select 'article', 'published_at', :include_blank => true  %><br />
-</div>
-<br clear="all"/>
+<fieldset class="set admin">
+  <legend><%= _("Article Attachments")%></legend>
+  <div id="attachments">
+    <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
+  </div>
+</fieldset>
 
-<p>
-<a href="#" onclick="Element.toggle('attachments'); return false;">Attachments (+/-)</a>
-<div id="attachments" style="display:none;">
-<%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1 } -%>
-</div>
-</p>
+<fieldset class="set admin">
+  <legend><%= _("Article Options")%></legend>
+  <ul>
+     <li>
+       <label for="article_permalink" class="float"><%= _("Permalink")%>:</label>
+       <%= text_field 'article', 'permalink'  %>
+     </li>
+     <li class="checkbox">
+       <label for="article_allow_comments" class="float"><%= _("Allow comments") %>: </label>
+       <%= check_box 'article', 'allow_comments'  %>
+     </li>
+     <li class="checkbox">
+        <label for="article_allow_pings" class="float"><%= _("Allow trackbacks")%>: </label>
+        <%= check_box 'article', 'allow_pings'  %>
+     </li>
+     <li>
+       <label for="article_published" class="float"><%= _("Published")%>:</label>
+       <%= check_box 'article', 'published'  %>
+     </li>
+     <li>
+        <label for="article_published_at" class="float"><%= _("Publish at")%>:</label>
+        <%= datetime_select 'article', 'published_at', :include_blank => true  %>
+     </li>
+     <li>
+        <label for="article_text_filter" class="float"><%= _("Textfilter")%>: </label>
+        <%= select 'article', 'text_filter', text_filter_options %>
+     </li>
+  </ul>
+</fieldset>
 
 <!--[eoform:articles]-->