typo 5.4.3 → 5.4.4

data/test/fixtures/users.yml

@@ -1,4 +1,5 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+# NOTE: passwords are valid when User.salt == 'change-me'.
 
 tobi:
   login: tobi

data/vendor/plugins/upload_progress/lib/upload_progress_helper.rb

@@ -293,7 +293,7 @@ module UploadProgress
     #   .uploadStatus { font-size: 10px; color: grey; }
     #
     def upload_status_text_tag(content=nil, options={})
-      content_tag("div", content, {:id => status_tag_id, :class => 'uploadStatus'}.merge(options))
+      content_tag("div", content, {:id => status_tag_id, :class => 'uploadStatus ui-progressbar-value ui-widget-header ui-corner-left'}.merge(options))
     end
 
     # Content helper that will create the element tree that can be easily styled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 5.4.3
+  version: 5.4.4
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,7 +137,6 @@ files:
 - app/apis/typo_web_service.rb
 - app/controllers/accounts_controller.rb
 - app/controllers/admin/base_controller.rb
-- app/controllers/admin/blacklist_controller.rb
 - app/controllers/admin/cache_controller.rb
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/content_controller.rb
@@ -161,6 +160,7 @@ files:
 - app/controllers/content_controller.rb
 - app/controllers/feedback_controller.rb
 - app/controllers/grouping_controller.rb
+- app/controllers/setup_controller.rb
 - app/controllers/tags_controller.rb
 - app/controllers/textfilter_controller.rb
 - app/controllers/theme_controller.rb
@@ -168,8 +168,8 @@ files:
 - app/controllers/xml_controller.rb
 - app/helpers/accounts_helper.rb
 - app/helpers/admin/base_helper.rb
-- app/helpers/admin/blacklist_helper.rb
 - app/helpers/admin/cache_helper.rb
+- app/helpers/admin/categories_helper.rb
 - app/helpers/admin/comments_helper.rb
 - app/helpers/admin/content_helper.rb
 - app/helpers/admin/feedback_helper.rb
@@ -200,7 +200,6 @@ files:
 - app/helpers/xml_helper.rb
 - app/models/article/states.rb
 - app/models/article.rb
-- app/models/blacklist_pattern.rb
 - app/models/blog.rb
 - app/models/blog_sweeper.rb
 - app/models/cache_information.rb
@@ -233,14 +232,6 @@ files:
 - app/views/accounts/login.html.erb
 - app/views/accounts/recover_password.html.erb
 - app/views/accounts/signup.html.erb
-- app/views/admin/base/_recent_comments.html.erb
-- app/views/admin/base/_recent_trackbacks.html.erb
-- app/views/admin/blacklist/_blacklist_patterns.html.erb
-- app/views/admin/blacklist/_form.html.erb
-- app/views/admin/blacklist/_quick_post.html.erb
-- app/views/admin/blacklist/destroy.html.erb
-- app/views/admin/blacklist/edit.html.erb
-- app/views/admin/blacklist/index.html.erb
 - app/views/admin/categories/_categories.html.erb
 - app/views/admin/categories/_form.html.erb
 - app/views/admin/categories/destroy.html.erb
@@ -263,7 +254,6 @@ files:
 - app/views/admin/dashboard/_overview.html.erb
 - app/views/admin/dashboard/_popular.html.erb
 - app/views/admin/dashboard/_posts.html.erb
-- app/views/admin/dashboard/_sysinfo.html.erb
 - app/views/admin/dashboard/_typo_dev.html.erb
 - app/views/admin/dashboard/_welcome.html.erb
 - app/views/admin/dashboard/index.html.erb
@@ -283,10 +273,6 @@ files:
 - app/views/admin/pages/new.html.erb
 - app/views/admin/pages/show.html.erb
 - app/views/admin/profiles/index.html.erb
-- app/views/admin/resources/_itunes_category_add.html.erb
-- app/views/admin/resources/_itunes_category_edit.html.erb
-- app/views/admin/resources/_metadata_add.html.erb
-- app/views/admin/resources/_metadata_edit.html.erb
 - app/views/admin/resources/_mime_edit.html.erb
 - app/views/admin/resources/_pages.html.erb
 - app/views/admin/resources/_upload.html.erb
