RubyGems - typo - Versions diffs - 4.1 → 4.1.1 - Mend

typo 4.1 → 4.1.1

Files changed (251) hide show

data/app/views/layouts/administration.rhtml CHANGED Viewed

@@ -5,6 +5,8 @@
                 <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_tiny_mce_if_used if this_blog.editor == 2 and (controller.action_name == 'new' or controller.action_name == 'edit') %>
+				<%= tiny_mce if this_blog.editor == 2 and (controller.action_name == 'new' or controller.action_name == 'edit') %>
                 <%= stylesheet_link_tag "administration.css" %>
                 <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo" %>
         </head>
@@ -29,10 +31,11 @@
           <ul id="tabs">
             <%= tab _("Publish"), :controller=>"/admin/content", :action => 'new' %>
             <%= tab _("Manage"), :controller=>"/admin/content/list", :action => 'index' %>
-            <%= tab _("Discuss"), :controller=>"/admin/feedback", :action => 'index' %>
-            <%= tab _("Design"), :controller=>"/admin/themes", :action => 'index' %>
+            <%= tab _("Feedback"), :controller=>"/admin/feedback", :action => 'index' %>
+            <%= tab _("Design"), :controller=>"/admin/sidebar", :action => 'index' %>
             <%= tab _("Users"), :controller=>"/admin/users", :action => 'index' %>
             <%= tab _("Settings"), :controller=>"/admin/", :action => 'index' %>
+            <%= tab _("Statistics"), :controller=>"/stats", :action => 'index' %>
           </ul>
         </div>

data/app/views/layouts/minimal.rhtml CHANGED Viewed

