typo 4.0.3 → 4.1

data/app/views/admin/general/update_database.rhtml

@@ -1,44 +1,44 @@
- <% @page_heading = 'Database migration' %>
+ <% @page_heading = _('Database migration') %>
 
 
 <div id="settings">
  <div id="gensettings" class="set" style="margin-top:10px;">
-   <h3>Information</h3>
+   <h3><%= _("Information")%></h3>
    <p>
-     <label>Current database version:</label> 
+     <label><%= _("Current database version")%>:</label>
      <span class="db_version"><%= @current_version %></span>
    </p>
    <p>
-     <label>New database version:</label> 
+     <label><%= _("New database version")%>:</label>
      <span class="db_version"><%= @needed_version %></span>
    </p>
    <p>
-     <label>Your database supports migrations:</label> 
-     <span class="db_version"><%= @support ? 'yes' : 'no' %></span>
+     <label><%= _("Your database supports migrations")%>:</label>
+     <span class="db_version"><%= @support ? _('yes') : _('no') %></span>
    </p>
   </div>
-  
-    
+
+
   <% unless @needed_migrations.blank? %>
   <div id="gensettings" class="set" style="margin-top:10px;">
-    <h3>Needed migrations</h3>
+    <h3><%= _("Needed migrations")%></h3>
     <ul>
     <% for migration in @needed_migrations %>
     <li><%= migration.humanize %></li>
-    <% end %>  
+    <% end %>
     </ul>
   </div>
   <% end %>
-  
+
 </div>
 
 
-<%= start_form_tag :action => 'migrate' %>
+<% form_tag :action => 'migrate' do %>
  <div id="operations" class="tasks">
    <% if @current_version == @needed_version %>
-     <strong>You are up to date!</strong>
+     <strong><%= _("You are up to date!")%></strong>
    <% else %>
-     <%= save("Update database now") %>  <small>may take a moment</small>
+     <%= save(_("Update database now")) %>  <small><%= _("may take a moment")%></small>
    <% end %>
  </div>
-<%= end_form_tag %>
+<% end %>

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

@@ -1,20 +1,37 @@
 <%= error_messages_for 'page' %>
 <!--[form:pages]-->
-<p>
-  <label for="page_name">Location:</label><br />
-  /pages/ <%= text_field 'page', 'name', :size => 16  %>
-</p>
-<p>
-  <label for="page_title">Title:</label><br />
-  <%= text_field 'page', 'title', :size => 20  %>
-</p>
-<p>
-  <label for="page_body">Content:</label><br />
-  <%= text_area 'page', 'body', :rows => 25, :style => 'width: 48%;'  %> 
-  <br/><%= markup_help_popup @page.text_filter, "Markup Help" %>
-</p>
+<fieldset class="set admin" style="display: block">
+  <legend><%= _("Page Body")%></legend>
+  <iframe id="preview" class="post" style="display: none;"></iframe>
+  <div style="width: 48%; float: left;">
+     <ul>
+       <li>
+          <label for="page_title" class="block"><%= _("Title")%>:</label>
+          <%= text_field 'page', 'title', :size => 20, :style => "width: 100%;"  %>
+       </li>
+       <li>
+          <label for="page_name" class="block"><%= _("Location")%>:</label>
+          /pages/ <%= text_field 'page', 'name', :size => 25  %>
+       </li>
+       <li>
+          <label for="page_body"><%= _("Body")%>:</label>
+          <%= markup_help_popup @page.text_filter, image_tag('help.png', :alt => " markup help", :title => "Markup help") %>
+          <%= text_area 'page', 'body', :rows => 25, :style => 'width: 100%;'  %> 
+       </li>
+     </ul>
+     <p class="r"><%= save(_("Save")) %> or <%= cancel %></p>
+  </div>
+  <br style="clear: both;" />
+</fieldset>
 
-<label for="page_text_filter">Textfilter: </label><%= select 'page', 'text_filter', text_filter_options %><br/>
-<br clear="all"/>
+<fieldset class="set admin">
+  <legend><%= _("Page Options")%></legend>
+  <ul>
+     <li>
+       <label for="page_text_filter" class="float"><%= _("Textfilter")%>: </label>
+       <%= select 'page', 'text_filter', text_filter_options %>
+     </li>
+  </ul>
+</fieldset>
 
 <!--[eoform:pages]-->