@@ -346,6 +332,7 @@ files:
 - app/views/comments/show.html.erb
 - app/views/layouts/accounts.html.erb
 - app/views/layouts/administration.html.erb
+- app/views/layouts/setup.html.erb
 - app/views/layouts/sidebar.html.erb
 - app/views/notification_mailer/_mail_footer.html.erb
 - app/views/notification_mailer/_mail_header.html.erb
@@ -355,6 +342,9 @@ files:
 - app/views/notification_mailer/trackback.html.erb
 - app/views/settings/done.html.erb
 - app/views/settings/install.html.erb
+- app/views/setup/confirm.html.erb
+- app/views/setup/index.html.erb
+- app/views/shared/_confirm.html.erb
 - app/views/shared/_search.html.erb
 - app/views/sidebar/_row.html.erb
 - app/views/sidebar/_sidebar.html.erb
@@ -391,7 +381,6 @@ files:
 - config/initializers/access_rules.rb
 - config/initializers/inflector.rb
 - config/initializers/mime_types.rb
-- config/iTunes.yml
 - config/lighttpd.conf
 - config/locales/nl.rb
 - config/mail.yml.example
@@ -488,6 +477,8 @@ files:
 - db/migrate/084_move_users_to_profiles.rb
 - db/migrate/085_add_article_parent_draft.rb
 - db/migrate/086_add_user_last_connection.rb
+- db/migrate/087_drop_blacklist_patterns.rb
+- db/migrate/088_drop_session_table.rb
 - db/schema.mysql-v3.sql
 - db/schema.mysql.sql
 - db/schema.postgresql.sql
@@ -497,7 +488,6 @@ 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
@@ -554,22 +544,22 @@ files:
 - public/dispatch.fcgi
 - public/dispatch.rb
 - public/favicon.ico
-- public/images/admin/blue_block_bottom_left.jpg
-- public/images/admin/blue_block_bottom_right.jpg
-- public/images/admin/blue_block_top_left.jpg
-- public/images/admin/blue_block_top_right.jpg
-- public/images/admin/editor_active_top_left.jpg
-- public/images/admin/editor_active_top_right.jpg
-- public/images/admin/editor_bottom_left.jpg
-- public/images/admin/editor_bottom_right.jpg
-- public/images/admin/input_text_left.jpg
-- public/images/admin/input_text_right.jpg
-- public/images/admin/input_text_small_left.jpg
-- public/images/admin/input_text_small_right.jpg
 - public/images/admin/loading.gif
-- public/images/admin/publisher_bottom.jpg
-- public/images/admin/publisher_top.jpg
 - public/images/admin/typologo.gif
+- public/images/admin/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+- public/images/admin/ui-bg_flat_15_cd0a0a_40x100.png
+- public/images/admin/ui-bg_glass_100_e4f1fb_1x400.png
+- public/images/admin/ui-bg_glass_80_d7ebf9_1x400.png
+- public/images/admin/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+- public/images/admin/ui-bg_highlight-hard_70_000000_1x100.png
+- public/images/admin/ui-bg_highlight-soft_100_deedf7_1x100.png
+- public/images/admin/ui-bg_highlight-soft_25_ffef8f_1x100.png
+- public/images/admin/ui-bg_highlight-soft_50_116088_1x100.png
+- public/images/admin/ui-icons_2694e8_256x240.png
+- public/images/admin/ui-icons_2e83ff_256x240.png
+- public/images/admin/ui-icons_3d80b3_256x240.png
+- public/images/admin/ui-icons_72a7cf_256x240.png
+- public/images/admin/ui-icons_ffffff_256x240.png
 - public/images/calendar_date_select/calendar.gif
 - public/images/close.gif
 - public/images/closelabel.gif
@@ -866,10 +856,10 @@ files:
 - public/javascripts/typo.js
 - public/javascripts/typo_carousel.js
 - public/robots.txt
