typo 5.2 → 5.2.98

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

@@ -5,7 +5,12 @@
   <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>
 
   <%= form_remote_tag(:url=>{:action=>'publish'},
-                      :loading => "new Element.show('update_spinner')")  %>
+                      :loading => "new Element.show('update_spinner')",
+                      :success => "var g = new k.Growler({location : 'br'}); 
+                			g.info('Sidebar was successfully saved', {life: 3});",
+                			:failure => "var g = new k.Growler({location : 'br'}); 
+                			g.error('Oops, something wrong happened', {life: 3});
+                			")  %>
   <div class="paginate r">
     <input value="<%= _('Publish changes')%>" class="submit" type="submit"/>
   </div>

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

@@ -1,6 +1,4 @@
 page.replace_html('available_box', :partial => 'availables',
                   :object => @available)
 page.replace_html('active', :partial => 'actives', :object => @active)
-page.visual_effect(:highlight, "messages", :duration => 3)
-page.replace_html('messages', '<p>Changes published</p>')
 page.hide('update_spinner')

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

@@ -1,6 +1,4 @@
 <%= error_messages_for 'user' %>
-<!--[form:user]-->
-<fieldset>
 <ul>
 <li>
   <label class="float" for="user_login"><%= _("Login")%>:</label>
@@ -8,7 +6,6 @@
 </li>
 <% 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 }) %>
   <% # _("Blog publisher"), _("Contributor") , _("Typo administrator") %>
@@ -30,16 +27,28 @@
   <label class="float" for="user_password"><%= _("Password confirmation")%>:</label>
   <%= password_field 'user', 'password_confirmation'  %>
 </li>
+<li>
+  <label class='float' for="user_state"><%= _("State")%></label>
+  <select name="user[state]">
+    <option value="active" <%= 'selected' if @user.state == 'active' %>><%= _("Active")%></option>
+    <option value="inactive" <%= 'selected' if @user.state == 'inactive'%>><%= _("Inactive")%></option>
+  </select>
+</li>
 <li>
 	<label class="float"><%= _("Editor")%>:</label>
-	<input type="radio" name="user[editor]" value="2" id="editor_2" <%= 'checked="checked"' if @user.editor == 2 %>/>
+	<input type="radio" name="user[editor]" value="visual" id="editor_2" <%= 'checked="checked"' if @user.editor == 'visual' %>/>
 	<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>
+		<input type="radio" name="user[editor]" value="simple" id="editor_0" <%= 'checked="checked"' if @user.editor == 'simple' %>/>
+	    <label for="editor_0"><%= _("Use simple editor")%></label>
 	</span>
-	</li>
-
+</li>
+<li>
+    <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
+    <select name="user[text_filter_id]" id="text_filter">
+      <%= options_for_select text_filter_options_with_id, @user.text_filter.id %>
+    </select>
+</li>
 <li>
   <label class="float" for="user_notify_via_email"><%= _("Send notification messages via email")%>?</label>
   <%= check_box 'user', 'notify_via_email'  %> 
@@ -54,5 +63,3 @@
   <%= check_box 'user', 'notify_on_comments'  %>
 </li>
 </ul>
-</fieldset>
-<!--[eoform:user]-->

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

@@ -10,9 +10,10 @@
       <th><%= _("Profile") %></th>
       <th><%= _("Articles") %></th>
       <th><%= _("Comments") %></th>
+      <th><%= _("State") %></th>
     </tr>
     <tr class="menubar">
-      <td colspan="6">&nbsp;</td>
+      <td colspan="7">&nbsp;</td>
     </tr>
     <% for user in @users -%>
     <tr <%= alternate_class %>>
@@ -22,6 +23,7 @@
       <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>

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

@@ -1,4 +1,4 @@
 <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>
-<%= simple_format(html(article, :body)) %>
+<%= html(article, :body) %>

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

@@ -1,9 +1,8 @@
 <li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= 'style="display:none"' if controller.request.xhr? %><%= onhover_show_admin_tools(:comment, comment.id) %>>
-  <%= admin_tools_for comment %>
   <a name="comment-<%= comment.id %>"></a>
   <%= gravatar_tag(comment.email) if this_blog.use_gravatar and comment.email %>
   <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong> </cite> <%= _("said")%> <%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:<br />
-  <%= simple_format comment.generate_html(:body) %>
+  <%= comment.generate_html(:body) %>
   <% unless comment.published -%>
     <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.  It won't appear on this blog until the author approves it")%>.</div>
   <% end -%>

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