data/app/views/admin/pages/_pages.rhtml

@@ -1,16 +1,17 @@
 <table cellspacing="1" cellpadding="0">
 <tr>
-  <th>Name</th>
-  <th>Title</th>
-  <th>Created</th>
-  <th>Edit</th>
-  <th>Delete</th>
+  <th><%= _("Title")%></th>
+  <th><%= _("Permalink")%></th>
+  <th><%= _("Posted at")%></th>
+  <th colspan="3"><%= _("Action")%></th>
+  <th></th>
 </tr>
 <% for page in @pages %>
 <tr <%= alternate_class %>>
-  <td><%= link_to page.name, {:action => "show", :id => page.id} %> <%= page_link(image_tag('go'), page) %></td>
-  <td><%= page.title %></td>
-  <td><%= distance_of_time_in_words_to_now page.created_at %> ago</td>
+  <td> <%= link_to_permalink(page,page.title) %></td>
+  <td>/pages/<%= page.name %></td>
+  <td><%= page.created_at.strftime("%d/%m/%Y at %H:%M") %></td>
+  <td class="operation"><%= link_to image_tag('show.png', :alt => "View article", :title => "Preview article"), {:action => "show", :id => page.id} %></td>
   <td class="operation"><%= link_to_edit page %></td>
   <td class="operation"><%= link_to_destroy page %></td>    
 </tr>  

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

@@ -1,4 +1,4 @@
-<%= start_form_tag :action=>"new" %>
+<% form_tag :action=>"new" do %>
 <p>
   <label for="page_title">Location:</label><br/>
    /pages/<%= text_field 'page', 'name', :size => 16  %>
@@ -18,4 +18,4 @@
 <div id="operations">
   <%= save("Save Post") %> 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/pages/destroy.rhtml

@@ -1,11 +1,11 @@
-  <% @page_heading = 'Pages' %>
+  <% @page_heading = <%= _("Pages") %>
 
   <% content_for('tasks') do %>
-    <%= task_show "Show this page", @page.id %>
-  <% end %> 
+    <%= task_show _("Show this page"), @page.id %>
+  <% end %>
 
-  <p>Are you sure you want to delete the page '<%= @page[:name] %>'?</p>
-  <%= start_form_tag :controller => 'pages', :action => 'destroy' %>
+  <p><%= _("Are you sure you want to delete the page")%> '<%= @page[:name] %>'?</p>
+  <% form_tag :controller => '/admin/pages', :action => 'destroy' do %>
   <%= hidden_field "page", "id" %>
-  <%= confirm_delete("Delete this page") %>
-  <%= end_form_tag %>
+  <%= confirm_delete(_("Delete this page")) %>
+  <% end %>

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

@@ -1,28 +1,9 @@
-  <% @page_heading = 'Pages' %>
-  
-  <% content_for('tasks') do %>
-    <%= task_new 'Create new page' %>
-    <li><%= link_to 'View page on your blog', page_url(@page) %></li>
-  <% end %> 
-
-  <%= start_form_tag({ :action => "edit", :id => @page }, :id => "page_form") %>
-  <h3>Editing page</h3>
-
-  <div class="form">
-    <!-- LIVE PREVIEW -->
-    <div id="preview" class="post" style="display:none;"></div>
-    <!-- /LIVE PREVIEW -->	
-    <%= render :partial => "form" %>
-  </div>
+  <% @page_heading = _('Pages') %>
 
-  <div id="operations">
-    <%= save %> or <%= cancel %>  
-  </div>
-
-  <%= end_form_tag %>
+  <% content_for('tasks') do %>
+    <%= task_new _('Create new page') %>
+    <li><%= link_to _('View page on your blog'), @page.permalink_url %></li>
+  <% end %>
 
