typo 5.4.3 → 5.4.4

data/CHANGELOG

@@ -1,15 +1,28 @@
-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.
+After releasing Typo 5.4.3, we realized something we actually knew for a while. If we wanted Typo to spread more, we had to make it prettier, easier to install and easier to use. That may sound obvious, but we were working with a quite old product, having legacy feature we didn't need, but, for some reason, we kept release after release, trying to work around instead of just dumping them. If we wanted to make Typo better, we first had to make it smaller. Dead obvious once again.
 
-Now sorting articles by publication date instead of creation date in the admin.
+Being the fourth of the Willy Ronis series, that version is the first going towards simplification: less useless feature, simpler, better interface, and lighter memory footprint. 
 
-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.
+Typo now comes with a new, easier to use setup that suppresses needed initial configuration. Just provide an email and a blog title, and you're done. This setup is the first stone in refreshing Typo installation process.
 
-Extending the editor a little bit, easier to use now.
+Previous admin refresh was not very satisfying, and we needed to rework it. Instead of trying to play the webdesigners, which none of us is, we used Jquery UI for the graphic part, and focused on Typo interface instead. The result is, for now, quite satisfying, even though we know we still can improve it. 
 
-Ticket 143: Publish at post setting does not work
+IPs and pattern blacklist has been completely removed. With Akismet and real time blacklist (RBL), Typo already provided 2 simple ways to fight against spam. Blacklisting IPs and patterns was a very advanced feature, which is definitely not a blogware job. If people want to do that type of filtering, they have many way to do it, using intrusion detection systems (IDS), Apache mod_security, or even packet filtering such as Linux Netfilter. 
+
+For ages, Typo provided a full iTunes metadata support for podcast publishers. We've completely removed them since it was useless for 99.99% of us. Typo still supports enclosure (files attached to a blog post, appearing in the RSS feed but not on the post itself) though.
+
+We've also resolved a bunch of bugs as well:
+
+The main reason why we've released that new version so early was because of a bug in the visual editor, losing posts content at saving time. Editors are very difficult to test since they rely on Javascript. However, we plan to add some Watir tests in a near future.
+
+#152: fix poor email grammar.
+
+#148: fixes a bug that prevents admin to edit a user without providing his password.
+
+#160: 404 error on the lightbox loading.gif and closelabel.gif.
+
+#155: after deleting an image, the file page is loaded.
+
+#143: publishing posts in the future didn't work unless you manually unpublishes them.
 
-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

@@ -12,8 +12,8 @@ Requirements
 
 Currently you need all of those things to get typo to run:
 
- * Ruby 1.8.6 or Ruby Enterprise Edition. 
- * Rails 2.3.5, Typo 5.4.3 DOES NOT support any older Rails version.
+ * Ruby 1.8.6, 1.8.7 or Ruby Enterprise Edition. 
+ * Rails 2.3.5, Typo 5.4.4 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/accounts_controller.rb

@@ -1,5 +1,6 @@
 class AccountsController < ApplicationController
 
+  before_filter :verify_config
   before_filter :verify_users, :only => [:login, :recover_password]
   filter_parameter_logging "password"
 
@@ -53,14 +54,7 @@ class AccountsController < ApplicationController
       if @user.save
         self.current_user = @user
         session[:user_id] = @user.id
-        
-        # Crappy hack : by default, the auto generated post is user_id less and it makes Typo crash
-        if User.count == 1
-          art = Article.find(:first)
-          art.user_id = @user.id
-          art.save
-        end
-        
+      
         redirect_to :controller => "accounts", :action => "confirm"
         return
       end
@@ -94,7 +88,6 @@ class AccountsController < ApplicationController
   end
 
   private
-
   def generate_password
     chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
     newpass = ""
@@ -106,5 +99,8 @@ class AccountsController < ApplicationController
     redirect_to(:controller => "accounts", :action => "signup") if User.count == 0
     true
   end
-
+  
+  def verify_config
+    redirect_to :controller => "setup", :action => "index" if  ! this_blog.configured?
+  end
 end

data/app/controllers/admin/content_controller.rb

@@ -113,7 +113,7 @@ class Admin::ContentController < Admin::BaseController
       render(:update) do |page|
         page.replace_html('autosave', hidden_field_tag('id', @article.id))
         page.replace_html('permalink', text_field('article', 'permalink', {:class => 'small medium'}))
