typo 5.4 → 5.4.1

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

@@ -27,14 +27,14 @@
       <td colspan="5">
         <select onchange='window.location=this.options[this.selectedIndex].value;'>
           <option value=''><%= _("All comments")%></option>
-          <option value='?ham=f' <%= 'selected' if params[:ham] %>><%= _("Limit to ham") %></option>
-          <option value='?confirmed=f' <%= 'selected' if params[:confirmed] %>><%= _("Unapproved comments") %></option>
-          <option value='?published=f' <%= 'selected' if params[:published] %>><%= _("Limit to spam")%></option>
+          <option value='?ham=f' <%= 'selected' if params[:ham] == 'f' %>><%= _("Limit to ham") %></option>
+          <option value='?confirmed=f' <%= 'selected' if params[:confirmed] == 'f' %>><%= _("Unapproved comments") %></option>
+          <option value='?published=f' <%= 'selected' if params[:published] == 'f' %>><%= _("Limit to spam")%></option>
         </select>
       </td>
     </tr>
     <%= render_void_table(@feedback.size, 9) %>
-    
+
     <%= render :partial => 'item', :collection => @feedback %>
     <%= display_pagination(@feedback, 6)%>
   </table>

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

@@ -17,6 +17,14 @@
       <%= check_box(:setting, :default_allow_comments)%>
     </p>
   </div>
+  <div>
+    <label for="comment_text_filter" class="float large"><%= _("Comments filter")%></label>
+    <p class='input_text_title'>
+      <select name="setting[comment_text_filter]" id="comment_text_filter">
+        <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
+      </select>      
+    </p>
+  </div>
   <div>
     <label class="float large" for="setting_use_gravatar"><%= _("Enable gravatars")%></label>
     <p class='input_text_title'>
@@ -73,13 +81,6 @@
       <%= text_field(:setting, :sp_akismet_key, {:class => 'small', :size => 25}) %>
     </p>
   </div>
-  <div>
-    <p><%= _("You can optionally disable non-Ajax comments. Typo will always use Ajax for comment submission if Javascript is enabled, so non-Ajax comments are either from spammers or users without Javascript.")%></p>
-    <label for="setting_sp_allow_non_ajax_comments" class="float"><%= _("Allow non-ajax comments") %></label>
-    <p class='input_text_title'>
-      <%= check_box(:setting, :sp_allow_non_ajax_comments)%>
-    </p>
-  </div>
   <div>
     <label for="setting_sp_article_auto_close" class="float"><%= _("Disable comments after")%></label>
     <p class='input_text_title'>

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

@@ -1,81 +1,80 @@
-	<% @page_heading = _('Write') %>
-  <% subtabs_for(:settings) %>
-  
-	<% form_tag :action => 'update' do %>
+<% @page_heading = _('Write') %>
+<% subtabs_for(:settings) %>
 
-<div class="admin">
-	<fieldset id="write" class="set">
-		<legend><%= _("Write")%></legend>
-		<ul>
-        <li>
-            <label for="comment_text_filter" class="float"><%= _("Comments filter")%></label>
-            <select name="setting[comment_text_filter]" id="comment_text_filter">
-            <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
-            </select>
-        </li>
-		</ul>
-	</fieldset>
-	
-	<fieldset id="publish" class="set">
-      <legend><%= _("Publish")%></legend>
-      <ul>
-          <li>
-              <%= _("When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.")%>
-          </li>
-          <li class="checkbox">
-            <label class="float" for="setting_send_outbound_pings"><%= _("Send trackbacks")%></label>
-            <%= check_box(:setting, :send_outbound_pings) %>
-          </li>
-          <li>
-              <label class="float" for="setting_ping_urls"><%= _("URLs to ping automatically")%></label>
-              <%= text_area(:setting, :ping_urls, :cols => 40, :rows => 5) %>
-          </li>
-          <li>
-              <label class="float" for="setting_geourl_location"><%= _("Latitude, Longitude")%></label>
-              <%= text_field(:setting, :geourl_location, :size => 20)%>
-              <span class="float"><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</span>
-          </li>
+<% form_tag :action => 'update' do %>
 
-      </ul>
+<fieldset>
+  <legend><%= _("Publish")%></legend>
+  <div>
+    <label class="float" for="setting_send_outbound_pings"><%= _("Send trackbacks")%></label>
+    <p class='input_text_title'>
+      <%= check_box(:setting, :send_outbound_pings) %>
+    </p>
+    <p><%= _("When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.")%></p>
+  </div>
+  <div>
+    <label class="float" for="setting_ping_urls"><%= _("URLs to ping automatically")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_area(:setting, :ping_urls, :rows => 3, :class => 'small medium') %>
+    </p>
+  </div>
+  <div>
+    <label class="float" for="setting_geourl_location"><%= _("Latitude, Longitude")%></label>
+    <p class='input_text_title ml140'>
+      <%= text_field(:setting, :geourl_location, { :class => 'small medium'})%><br />
+      <small><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</small>
+    </p>
+  </div>
   </fieldset>