-  <%= observe_form "page_form", 
-        :frequency => 2, 
-        :update => "preview",
-        :complete => "Element.show('preview')",
-        :url => { :action => "preview" } %>
+  <h3><%= _("Editing page")%></h3>
+  <%= render :partial => "admin/shared/edit", :locals => { :form_type => "page", :form_action => { :action => "edit", :id => @page } } %>

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

@@ -1,8 +1,9 @@
-  <% @page_heading = 'Pages' %>
+  <% @page_heading = _('Manage Pages') %>
 
   <% content_for('tasks') do %>
-    <%= task_quickpost('Quick Post') %>
-    <%= task_new 'Create new page' %>
+	<%= tab _("Manage Articles"), :controller=>"content", :action=>"list"%>
+	<%= tab _("Manage Categories"), :controller=>"categories", :action=>"index"%>
+	<%= tab _("Manage Resources"), :controller=>"resources", :action=>"list" %>
   <% end %> 
 
   <div id="quick-post" style="display:none;position:absolute;">

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

@@ -1,24 +1,7 @@
-  <% @page_heading = 'Pages' %>
+<% content_for('tasks') do %>
+	<%= tab _("Write an Article"), :controller=>"content", :action=>"new" %>
+<% end %> 
 
-  <h3>Creating page</h3>
+  <% @page_heading = _('Write a Page') %>
 
-  <%= start_form_tag({ :action => "new" }, :id => "page_form") %>
-  
-  <div class="form">	
-    <!-- LIVE PREVIEW --> 
-    <div id="preview" class="post" style="display: none;"></div>
-    <!-- /LIVE PREVIEW -->
-    <%= render_partial "form" %>
-  </div>
-
-  <div id="operations">
-    <%= save %> or <%= cancel %>  
-  </div>
-
-  <%= end_form_tag %>
-
-  <%= observe_form "page_form", 
-        :frequency => 2, 
-        :update => "preview",
-        :complete => "Element.show('preview')",
-        :url => { :action => "preview" } %>      
+  <%= render :partial => "admin/shared/edit", :locals => { :form_type => "page", :form_action => { :action => "new" } } %>

data/app/views/admin/pages/preview.rhtml

@@ -1 +1 @@
-<div><%= @page.full_html %></div>
+<div><%= @page.html %></div>

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

@@ -1,14 +1,14 @@
-  <% @page_heading = 'Pages' %>
+  <% @page_heading = _('Pages') %>
   
   <% content_for('tasks') do %>
-    <%= task_edit 'Edit this page', @page.id %>
-    <li><%= link_to 'View page on your blog', page_url(@page) %></li>
+    <%= task_edit _('Edit this page'), @page.id %>
+    <li><%= link_to _('View page on your blog'), @page.permalink_url %></li>
   <% end %> 
 
   <h3><%=h @page.name %></h3>
 
   <div class="form">	
-    <div><%= @page.full_html %></div>
-    <p class="meta">Posted: <%=h @page.created_at %> by <%=h @page.user.name %></p>
+    <div><%= @page.html %></div>
+    <p class="meta"><%= _("Posted at") %>: <%=h @page.created_at %> <%= _("by")%> <%=h @page.user.name %></p>
     <p>Lasted updated <%=h @page.updated_at %></p>    
   </div>

data/app/views/admin/resources/_itunes_category_edit.rhtml

@@ -1,6 +1,6 @@
 <%
-#Ssince the data is in yaml coming out of the DB it is converted here from
-#comparission. This is  a hack to get things working.
+#Since the data is in yaml coming out of the DB it is converted here from
+#comparision. This is  a hack to get things working.
 unless categories.nil?
   selected = YAML::load(categories)
 else

data/app/views/admin/resources/_metadata_add.rhtml

@@ -1,22 +1,22 @@
-<%= start_form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") %>
+<% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %>
 <div class="form">