+- public/stylesheets/accounts.css
 - public/stylesheets/administration.css
 - public/stylesheets/administration_rtl.css
 - public/stylesheets/base_packaged.css
-- public/stylesheets/border-radius-ie8.htc
 - public/stylesheets/calendar_date_select/default.css
 - public/stylesheets/codecollapse.css
 - public/stylesheets/coderay.css
@@ -902,7 +892,6 @@ files:
 - script/spacecheck
 - script/spec
 - spec/controllers/accounts_controller_spec.rb
-- spec/controllers/admin/blacklist_controller_spec.rb
 - spec/controllers/admin/cache_controller_spec.rb
 - spec/controllers/admin/categories_controller_spec.rb
 - spec/controllers/admin/content_controller_spec.rb
@@ -924,6 +913,7 @@ files:
 - spec/controllers/comments_controller_spec.rb
 - spec/controllers/routes/articles_routing_spec.rb
 - spec/controllers/routes/xml_routing_spec.rb
+- spec/controllers/setup_controller_spec.rb
 - spec/controllers/tags_controller_spec.rb
 - spec/controllers/textfilter_controller_spec.rb
 - spec/controllers/theme_controller_spec.rb
@@ -935,7 +925,6 @@ files:
 - spec/models/amazon_sidebar_spec.rb
 - spec/models/article_closing_spec.rb
 - spec/models/article_spec.rb
-- spec/models/blacklist_pattern_spec.rb
 - spec/models/blog_spec.rb
 - spec/models/cache_information_spec.rb
 - spec/models/cache_support_spec.rb
@@ -965,7 +954,6 @@ files:
 - spec/views/articles/index_spec.rb
 - spec/views/articles/read_spec.rb
 - spec/views/comments/html_sanitization_spec.rb
-- test/fixtures/blacklist_patterns.yml
 - test/fixtures/blogs.yml
 - test/fixtures/categories.yml
 - test/fixtures/categorizations.yml

data/app/controllers/admin/blacklist_controller.rb

@@ -1,47 +0,0 @@
-class Admin::BlacklistController < Admin::BaseController
-  def index
-    @blacklist_patterns = BlacklistPattern.paginate :page => params[:page], :order => 'pattern ASC', :per_page => this_blog.admin_display_elements
-  end
-
-  def new
-    @blacklist_pattern = BlacklistPattern.new
-
-    if params[:blacklist_pattern].has_key?('type')
-      @blacklist_pattern = case params[:blacklist_pattern][:type]
-        when "StringPattern": StringPattern.new
-        when "RegexPattern": RegexPattern.new
-      end
-    end rescue nil
-
-    @blacklist_pattern.attributes = params[:blacklist_pattern]
-
-    if request.post? and @blacklist_pattern.save
-      flash[:notice] = _('Blacklist Pattern was successfully created.')
-    else
-      flash[:error] = _('Blacklist Pattern could not be created.')
-    end
-    redirect_to :action => 'index'
-  end
-
-  def edit
-    @blacklist_pattern = BlacklistPattern.find(params[:id])
-    @blacklist_pattern.attributes = params[:blacklist_pattern]
-    if request.post? 
-      if @blacklist_pattern.save
-        flash[:notice] = _('BlacklistPattern was successfully updated.')
-      else
-        flash[:error] = _('Blacklist Pattern could not be updated.')
-      end
-      redirect_to :action => 'index'
-    end
-  end
-
-  def destroy
-    @blacklist_pattern = BlacklistPattern.find(params[:id])
-    if request.post?
-      @blacklist_pattern.destroy
-      redirect_to :action => 'index'
-    end
-  end
-
-end

data/app/helpers/admin/blacklist_helper.rb

@@ -1,2 +0,0 @@
-module Admin::BlacklistHelper
-end

data/app/models/blacklist_pattern.rb

