typo 5.4.2 → 5.4.3

data/CHANGELOG

@@ -1,23 +1,15 @@
-3 weeks after releasing Typo 5.4.1, and only 1 month after releasing Typo 5.4, we're happy to release Typo 5.4.2, an important bugfix release. Don't expect many feature here, even though we thought about some of them, it's really a bugfix, and nothing else.
+Typo 5.4.3 fixes some nasty bugs that went through Typo 5.4.2 despite running tests before releasing. If you've been using Typo 5.4.2, you really should upgrade. And if you're running any prior version, you should upgrade too.
 
-** Features
+Now sorting articles by publication date instead of creation date in the admin.
 
-We've split the attachments between images and non images assets. Provided you're using the simple editor, you can now use a fancy images carousel and insert your images in your text within a single click. This comes with a nice set of thumbnails.
+In the admin, comment forms fields are now filled with the user info. Url and 
+email fields have been switched too to fit front end comment forms.
 
-Finally, the long awaited "forgot my password" link is here. It will send you a new password whenever you lose yours. Cool isn't it?
-
-We've also done some optimization in the way Typo sends assets and manages cache. CSS and Javascript are now sent into 1 file, making them faster to load. RSS generation has also been fastened up.
-
-** Bugs
-
-A bug screwing up the editor when switching from simple to visual, causing users to lose their content when switching. Fixing that is a good reason to release today in itself.
-
-A bug preventing your registration email to go when creating your account, making you lose your password unless you change it manually before logging out.
-
-Fixed a security issue making the user passwords to be logged in clear in the application logs.
-
-Fixed a bug causing CKEditor to crash under MS Windows due to the lack of symlinks on windows.
+Extending the editor a little bit, easier to use now.
 
+Ticket 143: Publish at post setting does not work
 
+Fixing a critial bug that made the page editor crash at loading. 
 
+Fixing a bug in RDOC that raised an error when installing.
 

data/README

@@ -13,7 +13,7 @@ Requirements
 Currently you need all of those things to get typo to run:
 
  * Ruby 1.8.6 or Ruby Enterprise Edition. 
- * Rails 2.2, Typo 5.3 DOES NOT support Rails 2.1.
+ * Rails 2.3.5, Typo 5.4.3 DOES NOT support any older Rails version.
  * A database.  Typo supports MySQL, PostgreSQL, and SQLite.
  * Ruby drivers for your database.
  * For best performance, you should have a web server running either

data/app/controllers/articles_controller.rb

@@ -24,7 +24,7 @@ class ArticlesController < ContentController
       @articles = Article.paginate :page => params[:page], :conditions => { :published_at => time_delta(*params.values_at(:year, :month, :day)), :published => true }, :order => 'published_at DESC', :per_page => @limit
     else
       @noindex = 1 unless params[:page].blank?
-      @articles = Article.paginate :page => params[:page], :conditions => { :published => true }, :order => 'published_at DESC', :per_page => @limit
+      @articles = Article.paginate :page => params[:page], :conditions => ['published = ? AND published_at < ?', true, Time.now], :order => 'published_at DESC', :per_page => @limit
     end
     
     @page_title = index_title

data/app/models/article.rb

@@ -100,7 +100,7 @@ class Article < Content
         list_function << 'category(search_hash[:category])'
       end
 
-      paginate_hash[:order] = 'created_at DESC'
+      paginate_hash[:order] = 'published_at DESC'
       list_function << "paginate(paginate_hash)"
       eval(list_function.join('.'))
     end
@@ -408,7 +408,7 @@ class Article < Content
 
   # The web interface no longer distinguishes between separate "body" and
   # "extended" fields, and instead edits everything in a single edit field,
-  # separating the extended content using "<!--more-->".
+  # separating the extended content using "\<!--more-->".
   def body_and_extended
     if extended.nil? || extended.empty?
       body
@@ -417,7 +417,7 @@ class Article < Content
     end
   end
 
-  # Split apart value around a "<!--more-->" comment and assign it to our
+  # Split apart value around a "\<!--more-->" comment and assign it to our
   # #body and #extended fields.
   def body_and_extended= value
     parts = value.split(/\n?<!--more-->\n?/, 2)

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

