typo 5.3 → 5.4

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

@@ -1,31 +1,26 @@
 <% @page_heading = _('Users') + ' <span> &raquo; '+ link_to(_('add new'), :action=>'new') +'</span>' %>
-<% subtabs_for(:users) %>
+<% subtabs_for(:settings) %>
 
-<div class="list">
-  <table>
-    <tr>
-      <th><%= _("Username") %></th>
-      <th><%= _("Name") %></th>
-      <th><%= _("Email") %></th>
-      <th><%= _("Profile") %></th>
-      <th><%= _("Articles") %></th>
-      <th><%= _("Comments") %></th>
-      <th><%= _("State") %></th>
-    </tr>
-    <tr class="menubar">
-      <td colspan="7">&nbsp;</td>
-    </tr>
-    <% for user in @users -%>
-    <tr <%= alternate_class %>>
-      <td><%= link_to_edit user.login, user%></td>
-      <td> <%= user.name %></td>
-      <td><%= mail_to user.email, user.login%></td>
-      <td><%= _(user.profile.nicename) %></td>
-      <td><%= Article.count :conditions => "user_id = #{user.id}"  %></td>
-      <td><%= Comment.count :conditions => "user_id = #{user.id}"  %></td>
-      <td class='<%= user.state %>'><%= _("#{user.state}")%></td>
-    </tr>  
-    <% end -%>
-    <tr><td colspan="8" class="paginate"><%= will_paginate @users %></td></tr>
-  </table>
-</div>
+<table>
+  <tr>
+    <th><%= _("Username") %></th>
+    <th><%= _("Name") %></th>
+    <th><%= _("Email") %></th>
+    <th><%= _("Profile") %></th>
+    <th><%= _("Articles") %></th>
+    <th><%= _("Comments") %></th>
+    <th><%= _("State") %></th>
+  </tr>
+  <% for user in @users -%>
+  <tr <%= alternate_class %>>
+    <td><%= link_to_edit user.login, user%></td>
+    <td> <%= user.name %></td>
+    <td><%= mail_to user.email, user.login%></td>
+    <td><%= _(user.profile.nicename) %></td>
+    <td><%= Article.count :conditions => "user_id = #{user.id}"  %></td>
+    <td><%= Comment.count :conditions => "user_id = #{user.id}"  %></td>
+    <td class='<%= user.state %>'><%= _("%s user", user.state)%></td>
+  </tr>  
+  <% end -%>
+  <%= display_pagination(@users, 8)%>
+</table>

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

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

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

@@ -1,4 +1,18 @@
 <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>
-<%= html(article, :body) %>
+<% if controller.action_name == 'show' or controller.action_name == 'index' %>
+  <% if article.excerpt? %>
+    <%= article.excerpt %>
+  <% else %>
+    <%= article.html(:body) %>
+    <div class="extended">
+      <p><%= link_to_permalink article, _("Continue reading...") %></p>
+    </div>
+  <% end %>
+<% else %>
+  <%= article.html(:body) %>
+  <div class="extended">
+    <%= article.html(:extended) %>
+  </div>
+<% end %>

data/app/views/articles/_atom_feed.atom.builder

@@ -4,7 +4,7 @@ atom_feed do |feed|
     feed.subtitle(this_blog.blog_subtitle, "type" => "html")
   end
   feed.updated atom_feed.first.updated_at if atom_feed.first
-  feed.generator "Typo", :uri => "http://www.typosphere.org", :version => '4.x'
+  feed.generator "Typo", :uri => "http://www.typosphere.org", :version => '5.x'
 
   atom_feed.each do |value|
     value.to_atom(feed)

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

@@ -2,11 +2,13 @@ xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
 xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
 
 xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
+        "xmlns:atom" => "http://www.w3.org/2005/Atom",
         "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
   xml.channel do
     xml.title feed_title
-    xml.link @auto_discovery_url_rss
-    xml.language "en-us"
+    xml.link this_blog.base_url
+    xml.atom :link, :href => this_blog.url_for(params), :rel => 'self', :type => 'application/rss+xml'
+    xml.language this_blog.lang.gsub("_", "-").downcase
     xml.ttl "40"
     xml.description this_blog.blog_subtitle
 

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

@@ -37,7 +37,7 @@
   <% if @article.published_comments.blank? %>
     <li id="dummy_comment" style="display: none"></li>
   <% else %>
-    <%= render(:partial => "comment", :collection => @article.published_comments) %>
+    <%= render(:partial => "/articles/comment", :collection => @article.published_comments) %>
   <% end %>
   </ol>
 <% end -%>
@@ -49,7 +49,7 @@
     <span class="light-bg"><%= @article.trackback_url %></span>
     </p>
   <%= content_tag(:ol,
-        render(:partial => "trackback", :collection => @article.published_trackbacks),
+        render(:partial => "/articles/trackback", :collection => @article.published_trackbacks),
         :id => 'trackbackList', :class => 'trackback-list') unless @article.published_trackbacks.blank? %>
 <% end -%>
 