-  
-  <fieldset id="resources" class="set">
+
+  <fieldset>
     <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="setting_itunes_author" class="float"><%= _("Author")%></label>
-        <%= text_field(:setting, :itunes_author, :size => 25) %>
-      </li>
-      <li>
-        <label for="setting_itunes_subtitle" class="float"><%= _("Subtitle")%> <span class="mandatory">*</span></label>
-        <%= text_field(:setting, :itunes_subtitle, :size => 25) %>
-      </li>
-      <li>
-        <label class="float" for="setting_itunes_summary"><%= _("Summary")%> <span class="mandatory">*</span></label>
-        <%= text_area :setting, :itunes_summary, :cols => 40, :rows => 3 %>
-        <span class="float mandatory">* <%= _("Setting for channel")%></span>
-      </li>
-      <li>
-        <label class="float" for="setting_itunes_email"><%= _("Email")%> <span class="mandatory">**</span></label>
-        <%= text_field(:setting, :itunes_email, :size => 25) %>
-      </li>
-      <li>
-        <label class="float" for="setting_itunes_name"><%= _("Optional Name")%> <span class="mandatory">**</span></label>
-        <%= text_field(:setting, :itunes_name, :size => 25) %>
-        <span class="float mandatory">** <%= _("Not published by Apple")%></span>
-      </li>
-      <li>
-        <label class="float" for="setting_itunes_copyright"><%= _("Copyright Information")%></label>
-        <%= text_field(:setting, :itunes_copyright, :size => 25) %>
-      </li>
-      <li class="checkbox">
-        <label class="float" for="setting_itunes_explicit"><%= _("Explicit")%></label>
+    <div>
+      <p><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</p>
+      <label for="setting_itunes_author" class="float"><%= _("Author")%></label>
+      <p class='input_text_title'>
+        <%= text_field(:setting, :itunes_author, { :class => 'small medium'}) %>
+      </p>      
+    </div>
+    <div>
+      <label for="setting_itunes_subtitle" class="float"><%= _("Subtitle")%> <span class="mandatory">*</span></label>
+      <p class='input_text_title'>
+        <%= text_field(:setting, :itunes_subtitle, { :class => 'small medium'}) %>
+      </p>  
+    </div>
+    <div>
+      <label class="float" for="setting_itunes_summary"><%= _("Summary")%> <span class="mandatory">*</span></label>
+      <p class='input_text_title ml140'>
+        <%= text_area :setting, :itunes_summary, :rows => 3, :class => 'small medium' %>
+      </p>
+    </div>
+    <div>
+      <label class="float" for="setting_itunes_email"><%= _("Email")%> <span class="mandatory">**</span></label>
+      <p class='input_text_title'>
+        <%= text_field(:setting, :itunes_email, {:class => 'small medium'}) %>
+      </p>      
+    </div>
+    <div>
+      <label class="float" for="setting_itunes_name"><%= _("Optional Name")%> <span class="mandatory">**</span></label>
+      <p class='input_text_title'>
+        <%= text_field(:setting, :itunes_name, {:class => 'small medium'}) %><br />
+        <small>** <%= _("Not published by Apple")%></small>
+      </p>
+    </div>
+    <div>
+      <label class="float" for="setting_itunes_copyright"><%= _("Copyright Information")%></label>
+      <p class='input_text_title'>
+        <%= text_field(:setting, :itunes_copyright, {:class => 'small medium'}) %>
+      </p>      
+    </div>
+    <div>
+      <label class="float" for="setting_itunes_explicit"><%= _("Explicit")%></label>
+      <p class='input_text_title'>
         <%= check_box(:setting, :itunes_explicit)%>
-      </li>
-    </ul>
+      </p>
+    </div>
   </fieldset>
   <%= hidden_field_tag 'from', 'write' %>
   <%= render :partial => 'submit' %>
 </div>
-  <% end %>
+<% end %>

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

@@ -1,6 +1,6 @@
 <% @page_heading = _('Manage tags') %>
 <% subtabs_for(:content) %>
-  
+
 <table cellspacing="1" cellpadding="0">
   <tr>
     <th><%= _("Display Name") %></th>
@@ -12,8 +12,8 @@
   <tr <%= alternate_class %>>
     <td> <%= link_to_edit tag.display_name, tag %></td>
     <td><%= tag.name %></td>
-    <td><%= link_to_permalink tag, tag.articles.count %></td>
-  </tr>  
+    <td><%= link_to_permalink tag, tag.published_articles.count %></td>
+  </tr>
   <% end %>
-  <%= display_pagination(@tags, 3)%>  
+  <%= display_pagination(@tags, 3)%>
 </table>