@@ -1,4 +1,4 @@
-<% form_remote_tag :url => comments_path(@article),
+<% form_remote_tag :url => @article.comment_url,
                     :position=> :bottom,
                     :update => {:success => 'commentList'},
                     :loading => "loading()",
@@ -36,7 +36,7 @@
       <td colspan="2" id="frm-btns">
       <span id="comment_loading" style="display:none;"><%= image_tag "spinner.gif" %></span>&nbsp;&nbsp;
       <%= markup_help_popup TextFilter.find_by_name(this_blog.comment_text_filter), _("Comment Markup Help") %>
-      <a href="#" onclick="new Ajax.Updater('preview', '<%= preview_new_comment_path(@article) %>',  {asynchronous:true, evalScripts:true, parameters:Form.serialize('commentform'), onComplete:function(request){Element.show('preview')}}); return false;"><%= _("Preview comment")%></a>
+      <a href="#" onclick="new Ajax.Updater('preview', '<%= @article.preview_comment_url %>',  {asynchronous:true, evalScripts:true, parameters:Form.serialize('commentform'), onComplete:function(request){Element.show('preview')}}); return false;"><%= _("Preview comment")%></a>
       <input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
       </td>
     </tr>

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

@@ -1,5 +1,4 @@
 <li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
-  <%= admin_tools_for trackback %>
   <a name="trackback-<%= trackback.id %>"></a>
   <%= _("From")%> <strong><%= trackback.blog_name %></strong><br />
   <a href="<%= trackback.url %>" rel="nofollow"><%=h trackback.title %></a><br/>

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

@@ -1,3 +1,3 @@
 <%= gravatar_tag(@comment.email) if this_blog.use_gravatar and @comment.email %>
 <cite><strong><%=h @comment[:author] %></strong></cite>  <%= _("is about to say")%>:<br />
-<%= simple_format @comment.html %>
+<%= @comment.html %>

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

@@ -1,8 +1,8 @@
 <% for article in @articles -%>
- <div class="post">
-  <%= render :partial => "articles/article", :object => article %>
-  <%= link_to_permalink article, _("Read more") + "..." if article.extended? %>
-  <p class="meta"><%= article_links article %></p>
+  <div class="post">
+    <%= render :partial => "articles/article", :object => article %>
+    <%= link_to_permalink article, _("Read more") + "..." if article.extended? %>
+    <p class="meta"><%= article_links article %></p>
   </div>
 <% end -%>
 

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

@@ -55,7 +55,7 @@
 
 <p class="postmetadata alt">
   <small>
-  <a href="<%= url_for formatted_article_path(@article, :rss) %>" title="RSS Feed"><%= _("RSS feed for this post")%></a>
+  <a href="<%= @article.feed_url(:rss) %>" title="RSS Feed"><%= _("RSS feed for this post")%></a>
 <% if @article.allow_pings? -%>
   <a href="<%= @article.trackback_url %>" ><%= _("trackback uri")%></a>
 <% end -%>

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

@@ -9,13 +9,13 @@
 		<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
 	</head>
 
-	<body>
-	<div id="container">
+    <body>
+      <div id="container">
 
-  	<div id="content">
-      <%= yield %>
-  	</div>
-  </div>
-	</body>
+        <div id="content">
+          <%= yield %>
+        </div>
+      </div>
+    </body>
 </html>
 

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

@@ -5,11 +5,10 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
   <title>Typo Administration:  <%= controller.controller_name %></title>
   <meta http-equiv="imagetoolbar" content="no" />
-  <%= javascript_include_tag :fckeditor if current_user.editor == 2 %>
-  <%= javascript_include_tag 'quicktags' if current_user.editor == 0 %>
-  <%= stylesheet_link_tag "administration", "lightbox" %>
+  <%= stylesheet_link_tag "growler", "administration", "lightbox" %>
   <%= stylesheet_link_tag "administration_rtl" if ( _("Localization.rtl") == "1") %>
-  <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo", "lightbox", "administration" %>
+  <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "administration", :fckeditor %>
+  <%= calendar_date_select_includes %>
 </head>
 
 <body>

data/app/views/xml/feed.rss.builder

@@ -2,6 +2,7 @@ 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
@@ -9,6 +10,8 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
     xml.language "en-us"
     xml.ttl "40"
     xml.description this_blog.blog_subtitle
+    xml.atom :link, :href => @self_url, :rel => "self",
+      :type => "application/rss+xml"
 
     @items.each do |item|
       render :partial => "rss20_item_#{item.class.name.to_s.downcase}",

data/config/environment.rb

@@ -4,16 +4,28 @@
 # (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