-        page.replace_html('preview_link', link_to(_("Preview"), {:controller => '/previews', :id => @article.id }, {:target => 'new'}))
+        page.replace_html('preview_link', link_to(_("Preview"), {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new'}))
       end
 
       return true
@@ -146,11 +146,10 @@ class Admin::ContentController < Admin::BaseController
     # TODO Test if we can delete the next line. It's delete on nice_permalinks branch
     params[:article] ||= {}
 
-    @resources = Resource.find(:all, :order => 'filename')
+    @resources = Resource.find(:all, :conditions => "mime NOT LIKE '%image%'", :order => 'filename')
     @images = Resource.paginate :page => params[:page], :conditions => "mime LIKE '%image%'", :order => 'created_at DESC', :per_page => 10
     @article.attributes = params[:article]
 
-
     if request.post?
       set_article_author
       save_attachments

data/app/controllers/admin/profiles_controller.rb

@@ -8,7 +8,6 @@ class Admin::ProfilesController < Admin::BaseController
     if request.post? and @user.save
       current_user = @user
       flash[:notice] = _('User was successfully updated.')
-      redirect_to :controller => '/admin', :action => 'index'
     end
   end
 

data/app/controllers/admin/resources_controller.rb

@@ -28,28 +28,10 @@ class Admin::ResourcesController < Admin::BaseController
     end
   end
 
-  def remove_itunes_metadata
-    @resource = Resource.find(params[:id])
-    @resource.itunes_metadata = false
-    @resource.save(false)
-    flash[:notice] = _('Metadata was successfully removed.')
-    redirect_to :action => 'index'
-  end
-
   def update
     @resource = Resource.find(params[:resource][:id])
     @resource.attributes = params[:resource]
 
-    unless params[:itunes_category].nil?
-      itunes_categories = params[:itunes_category]
-      itunes_category_pre = Hash.new {|h, k| h[k] = [] }
-      itunes_categories.each do |cat|
-        cat_split = cat.split('-')
-        itunes_category_pre[cat_split[0]] << cat_split[1] unless
-        itunes_category_pre[cat_split[0]].include?(cat_split[0])
-      end
-      @resource.itunes_category = itunes_category_pre
-    end
     if request.post? and @resource.save
       flash[:notice] = _('Metadata was successfully updated.')
     else
@@ -78,7 +60,6 @@ class Admin::ResourcesController < Admin::BaseController
 
   def index
     @r = Resource.new
-    @itunes_category_list = @r.get_itunes_categories
     @resources = Resource.paginate :page => params[:page], :conditions => "mime NOT LIKE '%image%'", :order => 'created_at DESC', :per_page => this_blog.admin_display_elements
   end
   
@@ -98,10 +79,15 @@ class Admin::ResourcesController < Admin::BaseController
   def destroy
     begin
       @file = Resource.find(params[:id])
+      mime = @file.mime
       case request.method
         when :post
           @file.destroy
-          redirect_to :action => 'index'
+          if mime =~ /image/
+            redirect_to :action => 'images'
+          else
+            redirect_to :action => 'index'
+          end
       end
     rescue
       raise

data/app/controllers/articles_controller.rb

@@ -1,8 +1,8 @@
 class ArticlesController < ContentController
-  before_filter :verify_config
   before_filter :login_required, :only => [:preview]
   before_filter :auto_discovery_feed, :only => [:show, :index]
-
+  before_filter :verify_config
+  
   layout :theme_layout, :except => [:comment_preview, :trackback]
 
   cache_sweeper :blog_sweeper
@@ -187,10 +187,10 @@ class ArticlesController < ContentController
   private
 
   def verify_config
-    if User.count == 0
+    if  ! this_blog.configured?
+      redirect_to :controller => "setup", :action => "index"
+    elsif User.count == 0
       redirect_to :controller => "accounts", :action => "signup"
-    elsif ! this_blog.configured?
-      redirect_to :controller => "admin/settings", :action => "redirect"
     else
       return true
     end

data/app/controllers/setup_controller.rb

@@ -0,0 +1,45 @@
+class SetupController < ApplicationController
+  before_filter :check_config, :only => 'index'
+  layout 'setup'
+  
+  def index
+    if request.post?
+      Blog.transaction do
+        this_blog.blog_name = params[:setting][:blog_name]  
+        this_blog.base_url = blog_base_url
+        this_blog.save    
+      end
+      
+      @user = User.new(:login => 'admin', :email => params[:setting][:email])
+
+        @user.password = generate_password
+        session[:tmppass] = @user.password
+        @user.name = @user.login
+        if @user.save
+          self.current_user = @user
+          session[:user_id] = @user.id
+
+          # Crappy hack : by default, the auto generated post is user_id less and it makes Typo crash
+          if User.count == 1
+            art = Article.find(:first)
+            art.user_id = @user.id
+            art.save
+          end
+        end
+      redirect_to :action => 'confirm'
+    end
+  end
+
+  private
+  def generate_password
+    chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+    newpass = ""
+    1.upto(7) { |i| newpass << chars[rand(chars.size-1)] }
+    return newpass
+  end
+  
+  def check_config
+    return unless this_blog.configured?
+    redirect_to :controller => 'articles', :action => 'index'
+  end
+end

data/app/controllers/xml_controller.rb

@@ -55,15 +55,6 @@ class XmlController < ApplicationController
     end
   end
 
-  def itunes
-    @feed_title = "#{this_blog.blog_name} Podcast"
-    @items = Resource.find(:all, :order => 'created_at DESC',
-      :conditions => ['itunes_metadata = ?', true], :limit => this_blog.limit_rss_display)
-    respond_to do |format|
-      format.rss { render :action => "itunes_feed" }
-    end
-  end
-
   def articlerss
     redirect_to :action => 'feed', :format => 'rss', :type => 'article', :id => params[:id]
   end

data/app/helpers/admin/base_helper.rb

@@ -4,18 +4,22 @@ module Admin::BaseHelper
   def subtabs_for(current_module)
     output = []
     AccessControl.project_module(current_user.profile.label, current_module).submenus.each_with_index do |m,i| 
-      current = (m.url[:controller] == params[:controller] && m.url[:action] == params[:action]) ? "current" : ""
-      output << subtab(_(m.name), current, m.url)
+      current = 
+      output << subtab(_(m.name), (m.url[:controller] == params[:controller] && m.url[:action] == params[:action]) ? '' : m.url)
     end     
     content_for(:tasks) { output.join("\n") }
   end
 
-  def subtab(label, style, options = {})
-    content_tag :li, link_to(label, options, { "class"=> style })
+  def subtab(label, options = {})
+    return content_tag :li, "<span class='subtabs'>#{label}</span>" if options.empty?
+    content_tag :li, link_to(label, options)
   end
 
   def show_page_heading
-    content_tag(:h2, @page_heading, :class => 'mb20') unless @page_heading.blank?
+    heading = ""
+    heading << content_tag(:div, @link_to_new, :class => 'page_new') unless @link_to_new.blank?
+    heading << content_tag(:h2, @page_heading, :class => 'page_heading') unless @page_heading.blank?
+    
   end
 
   def cancel(url = {:action => 'index'})
@@ -30,14 +34,6 @@ module Admin::BaseHelper
    '<input type="submit" value="' + val + '" />'
   end
 
-  def link_to_show(record, controller = @controller.controller_name)
-    if record.published?
-      link_to image_tag('admin/show.png', :alt => _("show"), :title => _("Show content")), 
-        {:controller => controller, :action => 'show', :id => record.id}, 
-        {:class => "lbOn"}
-      end
-  end
-
   def link_to_edit(label, record, controller = @controller.controller_name)
     link_to label, :controller => controller, :action => 'edit', :id => record.id
   end
@@ -88,48 +84,50 @@ module Admin::BaseHelper
     content_tag :li, link_to(_('Back to overview'), :action => 'index')
   end
 
-  def task_add_resource_metadata(title,id)
-    link_to_function(title, toggle_effect('add-resource-metadata-' + id.to_s, 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
+  def task_edit_resource_mime(title,id)
+    link_to_function(title, toggle_effect('edit-resource-mime-' + id.to_s, 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
   end
 
-  def task_edit_resource_metadata(title,id)
-    link_to_function(title, toggle_effect('edit-resource-metadata-' + id.to_s, 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
+  def class_tab
+    'ui-state-default ui-corner-top'
   end
 
-  def task_edit_resource_mime(title,id)
-    link_to_function(title, toggle_effect('edit-resource-mime-' + id.to_s, 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
+  def class_selected_tab
+    'ui-state-default ui-corner-top ui-tabs-selected ui-state-active'
   end
 
   def class_write
     if controller.controller_name == "content" or controller.controller_name == "pages"
-      "current" if controller.action_name == "new"
+      return class_selected_tab if controller.action_name == 'new' || controller.action_name == 'edit'
     end
+    class_tab
   end
   
   def class_content
     if controller.controller_name  =~ /content|pages|categories|resources|feedback/
-      "current" if controller.action_name =~ /list|index|show/
+      return class_selected_tab if controller.action_name =~ /list|index|show|article/
     end
+    class_tab
   end
 
   def class_themes
-    "current" if controller.controller_name  =~ /themes|sidebar/
+    return class_selected_tab if controller.controller_name  =~ /themes|sidebar/
+    class_tab
   end
   
-  def class_users
-    controller.controller_name  =~ /users/ ? "current right" : "right"
-  end
-
   def class_dashboard
-    controller.controller_name  =~ /dashboard/ ? "current right" : "right"
+    return class_selected_tab if controller.controller_name  =~ /dashboard/ 
+    class_tab
   end    
 
   def class_settings
-    controller.controller_name  =~ /settings|textfilter/ ? "current right" : "right"
+    return class_selected_tab if controller.controller_name  =~ /settings|users/ 
+    class_tab
   end
   
   def class_profile
-    controller.controller_name  =~ /profiles/ ? "current right" : "right"
+    return class_selected_tab if controller.controller_name  =~ /profiles/ 
+    class_tab
   end
   
   def alternate_editor
@@ -161,7 +159,7 @@ module Admin::BaseHelper
   end
   
   def cancel_or_save
-    result = '<p class="right">'
+    result = '<p>'
     result << cancel 
     result << " "
     result << _("or") 
@@ -170,10 +168,29 @@ module Admin::BaseHelper
     result << '</p>'
     return result
   end
-  
-  def link_to_published(item)
+
+  def show_actions item
+    html = <<-HTML 
+      <div class='action' style='margin-top: 10px;'>
+        <small>#{link_to _("Edit"), :action => 'edit', :id => item.id}</small> |
+        <small>#{link_to_published item}</small> |
+        <small>#{link_to _("Delete"), :action => 'destroy', :id => item.id}</small>
+    </div>
+    HTML
+  end
     
-    item.published? ? link_to_permalink(item, _("published"), '', 'published') : "<span class='unpublished'>#{_("unpublished")}</span>"  
+  def format_date(date)
+    date.strftime('%d/%m/%Y')
+  end
+    
+  def link_to_published(item)
+    return link_to_permalink(item,  _("Show"), '', 'published') if item.published
+    link_to(_("Preview"), {:controller => '/articles', :action => 'preview', :id => item.id}, {:class => 'unpublished', :target => '_new'})
+  end
+  
+  def published_or_not(item)
+    return "<small class='published'>#{_("Published")}</small>" if item.published
+    "<small class='unpublished'>#{_("Unpublished")}</small>"
   end
   
   def macro_help_popup(macro, text)

data/app/helpers/admin/categories_helper.rb

@@ -0,0 +1,12 @@
+module Admin::CategoriesHelper
+  def show_actions item
+    html = <<-HTML 
+      <div class='action' style='margin-top: 10px;'>
+        <small>#{link_to_permalink item, pluralize(item.articles.size, _('no articles') , _('1 article'), __('%d articles'))}</small> |
+        <small>#{link_to _("Edit"), :action => 'edit', :id => item.id}</small> |
+        <small>#{link_to _("Delete"), :action => 'destroy', :id => item.id}</small>
+    </div>
+    HTML
+  end
+
+end

data/app/helpers/admin/feedback_helper.rb

@@ -2,4 +2,14 @@ module Admin::FeedbackHelper
   def comment_class state
     (state.to_s =~ /Ham/) ? 'published' : 'unpublished'
   end
+
+  def show_actions item
+    html = <<-HTML 
+      <div class='action' style='margin-top: 10px;'>
+        <small>#{link_to _("Show conversation"), :controller => 'feedback', :action => 'article', :id => item.article_id}</small> |
+        <small>#{link_to _("Delete"), :action => 'destroy', :id => item.id}</small>
+    </div>
+    HTML
+  end
+
 end

data/app/helpers/application_helper.rb

@@ -179,5 +179,18 @@ module ApplicationHelper
   def feed_rss
     url_for(:format => :rss, :only_path => false)
   end
+
+  def render_the_flash
+    return unless flash[:notice] or flash[:error]
+    the_class = flash[:error] ? 'ui-state-error' : 'ui-state-highlight'
+    the_icon = flash[:error] ? 'ui-icon-alert' : 'ui-icon-info'
+    
+    html = "<div class='ui-widget settings'>"
+    html << "<div class='#{the_class} ui-corner-all' style='padding: 0 .7em;'>" 
+    html << "<p><span class='ui-icon #{the_icon}' style='float: left; margin-right: .3em;'></span>"
+    html << render_flash rescue nil	
+    html << "</div>"
+    html << "</div>"    
+  end
   
 end