data/app/views/admin/themes/editor.html.erb

@@ -1,7 +1,8 @@
 <% @page_heading = _('Theme editor') %>
 <% subtabs_for(:themes) %>
 
-<div id="theme_list">	
+<% form_tag do %>
+<div id='editor-right'>
 	<h3>Stylesheets</h3>
 	<div class="theme-filer">	
 		<%= fetch_stylesheets %>
@@ -11,16 +12,18 @@
 	<div class="theme-filer">	
 		<%= fetch_layouts %>
 	</div>
-
+  
 </div>
 
-<% form_tag do %>
-<div id="theme_editor">
-<textarea name="theme_body">
-<%= @file %>
-</textarea>
-<%= hidden_field_tag 'type', params[:type] %>
-<%= hidden_field_tag 'file', params[:file] %>
+<div id="editor-left">
+  <textarea id="theme_body" name="theme_body" class='large' rows='25'>
+  <%= @file %>
+  </textarea>
+  <%= hidden_field_tag 'type', params[:type] %>
+  <%= hidden_field_tag 'file', params[:file] %>
+  </div>
+</div>
+<p class='right'>
+  <%= cancel_or_save %>
 </div>
-<div class="paginate r" style="clear: both; margin-top: 15px"><input type="submit" class="submit" value="<%= _('save') %>" />
 <% end %>

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

@@ -1,14 +1,16 @@
 <h2><%= link_to_permalink article,article.title %></h2>
 <p class="auth"><%= _("Posted by")%> <%= author_link(article) %>
 <%= js_distance_of_time_in_words_to_now article.published_at %></p>
-<% if controller.action_name == 'show' or controller.action_name == 'index' %>
+<% unless controller.action_name == 'redirect' %>
   <% if article.excerpt? %>
     <%= article.excerpt %>
   <% else %>
     <%= article.html(:body) %>
-    <div class="extended">
-      <p><%= link_to_permalink article, _("Continue reading...") %></p>
-    </div>
+    <% if article.extended? %>
+      <div class="extended">
+        <p><%= link_to_permalink article, _("Continue reading...") %></p>
+      </div>
+    <% end %>
   <% end %>
 <% else %>
   <%= article.html(:body) %>

data/bin/typo

@@ -27,6 +27,31 @@ require 'rails-installer'
         }        
       end
     end
+    
+    class Sqlite3 < RailsInstaller::Database
+      # The name of the sqlite database file
+      def self.db_file(installer)
+        File.join(installer.install_directory,'db','database.sqlite')
+      end
+      
+      def self.yml(installer)
+        %q{
+        login: &login
+          adapter: sqlite3
+          database: db/database.sqlite
+
+        development:
+          <<: *login
+
+        production:
+          <<: *login
+
+        test:
+          database: ":memory"
+          <<: *login
+        }        
+      end
+    end
 
 class TypoInstaller < RailsInstaller
   application_name 'typo'

data/config/initializers/access_rules.rb

@@ -47,7 +47,11 @@ AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
   map.permission "admin/cache"
   map.permission "admin/dashboard"
   map.permission "admin/textfilters"
+  # FIXME: For previews, during production 'previews' is needed, during
+  # test, 'articles' is needed. Proposed solution: move previews to
+  # ArticlesController
   map.permission "previews"
+  map.permission "articles"
 
   map.project_module :write, nil do |project|
     project.menu    "Write",            { :controller => "admin/content",    :action => "new" }

data/config/routes.rb

@@ -85,7 +85,7 @@ ActionController::Routing::Routes.draw do |map|
       :controller => 'textfilter', :action => 'public_action'
   end
 
-  map.connect 'previews/:id', :controller => 'previews', :action => 'index'
+  map.connect 'previews/:id', :controller => 'articles', :action => 'preview'
 
   # Work around the Bad URI bug
   %w{ accounts backend files sidebar textfilter xml }.each do |i|
@@ -100,7 +100,7 @@ ActionController::Routing::Routes.draw do |map|
     map.connect "/admin/#{i}/:action/:id", :controller => "admin/#{i}", :action => nil, :id => nil
   end
 
-  map.connect '*from', :controller => 'redirect', :action => 'redirect'
+  map.connect '*from', :controller => 'articles', :action => 'redirect'
 
   map.connect(':controller/:action/:id') do |default_route|
     class << default_route

data/db/schema.rb

@@ -17,12 +17,10 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "blacklist_patterns", :force => true do |t|
-    t.string "type"
+    t.string "type",    :limit => 15
     t.string "pattern"
   end
 
-  add_index "blacklist_patterns", ["pattern"], :name => "index_blacklist_patterns_on_pattern"
-
   create_table "blogs", :force => true do |t|
     t.text   "settings"
     t.string "base_url"