+
 # 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 )
 
@@ -49,6 +61,13 @@ Rails::Initializer.run do |config|
   config.gem 'coderay'
   config.gem 'htmlentities'
   config.gem 'json'
+  config.gem 'calendar_date_select'
+
+  # Declare needed (github) gems
+  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)
@@ -89,8 +108,6 @@ end
 # Include your application configuration below
 
 # Load included libraries.
-require 'actionwebservice'
-
 require 'redcloth'
 require 'bluecloth'
 require 'rubypants'
@@ -101,8 +118,6 @@ require 'migrator'
 require 'rails_patch/active_record'
 require 'login_system'
 require 'typo_version'
-require 'metafragment'
-require 'actionparamcache'
 $KCODE = 'u'
 require 'jcode'
 require 'xmlrpc_fix'

data/config/environments/development.rb

@@ -8,7 +8,7 @@ config.whiny_nils        = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+config.action_controller.perform_caching             = true
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/config/routes.rb

@@ -1,47 +1,14 @@
-module ActionController
-  module Resources
-    class InflectedResource < Resource
-      def member_path
-        @member_path ||= "#{singular_path}/:id"
-      end
-
-      def nesting_path_prefix
-        @nesting_path_prefix ||= "#{singular_path}/:#{singular}_id"
-      end
-
-      protected
-      def singular_path
-        @singular_path ||= "#{path_prefix}/#{singular}"
-      end
-    end
-
-    def inflected_resource(*entities, &block)
-      options = entities.last.is_a?(Hash) ? entities.pop : { }
-      entities.each { |entity| map_inflected_resource entity, options.dup, &block }
-    end
-
-    private
-    def map_inflected_resource(entities, options = { }, &block)
-      resource = InflectedResource.new(entities, options)
-
-      with_options :controller => resource.controller do |map|
-        map_collection_actions(map, resource)
-        map_default_collection_actions(map, resource)
-        map_new_actions(map, resource)
-        map_member_actions(map, resource)
-
-        if block_given?
-          with_options(:path_prefix => resource.nesting_path_prefix, &block)
-        end
-      end
-    end
-  end
-end
-
 ActionController::Routing::Routes.draw do |map|
 
   # default
   map.root :controller  => 'articles', :action => 'index'
+
+  # TODO: use only in archive sidebar. See how made other system
+  map.articles_by_month ':year/:month', :controller => 'articles', :action => 'index', :year => /\d{4}/, :month => /\d{1,2}/
+  map.articles_by_month_page ':year/:month/page/:page', :controller => 'articles', :action => 'index', :year => /\d{4}/, :month => /\d{1,2}/
+  map.articles_by_year ':year', :controller => 'articles', :action => 'index', :year => /\d{4}/
+  map.articles_by_year_page ':year/page/:page', :controller => 'articles', :action => 'index', :year => /\d{4}/
+
   map.admin 'admin', :controller  => 'admin/dashboard', :action => 'index'
 
   # make rss feed urls pretty and let them end in .xml
@@ -49,57 +16,48 @@ ActionController::Routing::Routes.draw do |map|
   # cached feeds with the correct xml mime type.
 
   map.xml 'articles.:format', :controller => 'articles', :action => 'index', :format => /rss|atom/
-  map.xml 'xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'
-  map.xml 'xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'
-  map.xml 'xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'
-  map.xml 'xml/trackbackrss/feed.xml', :controller => 'xml', :action => 'trackbackrss'
-
-  map.xml 'xml/:format/feed.xml', :controller => 'xml', :action => 'feed', :type => 'feed'
-  map.xml 'xml/:format/:type/feed.xml', :controller => 'xml', :action => 'feed'
-  map.xml 'xml/:format/:type/:id/feed.xml', :controller => 'xml', :action => 'feed'
-  map.xml 'xml/rss', :controller => 'xml', :action => 'feed', :type => 'feed', :format => 'rss'
-  map.xml 'sitemap.xml', :controller => 'xml', :action => 'feed', :format => 'googlesitemap', :type => 'sitemap'
-
-  map.resources :comments, :name_prefix => 'admin_'
-  map.resources :trackbacks
-  map.resources :users
-
-  map.datestamped_resources(:articles,
-                            :collection => {
-                              :search => :get, :comment_preview => :any,
-                              :archives => :get
-                            },
-                            :member => {
-                              :markup_help => :get
-                            }) do |dated|
-    dated.resources :comments, :new => { :preview => :any }
-    dated.resources :trackbacks
-    dated.connect 'trackbacks', :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}
+  
+  map.with_options :controller => 'xml', :path_prefix => 'xml' do |controller|
+    controller.xml 'itunes/feed.xml', :action => 'itunes'
+    controller.xml 'articlerss/:id/feed.xml', :action => 'articlerss'
+    controller.xml 'commentrss/feed.xml', :action => 'commentrss'
+    controller.xml 'trackbackrss/feed.xml', :action => 'trackbackrss'
+    
+    controller.with_options :action => 'feed' do |action|
+      action.xml 'rss', :type => 'feed', :format => 'rss'
+      action.xml 'sitemap.xml', :format => 'googlesitemap', :type => 'sitemap', :path_prefix => nil
+      action.xml ':format/feed.xml', :type => 'feed'
+      action.xml ':format/:type/feed.xml'
+      action.xml ':format/:type/:id/feed.xml'
+    end
   end
   
