typo 5.1.3 → 5.1.98

data/app/views/admin/settings/index.html.erb

@@ -1,71 +1,67 @@
-	<% @page_heading = _('General settings') %>
-  <% subtabs_for(:settings) %>
-  
-	<% form_tag :action => 'index' do %>
+<% @page_heading = _('General settings') %>
+<% subtabs_for(:settings) %>
+
+<% form_tag :action => 'update' do %>
 
 <div class="admin">
-  <fieldset id="gensettings" class="set" style="margin-top:10px;">
-		<legend><%= _("General options")%></legend>
+  <fieldset id="gensettings" class="set">
+    <legend><%= _("General options")%></legend>
     <ul>
-			<li>
-				<label for="blog_name" class="float"><%= _("Blog name")%>:</label>
-				<input name="setting[blog_name]" id="blog_name" type="text" value="<%=h this_blog.blog_name %>" size="<%= this_blog.blog_name.length %>" />
-			</li>
-			<li>
-				<label class="float" for="blog_subtitle"><%= _("Blog subtitle")%>:</label>
-				<input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" size="<%= this_blog.blog_subtitle.length%>" />
-		    </li>
-			<li>
-				<label class="float" for="base_url"><%= _("Blog URL")%>:</label>
-				<input name="setting[base_url]" id="base_url" type="text" value="<%=h this_blog.base_url %>" size="<%= this_blog.base_url.length %> " />
-			</li>
-			<li>
-				<label class="float" for="lang"><%= _("Language")%>:</label>
-				<select name="setting[lang]">
-					<%= fetch_langs %>
-				</select>
-			</li>
-			<li><%= _("By default, Typo generates static HTML pages for your posts. However, if you plan to publish posts in the futur, you may want to use semi dynamic caching") %>.</li>
-			<li>
-				<label class="float" for="caches_page"><%= _("Choose caching methode")%>:</label>
-				<input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/>
-				<label for="cache_option_0"><%= _("Use static HTML page caching ")%></label>
-				<span class="float">
-					<input type="radio" name="setting[cache_option]" value="caches_action_with_params" id="cache_option_1" <%= 'checked="checked"' if this_blog.cache_option == 'caches_action_with_params' %>/>
-					<label for="cache_option_1"><%= _("Use semi static caching (default)")%></label>
-				</span>
-			</li>
-			<li><%= _("You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.") %>.</li>
-			<li>
-				<label class="float" for="allow_signup"><%= _("Allow users to register")%>:</label>
-				<input type="radio" name="setting[allow_signup]" value="0" id="allow_signup_0" <%= 'checked="checked"' if this_blog.allow_signup == 0 %>/>
-				<label for="allow_signup_0"><%= _("No")%></label>
-				<span class="float">
-					<input type="radio" name="setting[allow_signup]" value="1" id="allow_signup_1" <%= 'checked="checked"' if this_blog.allow_signup == 1 %>/>
-					<label for="allow_signup_1"><%= _("Yes")%></label>
-				</span>
-			</li>
-		</ul>
+      <li>
+        <label for="blog_name" class="float"><%= _("Blog name")%>:</label>
+        <input name="setting[blog_name]" id="blog_name" type="text" value="<%=h this_blog.blog_name %>" size="<%= this_blog.blog_name.length %>" />
+      </li>
+      <li>
+        <label class="float" for="blog_subtitle"><%= _("Blog subtitle")%>:</label>
+        <input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" size="<%= this_blog.blog_subtitle.length%>" />
+      </li>
+      <li>
+        <label class="float" for="base_url"><%= _("Blog URL")%>:</label>
+        <input name="setting[base_url]" id="base_url" type="text" value="<%=h this_blog.base_url %>" size="<%= this_blog.base_url.length %> " />
+      </li>
+      <li>
+        <label class="float" for="lang"><%= _("Language")%>:</label>
+        <select name="setting[lang]">
+          <%= fetch_langs %>
+        </select>
+      </li>
+      <li><%= _("You can allow users to register to your blog. By default, they will register as contributors, an unpriviledged account level which grant them no rights but own a profile on the site. If you don't want users to register, you can thus add them by yourself in the users part of this admin.") %>.</li>
+      <li>
+        <label class="float" for="allow_signup"><%= _("Allow users to register")%>:</label>
+        <input type="radio" name="setting[allow_signup]" value="0" id="allow_signup_0" <%= 'checked="checked"' if this_blog.allow_signup == 0 %>/>
+        <label for="allow_signup_0"><%= _("No")%></label>
+        <span class="float">
+          <input type="radio" name="setting[allow_signup]" value="1" id="allow_signup_1" <%= 'checked="checked"' if this_blog.allow_signup == 1 %>/>
+          <label for="allow_signup_1"><%= _("Yes")%></label>
+        </span>
+      </li>
+    </ul>
   </fieldset>
 