-  <b>Resource MetaData</b><br />
-    <input type="checkbox" name="resource[itunes_metadata]" value="1">Set iTunes metadata for this enclosure</input><br />
-    <label for="resource_itunes_author_<%= id %>">Author:</label><br />
+  <b><%= _("Resource MetaData")%></b><br />
+    <input type="checkbox" name="resource[itunes_metadata]" value="1"><%= _("Set iTunes metadata for this enclosure")%></input><br />
+    <label for="resource_itunes_author_<%= id %>"><%= _("Author")%>:</label><br />
     <input name="resource[itunes_author]" size="25" id="resource_itunes_author_<%= id %>" type="text" value="<%= this_blog.itunes_author %>" /><br />
-    <label for="resource_itunes_subtitle_<%= id %>">Subtitle:</label><br />
+    <label for="resource_itunes_subtitle_<%= id %>"><%= _("Subtitle")%>:</label><br />
     <%= text_field 'resource', "itunes_subtitle", :id => "resource_itunes_subtitle_#{id}"  %><br />
-    <label for="resource_itunes_duration_<%= id %>">Duration:</label><br />
+    <label for="resource_itunes_duration_<%= id %>"><%= _("Duration")%>:</label><br />
     <%= text_field 'resource', "itunes_duration", :id => "resource_itunes_duration_#{id}", "size" => 8 %> (HH:MM:SS)<br />
-    <label for="resource_itunes_summary_<%= id %>">Summary:</label><br />
+    <label for="resource_itunes_summary_<%= id %>"><%= _("Summary")%>:</label><br />
     <%= text_area 'resource', "itunes_summary", :id => "resource_itunes_summary_#{id}", :rows => 5  %><br />
-    <label for="resource_itunes_category_<%= id %>">Category:</label><br />
+    <label for="resource_itunes_category_<%= id %>"><%= _("Category")%>:</label><br />
     <%= render :partial => "itunes_category_add", :locals => { :id => id } %><br />
-    <label for="resource_itunes_keywords_<%= id %>">Key Words:</label><br />
-    <%= text_field 'resource', "itunes_keywords", :id => "resource_itunes_keywords_#{id}" %><small>(seperate with spaces)</small><br />
-    <input name="resource[itunes_explicit]" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%>>Explicit</input><input name="resource[itunes_explicit]" type="hidden" value="0" />
+    <label for="resource_itunes_keywords_<%= id %>"><%= _("Key Words")%>:</label><br />
+    <%= text_field 'resource', "itunes_keywords", :id => "resource_itunes_keywords_#{id}" %><small>(<%= _("seperate with spaces")%>)</small><br />
+    <input name="resource[itunes_explicit]" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%>><%=_("Explicit")%></input><input name="resource[itunes_explicit]" type="hidden" value="0" />
   <br />
   <input name="resource[id]" type="hidden" value="<%= id %>" />
-<%= save("Save") %> or <a href="#" onclick="new Effect.BlindUp('add-resource-metadata-<%= id %>', {duration: 0.4}); return false;" >Cancel</a>
+<%= save(_("Save")) %> <%= _("or")%> <a href="#" onclick="new Effect.BlindUp('add-resource-metadata-<%= id %>', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
 </div>
-<%= end_form_tag %>
+<% end %>

data/app/views/admin/resources/_metadata_edit.rhtml

@@ -1,22 +1,22 @@
-<%= start_form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") %>
+<% form_tag({ :action => "update" }, :id => id, :enctype => "multipart/form-data") do %>
 <div class="form">
-  <b>Resource MetaData</b><br />
-  <%= link_to "Remove iTunes Metadata", { :action => "remove_itunes_metadata", :id => resource.id}, :confirm => "Are you sure?"%><br />
-    <label for="resource_itunes_author_<%= id %>">Author:</label><br />
+  <b><%= _("Resource MetaData")%></b><br />
+  <%= link_to _("Remove iTunes Metadata"), { :action => "remove_itunes_metadata", :id => resource.id}, :confirm => "Are you sure?"%><br />
+    <label for="resource_itunes_author_<%= id %>"><%= _("Author")%>:</label><br />
     <input name="resource[itunes_author]" size="25" id="resource_itunes_author_<%= id %>" type="text" value="<%=h resource.itunes_author %>" /><br />
