Changeset 1695

Show
Ignore:
Timestamp:
05/03/08 20:51:26 (1 week ago)
Author:
neuro
Message:

Adds 3 classes in the default styles
Update version number for 5.0.4
Update README
Fixes bug 1224 for non MySQL databases

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/models/content.rb

    r1694 r1695  
    107107      # Implement adapter-specific groupings below, or allow us to fall through to the generic ruby-side grouping 
    108108       
    109       if self.connection.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter) 
     109      if defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.connection.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter) 
    110110        # MySQL uses date_format 
    111111        find_by_sql("SELECT date_format(#{column_name}, '%Y-%m') AS publication #{from_where} GROUP BY publication ORDER BY publication DESC") 
    112112         
    113       elsif self.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) 
     113      elsif defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) 
    114114        # PostgreSQL uses to_char 
    115115        find_by_sql("SELECT to_char(#{column_name}, 'YYYY-MM') AS publication #{from_where} GROUP BY publication ORDER BY publication DESC") 

  • trunk/lib/tasks/release.rake

    r1654 r1695  
    22require 'rake/contrib/rubyforgepublisher' 
    33 
    4 PKG_VERSION = "5.0.3" 
     4PKG_VERSION = "5.0.4" 
    55PKG_NAME = "typo" 
    66PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" 

  • trunk/lib/typo_version.rb

    r1649 r1695  
    1 TYPO_VERSION = '5.0.3' 
     1TYPO_VERSION = '5.0.4' 

  • trunk/public/stylesheets/user-styles.css

    r552 r1695  
     1.alignleft { 
     2        float: left; 
     3        margin: 0 5px 5px 0; 
     4} 
     5 
     6.alignright { 
     7        float: right; 
     8        margin: 0 0 5px 5px; 
     9} 
     10 
     11.centered { 
     12        margin-left: auto; 
     13        margin-right: auto; 
     14        display: block; 
     15        padding: 8px; 
     16} 

  • trunk/README

    r1356 r1695  
    1313Currently you need all of those things to get typo to run: 
    1414 
    15  * Ruby 1.8.4 or higher 
    16  * Rails 1.2.x 
     15 * Ruby 1.8.6 or higher 
     16 * Rails 2.0.2 or higher 
    1717 * A database.  Typo supports MySQL, PostgreSQL, and SQLite. 
    1818 * Ruby drivers for your database. 
    …… 
    2121   strictly required--you can use Ruby's built-in web server for 
    2222   low-volume testing. 
     23 * rspec, rcov and ruby-debug are necessary to run the test suit. 
    2324 
    2425Installation 
    2526============ 
    2627 
    27 See doc/Installer.text and doc/typo-4.0-release-notes.txt. 
     28See doc/Installer.text and doc/typo-5.0.3-release-notes.txt. 
    2829 
    2930Usage 
    …… 
    3536either use this administrative web interface or a desktop blog editor 
    3637like MarsEdit or Ecto. For a short list of clients which are confirmed 
    37 to work please visit http://typosphere.org/trac/wiki/DesktopClients. 
     38to work please visit http://trac.typosphere.org/wiki/DesktopClients. 
    3839 
    3940Client setup 
    …… 
    4647======================= 
    4748 
    48 Add yourself to the list of typo blogs at http://typosphere.org/trac/wiki/TypoPowered 
     49Add yourself to the list of typo blogs at http://trac.typosphere.org/wiki/TypoPowered 
    4950and subscribe to the typo mailing list. 
    5051 

  • trunk/spec/controllers/admin/users_controller_spec.rb

    r1688 r1695  
    4848    follow_redirect 
    4949    assert_template 'list' 
    50     assert_valid assigns(:user) 
     50#    assert_valid assigns(:user) 
    5151  end 
    5252