@@ -63,7 +63,7 @@
 </p>
 
 <% unless @article.comments_closed? -%>
-  <%= render :partial => 'comment_box' %>
+  <%= render :partial => '/articles/comment_box' %>
 <% else -%>
   <p><%= _("Comments are disabled")%></p>
 <% end -%>

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

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

data/app/views/authors/show.html.erb

@@ -0,0 +1,37 @@
+<div class="post">
+  <h2><%= @author.name %></h2>
+  <ul>
+    <%= display_profile_item @author.url, @author.show_url, _("Web site:") %>
+    <%= display_profile_item @author.msn, @author.show_msn, _("MSN:") %>
+    <%= display_profile_item @author.yahoo, @author.show_yahoo, _("Yahoo:") %>
+    <%= display_profile_item @author.jabber, @author.show_jabber, _("Jabber:") %>
+    <%= display_profile_item @author.aim, @author.show_aim, _("AIM:") %>
+    <%= display_profile_item @author.twitter, @author.show_twitter, _("Twitter:") %>
+  </ul>
+
+  <h3><%= _("About %s", @author.name)%></h3>
+  <%= @author.description%>
+</div>
+
+<% if @author.articles.to_a.empty? -%>
+<div class="post">
+<p><%= _("This author has not published any article yet")%>...</p>
+</div>
+<% else
+     currentmonth = 0
+     currentyear = 0
+     for article in @author.articles
+       if (article.published_at.month != currentmonth || article.published_at.year != currentyear)
+         currentmonth = article.published_at.month
+         currentyear = article.published_at.year -%>
+          <h3 class="archivemonth"><%= _(Date::MONTHNAMES[article.published_at.month]) %> <%= article.published_at.year %></h3>
+           <% end -%>
+  <div class="archivepost">
+  <%= article.published_at.mday %> -
+  <%= link_to_permalink(article,h(article.title)) %>
+  <% if !article.categories.empty? %> <%= _("posted in") %>
+  <%= article.categories.collect {|c| link_to_permalink c,c.name }.join(", ") -%>
+  <% end -%>
+ </div>
+<% end
+  end -%>

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

@@ -9,10 +9,9 @@
 		<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
 	</head>
 
-    <body>
-      <div id="container">
-
-        <div id="content">
+    <body style='background: #023;'>
+      <div id='logincontainer'>
+        <div id='innerlogin'>
           <%= yield %>
         </div>
       </div>

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

@@ -7,48 +7,45 @@
   <meta http-equiv="imagetoolbar" content="no" />
   <%= stylesheet_link_tag "growler", "administration", "lightbox" %>
   <%= stylesheet_link_tag "administration_rtl" if ( _("Localization.rtl") == "1") %>
-  <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "administration", :fckeditor %>
-  <%= calendar_date_select_includes %>
+  <%= javascript_include_tag "prototype", "effects", "builder", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "administration", :ckeditor %>
+  <%= calendar_date_select_includes %>  
 </head>
 
 <body>
-  <div id="container">
-    <div id="topnav">
-      <ul id="tabs">
-        <li class="right"><%= link_to _('your blog'), this_blog.base_url %></li>
-        <li class="right"><%= link_to _("log out"), :controller => "/accounts", :action=>"logout" %></li>
-        <% for pm in current_user.project_modules %>
-          <%= content_tag :li, (link_to _(pm.human_name), pm.menus.first.url), :class => send("class_#{pm.name}") %>
-        <% end %>
-        <li class="right"><%= link_to _('Dashboard'), :controller => '/admin' %></li>
-      </ul>
-    </div>
-    <% if not @_render_stack.first =~ /login|signup|logout/ %>
-    <div id="subtabs">
+  <div id='header'>
+    <h1><%= link_to this_blog.blog_name, this_blog.base_url %></h1>
+  </div>
+  <div id='menu'>
+    <ul id='tabs'>
+      <li <%='class="current"' if controller.controller_name == 'dashboard' %>><%= link_to _('Dashboard'), :controller => '/admin' %></li>
+      <% for pm in current_user.project_modules %>
+        <%= content_tag :li, (link_to _(pm.menus.first.name ), pm.menus.first.url), :class => send("class_#{pm.name}") %>
+      <% end %>
+    </ul>
+    <%= link_to _("%s &raquo;", "Log out"), {:controller => "/accounts", :action=>"logout"}, :id => 'logout' %>
+  </div>
+  <% unless (@_first_render =~ /login|signup|logout/) %>
+    <div id="submenu">
       <ul>
         <%= yield :tasks %>
       </ul>
-      <div style="clear:both;"></div>
     </div>