@@ -55,10 +55,10 @@
       <script type="text/javascript">edToolbar('article_body_and_extended');</script>
     </div>
     <div id ='visual_editor' <%= "style='display: none;'" if current_user.editor == 'simple'%> >
-      <%= ckeditor_textarea('article', 'body_and_extended', {:height => '300px', :class => 'large', :height => '300px', :rows => '15'}) if current_user.editor == 'visual' %>
+      <%= ckeditor_textarea('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'visual' %>
     </div>
     <div id='simple_editor' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
-      <%= text_area('article', 'body_and_extended', {:height => '300px', :class => 'large', :height => '300px', :rows => '15'}) %>
+      <%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) %>
       <%= render_macros(@macros) if current_user.editor == 'simple' %>  
     </div>
   </div>

data/app/views/admin/content/_simple_editor.html.erb

@@ -6,7 +6,7 @@
   $('text_filter').value = $('user_textfilter').value;
   content = CKEDITOR.instances.article__body_and_extended_editor.getData();
 </script>
-<%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '15'}) %>
+<%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) %>
 <script type="text/javascript">
   $('visual_editor').innerHTML = "";
   $('visual_editor').style.display = 'none';

data/app/views/admin/content/_visual_editor.html.erb

@@ -12,7 +12,7 @@
       delete(CKEDITOR.instances.article__body_and_extended_editor);
     }
 </script>
-<%= ckeditor_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
+<%= ckeditor_textarea('article', 'body_and_extended', {:height => '300', :class => 'large'}) %>
 <script type="text/javascript">
   content = CKEDITOR.instances.article__body_and_extended_editor.setData(html);
 </script>

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

@@ -8,19 +8,19 @@
   <div>
     <label for="comment_author" class='float'><%= _("Author")%></label>
     <p class='input_text_title'>
-      <%= text_field 'comment', 'author', :class => 'small medium' %>
+      <%= text_field 'comment', 'author', :class => 'small medium', :value => current_user.display_name %>
     </p>
   </div>
   <div>
-    <label for="comment_url" class='float'><%= _("Url") %></label>
+    <label for="comment_email" class='float'><%= _("Email")%></label>
     <p class='input_text_title'>
-      <%= text_field 'comment', 'url', :class => 'small medium' %>
+      <%= text_field 'comment', 'email', :class => 'small medium', :value => current_user.email %>
     </p>
   </div>
   <div>
-    <label for="comment_email" class='float'><%= _("Email")%></label>
+    <label for="comment_url" class='float'><%= _("Url") %></label>
     <p class='input_text_title'>
-      <%= text_field 'comment', 'email', :class => 'small medium' %>
+      <%= text_field 'comment', 'url', :class => 'small medium', :value => current_user.url %>
     </p>
   </div>
   <div>

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

@@ -1,3 +1,5 @@
+<input type="hidden" name="current_editor" id="current_editor" value="<%= current_user.editor %>" />
+<input type="hidden" name="user_textfilter" id="user_textfilter" value="<%= current_user.text_filter.name %>" />
 <%= error_messages_for 'page' %>
 
 <div id='editor-right'>
@@ -33,10 +35,12 @@
     <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
       <script type="text/javascript">edToolbar('page_body');</script>
     </div>
