typo 5.0.3.98 → 5.0.3.98.1

data/app/controllers/admin/base_controller.rb

@@ -6,22 +6,9 @@ class Admin::BaseController < ApplicationController
   layout 'administration'
   before_filter :login_required, :except => [ :login, :signup ]
   before_filter :look_for_needed_db_updates, :except => [:login, :signup, :update_database, :migrate]
-  before_filter :deprecation_warning
   cache_sweeper :blog_sweeper
 
   private
-
-  # Deprecation warning for plugins removal
-  def deprecation_warning
-    if this_blog.deprecation_warning != 42
-      Blog.transaction do
-        this_blog.deprecation_warning = 42
-        this_blog.save
-      end
-      flash[:error] = "Deprecation warning: please, notice that most plugins have been  removed from the main engine in this new version. To download them, run <code>script/plugins install myplugin</code>, where myplugin is one of them at http://svn.typosphere.org/typo/plugins/"
-    end
-  end
-
   def look_for_needed_db_updates
     if Migrator.offer_migration_when_available
       redirect_to :controller => '/admin/general', :action => 'update_database' if Migrator.current_schema_version != Migrator.max_schema_version

data/app/controllers/application.rb

@@ -2,6 +2,7 @@
 # Likewise will all the methods added be available for all controllers.
 class ApplicationController < ActionController::Base
   include ::LoginSystem
+  protect_from_forgery :secret => '1c8b953667056f1a3c324d6b369f6158', :except => [:search, :preview]
   before_filter :reset_local_cache, :fire_triggers, :load_lang
   after_filter :reset_local_cache
 
@@ -17,8 +18,7 @@ class ApplicationController < ActionController::Base
 
   def setup_themer
     # Ick!
-    self.view_paths =
-      ::ActionController::Base.view_paths.dup.unshift("#{RAILS_ROOT}/themes/#{this_blog.theme}/views")
+    self.view_paths = ::ActionController::Base.view_paths.dup.unshift("#{RAILS_ROOT}/themes/#{this_blog.theme}/views")
   end
 
   def error(message = "Record not found...", options = { })

data/app/controllers/articles_controller.rb

@@ -14,7 +14,7 @@ class ArticlesController < ContentController
     caches_page *cached_pages
   end
 
-  session :new_session => false
+  session :new_session => true
 
   helper :'admin/base'
 

data/app/controllers/live_controller.rb

@@ -1,4 +1,5 @@
 class LiveController < ContentController
+  skip_before_filter :verify_authenticity_token
   session :off
 
   def search

data/app/controllers/xml_controller.rb

@@ -21,7 +21,7 @@ class XmlController < ApplicationController
 
     case params[:type]
     when 'feed'
-      head :moved_permanently, :location => formatted_articles_url(@format)
+      redirect_to :controller => 'articles', :action => 'index', :format => @format, :status => 301
     when 'comments'
       head :moved_permanently, :location => formatted_admin_comments_url(@format)
     when 'article'

data/config/environments/test.rb

@@ -16,5 +16,8 @@ config.action_controller.perform_caching             = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
+# Disables requets forgery protection
+config.action_controller.allow_forgery_protection    = false 
+
 Migrator.offer_migration_when_available            = false
 require 'ruby-debug'

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.0.3.98"
+PKG_VERSION = "5.0.3.98.1"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -35,6 +35,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("mongrel_cluster", ">= 0.2.0")
   s.add_dependency("sqlite3-ruby", ">= 1.1.0")
   s.add_dependency("rails-app-installer", ">= 0.2.0")
+  s.add_dependency("ruby-debug", ">= 0.10.1")
+  s.add_dependency("flexmock", ">= 0.8.2")
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.0.3.98'
+TYPO_VERSION = '5.0.3.98.1'

data/spec/controllers/xml_controller_spec.rb

@@ -90,7 +90,7 @@ describe XmlController do
 
   def test_feed_rss20
     get :feed, :format => 'rss20', :type => 'feed'
-    assert_moved_permanently_to formatted_articles_url(:rss)
+    assert_moved_permanently_to 'http://test.host/articles.rss'
   end
 
   def test_feed_rss20_comments
@@ -125,7 +125,7 @@ describe XmlController do
   def test_feed_atom10_feed
     get :feed, :format => 'atom10', :type => 'feed'
     assert_response :moved_permanently
-    assert_moved_permanently_to formatted_articles_url('atom')
+    assert_moved_permanently_to "http://test.host/articles.atom"
   end
 
   def test_feed_atom10_comments