-    <% end %>
+  <% end %>
 
-    <div id="overall">
-      <% if flash[:notice] or flash[:error] %>
-      <div id="flash">
-        <%= render_flash rescue nil %>
-      </div>
-      <% end %>
-
-      <div id="main">
-        <%= show_page_heading %>
-
-        <%= yield  %>
-      </div>
-    </div>
-    <div id="footer">
-      Typo <%=h TYPO_VERSION %>
+  <div id='content'>
+    <% if flash[:notice] or flash[:error] %>
+    <div id="flash">
+      <%= render_flash rescue nil %>
     </div>
+    <% end %>
+    
+    <%= show_page_heading %>
+    <%= yield  %>
+  </div>
 
+  <div id="footer">
+    <%= link_to(this_blog.blog_name, this_blog.base_url) %> <%= _("is proudly powered by")%> Typo <%=h TYPO_VERSION %>
   </div>
+
 </body>
 </html>

data/app/views/shared/_search.html.erb

@@ -0,0 +1,10 @@
+<% form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
+ <label for="q">Live Search:</label><input type="text" id="q" name="q" value="" size="15" />
+<%= image_tag "spinner-blue.gif", :id => 'search_spinner', :style => 'display:none;' %>
+<% end %>
+<%= observe_field "q", :frequency => 1,
+    :url => { :controller => "live", :action => "search" },
+    :loading => "Element.show('search_spinner')",
+    :complete => "Element.hide('search_spinner')",
+    :update => "search-results",
+    :with => "'q=' + encodeURIComponent($F('q'))" -%>

data/app/views/xml/_atom10_item_article.atom.builder

@@ -35,7 +35,5 @@ xm.entry do
     end
   end
   xm.summary html(item, :body), "type"=>"html"
-  if this_blog.show_extended_on_rss
-    xm.content html(item, :all), "type"=>"html" if this_blog.show_extended_on_rss 
-  end
+  xm.content html(item, :all), "type"=>"html" if this_blog.show_extended_on_rss 
 end

data/bin/typo

@@ -55,6 +55,10 @@ class TypoInstaller < RailsInstaller
     message "Migrating #{@@app_name.capitalize}'s database to newest release"
     
     in_directory install_directory do
+      unless system("rake -s gems:install")
+        raise InstallFailed, "Missing dependencies"
+      end
+      
       unless system("rake -s db:migrate")
         raise InstallFailed, "Migration failed"
       end

data/config/boot.rb

@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -67,7 +68,7 @@ module Rails
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -82,7 +83,7 @@ module Rails
 
       def load_rubygems
         require 'rubygems'
-        min_version = '1.1.1'
+        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1

data/config/environment.rb

@@ -4,115 +4,66 @@
 # (Use only when you can't set environment variables through your web/app server)
 # ENV['RAILS_ENV'] = 'production'
 
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
-# need this early for plugins
-require 'typo_deprecated'
-
-class Rails::Configuration
-  attr_accessor :action_web_service
-end
-
 Rails::Initializer.run do |config|
   # Skip frameworks you're not going to use
   config.frameworks -= [ :active_resource ]
 
-  # Fix up action_web_service, see:
-  # http://www.texperts.com/2007/12/21/using-action-web-service-with-rails-20/
-  config.frameworks += [ :action_web_service ]
-
-  config.action_web_service = Rails::OrderedOptions.new
-
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/app/services )
 
   # I need the localization plugin to load first
   # Otherwise, I can't localize plugins <= localization
   # Forcing manually the load of the textfilters plugins fixes the bugs with apache in production.
-  config.plugins = [ 'localization', :all ]
+  config.plugins = [ :localization, :all ]
   
   config.load_paths += %W(
     vendor/rubypants
     vendor/akismet
-    vendor/redcloth/lib
-    vendor/bluecloth/lib
     vendor/flickr
-    vendor/gems/coderay
-    vendor/sparklines/lib
     vendor/uuidtools/lib
-    vendor/mocha/lib
-    vendor/memcache-client/lib
-    vendor/cached_model/lib
     vendor/rails/railties
     vendor/rails/railties/lib
     vendor/rails/actionpack/lib
     vendor/rails/activesupport/lib
     vendor/rails/activerecord/lib
     vendor/rails/actionmailer/lib
-    vendor/actionwebservice/lib
     app/apis
   ).map {|dir| "#{RAILS_ROOT}/#{dir}"}.select { |dir| File.directory?(dir) }
 
   # Declare the gems in vendor/gems, so that we can easily freeze and/or
   # install them.
-  config.gem 'coderay'
   config.gem 'htmlentities'
   config.gem 'json'
   config.gem 'calendar_date_select'