-  <fieldset id="seo" class="set" style="margin-top:10px;">
-    <legend><%= _("Search Engine Optimisation")%></legend>
+  <fieldset id="Cache" class="set">
+    <legend><%= _("Cache")%></legend>
     <ul>
       <li>
-        <label class="float"><%= _("Show blog name")%>:</label>
-        <input type="radio" name="setting[title_prefix]" value="1" id="blog_title_prefix_1" <%= 'checked="checked"' if this_blog.title_prefix == 1 %>/>
-        <label for="blog_title_prefix_1"><%= _("At the beginning of page title")%></label>
-        <span class="float">
-          <input type="radio" name="setting[title_prefix]" value="2" id="blog_title_prefix_2" <%= 'checked="checked"' if this_blog.title_prefix == 2 %>/>
-          <label for="blog_title_prefix_2"><%= _("At the end of page title")%></label>
-        </span>
+        <%= _("By default, Typo generates static HTML pages for your posts. However, if you plan to publish posts in the futur, you may want to use semi dynamic caching") %>.
+      </li>
+      <li>
+        <label class="float" for="caches_page"><%= _("Choose caching methode")%>:</label>
+        <input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/>
+        <label for="cache_option_0"><%= _("Use static HTML page caching ")%></label>
         <span class="float">
-          <input type="radio" name="setting[title_prefix]" value="0" id="blog_title_prefix_0" <%= 'checked="checked"' if this_blog.title_prefix == 0 %>/>
-          <label for="blog_title_prefix_0"><%= _("Don't show blog name in page title")%></label>
+          <input type="radio" name="setting[cache_option]" value="caches_action_with_params" id="cache_option_1" <%= 'checked="checked"' if this_blog.cache_option == 'caches_action_with_params' %>/>
+          <label for="cache_option_1"><%= _("Use semi static caching (default)")%></label>
         </span>
       </li>
+      <li><%= _("If you experience trouble with caching, you can wipe the cache out manually") %></li>
+      <li>
+        <label class="float"><%= _("Choose caching methode")%>:</label>
+        <%= sweep_cache_link %>
+      </li>
     </ul>
   </fieldset>
-<%= render :partial => 'submit' %>
+
+  <%= hidden_field_tag 'from', 'index' %>  
+  <%= render :partial => 'submit' %>
 </div>
-  <% end %>
+<% end %>

data/app/views/admin/settings/read.html.erb

@@ -1,6 +1,6 @@
 	<% @page_heading = _('Read') %>
   <% subtabs_for(:settings) %>
-	<% form_tag :action => 'read' do %>
+	<% form_tag :action => 'update' do %>
 
 <div class="admin">
 	<fieldset id="read" class="set">
@@ -22,6 +22,7 @@
 			</li>
 		</ul>
 	</fieldset>
+  <%= hidden_field_tag 'from', 'read' %>
 
 	<%= render :partial => 'submit' %>
 

data/app/views/admin/settings/seo.html.erb