@@ -200,7 +200,7 @@ describe XmlController do
   def test_atom03
     get :feed, :format => 'atom03', :type => 'feed'
     assert_response :moved_permanently
-    assert_moved_permanently_to formatted_articles_url('atom')
+    assert_moved_permanently_to 'http://test.host/articles.atom'
   end
 
   def test_itunes

data/themes/typographic/stylesheets/layout.css

@@ -309,7 +309,7 @@ h3 {
 }
 
 
-div.static-body, ul, #sform p {
+div.static-body, #sidebar ul, #sform p {
 	background:url(../../images/theme/bg_white.png);
 	padding:14px
 }
@@ -319,12 +319,19 @@ div.static-body ul {
 	padding:0;
 }
 
-ul li {
+#sidebar ul li {
 	list-style-type:none;
 	background:url(../../images/theme/bullet_right.png) 98% 70% no-repeat;
 	padding-right: 17px;
 }
 
+ul li {
+	list-style-type:none;
+	background:url(../../images/theme/bullet_right.png) 0% 70% no-repeat;
+	padding-left: 17px;
+}
+
+
 #sform input {
 	width:180px;
 	padding:5px;

data/vendor/plugins/audioscrobbler_sidebar/MAINTAINERS

@@ -0,0 +1,26 @@
+This is a list of Typo maintainers. If you have a commit bit, please add your
+name and contact details to the list.
+
+Original Author
+
+Tobias Luetke <tobi@leetsoft.com> 
+blog: http://blog.leetsoft.com/
+irc:  xal
+
+Peons
+
+Scott Laird <scott@sigkill.org>
+blog: http://scottstuff.net/
+irc:  slaird
+
+Piers Cawley <pdcawley@bofh.org.uk>
+blog: http://www.bofh.org.uk/
+irc:  pdcawley
+
+Kevin Ballard <kevin@sb.org>
+blog: http://kevin.sb.org
+irc:  Eridius
+
+Frédéric de Villamil <frederic@de-villamil.com>
+blog: http://fredericdevillamil.com
+irc: neuro`

data/vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2005 Tobias Luetke
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/vendor/plugins/audioscrobbler_sidebar/README

@@ -0,0 +1,27 @@
+What is it?
+===========
+
+This is an audioscrobbler sidebar plugin for typo blogging engine.
+
+Requirements
+============
+
+Currently you need all of those things to get typo to run:
+
+ * Typo 1.4.1 or higer
+ * Rails 1.2.x
+
+Installation
+============
+
+When in Typo root directory, just run
+./script/plugin install http://svn.typosphere.org/typo/plugins/audioscrobbler_sidebar/
+
+Usage
+======
+
+Typo's administrative interface is available at http://your.domain.com/admin. 
+To activate the plugin, drag and drop it in the sidebar and fill the config.
+
+Enjoy,
+Your typo team

data/vendor/plugins/audioscrobbler_sidebar/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the audioscrobbler_sidebar plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the audioscrobbler_sidebar plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'AudioscrobblerSidebar'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/audioscrobbler_sidebar/init.rb

@@ -0,0 +1,5 @@
+require 'sidebar'
+require 'audioscrobbler_sidebar'
+
+AudioscrobblerSidebar.view_root = File.dirname(__FILE__) + '/views'
+

data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb

@@ -0,0 +1,54 @@
+require 'open-uri'
+require 'time'
+require 'rexml/document'
+
+class Audioscrobbler
+  include REXML
+
+  attr_accessor :url, :items, :link, :artist, :title
+
+  # This object holds given information of an item
+  class AudioscrobblerItem < Struct.new(:link, :artist, :title, :date)
+    def to_s; title end
+  end
+
+  # Pass the url to the RSS feed you would like to keep tabs on
+  # by default this will request the rss from the server right away and
+  # fill the items array
+  def initialize(url, refresh = true)
+	self.items  = []
+	self.url    = url
+	self.refresh if refresh
+  end
+
+  # This method lets you refresh the items in the items array
+  # useful if you keep the object cached in memory and
+  def refresh
+    open(@url) do |http|
+      parse(http.read)
+    end
+  end
+
+  private
+
+  def parse(body)
+
+    xml = Document.new(body)
+
+    self.items        = []
+    self.link         = XPath.match(xml, "//channel/link/text()").to_s
+    self.title        = XPath.match(xml, "//channel/title/text()").to_s
+
+    XPath.each(xml, "//item/") do |elem|
+
+      item = AudioscrobblerItem.new
+      item.title       = XPath.match(elem, "dc:title/text()").to_s
+      item.artist       = XPath.match(elem, "mm:Artist/dc:creator/dc:title/text()").to_s
+      item.link        = XPath.match(elem, "link/text()").to_s
+      item.date        = Time.mktime(*ParseDate.parsedate(XPath.match(elem, "dc:date/text()").to_s))
+      items << item
+    end
+
+    self.items = items.sort_by { |item| item.date }.reverse
+  end
+end

data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb

@@ -0,0 +1,13 @@
+class AudioscrobblerSidebar < Sidebar
+  description 'Bookmarks from <a href="http://www.audioscrobbler.com">Audioscrobbler</a>'
+  setting :feed, 'http://ws.audioscrobbler.com/rdf/history/USERNAME'
+  setting :count, 10, :label => 'Items limit'
+
+  lifetime 1.day
+
+  attr_reader :audioscrobbler
+
+  def parse_request(contents, params)
+    @audioscrobbler = (Audioscrobbler.new(feed) rescue nil)
+  end
+end

data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class AudioscrobblerSidebarTest < Test::Unit::TestCase
+  def test_sidebar_is_available
+    assert Sidebar.available_sidebars.include?(AudioscrobblerSidebar)
+  end
+end

data/vendor/plugins/audioscrobbler_sidebar/views/content.rhtml

@@ -0,0 +1,10 @@
+<% if sidebar.audioscrobbler -%>
+  <div id="audioscrobbler">
+    <h3><%= sidebar.audioscrobbler.title %></h3>
+    <ul>
+      <% for item in sidebar.audioscrobbler.items.to_a.slice(0,sidebar.count.to_i) -%>
+        <li><a href="<%= item.link %>" title="<%=h item.title %>"><%=h item.artist %> / <%=h item.title %> </a></li>
+      <% end -%>
+    </ul>
+  </div>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 5.0.3.98
+  version: 5.0.3.98.1
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-29 00:00:00 +02:00
+date: 2008-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,24 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.2
+    version: 
 description: 
 email: frederic@de-villamil.com
 executables: 
@@ -1356,50 +1374,6 @@ files:
 - themes/typographic/views/shared/_search.html.erb
 - themes/typographic/views/theme
 - themes/typographic/views/theme/static_view_test.html.erb
-- themes/typographic2
-- themes/typographic2/.DS_Store
-- themes/typographic2/about.markdown
-- themes/typographic2/images
-- themes/typographic2/images/accept.png
-- themes/typographic2/images/accept50.png
-- themes/typographic2/images/bg_body.jpg
-- themes/typographic2/images/bg_white.png
-- themes/typographic2/images/bg_wrapper.jpg
-- themes/typographic2/images/bullet_bottom.png
-- themes/typographic2/images/bullet_right.png
-- themes/typographic2/images/email_open.png
-- themes/typographic2/images/email_open50.png
-- themes/typographic2/images/meta.png
-- themes/typographic2/images/page_edit.png
-- themes/typographic2/images/page_edit50.png
-- themes/typographic2/images/tag.png
-- themes/typographic2/images/Thumbs.db
-- themes/typographic2/images/user.png
-- themes/typographic2/images/user50.png
-- themes/typographic2/images/world_link.png
-- themes/typographic2/images/world_link50.png
-- themes/typographic2/layouts
-- themes/typographic2/layouts/default.html.erb
-- themes/typographic2/preview.png
-- themes/typographic2/stylesheets
-- themes/typographic2/stylesheets/colors.css
-- themes/typographic2/stylesheets/layout.css
-- themes/typographic2/stylesheets/reset.css
-- themes/typographic2/stylesheets/style.css
-- themes/typographic2/views
-- themes/typographic2/views/articles
-- themes/typographic2/views/articles/_article.html.erb
-- themes/typographic2/views/articles/_comment.html.erb
-- themes/typographic2/views/articles/_comment_form.html.erb
-- themes/typographic2/views/articles/_comment_list.html.erb
-- themes/typographic2/views/articles/_trackback.html.erb
-- themes/typographic2/views/articles/comment_preview.html.erb
-- themes/typographic2/views/articles/index.html.erb
-- themes/typographic2/views/articles/read.html.erb
-- themes/typographic2/views/shared
-- themes/typographic2/views/shared/_search.html.erb
-- themes/typographic2/views/theme
-- themes/typographic2/views/theme/static_view_test.html.erb
 - tmp
 - tmp/cache
 - tmp/pids
@@ -1589,6 +1563,19 @@ files:
 - vendor/plugins/archives_sidebar/test/archives_sidebar_test.rb
 - vendor/plugins/archives_sidebar/views
 - vendor/plugins/archives_sidebar/views/content.rhtml
+- vendor/plugins/audioscrobbler_sidebar
+- vendor/plugins/audioscrobbler_sidebar/init.rb
+- vendor/plugins/audioscrobbler_sidebar/lib
+- vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb
+- vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb
+- vendor/plugins/audioscrobbler_sidebar/MAINTAINERS
+- vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE
+- vendor/plugins/audioscrobbler_sidebar/Rakefile
+- vendor/plugins/audioscrobbler_sidebar/README
+- vendor/plugins/audioscrobbler_sidebar/test
+- vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb
+- vendor/plugins/audioscrobbler_sidebar/views
+- vendor/plugins/audioscrobbler_sidebar/views/content.rhtml
 - vendor/plugins/auto_complete
 - vendor/plugins/auto_complete/init.rb
 - vendor/plugins/auto_complete/lib

data/themes/typographic2/about.markdown

@@ -1,7 +0,0 @@
-### Typographic by [Hélène][1]
-
-Typographic is the new Typo default theme starting version 5.0.4. It was specially designed for this use by [Hélène][2] for [O2source][3]. 
-
-[1]: http://www.o2sources.com/people/helene
-[2]:http://www.jeuxdemaux.com/
-[3]: http://www.o2sources.com

data/themes/typographic2/layouts/default.html.erb

@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title><%=h page_title %></title>
-  <%= page_header %>
-  <%= stylesheet_link_tag '/stylesheets/theme/style.css', :media => 'all' %>
-</head>
-
-<body>
-  <div id="wrapper">
-    <!-- start header -->
-    <div id="header">
-      <h1><%= link_to this_blog.blog_name, this_blog.base_url %></h1>
-      <p class="desc"><%= this_blog.blog_subtitle %></p>
-    </div>
-    <!-- end header -->
-
-  <div id="page">
-    <div id="sidebar">
-      <!-- search -->
-      <%= render :partial => 'shared/search' %>
-
-      <!-- sidebar components -->
-      <%= render_sidebars %>
-    </div>
-
-    <div id="content">
-      <%= @content_for_layout %>
-      <%= javascript_tag 'show_dates_as_local_time()' %>
-    </div>
-
-  <div id="footer">
-    <div class="wrap">
-      <p id="legal">
-        <%= _("Powered by %s", link_to ('typo', 'http://typosphere.org')) %>
-        <%= _("Designed by %s ", link_to ('Hélène', 'http://www.o2sources.com/people/helene')) %>
-      </p>
-    </div>
-  </div>
-</body>
-</html>
-

data/themes/typographic2/stylesheets/colors.css

@@ -1,51 +0,0 @@
-/*------------------------------------------------------------------
-# [Color codes]
-
-# Dark grey (h1,h3): #3d3d3d
-# Mid grey (header des): #787878
-# Mid grey (h2, links:hover, h2 a, form#commentform) : #5d5d5d
-# Black (text) : #000
-# Blue (links) #288aaa
-# Light grey (meta, footer) : #8b8b8b
-# Dark orange (border .title) : #e8d1b6
-# Orange (border images, input, textarea) : #f4c997
-# Light orange (body background) : #ffebd6
-# Light brown (footer border) : #e1d8ce
-# */
-
-body {
-	color : #000;
-	background-color: #ffebd6;
-}
-
-h1, h3, h1 a {
-	color: #3d3d3d
-}
-
-#header p.desc  {
-	color :#787878;
-}
-
-h2, a:hover, h2 a, #commentform label, #commentform input {
-	color: #5d5d5d
-}
-
-a {
-	color: #288aaa
-}
-
-div.meta, #footer {
-	color: #8b8b8b
-}
-
-div.atomentry div.title {
-	border-color: #e8d1b6
-}
-
-div.atomentry div.content img, input, textarea {
-	border-color: #f4c997
-}
-
-#footer {
-	border-color: #e1d8ce
-}

data/themes/typographic2/stylesheets/layout.css

@@ -1,346 +0,0 @@
-
-/*
-1. Body
-	2. Wrapper
-		3. Header / #header
-			3.1. Logo / #logo
-			3.2. Menu / #menu
-		4. Page
-			4.1. Content / #content
-				4.1.1. Post / .atomentry
-				4.1.2. Comments 
-			4.2. Sidebar / #sidebar
-				4.2.1. Search / #search
-				4.2.2. Loading / #loading
-				4.2.4. Results / #results
-				4.2.5. Categories / #categories
-		5. Footer / #footer
-*/
-
-
-/*------------------------------------------------------------------
-[1. Body]
-*/
-body {
-	font-family: "Century Gothic", Arial, Verdana, sans-serif;
-	font-size: 0.9em;
-	background:url(../../images/theme/bg_body.jpg) top center no-repeat;
-}
-
-input, textarea {
-	border: solid 1px;
-	font-family: "Century Gothic", Arial, Verdana, sans-serif;
-}
-
-a {
-}
-a:hover {
-	text-decoration: none;
-}
-
-/*------------------------------------------------------------------
-[2. Wrapper]
-*/
-wrapper {
-	background:url(../../images/theme/bg_wrapper.jpg) bottom left repeat-x;
-}
-
-/*------------------------------------------------------------------
-[3. Header]
-*/
-
-#header {
-	max-width: 1000px;
-	min-width: 400px;
-	margin:50px auto 55px auto;
-	position: relative;
-	text-align:right;
-}
-
-p.desc {
-	font-size: 0.8em;
-}
-
-h1 a {
-	text-decoration : none;
-	font-weight:normal;
-	font-size: 1.6em;
-}
-
-/*------------------------------------------------------------------
-[4. Page]
-*/
-#page {
-	max-width: 1000px;
-	min-width: 400px;
-	margin-left:auto;
-	margin-right: auto;
-	position: relative;
-}
-
-/*------------------------------------------------------------------
-[4.1. Content]
-*/
-
-#content {
-	margin-right: 250px; 
-}
-
-
-/*------------------------------------------------------------------
-[4.1.1. Post]
-*/
-
-div.atomentry {
-	margin-bottom:75px;
-}
-
-	div.atomentry div.title {
-		border-left: 10px solid;
-		padding-left: 10px;
-		margin-bottom: 15px;
-	}
-
-		div.title cite {
-			font-style:normal; 
-		}
-		
-		div.title abbr {
-			border:none;
-		}
-	
-	h2.title a {
-		text-decoration : none;
-		font-weight:normal;
-		font-size:1.6em
-	}
-	
-	div.meta {
-		font-size: 0.7em;
-	}
-	
-	div.atomentry img {
-		border: solid 1px;
-		padding: 5px;
-	}
-	
-	img.right {
-		float:right;
-		margin-left:10px;
-		margin-bottom:5px;
-	}
-	
-	img.left {
-		float:left;
-		margin-right:10px;
-		margin-bottom:5px;	
-	}
-
-	div.atomentry div.content p {
-		margin-top: 5px;
-		margin-bottom: 15px;
-	}
-p.links {
-	text-align:right;
-	margin-top:15px;
-}
-
-a.more, a.comments {
-	background:url(../../images/theme/bullet_right.png) no-repeat 0 70%;
-	padding-left:15px;
-	margin-left: 35px;
-	font-size:0.8em;
-}
-
-a.more:hover, a.comments:hover {
-	background-image:url(../../images/theme/bullet_bottom.png)
-}
-
-p.infos {
-	background:url(../../images/theme/meta.png) no-repeat;
-	min-height:18px;
-	padding-left: 20px;
-	font-size:1.2em
-}
-
-p.tags {
-	background:url(../../images/theme/tag.png) no-repeat;
-	min-height: 18px;
-	padding: 2px 0 0 20px;
-	font-size:1.2em
-}
-/*------------------------------------------------------------------
-[4.1.2. Comments]
-*/
-
-#commentform {
-	background:url(../../images/theme/bg_white.png);
-	padding:10px 35px 25px 10px
-}
-
-	#commentform input {
-		width:180px;
-		padding:3px 3px 3px 23px;
-		margin: 15px;
-	}
-	
-	#commentform textarea {
-		padding:3px;
-		margin: 15px 0 15px 15px;
-		font-size:1em;
-		width:480px;
-	}	
-
-	#commentform label {
-		float:left;
-		width: 150px;
-		text-align:right;
-		height:30px;
-		padding-top:15px;
-		margin-left: 50px;
-		line-height:0.7em
-	}
-	
-	#commentform label small {
-		font-size:0.6em	
-	}
-	
-	input#comment_author {
-		background:url(../../images/theme/user50.png) no-repeat #FFF 2% 50%;
-	}
-	
-	input#comment_author:hover {
-		background:url(../../images/theme/user.png) no-repeat #FFF 2% 50%;
-	}
-	
-	input#comment_email {
-		background:url(../../images/theme/email_open50.png) no-repeat #FFF 2% 50%;
-	}
-	
-	input#comment_email:hover {
-		background:url(../../images/theme/email_open.png) no-repeat #FFF 2% 50%;
-	}
-	
-	input#comment_url {
-		background:url(../../images/theme/world_link50.png) no-repeat #FFF 2% 50%;
-	}
-	
-	input#comment_url:hover {
-		background:url(../../images/theme/world_link.png) no-repeat #FFF 2% 50%;
-	}
-	
-	input#form-preview-button {
-		background:url(../../images/theme/page_edit50.png) no-repeat #f6e0c6 2% 50%;
-		width: 110px;
-		margin:0
-	}
-	
-	input#form-preview-button:hover {
-		background:url(../../images/theme/page_edit.png) no-repeat #f6e0c6 2% 50%;
-	}
-	
-	
-	input#form-submit-button {
-		background:url(../../images/theme/accept50.png) no-repeat #f6e0c6 2% 50%;
-		width: 110px;
-		margin:0
-	}
-	
-	input#form-submit-button:hover {
-		background:url(../../images/theme/accept.png) no-repeat #f6e0c6 2% 50%;
-	}
-
-ol#commentList {
-	margin-left: 25px;
-}
-
-ol#commentList  li {
-	margin: 10px 0 10px 0
-}
-
-div.commentContent {
-	padding:10px;
-	background:url(../../images/theme/bg_white.png);
-	margin:5px 0 0 0 
-	
-}
-
-div.author cite {
-	font-style:normal
-}
-
-h2#trackbacks-title, h2#comments-title, h2#formComments-title{
-	font-weight:normal;
-	font-size:1.6em;
-	margin-top:65px;
-	line-height:0.8em;
-}
-
-p.trackbackurl span {
-	font-size: 0.8em
-}
-
-p.buttons {
-	clear:left;
-	text-align:right
-}
-
-p.buttons input {
-	width: 110px
-}
-/*------------------------------------------------------------------
-[4.2. Sidebar]
-*/
-#sidebar {
-	float:right;
-	position: relative;
-	right:0;
-	top:0;
-	width:220px;
-	text-align:right;
-	font-size:
-}
-
-h3 {
-	margin-top:25px;
-	font-size:1.7em;
-	font-weight:normal;
-	line-height:0.9em;
-}
-
-
-div.static-body, ul, #sform p {
-	background:url(../../images/theme/bg_white.png);
-	padding:14px
-}
-
-div.static-body ul {
-	background:none;
-	padding:0;
-}
-
-ul li {
-	list-style-type:none;
-	background:url(../../images/theme/bullet_right.png) 98% 70% no-repeat;
-	padding-right: 17px;
-}
-
-#sform input {
-	width:180px;
-	padding:5px;
-}
-
-/*------------------------------------------------------------------
-[5. Footer]
-*/
-#footer {
-	max-width: 1000px;
-	min-width: 400px;
-	margin: 50px auto 0 auto;
-	position: relative;
-	text-align:center;
-	padding:5px;
-	border-top: solid 1px;
-	font-size: 0.6em;
-	clear:both
-}

data/themes/typographic2/stylesheets/reset.css

@@ -1,5 +0,0 @@
-/* RESET */
-html,*{
-  margin: 0;
-  padding: 0;
-}

data/themes/typographic2/stylesheets/style.css

@@ -1,36 +0,0 @@
-/* CSS Document */
-/*------------------------------------------------------------------
-[Master Stylesheet]
-
-Project:	TypoGraphic 
-Version:	1.0
-Last change:	04/06/08 [fixed Float bug, vf]
-Assigned to:	Helene Douchet (hdo)
-
-[Table of contents]
-
-1. Body
-	2. Wrapper
-		3. Header / #header
-		4. Page
-			4.1. Content / #content
-				4.1.1. Post / .atomentry
-			4.2. Sidebar / #sidebar
-				4.2.1. Search / #search
-				4.2.2. Loading / #loading
-				4.2.4. Results / #results
-				4.2.5. Categories / #categories
-		5. Footer / #footer
--------------------------------------------------------------------*/
-
-@import "reset.css";
-@import "layout.css";
-@import "colors.css";
-/* @import "debugging.css"; */
-
-
-
-
-
-
-

data/themes/typographic2/views/articles/_article.html.erb

@@ -1,41 +0,0 @@
-<div class="atomentry" id="article-<%= article.id %>">
-  <div class="title">
-    <h2 class="title"><%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %></h2>
-    <div class="meta">
-      <%= _("Posted by") %> <cite><%= author_link(article) %></cite> <abbr class="published" title="<%= article.published_at.xmlschema %>"><%= js_distance_of_time_in_words_to_now article.published_at %></abbr>
-    </div>
-  </div>
-  <div class="content">
-    <%= article.html(:body) %>
-
-    <% if article.extended? -%>
-      <div class="extended">
-        <% if controller.action_name == 'index' -%>
-          <p><%= link_to_permalink article,_("Continue reading...") %></p>
-        <% else -%>
-          <%= article.html(:extended) %>
-        <% end -%>
-      </div>
-    <% end -%>  
-  </div>
-  <% if controller.controller_name == "articles" and controller.action_name == "show" %>
-  <div class="meta">
-    <p class="infos"><small>
-      <%= _("This entry was posted on %s", content_tag(:abbr, js_distance_of_time_in_words_to_now (@article.published_at), {:class => 'published', :title => @article.published_at.xmlschema})) %>
-      <%= _("and %s", category_links(@article)) unless @article.categories.empty? %>. 
-      <%= _("You can follow any any response to this entry through the %s", link_to(_("Atom feed"), @auto_discovery_url_atom)) %>. 
-      <%= _("You can leave a %s", link_to_permalink(article, _('comment'), 'comments')) if @article.allow_comments? %> 
-      <%= _("or a %s from your own site", link_to_permalink(@article, _('trackback'), 'trackbacks')) if @article.allow_pings? %>.
-    </small></p>
-    <p class="tags">
-      <%= tag_links(@article) unless @article.tags.empty? %>
-    </p>
-  </div>    
-  <% else %>
-	<p class="links">
-		<%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %>
-		<%= link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments', 'comments') %>
-	</p>    
-  <% end %>
-  <br style="clear:both;" />
-</div>

data/themes/typographic2/views/articles/_comment.html.erb

@@ -1,14 +0,0 @@
-<li class="comment" id="comment-<%= comment.id %>">
-  <div class="author">
-    <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
-    <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
-    <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> <%= _("later")%>:</abbr>
-  </div>
-  <div class="commentContent">
-    <%= comment.html %>
-  </div>
-  <% unless comment.published -%>
-  <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.") %></div>
-  <% end -%>
-</li>
-

data/themes/typographic2/views/articles/_comment_form.html.erb

@@ -1,48 +0,0 @@
-<% form_remote_tag :url      => comments_path(@article),
-                    :position => :bottom,
-                    :update   => {:success => 'commentList'},
-                    :loading  => "loading()",
-                    :complete => "complete(request)",
-                    :failure  => "failure(request)",
-                    :html     => {:id => 'commentform', :class => 'comments' } \
-    do %>
-
-<div id="preview" style="display:none"></div>
-
-<h2 id="formComments-title"><%= _("Leave a comment")%></h2>
-<div id="respond" class="post">
-  <p>
-		<label for="comment_author"><%= _("Name %s", content_tag(:small, '('+_('required')+')' ))%></label>
-		<%= text_field "comment", "author" %> 
-  </p>
-
-  <p>
-		<label for="comment_email"><%= _("Email")%> <%= content_tag('small', "(#{link_to('gravatar', 'http://gravatar.com')} "+ _("enabled") + ")") if this_blog.use_gravatar %> <small>(<%= _("never displayed") %>)</small></label>
-		<%= text_field "comment", "email" %>
-	</p>
-	<p>
-		<label><%= _("Website")%></label>
-		<%= text_field "comment", "url" %>
-	</p>
-
-  <p>
-    <label>
-      <%= _("Comments")%>:
-      <%= content_tag('small', link_to(_("Textile enabled"), "http://hobix.com/textile/")) if this_blog.comment_text_filter.include? 'textile' %>
-      <%= content_tag('small', link_to(_("Markdown enabled"), "http://daringfireball.net/projects/markdown/")) if this_blog.comment_text_filter.include? 'markdown' %>
-      <br />
-    </label>
-    <%= text_area 'comment', 'body', :rows => 10 %>
-  </p>
-
-  <p class="buttons">
-    <%= submit_to_remote('preview', _('Preview') + '!',
-                         :update => 'preview',
-                         :complete => "Element.show('preview')",
-                         :url    => preview_new_comment_path(@article),
-												 :html => {:class => 'submit', :id => 'form-preview-button'}) %>
-    <%= submit_tag _('Submit'), :id => 'form-submit-button', :class => 'submit', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
-    <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %>
-  </p>
-</div>
-<% end %>

data/themes/typographic2/views/articles/_comment_list.html.erb

@@ -1,7 +0,0 @@
-<ol id="commentList" class="comments">
-  <% if @article.published_comments.any? -%>
-    <%= render(:partial => "comment", :collection => @article.published_comments) %>
-  <% else -%>
-    <li class="dummy_comment" style="display:none"><%= _("No comments")%></li>
-  <% end -%>
-</ol>

data/themes/typographic2/views/articles/_trackback.html.erb

@@ -1,9 +0,0 @@
-<li class="trackback" id="trackback-<%= trackback.id %>">
-  <div class="author">
-    <a href="<%= trackback.url %>" rel="nofollow"><%= trackback.title %></a>
-    <abbr><%_("From")%> <cite><%= trackback.blog_name %></cite></abbr>
-  </div>
-  <div class="content">
-    <%= trackback.excerpt %>
-  </div>
-</li>

data/themes/typographic2/views/articles/comment_preview.html.erb

@@ -1,10 +0,0 @@
-<div class="comment preview">
-  <div class="author">
-    <%= content_tag(:div, gravatar_tag(@comment.email)) if this_blog.use_gravatar and @comment.email %>
-    <cite><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></cite>
-    <abbr><%= _("is about to say")%></abbr>
-  </div>
-  <div class="content">
-    <%= @comment.html %>
-  </div>
-</div>

data/themes/typographic2/views/articles/index.html.erb

@@ -1,5 +0,0 @@
-<%= render :partial => 'articles/article', :collection => @articles %>
-
-<% unless @pages.item_count <= this_blog.limit_article_display -%>
-<p class="pagination"><%= _("Older posts")%>: <%= pagination_links @pages, :params => { :action => @controller.action_name } %></p>
-<% end -%>

data/themes/typographic2/views/articles/read.html.erb

@@ -1,42 +0,0 @@
-<!--
-<rdf:RDF
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/">
-<rdf:Description
-  rdf:about=""
-  trackback:ping="<%= @article.trackback_url %>"
-  dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
-  dc:identifier="<%= @article.permalink_url %>"
-  dc:description="<%=h (@article.html.strip_html[0..255]).gsub(/-+/, '-') %>"
-  dc:creator="<%= h @article.author %>"
-  dc:date="<%= @article.updated_at.xmlschema %>" />
-</rdf:RDF>
--->
-
-<%= render :partial => 'article', :object => @article %>
-
-
-<% if @article.allow_pings? -%>
-  <h2 id="trackbacks-title"><a id="trackbacks"><%= _("Trackbacks")%></a></h2>
-  <p class="trackbackurl">
-    <%= _("Use the following link to trackback from your own site")%>:<br />
-    <%= @article.trackback_url %>
-  </p>
-
-  <% unless @article.published_trackbacks.blank? -%>
-  <ol id="trackbacks" class="comments">
-    <%= render(:partial => "trackback", :collection => @article.published_trackbacks) %>
-  </ol>
-  <% end -%>
-<% end -%>
-
-<% if @article.allow_comments? or @article.published_comments.size > 0 -%>
-  <h2 id="comments-title"><a id="comments"><%= _("Comments")%></a></h2>
-
-  <div id="comments_div">
-    <%= render :partial => "comment_list" %>
-  </div>
-<% end -%>
-
-<%= render :partial => 'comment_form' if @article.allow_comments? %>

data/themes/typographic2/views/shared/_search.html.erb

@@ -1,17 +0,0 @@
-<div id="search" class="search">
-    <% form_tag({ :controller => 'articles', :action => 'search' },
-                { :method => 'get', :id => 'sform' }) do -%>
-			<h3><%= _("Search")%></h3>
-      <p><input type="text" id="q" name="q" value="" /></p>
-    <% end -%>
-
-    <div id="loading" class="loading" style="display:none;"><%= _("Searching")%>...</div>
-    <div id="results" class="results"></div>
-  <%= observe_field 'q',
-                    :url        => { :controller => 'live', :action => 'search' },
-                    :frequency  => 1,
-                    :loading    => "Element.show('loading')",
-                    :complete   => "Element.hide('loading')",
-                    :update     => 'results',
-                    :with       => "'q=' + encodeURIComponent($F('q'))" %>
-</div>

data/themes/typographic2/views/theme/static_view_test.html.erb

@@ -1 +0,0 @@
-<!-- Static View Test from standard issue -->