@@ -38,14 +36,14 @@ ActiveRecord::Schema.define(:version => 86) do
 
   create_table "categories", :force => true do |t|
     t.string  "name"
-    t.integer "position"
+    t.integer "position",    :default => 0, :null => false
     t.string  "permalink"
     t.text    "keywords"
     t.text    "description"
     t.integer "parent_id"
   end
 
-  add_index "categories", ["permalink"], :name => "index_categories_on_permalink"
+  add_index "categories", ["permalink"], :name => "categories_permalink_index"
 
   create_table "categorizations", :force => true do |t|
     t.integer "article_id"
@@ -77,8 +75,8 @@ ActiveRecord::Schema.define(:version => 86) do
     t.integer  "parent_id"
   end
 
-  add_index "contents", ["published"], :name => "index_contents_on_published"
-  add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
+  add_index "contents", ["published"], :name => "contents_published_index"
+  add_index "contents", ["text_filter_id"], :name => "contents_text_filter_id_index"
 
   create_table "feedback", :force => true do |t|
     t.string   "type"
@@ -103,8 +101,8 @@ ActiveRecord::Schema.define(:version => 86) do
     t.boolean  "status_confirmed"
   end
 
-  add_index "feedback", ["article_id"], :name => "index_feedback_on_article_id"
-  add_index "feedback", ["text_filter_id"], :name => "index_feedback_on_text_filter_id"
+  add_index "feedback", ["article_id"], :name => "feedback_article_id_index"
+  add_index "feedback", ["text_filter_id"], :name => "feedback_text_filter_id_index"
 
   create_table "notifications", :force => true do |t|
     t.integer  "content_id"
@@ -114,10 +112,10 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "page_caches", :force => true do |t|
-    t.string "name"
+    t.string "name", :null => false
   end
 
-  add_index "page_caches", ["name"], :name => "index_page_caches_on_name"
+  add_index "page_caches", ["name"], :name => "name"
 
   create_table "pings", :force => true do |t|
     t.integer  "article_id"
@@ -125,7 +123,7 @@ ActiveRecord::Schema.define(:version => 86) do
     t.datetime "created_at"
   end
 
-  add_index "pings", ["article_id"], :name => "index_pings_on_article_id"
+  add_index "pings", ["article_id"], :name => "article_id"
 
   create_table "profiles", :force => true do |t|
     t.string "label"
@@ -166,19 +164,20 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "sessions", :force => true do |t|
-    t.string   "sessid"
+    t.string   "sessid",     :limit => 32
     t.text     "data"
-    t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["sessid"], :name => "index_sessions_on_sessid"
+  add_index "sessions", ["sessid"], :name => "sessid", :unique => true
+  add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
 
   create_table "sidebars", :force => true do |t|
-    t.integer "active_position"
-    t.text    "config"
-    t.integer "staged_position"
-    t.string  "type"
+    t.integer  "active_position"
+    t.text     "config"
+    t.integer  "staged_position"
+    t.datetime "updated_at"
+    t.string   "type"
   end
 
   create_table "sitealizer", :force => true do |t|
@@ -206,6 +205,11 @@ ActiveRecord::Schema.define(:version => 86) do
     t.text   "params"
   end
 
+  create_table "text_link_ads_rss", :force => true do |t|
+    t.string  "html",    :limit => 1024
+    t.integer "post_id"
+  end
+
   create_table "triggers", :force => true do |t|
     t.integer  "pending_item_id"
     t.string   "pending_item_type"
@@ -214,10 +218,10 @@ ActiveRecord::Schema.define(:version => 86) do
   end
 
   create_table "users", :force => true do |t|
-    t.string   "login"
-    t.string   "password"
-    t.text     "email"
-    t.text     "name"
+    t.string   "login",                     :limit => 80
+    t.string   "password",                  :limit => 40
+    t.string   "name",                      :limit => 80
+    t.string   "email",                     :limit => 80
     t.boolean  "notify_via_email"
     t.boolean  "notify_on_new_articles"
     t.boolean  "notify_on_comments"
@@ -226,9 +230,9 @@ ActiveRecord::Schema.define(:version => 86) do
     t.integer  "profile_id"
     t.string   "remember_token"
     t.datetime "remember_token_expires_at"
-    t.string   "text_filter_id",            :default => "1"
-    t.string   "editor",                    :default => "simple"
-    t.string   "state",                     :default => "active"
+    t.string   "text_filter_id",                          :default => "1"
+    t.string   "editor",                                  :default => "simple"
+    t.string   "state",                                   :default => "active"
     t.string   "firstname"
     t.string   "lastname"
     t.string   "nickname"
@@ -247,4 +251,6 @@ ActiveRecord::Schema.define(:version => 86) do
     t.datetime "last_connection"
   end
 
+  add_index "users", ["login"], :name => "login", :unique => true
+
 end