@@ -0,0 +1,46 @@
+<% @page_heading = _('Search Engine Optimization') %>
+<% subtabs_for(:settings) %>
+
+<% form_tag :action => 'update' do %>
+<div class="admin">
+  <fieldset class="set">
+    <legend><%= _("Search Engine Optimisation")%></legend>
+    <ul>
+      <li>
+        <label class="float"><%= _("Show blog name")%>:</label>
+        <input type="radio" name="setting[title_prefix]" value="1" id="blog_title_prefix_1" <%= 'checked="checked"' if this_blog.title_prefix == 1 %>/>
+        <label for="blog_title_prefix_1"><%= _("At the beginning of page title")%></label>
+        <span class="float">
+          <input type="radio" name="setting[title_prefix]" value="2" id="blog_title_prefix_2" <%= 'checked="checked"' if this_blog.title_prefix == 2 %>/>
+          <label for="blog_title_prefix_2"><%= _("At the end of page title")%></label>
+        </span>
+        <span class="float">
+          <input type="radio" name="setting[title_prefix]" value="0" id="blog_title_prefix_0" <%= 'checked="checked"' if this_blog.title_prefix == 0 %>/>
+          <label for="blog_title_prefix_0"><%= _("Don't show blog name in page title")%></label>
+        </span>
+      </li>
+      <li>
+          <label class="float" for="google_analytics"><%= _("Google Analytics")%></label>
+          <input type="text" name="setting[google_analytics]" id="google_analytics" size="25" value="<%=h this_blog.google_analytics %>" />
+      </li>
+      <li>
+          <label class="float" for="meta_description"><%= _("Meta description")%></label>
+          <textarea name="setting[meta_description]" id="meta_description" rows="5" cols="50"><%=h this_blog.meta_description %></textarea>
+      </li>
+      <li>
+          <label class="float" for="meta_keywords"><%= _("Meta keywords")%></label>
+          <input type="text" name="setting[meta_keywords]" id="meta_keywords" size="25" value="<%=h this_blog.meta_keywords %>" />
+      </li>
+      <li class="checkbox">
+        <label class="float" for="rss_description"><%= _("Use RSS description")%>:</label>
+        <input name="setting[rss_description]" id="rss_description" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.rss_description %> />
+       <input name="setting[rss_description]" type="hidden" value="0" />
+       <span class="float"><%= "#{_('This will display')} <em>#{_('Original article writen by')} ... #{_('and published on')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a> | <a href='#{this_blog.base_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}</em> #{_('at the bottom of each of your post in the RSS feed')}"%></span>
+      </li>
+
+    </ul>
+  </fieldset>
+  <%= hidden_field_tag 'from', 'index' %>  
+  <%= render :partial => 'submit' %>
+</div>
+<% end %>

data/app/views/admin/settings/update_database.html.erb

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

data/app/views/admin/settings/write.html.erb

@@ -1,21 +1,12 @@
 	<% @page_heading = _('Write') %>
   <% subtabs_for(:settings) %>
   
-	<% form_tag :action => 'write' do %>
+	<% form_tag :action => 'update' do %>
 
 <div class="admin">
 	<fieldset id="write" class="set">
 		<legend><%= _("Write")%></legend>
 		<ul>
-			<li>
-				<label class="float"><%= _("Editor")%>:</label>
-				<input type="radio" name="setting[editor]" value="2" id="editor_2" <%= 'checked="checked"' if this_blog.editor == 2 %>/>
-				<label for="editor_2"><%= _("Use visual rich editor")%></label>
-				<span class="float">
-					<input type="radio" name="setting[editor]" value="0" id="editor_0" <%= 'checked="checked"' if this_blog.editor == 0 %>/>
-				    <label for="editor_0"><%= _("Use simple editor without live preview")%></label>
-				</span>
-		  	</li>
 		    <li>
             <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
             <select name="setting[text_filter]" id="text_filter">
@@ -54,6 +45,45 @@
 
       </ul>
   </fieldset>
-<%= render :partial => 'submit' %>
+  
+  <fieldset id="resources" class="set">
+    <legend><%= _("Podcasts")%></legend>
+    <ul>
+      <li><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</li>
+      <li>
+        <label for="itunes_author" class="float"><%= _("Author")%>:</label>
+        <input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
+      </li>
+      <li>
+        <label for="itunes_subtitle" class="float"><%= _("Subtitle")%>: <span class="mandatory">*</span></label>
+        <input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" />
+      </li>
+      <li>
+        <label class="float" for="itunes_summary"><%= _("Summary")%>: <span class="mandatory">*</span></label>
+        <textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
+        <span class="float mandatory">* <%= _("Setting for channel")%></span>
+      </li>
+      <li>
+        <label class="float" for="itunes_email"><%= _("Email")%>: <span class="mandatory">**</span></label>
+        <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" />
+      </li>
+      <li>
+        <label class="float" for="itunes_name"><%= _("Optional Name")%>: <span class="mandatory">**</span></label>
+        <input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" />
+        <span class="float mandatory">** <%= _("Not published by Apple")%></span>
+      </li>
+      <li>
+        <label class="float" for="itunes_copyright"><%= _("Copyright Information")%>:</label>
+        <input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
+      </li>
+      <li class="checkbox">
+        <label class="float" for="itunes_explicit"><%= _("Explicit")%>:</label>
+        <input name="setting[itunes_explicit]" id="itunes_explicit" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%> />
+        <input name="setting[itunes_explicit]" type="hidden" value="0" />
+      </li>
+    </ul>
+  </fieldset>
+  <%= hidden_field_tag 'from', 'write' %>
+  <%= render :partial => 'submit' %>
 </div>
   <% end %>