-    <div id='<%= alternate_editor %>_editor' style='display: none;'></div>
-    <div id='<%= "#{current_user.editor}_editor" %>'>
-      <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
-      <%= render_macros(@macros) if current_user.editor == 'visual' %>
+    <div id ='visual_editor' <%= "style='display: none;'" if current_user.editor == 'simple'%> >
+      <%= ckeditor_textarea('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'visual' %>
+    </div>
+    <div id='simple_editor' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
+      <%= text_area('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) %>
+      <%= render_macros(@macros) if current_user.editor == 'simple' %>  
     </div>
   </div>
   <div class='editor_bottom'>

data/app/views/admin/pages/_simple_editor.html.erb

@@ -1,15 +1,16 @@
 <script type="text/javascript">
   $('quicktags').style.display = 'block';
+  $('simple_editor').style.display = 'block';
   $('s').className = 'active';
   $('f').className = 'inactive';
-  $('simple_editor').style.display = 'block';
-  html = FCKeditorAPI.GetInstance('page__body_editor').GetHTML();
+  $('text_filter').value = $('user_textfilter').value;
+  content = CKEDITOR.instances.page__body_editor.getData();
 </script>
-<%= text_area('page', 'body', {:class => 'medium', :height => '300'}) %>
+
+<%= text_area('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) %>
 
 <script type="text/javascript">
-  $('page_body').innerHTML = html;
   $('visual_editor').innerHTML = "";
   $('visual_editor').style.display = 'none';
-  html = null;
+  $('page_body').innerHTML = content;
 </script>

data/app/views/admin/pages/_visual_editor.html.erb

@@ -4,6 +4,7 @@
   $('visual_editor').style.display = 'block';
   $('s').className = 'inactive';
   $('f').className = 'active';
+  $('text_filter').value = 'none';
   html = $('page_body').value;  
   
   if (CKEDITOR.instances.page__body_editor &&
@@ -12,7 +13,7 @@
     }
     
 </script>
-<%= ckeditor_textarea('page', 'body', {:height => '300', :class => 'medium'}) %>
+<%= ckeditor_textarea('page', 'body', {:height => '300', :class => 'large'}) %>
 <script type="text/javascript">
   content = CKEDITOR.instances.page__body_editor.setData(html);
 </script>

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

@@ -6,4 +6,4 @@
   </div>
 <% end -%>
 
-<p id="pagination"><%= will_paginate @articles %></p>
+<%= will_paginate @articles %>

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

@@ -5,4 +5,4 @@
   </div>
 <% end -%>
 
-<p id="pagination"><%= will_paginate @articles %></p>
+<%= will_paginate @articles %>

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.4.2"
+PKG_VERSION = "5.4.3"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.4.2'
+TYPO_VERSION = '5.4.3'

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Admin::DashboardController do
+  before do
+    request.session = { :user => users(:tobi).id }
+  end
+
+  it "test_index" do
+    get :index
+    response.should render_template('index')
+  end
+
+end

data/spec/views/articles/index_spec.rb

@@ -33,6 +33,10 @@ with_each_theme do |theme, view_path|
         response.should have_tag("p", "body")
         response.should_not have_tag("p>p", "body")
       end
+
+      it "should not have div nested inside p" do
+	response.should_not have_tag("p>div")
+      end
     end
 
     # *notice

data/themes/dirtylicious/views/articles/index.html.erb

@@ -1,3 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<p class="pagination"><%= will_paginate @articles %></p>
+<%= will_paginate @articles %>

data/themes/scribbish/views/articles/index.html.erb

@@ -1,3 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<p class="pagination"><%= will_paginate @articles %></p>
+<%= will_paginate @articles %>

data/themes/standard_issue/views/articles/index.html.erb

@@ -1,3 +1,3 @@
 <%= render :partial => 'articles/article', :collection => @articles %>
 
-<p class="pagination"><%= will_paginate @articles %></p>
+<%= will_paginate @articles %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 5.4.2
+  version: 5.4.3
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +01:00
+date: 2010-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -497,6 +497,7 @@ files:
 - db/schema.sqlserver.sql
 - db/schema_version
 - db/scripts/fix_permalinks.rb
+- db/typo_dev
 - db/updates/update.168.to.200.mysql.sql
 - db/updates/update.168.to.200.psql.sql
 - doc/Installer.txt
@@ -905,6 +906,7 @@ files:
 - spec/controllers/admin/cache_controller_spec.rb
 - spec/controllers/admin/categories_controller_spec.rb
 - spec/controllers/admin/content_controller_spec.rb
+- spec/controllers/admin/dashboard_controller_spec.rb
 - spec/controllers/admin/feedback_controller_spec.rb
 - spec/controllers/admin/pages_controller_spec.rb
 - spec/controllers/admin/profiles_controller_spec.rb