+  config.gem 'bluecloth', :version => '~> 2.0.5'
+  config.gem 'coderay', :version => '~> 0.8'
+  config.gem 'mislav-will_paginate', :version => '~> 2.3.11', :lib => 'will_paginate', 
+          :source => 'http://gems.github.com'
+  config.gem 'RedCloth', :version => '~> 4.2.2'
+  config.gem 'panztel-actionwebservice', :version => '2.3.5', :lib => 'actionwebservice'
+  config.gem 'addressable', :version => '~> 2.1.0', :lib => 'addressable/uri'
 
-  # Declare needed (github) gems
-  # This is for legacy documentation, these gems are vendored for release.
-  # config.gem 'datanoise-actionwebservice', :version => '2.2.2', :lib => 'actionwebservice', :source => 'http://gems.github.com'
-  # config.gem 'mislav-will_paginate', :version => '2.3.7', :lib => 'will_paginate', :source => 'http://gems.github.com'
-  # Rails 2.2.2 bug : decommenting this line forces the use of the test database regardless of the RAILS_ENV
-  # config.gem 'rspec-rails', :lib => 'spec/rails', :version => '~> 1.1.11'
-
-  # Force all environments to use the same logger level
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-
+  
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake create_sessions_table')
   config.action_controller.session_store = :active_record_store
 
-  # Enable page/fragment caching by setting a file-based store
-  # (remember to create the caching directory and make it readable to the application)
-  config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+  # Disable use of the Accept header, since it causes bad results with our
+  # static caching (e.g., caching an atom feed as index.html).
+  config.action_controller.use_accept_header = false
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
   config.active_record.observers = :email_notifier, :web_notifier
-
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-
-  # Use Active Record's schema dumper instead of SQL when creating the test database
-  # (enables use of different database adapters for development and test environments)
-  # config.active_record.schema_format = :ruby
-
-  # See Rails::Configuration for more options
 end
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-
-# Include your application configuration below
-
 # Load included libraries.
-require 'redcloth'
-require 'bluecloth'
 require 'rubypants'
-require 'flickr'
 require 'uuidtools'
 
 require 'migrator'
@@ -121,39 +72,7 @@ require 'login_system'
 require 'typo_version'
 $KCODE = 'u'
 require 'jcode'
-require 'xmlrpc_fix'
 require 'transforms'
-require 'builder'
-
-
-#MemoryProfiler.start(:delay => 10, :string_debug => false)
-
-unless Builder::XmlMarkup.methods.include? '_attr_value'
-  # Builder 2.0 has many important fixes, but for now we will only backport
-  # this one...
-  class Builder::XmlMarkup
-    # Insert the attributes (given in the hash).
-    def _insert_attributes(attrs, order=[])
-      return if attrs.nil?
-      order.each do |k|
-        v = attrs[k]
-        @target << %{ #{k}="#{_attr_value(v)}"} if v # " WART
-      end
-      attrs.each do |k, v|
-        @target << %{ #{k}="#{_attr_value(v)}"} unless order.member?(k) # " WART
-      end
-    end
-
-   def _attr_value(value)
-      case value
-      when Symbol
-        value.to_s
-      else
-        _escape(value.to_s).gsub(%r{"}, '&quot;')  # " WART
-      end
-    end
-  end
-end
 
 ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(
   :long_weekday => '%a %B %e, %Y %H:%M'
@@ -163,17 +82,26 @@ ActionMailer::Base.default_charset = 'utf-8'
 
 # I wanted to put this as a "setup" page, but it seems I can't catch the 
 # exception fast enough and get a 500 error
-if RAILS_ENV != 'test'
-  begin
-    ActiveRecord::Base.connection.select_all("select * from sessions")
-  rescue
-    begin
-      ActiveRecord::Base.connection.current_database
-      Migrator.migrate
-    rescue
-      # if there are no database, migrator doesn't no start
+#if RAILS_ENV != 'test'
+#  begin
+#    ActiveRecord::Base.connection.select_all("select * from sessions")
+#  rescue
+#    begin
+#      ActiveRecord::Base.connection.current_database
+#      Migrator.migrate
+#    rescue
+#      # if there are no database, migrator doesn't no start
       # use case : rake db:create in rails tasks
-    end
+#    end
+#  end
+#end
+
+# Work around interpolation deprecation problem: %d is replaced by
+# {{count}}, even when we don't want them to.
+# FIXME: We should probably fully convert to standard Rails I18n.
+class I18n::Backend::Simple
+  def interpolate(locale, string, values = {})
+    interpolate_without_deprecated_syntax(locale, string, values)
   end
 end
 
@@ -190,8 +118,3 @@ if RAILS_ENV != 'test'
 end
 
 FLICKR_KEY='84f652422f05b96b29b9a960e0081c50'
-
-#require 'memcache_util'
-require 'cached_model'
-CachedModel.use_local_cache = true
-CachedModel.use_memcache = false