data/app/views/admin/shared/_edit.html.erb

@@ -1,4 +1,5 @@
-<% form_tag(form_action, :id => "#{form_type}_form", :enctype => "multipart/form-data") do %>
+<% className = form_action.delete(:class) %>
+<% form_tag(form_action, :id => "#{form_type}_form", :enctype => "multipart/form-data", :class => className) do %>
 
   <%= render :partial => "form" %>
 

data/app/views/admin/sidebar/index.html.erb

@@ -1,5 +1,5 @@
-<% @page_heading = 'Sidebar' %>
-<% subtabs_for(:sidebar) %>
+<% @page_heading = _('Sidebar') %>
+<% subtabs_for(:themes) %>
 
 
   <p><%= _("Drag and drop to change the sidebar items displayed on this blog.  To remove items from the sidebar just click remove  Changes are saved immediately, but not activated until you click the 'Publish' button")%>.</p>
@@ -38,7 +38,7 @@
   </div>
   
 <h2><%= _("Get more themes") %></h2>
-  <p>You can download and install sidebar plugins from our official <a href="http://typosphere.org/articles/2007/08/26/typo-plugins-directory">plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory. You can aso run</p> 
+  <p>You can download and install sidebar plugins from our official <a href="http://typosphere.org/wiki/typo/Finding_Typo_Plugins">plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory. You can aso run</p> 
   
-  <p><code>script/plugins install http://svn.typosphere.org/typo/plugins/myplugin.</code></p>
+  <p><code>script/plugins install http://svn.typosphere.org/plugins/myplugin.</code></p>
   

data/app/views/admin/sidebar/set_active.rjs

@@ -2,7 +2,7 @@ if flash[:sidebars].size == 1
   page.remove 'sidebar_instructions'
 end
 if @new_item