@@ -2,8 +2,140 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <%= page_header %>
-  <%= stylesheet_link_tag "/stylesheets/minimal", :media => 'all' %>
-  <%= stylesheet_link_tag "/stylesheets/user-styles", :media => 'all' %>
+  <style type="text/css">
+/* Stuff cherry-picked from azure.css */
+body {
+  font: 1em/1.2em Arial, Verdana, Helvetica, sans-serif;
+}
+#main {
+  margin: 0;
+  padding: 0;
+  font-size: 80%;
+  background: #fff;
+}
+a {
+  color: #5189b5;
+  text-decoration: none;
+  border-bottom: 1px dotted #5189b5;
+}
+a:hover { color: #85ab02; border-bottom-color: #85ab02; }
+h1, h2, h3, h4, h5, h6 {
+  margin: 0;
+  padding: 0;
+}
+form, div { padding: 0; margin: 0; }
+p { margin: 0 0 1em 0; padding: 0; }
+img { border: 0; }
+.post h2 {
+  font: normal 140%/1.3em Arial, Verdana, Helvetica, sans-serif;
+}
+.post h2 a {
+  color: #5189b5;
+  text-decoration: none;
+  border: none;
+}
+.post h2 a:hover {
+  color: #85ab02;
+}
+p.meta {
+  font-size: 75%;
+  text-align: right;
+  margin-right: 5px;
+}
+p.auth {
+  padding: 0 0 0 12px;
+  font-size: 85%;
+  margin-left: 10px;
+  font-weight: bold;
+  color: #9a9a9b;
+  background: url(../images/bracket.gif) no-repeat;
+}
+/*+-------------------------------------------+
+|                    MISC                                 |
++-------------------------------------------+*/
+a[name] { border: none; }
+/* Syntax highlighting */
+.typocode_ruby .normal {}
+.typocode_ruby .comment { color: #005; font-style: italic; }
+.typocode_ruby .keyword { color: #A00; font-weight: bold; }
+.typocode_ruby .method { color: #077; }
+.typocode_ruby .class { color: #074; }
+.typocode_ruby .module { color: #050; }
+.typocode_ruby .punct { color: #447; font-weight: bold; }
+.typocode_ruby .symbol { color: #099; }
+.typocode_ruby .string { color: #944; background: #FFE; }
+.typocode_ruby .char { color: #F07; }
+.typocode_ruby .ident { color: #004; }
+.typocode_ruby .constant { color: #07F; }
+.typocode_ruby .regex { color: #B66; background: #FEF; }
+.typocode_ruby .number { color: #F99; }
+.typocode_ruby .attribute { color: #7BB; }
+.typocode_ruby .global { color: #7FB; }
+.typocode_ruby .expr { color: #227; }
+.typocode_ruby .escape { color: #277; }
+.typocode_xml .normal {}
+.typocode_xml .namespace { color: #B66; font-weight: bold; }
+.typocode_xml .tag { color: #F88; }
+.typocode_xml .comment { color: #005; font-style: italic; }
+.typocode_xml .punct { color: #447; font-weight: bold; }
+.typocode_xml .string { color: #944; }
+.typocode_xml .number { color: #F99; }
+.typocode_xml .attribute { color: #BB7; }
+.typocode_yaml .normal {}
+.typocode_yaml .document { font-weight: bold; color: #07F; }
+.typocode_yaml .type { font-weight: bold; color: #05C; }
+.typocode_yaml .key { color: #F88; }
+.typocode_yaml .comment { color: #005; font-style: italic; }
+.typocode_yaml .punct { color: #447; font-weight: bold; }
+.typocode_yaml .string { color: #944; }
+.typocode_yaml .number { color: #F99; }
+.typocode_yaml .time { color: #F99; }
+.typocode_yaml .date { color: #F99; }
+.typocode_yaml .ref { color: #944; }
+.typocode_yaml .anchor { color: #944; }
+.typocode {
+  background-color:#eee;
+  padding:2px;
+  margin:5px;
+  margin-left:1em;
+  margin-bottom:1em;
+}
+.typocode pre {
+  padding: 0px;
+  margin: 0px;
+  background: transparent;
+  font-family: monospace;
+  overflow:auto;
+}
+.typocode .lineno {
+  text-align: right;
+  /*  color: #B00;*/
+  font-family: monospace;
+  padding-right: 1em;
+}
+code {
+  font-size:120%;
+}
+  </style>
 </head>
 <body>
 	<div id="main">

data/config/boot.rb CHANGED Viewed

@@ -36,7 +36,7 @@ unless defined?(Rails::Initializer)
         exit 1
       end
     else
-      require_gem "rails"
+      gem "rails"
       require 'initializer'
     end
   end

data/config/environment.rb CHANGED Viewed

@@ -16,11 +16,19 @@ Rails::Initializer.run do |config|
   # I need the localization plugin to load first
   # Otherwise, I can't localize plugins <= localization
-  config.plugins = [ 'localization' ]
+  # Forcing manually the load of the textfilters plugins fixes the bugs with apache in production.
+  config.plugins = [ 'localization',
+    'typo_textfilter_flickr',
+    'typo_textfilter_tmcode',
+    'typo_textfilter_sparkline',
+    'typo_textfilter_lightbox',
+    'typo_textfilter_amazon' ]
   Dir.entries("#{RAILS_ROOT}/vendor/plugins/").each { |dir|
-    config.plugins.push("#{dir}") if File.directory?("#{RAILS_ROOT}/vendor/plugins/#{dir}/lib")
+    config.plugins.push("#{dir}") if (File.directory?("#{RAILS_ROOT}/vendor/plugins/#{dir}/lib")  or File.exist?("#{RAILS_ROOT}/vendor/plugins/#{dir}/init.rb"))
   }
   config.load_paths += %W(
     vendor/rubypants
     vendor/akismet
@@ -153,4 +161,4 @@ CachedModel.use_local_cache = true
 CachedModel.use_memcache = false
 # Uncomment this to choose your blog's language
-#Localization.lang = 'fr_FR'
+# Localization.lang = 'fr_FR'

data/config/environments/test.rb CHANGED Viewed

@@ -16,11 +16,4 @@ config.action_controller.perform_caching             = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
-# Overwrite the default settings for fixtures in tests. See Fixtures
-# for more details about these settings.
-#config.transactional_fixtures = true
-#config.instantiated_fixtures = false
-#onfig.pre_loaded_fixtures = false
 Migrator.offer_migration_when_available            = false

data/config/routes.rb CHANGED Viewed

@@ -83,6 +83,9 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'plugins/filters/:filter/:public_action',
     :controller => 'textfilter', :action => 'public_action'
+  # Stats plugin
+  map.connect '/stats/:action', :controller => 'sitealizer'
   # Work around the Bad URI bug
   %w{ accounts articles backend files live sidebar textfilter xml }.each do |i|
     map.connect "#{i}", :controller => "#{i}", :action => 'index'

data/db/migrate/004_add_sidebars.rb CHANGED Viewed

@@ -19,9 +19,25 @@ class AddSidebars < ActiveRecord::Migration
         t.column :staged_config, :text
       end
-      Bare4Sidebar.create(:active_position=>0, :controller=>'category')
-      Bare4Sidebar.create(:active_position=>1, :controller=>'static')
-      Bare4Sidebar.create(:active_position=>2, :controller=>'xml')
+      Bare4Sidebar.create(:active_position=>0, :controller=>'category', :active_config=>'--- !map:HashWithIndifferentAccess
+      empty: false
+      count: true')
+      Bare4Sidebar.create(:active_position=>1, :controller=>'static', :active_config=>'--- !map:HashWithIndifferentAccess
+      title: Links
+      body: |+
+        <ul>
+          <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li>
+          <li><a href="http://scottstuff.net" title="Scottstuff">scottstuff.net</a></li>
+          <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li>
+          <li><a href="http://kevin.sb.org/">Kevin Ballard</a></li>
+          <li><a href="http://fredericdevillamil.com">Frédéric de Villamil</a></li>
+          <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li>
+        </ul>')
+      Bare4Sidebar.create(:active_position=>2, :controller=>'xml', :active_config=>'--- !map:HashWithIndifferentAccess
+      format: rss20
+      trackbacks: true
+      comments: true
+      articles: true')
     end
   end
@@ -29,3 +45,5 @@ class AddSidebars < ActiveRecord::Migration
     drop_table :sidebars
   end
 end

data/db/migrate/056_create_notifications.rb CHANGED Viewed

@@ -6,7 +6,7 @@ class CreateNotifications < ActiveRecord::Migration
   end
   def self.up
-   rename_table :notifications, :old_notifications
+    rename_table :notifications, :old_notifications
     create_table :notifications do |t|
       t.column :content_id, :integer
       t.column :user_id, :integer

data/db/migrate/062_add_sitealizer_plugin.rb ADDED Viewed

@@ -0,0 +1,18 @@
+class AddSitealizerPlugin < ActiveRecord::Migration
+  def self.up
+    create_table :sitealizer do |t|
+      t.column :path,           :string
+      t.column :ip,             :string
+      t.column :referer,        :string
+      t.column :language,       :string
+      t.column :user_agent,     :string
+      t.column :created_at,     :datetime
+      t.column :created_on,     :date
+    end
+  end
+  def self.down
+    drop_table :sitealizer
+  end
+end

data/db/schema.mysql-v3.sql ADDED Viewed

@@ -0,0 +1,217 @@
+-- This file is autogenerated by the Rail schema generator, using
+-- the schema defined in db/migration/*.rb
+--
+-- Do not edit this file.  Instead, add a new migration using
+-- ./script/generate migration <name>, and then run
+-- ./script/generate schema
+-- tables
+CREATE TABLE articles_categories (
+  `article_id` int(11),
+  `category_id` int(11),
+  `is_primary` int(11)
+) TYPE=MyISAM;
+CREATE TABLE articles_tags (
+  `article_id` int(11),
+  `tag_id` int(11)
+) TYPE=MyISAM;
+CREATE TABLE blacklist_patterns (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `type` varchar(255),
+  `pattern` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE blogs (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `settings` text,
+  `base_url` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE categories (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `name` varchar(255),
+  `position` int(11),
+  `permalink` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE contents (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `type` varchar(255),
+  `title` varchar(255),
+  `author` varchar(255),
+  `body` text,
+  `extended` text,
+  `excerpt` text,
+  `keywords` varchar(255),
+  `created_at` datetime,
+  `updated_at` datetime,
+  `user_id` int(11),
+  `permalink` varchar(255),
+  `guid` varchar(255),
+  `text_filter_id` int(11),
+  `whiteboard` text,
+  `article_id` int(11),
+  `email` varchar(255),
+  `url` varchar(255),
+  `ip` varchar(40),
+  `blog_name` varchar(255),
+  `name` varchar(255),
+  `published` tinyint(1) DEFAULT 0,
+  `allow_pings` tinyint(1),
+  `allow_comments` tinyint(1),
+  `blog_id` int(11) NOT NULL,
+  `published_at` datetime,
+  `state` text,
+  `status_confirmed` tinyint(1)
+) TYPE=MyISAM;
+CREATE TABLE notifications (
+  `notify_user_id` int(11),
+  `notify_content_id` int(11),
+  `created_at` datetime,
+  `updated_at` datetime
+) TYPE=MyISAM;
+CREATE TABLE page_caches (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `name` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE pings (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `article_id` int(11),
+  `url` varchar(255),
+  `created_at` datetime
+) TYPE=MyISAM;
+CREATE TABLE redirects (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `from_path` varchar(255),
+  `to_path` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE resources (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `size` int(11),
+  `filename` varchar(255),
+  `mime` varchar(255),
+  `created_at` datetime,
+  `updated_at` datetime,
+  `article_id` int(11),
+  `itunes_metadata` tinyint(1),
+  `itunes_author` varchar(255),
+  `itunes_subtitle` varchar(255),
+  `itunes_duration` int(11),
+  `itunes_summary` text,
+  `itunes_keywords` varchar(255),
+  `itunes_category` varchar(255),
+  `itunes_explicit` tinyint(1)
+) TYPE=MyISAM;
+CREATE TABLE sessions (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `sessid` varchar(255),
+  `data` text,
+  `created_at` datetime,
+  `updated_at` datetime
+) TYPE=MyISAM;
+CREATE TABLE sidebars (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `controller` varchar(255),
+  `active_position` int(11),
+  `config` text,
+  `staged_position` int(11)
+) TYPE=MyISAM;
+CREATE TABLE tags (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `name` varchar(255),
+  `created_at` datetime,
+  `updated_at` datetime,
+  `display_name` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE text_filters (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `name` varchar(255),
+  `description` varchar(255),
+  `markup` varchar(255),
+  `filters` text,
+  `params` text
+) TYPE=MyISAM;
+CREATE TABLE triggers (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `pending_item_id` int(11),
+  `pending_item_type` varchar(255),
+  `due_at` datetime,
+  `trigger_method` varchar(255)
+) TYPE=MyISAM;
+CREATE TABLE users (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `login` varchar(255),
+  `password` varchar(255),
+  `email` text,
+  `name` text,
+  `notify_via_email` tinyint(1),
+  `notify_on_new_articles` tinyint(1),
+  `notify_on_comments` tinyint(1),
+  `notify_watch_my_articles` tinyint(1),
+  `notify_via_jabber` tinyint(1),
+  `jabber` varchar(255)
+) TYPE=MyISAM;
+-- indexes
+CREATE  INDEX `blacklist_patterns_pattern_index` ON blacklist_patterns (`pattern`);
+CREATE  INDEX `categories_permalink_index` ON categories (`permalink`);
+CREATE  INDEX `contents_blog_id_index` ON contents (`blog_id`);
+CREATE  INDEX `contents_article_id_index` ON contents (`article_id`);
+CREATE  INDEX `page_caches_name_index` ON page_caches (`name`);
+CREATE  INDEX `pings_article_id_index` ON pings (`article_id`);
+CREATE  INDEX `sessions_sessid_index` ON sessions (`sessid`);
+-- data
+INSERT INTO sidebars (`config`, `staged_position`, `active_position`, `controller`) VALUES(NULL, NULL, 0, 'category');
+INSERT INTO sidebars (`config`, `staged_position`, `active_position`, `controller`) VALUES(NULL, NULL, 1, 'static');
+INSERT INTO sidebars (`config`, `staged_position`, `active_position`, `controller`) VALUES(NULL, NULL, 2, 'xml');
+INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('none', '--- []
+', 'None', '--- {}
+', 'none');
+INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('markdown', '--- []
+', 'Markdown', '--- {}
+', 'markdown');
+INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('smartypants', '---
+- :smartypants
+', 'SmartyPants', '--- {}
+', 'none');
+INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('markdown smartypants', '---
+- :smartypants
+', 'Markdown with SmartyPants', '--- {}
+', 'markdown');
+INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('textile', '--- []
+', 'Textile', '--- {}
+', 'textile');
+-- schema version meta-info
+CREATE TABLE schema_info (
+  `version` int(11)
+) TYPE=MyISAM;
+insert into schema_info (version) values (53);

data/db/schema.mysql.sql CHANGED Viewed

@@ -155,6 +155,17 @@ CREATE TABLE sidebars (
   `blog_id` int(11) DEFAULT NULL
 ) ENGINE=InnoDB;
+CREATE TABLE sitealizer (
+  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+  `path` varchar(255) DEFAULT NULL,
+  `ip` varchar(255) DEFAULT NULL,
+  `referer` varchar(255) DEFAULT NULL,
+  `language` varchar(255) DEFAULT NULL,
+  `user_agent` varchar(255) DEFAULT NULL,
+  `created_at` datetime DEFAULT NULL,
+  `created_on` date DEFAULT NULL
+) ENGINE=InnoDB;
 CREATE TABLE tags (
   `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
   `name` varchar(255) DEFAULT NULL,
@@ -210,6 +221,25 @@ CREATE  INDEX `index_sessions_on_sessid` ON sessions (`sessid`);
 -- data
+INSERT INTO sidebars (`config`, `staged_position`, `type`, `active_position`, `blog_id`) VALUES('--- !map:HashWithIndifferentAccess
+      empty: false
+      count: true', NULL, NULL, 0, NULL);
+INSERT INTO sidebars (`config`, `staged_position`, `type`, `active_position`, `blog_id`) VALUES('--- !map:HashWithIndifferentAccess
+      title: Links
+      body: |+
+        <ul>
+          <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li>
+          <li><a href="http://scottstuff.net" title="Scottstuff">scottstuff.net</a></li>
+          <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li>
+          <li><a href="http://kevin.sb.org/">Kevin Ballard</a></li>
+          <li><a href="http://fredericdevillamil.com">Frédéric de Villamil</a></li>
+          <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li>
+        </ul>', NULL, NULL, 1, NULL);
+INSERT INTO sidebars (`config`, `staged_position`, `type`, `active_position`, `blog_id`) VALUES('--- !map:HashWithIndifferentAccess
+      format: rss20
+      trackbacks: true
+      comments: true
+      articles: true', NULL, NULL, 2, NULL);
 INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('none', '--- []
 ', 'None', '--- {}
@@ -236,14 +266,10 @@ INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`)
 ', 'textile');
-INSERT INTO `sidebars` (`id`, `active_position`, `config`, `staged_position`, `type`, `blog_id`) VALUES (1, 0, '--- !map:HashWithIndifferentAccess \nempty: false\ncount: true\n', 0, 'CategorySidebar', 1);
-INSERT INTO `sidebars` (`id`, `active_position`, `config`, `staged_position`, `type`, `blog_id`) VALUES (3, 2, '--- !map:HashWithIndifferentAccess \nformat: rss20\ntrackbacks: false\ncomments: true\narticles: true\n', 2, 'XmlSidebar', 1);
-INSERT INTO `sidebars` (`id`, `active_position`, `config`, `staged_position`, `type`, `blog_id`) VALUES (4, 1, '--- !map:HashWithIndifferentAccess \nbody: "<ul>\\n  <li><a href=\\"http://www.typosphere.org\\" title=\\"Typo\\">Typo</a></li>\\n  <li><a href=\\"http://blog.leetsoft.com\\" title=\\"too-biased\\">too-biased</a></li>\\n  <li><a href=\\"http://blog.remor.com/\\" title=\\"seth hall\\">Seth Hall</a></li>\\n  <li><a href=\\"http://scottstuff.net\\" title=\\"Scottstuff\\">scottstuff.net</a></li>\\n  <li><a href=\\"http://www.bofh.org.uk\\" title=\\"Just a Summary\\">Just A Summary</a></li>\\n  <li><a href=\\"http://nubyonrails.com\\" title=\\"Topfunky\\">Topfunky</a></li>\\n  <li><a href=\\"http://planettypo.com\\" title=\\"PlanetTypo\\">PlanetTypo</a></li>\\n  <li><a href=\\"http://typoforums.org\\" title=\\"Typo Forums\\">Typo Forums</a></li>\\n  <li><a href=\\"http://fredericdevillamil.com\\" title=\\"Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil\\">Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil</a></li>\\n\\\n  </ul>\\n"\ntitle: Links\n', NULL, 'StaticSidebar', 1);
 -- schema version meta-info
 CREATE TABLE schema_info (
   `version` int(11) DEFAULT NULL
 ) ENGINE=InnoDB;
-insert into schema_info (version) values (61);
+insert into schema_info (version) values (62);

data/db/schema.postgresql.sql CHANGED Viewed

@@ -155,6 +155,17 @@ CREATE TABLE sidebars (
   "blog_id" integer DEFAULT NULL
 );
+CREATE TABLE sitealizer (
+  "id" serial primary key,
+  "path" character varying(255) DEFAULT NULL,
+  "ip" character varying(255) DEFAULT NULL,
+  "referer" character varying(255) DEFAULT NULL,
+  "language" character varying(255) DEFAULT NULL,
+  "user_agent" character varying(255) DEFAULT NULL,
+  "created_at" timestamp DEFAULT NULL,
+  "created_on" date DEFAULT NULL
+);
 CREATE TABLE tags (
   "id" serial primary key,
   "name" character varying(255) DEFAULT NULL,
@@ -210,6 +221,25 @@ CREATE  INDEX "index_sessions_on_sessid" ON sessions ("sessid");
 -- data
+INSERT INTO sidebars ("config", "staged_position", "type", "active_position", "blog_id") VALUES('--- !map:HashWithIndifferentAccess
+      empty: false
+      count: true', NULL, NULL, 0, NULL);
+INSERT INTO sidebars ("config", "staged_position", "type", "active_position", "blog_id") VALUES('--- !map:HashWithIndifferentAccess
+      title: Links
+      body: |+
+        <ul>
+          <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li>
+          <li><a href="http://scottstuff.net" title="Scottstuff">scottstuff.net</a></li>
+          <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li>
+          <li><a href="http://kevin.sb.org/">Kevin Ballard</a></li>
+          <li><a href="http://fredericdevillamil.com">Frédéric de Villamil</a></li>
+          <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li>
+        </ul>', NULL, NULL, 1, NULL);
+INSERT INTO sidebars ("config", "staged_position", "type", "active_position", "blog_id") VALUES('--- !map:HashWithIndifferentAccess
+      format: rss20
+      trackbacks: true
+      comments: true
+      articles: true', NULL, NULL, 2, NULL);
 INSERT INTO text_filters ("name", "filters", "description", "params", "markup") VALUES('none', '--- []
 ', 'None', '--- {}
@@ -236,15 +266,10 @@ INSERT INTO text_filters ("name", "filters", "description", "params", "markup")
 ', 'textile');
-INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (1, 0, '--- !map:HashWithIndifferentAccess \nempty: false\ncount: true\n', 0, 'CategorySidebar', 1);
-INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (2, 2, '--- !map:HashWithIndifferentAccess \nformat: rss20\ntrackbacks: false\ncomments: true\narticles: true\n', 2, 'XmlSidebar', 1);
-INSERT INTO sidebars ("id", "active_position", "config", "staged_position", "type", "blog_id") VALUES (3, 1, '--- !map:HashWithIndifferentAccess \nbody: "<ul>\\n  <li><a href=\\"http://www.typosphere.org\\" title=\\"Typo\\">Typo</a></li>\\n  <li><a href=\\"http://blog.leetsoft.com\\" title=\\"too-biased\\">too-biased</a></li>\\n  <li><a href=\\"http://blog.remor.com/\\" title=\\"seth hall\\">Seth Hall</a></li>\\n  <li><a href=\\"http://scottstuff.net\\" title=\\"Scottstuff\\">scottstuff.net</a></li>\\n  <li><a href=\\"http://www.bofh.org.uk\\" title=\\"Just a Summary\\">Just A Summary</a></li>\\n  <li><a href=\\"http://nubyonrails.com\\" title=\\"Topfunky\\">Topfunky</a></li>\\n  <li><a href=\\"http://planettypo.com\\" title=\\"PlanetTypo\\">PlanetTypo</a></li>\\n  <li><a href=\\"http://typoforums.org\\" title=\\"Typo Forums\\">Typo Forums</a></li>\\n  <li><a href=\\"http://fredericdevillamil.com\\" title=\\"Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil\\">Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil</a></li>\\n\\\n  </ul>\\n"\ntitle: Links\n', NULL, 'StaticSidebar', 1);
 -- schema version meta-info
 CREATE TABLE schema_info (
   "version" integer DEFAULT NULL
 );
-insert into schema_info (version) values (61);
+insert into schema_info (version) values (62);