+
+  map.resources :comments, :name_prefix => 'admin_', :collection => [:preview]
+  map.resources :trackbacks
+
+  map.live_search_articles '/live_search/', :controller => "articles", :action => "live_search"
+  map.connect '/search/:q.:format', :controller => "articles", :action => "search"
+  map.connect '/search/', :controller => "articles", :action => "search"
+  map.connect '/archives/', :controller => "articles", :action => "archives"
+
+  # I thinks it's useless. More investigating
   map.connect "trackbacks/:id/:day/:month/:year",
     :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}
 
-  # Redirects from old permalinks
-  map.connect "articles/:controler/:name",
-    :controller => 'redirect', :action => 'redirect'
-    map.connect "articles/:controler",
-      :controller => 'redirect', :action => 'redirect'
+  # Before use inflected_resource
+  map.resources :categories, :except => [:show, :update, :destroy, :edit]
+  map.resources :categories, :as => 'category', :only => [:show, :edit, :update, :destroy]
 
-  map.inflected_resource(:categories, :path_prefix => '')
-  map.connect '/category/:id/page/:page',
-  :controller => 'categories', :action => 'show'
-  
-  map.inflected_resource(:authors, :path_prefix => '')
+  map.connect '/category/:id/page/:page', :controller => 'categories', :action => 'show'
   
-  map.inflected_resource(:tags, :path_prefix => '')
-  map.connect '/tag/:id/page/:page',
-    :controller => 'tags', :action => 'show'
-  map.connect '/tags/page/:page', 
-    :controller => 'tags', :action => 'index'
-  
-  map.resources(:feedback)
+  # Before use inflected_resource
+  map.resources :tags, :except => [:show, :update, :destroy, :edit]
+  map.resources :tags, :as => 'tag', :only => [:show, :edit, :update, :destroy]
 
+  map.connect '/tag/:id/page/:page', :controller => 'tags', :action => 'show'
+  map.connect '/tags/page/:page', :controller => 'tags', :action => 'index'
+  
   # allow neat perma urls
   map.connect 'page/:page',
     :controller => 'articles', :action => 'index',
@@ -108,22 +66,6 @@ ActionController::Routing::Routes.draw do |map|
   date_options = { :year => /\d{4}/, :month => /(?:0?[1-9]|1[012])/, :day => /(?:0[1-9]|[12]\d|3[01])/ }
 
   map.with_options(:conditions => {:method => :get}) do |get|
-    get.with_options(date_options.merge(:controller => 'articles')) do |dated|
-      dated.with_options(:action => 'index') do |finder|
-        # new URL
-        finder.connect ':year/page/:page',
-          :month => nil, :day => nil, :page => /\d+/
-        finder.connect ':year/:month/page/:page',
-          :day => nil, :page => /\d+/
-        finder.connect ':year/:month/:day/page/:page', :page => /\d+/
-        finder.connect ':year',
-          :month => nil, :day => nil
-          finder.connect ':year/:month',
-            :day => nil
-          finder.connect ':year/:month/:day', :page => nil
-      end
-    end
-
     get.connect 'pages/*name',:controller => 'articles', :action => 'view_page'
 
     get.with_options(:controller => 'theme', :filename => /.*/, :conditions => {:method => :get}) do |theme|
@@ -140,7 +82,7 @@ ActionController::Routing::Routes.draw do |map|
   end
 
   # Work around the Bad URI bug
-  %w{ accounts articles backend files live sidebar textfilter xml }.each do |i|
+  %w{ accounts backend files sidebar textfilter xml }.each do |i|
     map.connect "#{i}", :controller => "#{i}", :action => 'index'
     map.connect "#{i}/:action", :controller => "#{i}"
     map.connect "#{i}/:action/:id", :controller => i, :id => nil