-  page.replace("available_#{@target}", :partial => 'active',
+  page.replace("available_#{@new_item.short_name}", :partial => 'active',
                :object => @new_item)
 end
 page.replace_html('available_box', :partial => 'availables',

data/app/views/admin/tags/_tags.html.erb

@@ -1,19 +1,18 @@
 <table cellspacing="1" cellpadding="0">
-<tr class="first">
+<tr>
   <th><%= _("Display Name") %></th>
   <th><%= _("Name") %></th>
   <th><%= _("Articles") %></th>
-  <th><%= _("Edit")%></th>
-  <th><%= _("Delete")%></th>
 </tr>
-<%= render_void_table(@tags.size, 5)  %>
+<tr class="menubar">
+  <td colspan="3">&nbsp;</td>
+</tr>
+<%= render_void_table(@tags.size, 3)  %>
 <% for tag in @tags %>
 <tr <%= alternate_class %>>
-  <td> <%= link_to tag.display_name, tag %></td>
+  <td> <%= link_to_edit tag.display_name, tag %></td>
   <td><%= tag.name %></td>
-  <td><%= tag.article_counter %></td>
-  <td class="operation"><%= link_to_edit tag %></td>
-  <td class="operation"><%= link_to image_tag('admin/delete.png'), {:action => 'destroy', :id => tag.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :method => :post %></td>
+  <td><%= link_to_permalink tag, tag.articles.count %></td>
 </tr>  
 <% end %>
 </table>

data/app/views/admin/tags/edit.html.erb

@@ -5,9 +5,9 @@
 <% end %>
 
 <% form_tag :action=>"edit", :id => @tag.id do %>
-  <%= render_partial "form" %>
+  <%= render :partial => "form" %>
 
   <%= cancel_or_save %>
 <% end %>
 
-  
+  

data/app/views/admin/tags/index.html.erb

@@ -6,7 +6,5 @@
   </div>                      
   
   <div class="paginate">
-    <%= link_to _("Previous page"), { :id => @tags_pages.current.previous } if @tags_pages.current.previous -%>
-    <%= pagination_links @tags_pages, :name => 'id' -%>
-    <%= link_to _("Next page"), { :id => @tags_pages.current.next } if @tags_pages.current.next -%>
+    <%= will_paginate @tags %>
 	</div>

data/app/views/admin/users/_form.html.erb

@@ -6,10 +6,12 @@
   <label class="float" for="user_login"><%= _("Login")%>:</label>
   <%= text_field 'user', 'login'  %>
 </li>
-<% if current_user.profile.label == 'admin' %>
+<% if current_user.admin? %>
 <li>
+  
 	<label class="float" for="user_profile"><%= _("Profile")%>:</label>
-	<%=  select("user", "profile_id", @profiles.collect {|p| [ p.nicename, p.id ] }, { :include_blank => true }) %>
+	<%=  select("user", "profile_id", @profiles.collect {|p| [ _(p.nicename), p.id ] }, { :include_blank => true }) %>
+  <% # _("Blog publisher"), _("Contributor") , _("Typo administrator") %>
 </li>
 <% end %>
 <li>
@@ -18,7 +20,7 @@
 </li>
 <li>
 <label class="float" for="user_email"><%= _("Email")%>:</label> 
-<%= text_field 'user', 'email'  %> <small>(this will be shown publically if supplied)</small>
+<%= text_field 'user', 'email'  %> <small><%=_("(this will be shown publically if supplied)") %></small>
 </li>
 <li>
   <label class="float" for="user_password"><%= _("Password")%>:</label>
@@ -28,6 +30,15 @@
   <label class="float" for="user_password"><%= _("Password confirmation")%>:</label>
   <%= password_field 'user', 'password_confirmation'  %>
 </li>
+<li>
+	<label class="float"><%= _("Editor")%>:</label>
+	<input type="radio" name="user[editor]" value="2" id="editor_2" <%= 'checked="checked"' if @user.editor == 2 %>/>
+	<label for="editor_2"><%= _("Use visual rich editor")%></label>
+	<span class="float">
+		<input type="radio" name="user[editor]" value="0" id="editor_0" <%= 'checked="checked"' if @user.editor == 0 %>/>
+	    <label for="editor_0"><%= _("Use simple editor without live preview")%></label>
+	</span>
+	</li>
 
 <li>
   <label class="float" for="user_notify_via_email"><%= _("Send notification messages via email")%>?</label>

data/app/views/admin/users/edit.html.erb

@@ -3,7 +3,7 @@
   <% form_tag :action=>"edit", :id => @user.id do %>
 
   <div class="admin">
-    <%= render_partial "form" %>
+    <%= render :partial => "form" %>
   </div>
 
   <%= cancel_or_save %>

data/app/views/admin/users/index.html.erb

@@ -1,29 +1,29 @@
-  <% @page_heading = _('Users') + ' <span> &raquo; '+ link_to('add new', :action=>'new') +'</span>' %>
-  <% subtabs_for(:users) %>
+<% @page_heading = _('Users') + ' <span> &raquo; '+ link_to(_('add new'), :action=>'new') +'</span>' %>
+<% subtabs_for(:users) %>
 
 <div class="list">
   <table>
-    <tr class="first">
-	  	<th class="first"><%= _("Name")%></th>
-      <th><%= _("Username")%></th>
-      <th><%= _("Profile")%></th>
-      <th><%= _("Articles")%></th>
-      <th><%= _("Comments")%></th>
-	  	<th><%= _("View") %></th>
-			<th><%= _("Edit") %></th>
-			<th class="last"><%= _("Delete") %></th>
+    <tr>
+      <th><%= _("Username") %></th>
+      <th><%= _("Name") %></th>
+      <th><%= _("Email") %></th>
+      <th><%= _("Profile") %></th>
+      <th><%= _("Articles") %></th>
+      <th><%= _("Comments") %></th>
+    </tr>
+    <tr class="menubar">
+      <td colspan="6">&nbsp;</td>
     </tr>
     <% for user in @users -%>
     <tr <%= alternate_class %>>
-      <td class="field first"> <%= user.name %></td>
+      <td class="field"><%= link_to_edit user.login, user%></td>
+      <td class="field"> <%= user.name %></td>
       <td class="field"><%= mail_to user.email, user.login%></td>
-      <td class="field"><%= user.profile.nicename %></td>
+      <td class="field"><%= _(user.profile.nicename) %></td>
       <td class="field"><%= Article.count :conditions => "user_id = #{user.id}"  %></td>
       <td class="field"><%= Comment.count :conditions => "user_id = #{user.id}"  %></td>
-	  <td class="operation"><%= link_to image_tag('admin/show.png'), {:controller => 'content', :action => 'list', "search[user_id]" => user.id} %></td>
-      <td class="operation"><%= link_to_edit user %></td>
-      <td class="operation last"><%= link_to_destroy user %></td>    
     </tr>  
     <% end -%>
+    <tr><td colspan="8" class="paginate"><%= will_paginate @users %></td></tr>
   </table>
 </div>

data/app/views/admin/users/new.html.erb

@@ -5,7 +5,7 @@
   <% form_tag :action=>"new" do %>
 
   <div class="admin">
-    <%= render_partial "form" %>
+    <%= render :partial => "form" %>
   </div>
 
   <%= cancel_or_save %>

data/app/views/articles/_comment_failed.html.erb

@@ -1,3 +1,4 @@
+<%= error_messages_for 'comment' %>
 <li>
   <%= _("Opps, something wrong happened, the comment could not be saved")%>
 </li>

data/app/views/articles/_rss20_feed.rss.builder

@@ -5,7 +5,7 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
         "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
   xml.channel do
     xml.title feed_title
-    xml.link url_for(:only_path => false, :format => :rss)
+    xml.link @auto_discovery_url_rss
     xml.language "en-us"
     xml.ttl "40"
     xml.description this_blog.blog_subtitle

data/app/views/articles/groupings.html.erb

@@ -1,9 +1,9 @@
-<div class="entry">
+<div class="post">
+  <h2 class="title"><%= _(controller.controller_name.capitalize) %></h2>
 <% unless @groupings.empty? -%>
-<% max_counter = @groupings[0].article_counter -%>
 <%= ul_tag_for @grouping_class %>
 <% for grp in @groupings.sort_by{|grp|grp.display_name} -%>
-  <li class="<%= calc_distributed_class(grp.article_counter, max_counter, @grouping_class, 0, 10) %>">
+  <li>
     <%= link_to_permalink(grp, grp.display_name) %>
   </li>
 <% end -%>
@@ -12,3 +12,4 @@
 <p><%= _("There are")%> <%= @grouping_class.to_s.underscore.pluralize %>.</p>
 <% end -%>
 </div>
+<p><%= will_paginate %></p>

data/app/views/articles/index.html.erb

@@ -6,6 +6,4 @@
   </div>
 <% end -%>
 
-<% unless @pages.item_count <= this_blog.limit_article_display %>
-  <p id="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>
+<p id="pagination"><%= will_paginate @articles %></p>

data/app/views/articles/search.html.erb

@@ -0,0 +1,8 @@
+<% for article in @articles -%>
+ <div class="post">
+   <h2><%= link_to_permalink article,article.title %></h2>
+   <%= article.body.gsub(/<\/?[^>]*>/, "").slice(0..300) %>...
+  </div>
+<% end -%>
+
+<p id="pagination"><%= will_paginate @articles %></p>

data/app/views/layouts/accounts.html.erb

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />		
-		<title>Typo Administration:  <%= controller.controller_name %></title>
+		<title><%= @page_title %></title>
 		<meta http-equiv="imagetoolbar" content="no" />
 		<%= stylesheet_link_tag "administration.css" %>
 		<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
@@ -13,8 +13,7 @@
 	<div id="container">
 
   	<div id="content">
-  	  <h2><%= @page_heading %></h2>
-      <%= @content_for_layout %>
+      <%= yield %>
   	</div>
   </div>
 	</body>