-    <label for="resource_itunes_subtitle_<%= id %>">Subtitle:</label><br />
+    <label for="resource_itunes_subtitle_<%= id %>"><%= _("Subtitle")%>:</label><br />
     <input name="resource[itunes_subtitle]" size="25" id="resource_itunes_subtitle_<%= id %>" type="text" value="<%=h resource.itunes_subtitle %>" /><br />
-    <label for="resource_itunes_duration_<%= id %>">Duration:</label><br />
+    <label for="resource_itunes_duration_<%= id %>"><%= _("Duration")%>:</label><br />
     <input name="resource[itunes_duration]" size="8" id="resource_itunes_duration_<%= id %>" type="text" value="<%=h resource.itunes_duration %>" /><small>(HH:MM:SS)</small><br />
-    <label for="resource_itunes_summary_<%= id %>">Summary:</label><br />
+    <label for="resource_itunes_summary_<%= id %>"><%= _("Summary")%>:</label><br />
     <textarea name="resource[itunes_summary]" id="resource_itunes_summary_<%= id %>" rows="5" cols="35"><%=h resource.itunes_summary %></textarea><br />
-    <label for="resource_itunes_category_<%= id %>">Category:</label><br />
+    <label for="resource_itunes_category_<%= id %>"><%= _("Category")%>:</label><br />
     <%= render :partial => "itunes_category_edit", :locals => { :categories => resource.itunes_category, :id => id } %><br />
-    <label for="resource_itunes_keywords_<%= id %>">Key Words:</label><br />
-    <input name="resource[itunes_keywords]" size="25" id="resource_itunes_keywords_<%= id %>" type="text" value="<%=h resource.itunes_keywords %>" /><small>(seperate with spaces)</small><br />
-    <input name="resource[itunes_explicit]" type="checkbox"  value="1" <%= 'checked="checked"' if resource.itunes_explicit%>>Explicit</input><input name="resource[itunes_explicit]" type="hidden" value="0" />
+    <label for="resource_itunes_keywords_<%= id %>"><%= _("Key Words")%>:</label><br />
+    <input name="resource[itunes_keywords]" size="25" id="resource_itunes_keywords_<%= id %>" type="text" value="<%=h resource.itunes_keywords %>" /><small>(<%= _("seperate with spaces")%>)</small><br />
+    <input name="resource[itunes_explicit]" type="checkbox"  value="1" <%= 'checked="checked"' if resource.itunes_explicit%>><%= _("Explicit")%></input><input name="resource[itunes_explicit]" type="hidden" value="0" />
   <br />
-  <input name="resource[id]" type="hidden" value="<%= id %>" /> 
-<%= save("Save") %> or <a href="#" onclick="new Effect.BlindUp('edit-resource-metadata-<%= id %>', {duration: 0.4}); return false;" >Cancel</a>
+  <input name="resource[id]" type="hidden" value="<%= id %>" />
+<%= save(<%=_("Save")) %> <%= _("or")> <a href="#" onclick="new Effect.BlindUp('edit-resource-metadata-<%= id %>', {duration: 0.4}); return false;" ><%= _("Cancel") %></a>
 </div>
-<%= end_form_tag %>
+<% end %>

data/app/views/admin/resources/_mime_edit.rhtml

@@ -1,8 +1,8 @@
-<%= start_form_tag({ :action => "set_mime" }, :id => id, :enctype => "multipart/form-data") %>
+<% form_tag({ :action => "set_mime" }, :id => id, :enctype => "multipart/form-data") do %>
 <div class="form">
-  <label for="resource_mime_<%= id %>">Content Type:</label><br/>
+  <label for="resource_mime_<%= id %>"><%=_("Content Type")%>:</label><br/>
   <input name="resource[mime]" size="22" id="resource_mime_<%= id %>" type="text" value="<%=h mime %>" /><br />
-  <input name="resource[id]" type="hidden" value="<%= id %>" /> 
-<%= save("Save") %> or <a href="#" onclick="new Effect.BlindUp('edit-resource-mime-<%= id %>', {duration: 0.4}); return false;" >Cancel</a>
+  <input name="resource[id]" type="hidden" value="<%= id %>" />
+<%= save(_("Save")) %> <%= _("or") %> <a href="#" onclick="new Effect.BlindUp('edit-resource-mime-<%= id %>', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
 </div>