@@ -1,24 +0,0 @@
-class BlacklistPattern < ActiveRecord::Base
-end
-
-class RegexPattern < BlacklistPattern
-  validates_presence_of :pattern
-  def matches?(string)
-    string.match(/#{pattern}/)
-  end
-
-  def to_s
-    "Regex /#{pattern}/"
-  end
-end
-
-class StringPattern < BlacklistPattern
-  validates_presence_of :pattern
-  def matches?(string)
-    string.match(/\b#{Regexp.quote(pattern)}\b/)
-  end
-
-  def to_s
-    "String '#{pattern}'"
-  end
-end

data/app/views/admin/base/_recent_comments.html.erb

@@ -1,10 +0,0 @@
-<h2><%= _("Recent comments")%></h2>
-<ul class="recent">
-<% for comment in Comment.find(:all, :limit => 5, :order => 'id DESC' ) %>
-  <li>
-  <h4><%= truncate(comment.author, :length => 20) %></h4>
-  <div><%= link_to truncate(comment.body, :length => 20), :controller => "/admin/comments", :action => "show", :id => comment.id, :article_id => comment.article_id %></div>
-    <p class="right"><%= time_ago_in_words(comment.created_at) %> ago</p>
-  </li>
-<% end %>
-</ul>

data/app/views/admin/base/_recent_trackbacks.html.erb

@@ -1,10 +0,0 @@
-<h2><%=_("Recent trackbacks")%></h2>
-<ul class="recent">
-<% for trackback in Trackback.find(:all, :limit => 5, :order => 'id DESC' ) %>
-  <li>
-  <%= link_to truncate(trackback.excerpt, :length => 20), :controller => "/admin/trackbacks", :action => "show", :id => trackback.id, :article_id => trackback.article_id %><br />
-  by <%= truncate(trackback.blog_name, :length => 20) %><br />
-    <%= time_ago_in_words(trackback.created_at) %> ago
-  </li>
-<% end %>
-</ul>

data/app/views/admin/blacklist/_blacklist_patterns.html.erb

@@ -1,16 +0,0 @@
-<table cellspacing="1" cellpadding="0">
-  <tr>
-    <th><%= _("Pattern") %></th>
-    <th><%= _("Type") %></th>
-    <th><%= _("Delete")%></th>
-  </tr>
-  <%= render_void_table(@blacklist_patterns.size, 3)  %>
-  <% for blacklist_pattern in @blacklist_patterns -%>
-  <tr <%= alternate_class -%>>  
-    <td><%= link_to h(blacklist_pattern.pattern), :action => "edit", :id => blacklist_pattern.id %></td>
-    <td><%= blacklist_pattern.class %></td>
-    <td><%= link_to _("Delete"), :action => 'destroy',  :id => blacklist_pattern.id %></td>
-  </tr>  
-<% end -%>
-<%= display_pagination(@blacklist_patterns, 3)%>
-</table>

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

@@ -1,14 +0,0 @@
-<%= error_messages_for 'blacklist_pattern' %>
-
-<ul class="admin">
-  <li>
-    <label for="blacklist_pattern_pattern" class="block"><%= _("Pattern")%></label> 
-    <%= text_field :blacklist_pattern, :pattern  %>    
-  </li>
-  <li>  
-    <label for="blacklist_pattern_type" class="block"><%= _("Type")%></label>
-    <select name="blacklist_pattern[type]">
-    <%= options_for_select [ [_('String'), 'StringPattern'], [_('Regex'), 'RegexPattern' ] ]  %>
-  </select>
-  </li>
-</ul>

data/app/views/admin/blacklist/_quick_post.html.erb

@@ -1,9 +0,0 @@
-<% form_tag :action=>"new" do %>
-
-  <%= render :partial => "form" %>
-
-  <p class="paginate r">
-    <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >
-    <%= _("Cancel")%></a> <%= _("or")%> <%= save(_("Save") + "&raquo;") %> 
-  </p>
-<% end %>

data/app/views/admin/blacklist/destroy.html.erb

@@ -1,10 +0,0 @@
-<% @page_heading = _('Blacklist Patterns') %>
-
-<% content_for('tasks') do %>
-  <%= task_overview %>
-<% end %>
-
-<p><%= _("Are you sure you want to delete this item?")%></p>
-<% form_tag :action => "destroy", :id => @blacklist_pattern.id do %>
-  <%= confirm_delete %>
-<% end %>

data/app/views/admin/blacklist/edit.html.erb

@@ -1,10 +0,0 @@
-<% @page_heading = _('Editing pattern') %>
-
-<% content_for('tasks') do %>
-    <%= task_overview %>
-<% end %>
-  
-<% form_tag :action=>"edit", :id => @blacklist_pattern.id do %>
-  <%= render :partial => "form" %>
-  <%= cancel_or_save %>
-<% end %>

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

@@ -1,10 +0,0 @@
-  <% @page_heading = _('Blacklist Patterns') + ' <span>&raquo; ' + task_quickpost(_('add new') + '</span>')  %>
-  <% subtabs_for(:settings) %>
-  
-  <div id="quick-post" style="display:none;position:absolute;">
-    <%= render :partial => "quick_post" %>
-  </div>
-
-  <div class="list">	
-    <%= render :partial => 'blacklist_patterns' %>  
-  </div>                      

data/app/views/admin/dashboard/_sysinfo.html.erb

@@ -1,11 +0,0 @@
-<div class="bordered">
-  <h3><%= _("About your blog") %></h3>
-
-  <p><%= _("You're running Typo %s", TYPO_VERSION) %></p>
-  <ul> 
-    <li> <%= _("Total posts : %d", @statposts) %></li>
-    <li> <%= _("Your posts : %d" , @statuserposts) %></li>
-    <li> <%= _("Total comments : %d" , @statcomments) %></li>
-    <li> <%= _("Spam comments : %d" , @statspam) %></li>
-  </ul>
-</div>

data/app/views/admin/resources/_itunes_category_add.html.erb

@@ -1,11 +0,0 @@
-<select name="itunes_category[]" id="resource_itunes_category_<%= id %>" size="3" multiple="multiple">
-  <% @itunes_category_list.each do |pcat| -%>
-    <% pcat.each_pair do |cat,subcats| -%>
-    <% #not a great way of handling this but it looks better -%>
-        <option value="<%=h cat %>"><%=h cat %></option>
-      <% subcats.each do |subcat|  -%>
-        <option value="<%=h cat %>-<%=h subcat %>">&nbsp;-<%=h subcat %></option>
-      <% end unless subcats.nil?  -%>
-    <% end -%>
-  <% end -%>
-</select>

data/app/views/admin/resources/_itunes_category_edit.html.erb

@@ -1,32 +0,0 @@
-<%
-#Since the data is in yaml coming out of the DB it is converted here from
-#comparision. This is  a hack to get things working.
-unless categories.nil?
-  selected = YAML::load(categories)
-else
-  selected = Hash.new
-end
--%>
-<select name="itunes_category[]" id="resource_itunes_category_<%= id %>" size="3" multiple="multiple">
-  <% @itunes_category_list.each do |h|
-    h.each_pair do |cat,subcats| -%>
-    <% # not a great way of handling this but it looks better -%>
-      <% if selected.key?(cat)  -%>
-        <option value="<%=h cat %>" selected="selected"><%=h cat %></option>
-      <% else -%>
-        <option value="<%=h cat %>"><%=h cat %></option>
-      <% end -%>
-      <% subcats.each do |subcat| -%>
-        <% unless selected[cat].nil? -%>
-          <% if selected[cat].include?(subcat) -%>
-            <option value="<%=h cat %>-<%=h subcat %>" selected="selected">&nbsp;-<%=h subcat %></option>
-          <% else -%>
-            <option value="<%=h cat %>-<%=h subcat %>">&nbsp;-<%=h subcat %></option>
-          <% end -%>
-        <% else -%>
-          <option value="<%=h cat %>-<%=h subcat %>">&nbsp;-<%=h subcat %></option>
-        <% end -%>
-      <% end unless subcats.nil?  %>
-    <% end -%>
-  <% end -%>
-</select>