-<%= end_form_tag %>
+<% end %>

data/app/views/admin/resources/_pages.rhtml

@@ -1,3 +1,3 @@
-    <%= link_to "Previous page", { :id => pages.current.previous } if pages.current.previous -%>
+    <%= link_to <%= _("Previous page"), { :id => pages.current.previous } if pages.current.previous -%>
     <%= pagination_links pages, :name => 'id' -%>
-    <%= link_to "Next page", { :id => pages.current.next } if pages.current.next -%>
+    <%= link_to _("Next page"), { :id => pages.current.next } if pages.current.next -%>

data/app/views/admin/resources/_resources.rhtml

@@ -1,11 +1,11 @@
 <table cellspacing="1" cellpadding="0">
 <tr>
-  <th>Filename <small>(right-click for link)</small></th>
-  <th>Content Type</th>
-  <th>MetaData</th>
-  <th>File Size</th>
-  <th>Uploaded</th>
-  <th>Delete</th>
+  <th><%= _("Filename")%> <small>(right-click for link)</small></th>
+  <th><%= _("Content Type")%></th>
+  <th><%= _("MetaData")%></th>
+  <th><%= _("File Size")%></th>
+  <th><%= _("Uploaded")%></th>
+  <th><%= _("Delete")%></th>
 </tr>
 <% blog_root = request.relative_url_root -%>
 <% for upload in resources -%>
@@ -19,14 +19,14 @@
   </td>
   <% if upload.itunes_metadata? %>
   <td>
-    <%= task_edit_resource_metadata('Edit MetaData (+/-)', upload.id) %>
+    <%= task_edit_resource_metadata(_("Edit MetaData") + ' (+/-)', upload.id) %>
     <div id="edit-resource-metadata-<%= upload.id%>" style="display:none;position:absolute;">
       <%= render :partial => "metadata_edit" , :locals => {:id => upload.id, :resource => upload}%>
     </div>
   </td>
   <% else -%>
   <td>
-    <%= task_add_resource_metadata('Add MetaData (+/-)', upload.id) %>
+    <%= task_add_resource_metadata(_("Add MetaData") + ' (+/-)', upload.id) %>
     <div id="add-resource-metadata-<%= upload.id%>" style="display:none;position:absolute;">
       <%= render :partial => "metadata_add", :locals => {:id => upload.id} %>
     </div>

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

@@ -1,11 +1,11 @@
-  <% @page_heading = 'File Uploads' %>
+  <% @page_heading = _('File Uploads') %>
 
   <% content_for('tasks') do %>
-    <%= task_new 'Upload a new File' %>
-  <% end %> 
+    <%= task_new _('Upload a new File') %>
+  <% end %>
 
-  <p>Are you sure you want to delete this file ( <%= @file.filename -%> )?</p>
-  <%= start_form_tag :action => 'destroy' %>
+  <p><%= _("Are you sure you want to delete this file")%> ( <%= @file.filename -%> )?</p>
+  <% form_tag :action => 'destroy' do %>
   <%= hidden_field "file", "id" %>
-  <%= confirm_delete("Delete this file from the webserver?") %>
-  <%= end_form_tag %>
+  <%= confirm_delete(_("Delete this file from the webserver?")) %>
+  <% end %>

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

@@ -1,7 +1,10 @@
-  <% @page_heading = 'Resources Available' %>
-  <% @page_title = 'Upload a File' %>
+  <% @page_heading = _('Manage Resources') %>
+  <% @page_title = _('Upload a new File') %>
   <% content_for('tasks') do %>
-    <%= task_new 'Upload a new Resource' %>
+    <%= task_new _('Upload a new Resource') %>
+	<%= tab _("Manage Articles"), :controller=>"content", :action=>"list"%>
+	<%= tab _("Manage Pages"), :controller=>"pages", :action=>"list" %>
+	<%= tab _("Manage Categories"), :controller=>"categories", :action=>"list" %>
   <% end %> 
 
   <div class="list" id="resources">