radiant 0.9.1 → 1.0.0.rc1

data/app/views/admin/pages/remove.html.haml

@@ -12,7 +12,7 @@
       = render_node @page, :simple => true
 
 - form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing pages…"} do
-  %p.buttons
+  .buttons
     %input.button{:type=>"submit", :value => t('delete_pages', :pages => pages) }/
     = t('or')    
     = link_to t('cancel'), admin_pages_url

data/app/views/admin/preferences/edit.html.haml

@@ -38,7 +38,7 @@
       
       - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
         - form_bottom.edit_buttons do
-          %p.buttons
+          .buttons
             = save_model_button @user
             = t('or')
             = link_to t('cancel'), admin_url

data/app/views/admin/references/filters.haml

@@ -1,5 +1,5 @@
 .popup
-  %h3.title
+  .popup_title
     = _display_name
     Reference
   .reference=filter_reference

data/app/views/admin/references/tags.haml

@@ -1,5 +1,5 @@
 .popup
-  %h3.title
+  .popup_title
     =t('available_tags_for', :name =>  _display_name)
   %p
     %label.inline{:for => "search_#{class_of_page.name.underscore}_tag_reference"} Filter Tags

data/app/views/admin/snippets/_form.html.haml

@@ -15,7 +15,7 @@
         .set
           %p
             = f.label :filter_id, t('filter')
-            = f.select :filter_id, [[t('select.none'), '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, :id => 'snippet_filter'
+            = f.select :filter_id, filter_options_for_select(f.object.filter_id), :id => 'snippet_filter'
             %span.reference_links
               == #{t('reference')}:
               %span{:id => "filter_reference_link"}
@@ -24,7 +24,7 @@
                 = link_to_function t('available_tags'), "loadTagReference('Page');"
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.edit_buttons do
-      %p.buttons{:style=>"clear: left"}
+      .buttons{:style=>"clear: left"}
         = save_model_button(@snippet)
         = save_model_and_continue_editing_button(@snippet)
         = t('or')

data/app/views/admin/snippets/index.html.haml

@@ -2,26 +2,26 @@
 
 .outset
   = render_region :top
-  %table#snippets.index
+  %table.index#snippets
     %thead
       %tr
         - render_region :thead do |thead|
           - thead.title_header do
-            %th.snippet= t('snippet')
-          - thead.modify_header do
-            %th.modify= t('modify')
+            %th.name= t('snippet')
+          - thead.actions_header do
+            %th.actions{:style=>"width:9em"}= t('modify')
     %tbody
       - if @snippets.any?
         - @snippets.each do |snippet|
-          %tr.node.level_1
+          %tr[snippet]
             - render_region :tbody, :locals => {:snippet => snippet} do |tbody|
               - tbody.title_cell do
-                %td.snippet
+                %td.name
                   = image('snippet', :alt => '')
-                  %span= link_to snippet.name, edit_admin_snippet_url(snippet)
-              - tbody.modify_cell do
-                %td.remove
-                  = link_to t('remove'), remove_admin_snippet_url(snippet)
+                  = link_to snippet.name, edit_admin_snippet_url(snippet)
+              - tbody.actions_cell do
+                %td.actions
+                  = link_to image('minus') + ' ' + t('remove'), remove_admin_snippet_url(snippet), :class => "action"
       - else
         %tr
           %td.empty{:colspan => admin.snippet.index.tbody.length}= t('no_snippets')
@@ -31,4 +31,4 @@
     #actions
       = pagination_for(@snippets)
       %ul
-        %li= link_to image('plus') + " " + t('new_snippet'), new_admin_snippet_url
+        %li= link_to image('plus') + " " + t('new_snippet'), new_admin_snippet_url, :class => 'action_button'

data/app/views/admin/snippets/remove.html.haml

@@ -11,7 +11,7 @@
         %span.title= @snippet.name
 
 - form_for [:admin, @snippet], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing snippet…"} do
-  %p.buttons
+  .buttons
     %input.button{:type=>"submit", :value => t('delete_snippet')}/
     = t('or')
     = link_to t('cancel'), admin_snippets_url

data/app/views/admin/users/_avatar.html.haml

@@ -1,3 +1,5 @@
 #avatar
   = image_tag(gravatar_url(@user.email, :size=>"96px"), :class=>"avatar", :width=>96, :height=>96, :alt=>"")
-  %p.caption Avatar provided by Gravatar.com
+  %p.caption
+    Avatar provided by 
+    = link_to "gravatar.com", 'http://gravatar.com/site/signup/'

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

@@ -1,7 +1,7 @@
 - form_for [:admin, @user] do |f|
   = hidden_field "user", "lock_version"
   
-  = render :partial => 'avatar'
+  = render :partial => 'avatar' unless @user.new_record?
   
   = render_region :form_top, :locals => {:f => f}
   
@@ -19,7 +19,7 @@
     - form.edit_username do
       %p
         = f.label :login, t('username') 
-        = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40 
+        = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40, :autocomplete => 'off'
     
     - form.edit_password do
       = render "password_fields", :f => f
@@ -44,7 +44,7 @@
   
   - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
     - form_bottom.edit_buttons do
-      %p.buttons
+      .buttons
         = save_model_button(@user)
         = save_model_and_continue_editing_button(@user)
         = t('or')   

data/app/views/admin/users/_password_fields.html.haml

@@ -6,10 +6,10 @@
 .set#change_password{:style=> (!@user.new_record? && @user.valid?) ? "display: none" : nil}
   %p
     = f.label :password, t('new_password')
-    = f.password_field "password", :class => "textbox big", :value => "", :size => 15, :maxlength => 40
+    = f.password_field "password", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'off'
   %p
     = f.label :password_confirmation, t('password_confirmation')
-    = f.password_field "password_confirmation", :class => "textbox big", :value => "", :size => 15, :maxlength => 40
+    = f.password_field "password_confirmation", :class => "textbox big", :value => "", :size => 15, :maxlength => 40, :autocomplete => 'off'
     - unless @user.new_record?
       %span
         = t('or')

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

@@ -3,7 +3,7 @@
 = render_region :top
 
 .outset
-  %table#users.index
+  %table.index#users
     %thead
       %tr
         - render_region :thead do |thead|
@@ -11,29 +11,29 @@
             %th.user== #{t('name')} / #{t('username')}
           - thead.roles_header do
             %th.roles= t('roles')
-          - thead.modify_header do
-            %th.modify= t('modify')
+          - thead.actions_header do
+            %th.actions{:style=>"width:9em"}= t('modify')
     %tbody
       - @users.each do |user|
-        %tr.node.level_1
+        %tr[user]
           - render_region :tbody, :locals => {:user => user} do |tbody|
             - tbody.title_cell do
-              %td.user
+              %td.name
                 = link_to image_tag(gravatar_url(user.email, :size=>"32px"), :class=>"avatar avatar_32x32", :width=>32, :height=>32, :alt=>""), edit_admin_user_url(user)
                 = link_to user.name, edit_admin_user_url(user)
-                %span.login= h user.login
+                %span.login (#{h user.login})
             - tbody.roles_cell do
               %td.roles= roles(user)
-            - tbody.modify_cell do
-              %td.remove
+            - tbody.actions_cell do
+              %td.actions
                 - if user == current_user
-                  %span.disabled= t('remove')
+                  %span.action.disabled= image('minus_disabled') + ' ' + t('remove')
                 - else
-                  = link_to t('remove'), remove_admin_user_url(user)
+                  = link_to image('minus') + ' ' + t('remove'), remove_admin_user_url(user), :class => "action"
 
 - render_region :bottom do |bottom|
   - bottom.new_button do
     #actions
       = pagination_for(@users)
       %ul
-        %li= link_to image('plus') + " " + t('new_user'), new_admin_user_url
+        %li= link_to image('plus') + " " + t('new_user'), new_admin_user_url, :class => 'action_button'

data/app/views/admin/users/remove.html.haml

@@ -10,7 +10,7 @@
         %span.title= @user.name
 
 - form_for [:admin, @user], :html => { :method => :delete, 'data-onsubmit_status'=>"Removing user…" } do
-  %p.buttons
+  .buttons
     %input.button{:type=>"submit", :value => t('delete_user')}/
     = t('or')  
     = link_to t('cancel'), admin_users_path

data/app/views/admin/welcome/login.html.haml

@@ -13,7 +13,7 @@
     %p.remember_me
       = check_box_tag :remember_me, 1, false, :class => 'checkbox'
       %label.checkbox{:for=>"remember_me"}= t('remember_me_in_this_browser')
-    %p.buttons
+    .buttons
       %input.button{:type => "submit", :value => t('login')}
 
 %p.version

data/app/views/layouts/application.html.haml

@@ -6,7 +6,7 @@
     - @stylesheets.uniq.each do |stylesheet|
       = stylesheet_link_tag stylesheet
     %script{:type=>"text/javascript"}="var relative_url_root = '#{ActionController::Base.relative_url_root}';"
-    = javascript_include_tag %w(admin/prototype admin/effects admin/lowpro admin/dateinput admin/pagestatus admin/cookie admin/popup admin/status admin/utility admin/codearea admin/tabcontrol admin/ruledtable admin/sitemap admin/shortcuts admin/toggle admin/validationerror admin/application), :cache => 'admin/all'
+    = javascript_include_tag %w(admin/prototype admin/effects admin/dragdrop admin/lowpro admin/dateinput admin/pagestatus admin/cookie admin/popup admin/pagefield admin/dropdown admin/status admin/utility admin/codearea admin/tabcontrol admin/ruledtable admin/sitemap admin/shortcuts admin/toggle admin/validationerror admin/application), :cache => 'admin/all'
     - @javascripts.uniq.each do |javascript|
       = javascript_include_tag javascript
     - if @content_for_page_scripts
@@ -27,19 +27,14 @@
             - nav_tabs.each do |tab|
               - if tab.visible?(current_user)
                 %li{:class=>('current ' if current_tab?(tab)).to_s}
-                  %a{:href=>(tab.first.relative_url if tab.first)}
-                    = translate_with_default(tab.name)
-                  - if current_tab?(tab)
-                    %ul#nav_sub
-                      - tab.each do |sub_item|
-                        - if sub_item.visible?(current_user)
-                          %li
-                            %a{:href => sub_item.relative_url, :class => current_item?(sub_item) ? 'current' : ''}>
-                              %span
-                                = translate_with_default(sub_item.name)
-                                
-          #header_bottom
-            %div
+                  = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
+          #toolbar
+            - if @current_tab.size > 1
+              %ul#secondary_navigation
+                - @current_tab.each do |sub_item|
+                  - if sub_item.visible?(current_user)
+                    %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
+            = yield :toolbar
       #main
         - if flash[:notice]
           #notice

data/config/boot.rb

@@ -1,7 +1,7 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
-RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..") unless defined?(RAILS_ROOT)
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
 module Rails
   class << self
@@ -46,7 +46,7 @@ module Radiant
     def preinitialize
       load(preinitializer_path) if File.exist?(preinitializer_path)
     end
-    
+
     def loaded_via_gem?
       pick_boot.is_a? GemBoot
     end
@@ -58,9 +58,21 @@ module Radiant
 
   class Boot
     def run
+      load_mutex
       load_initializer
     end
     
+    # RubyGems from version 1.6 does not require thread but Rails depend on it
+    # This should newer rails do automaticly
+    def load_mutex
+      begin
+        require "thread" unless defined?(Mutex)
+      rescue LoadError => e
+        $stderr.puts %(Mutex could not be initialized. #{load_error_message})
+        exit 1
+      end
+    end
+    
     def load_initializer
       begin
         require 'radiant'
@@ -70,6 +82,8 @@ module Radiant
         exit 1
       end
       Radiant::Initializer.run(:set_load_path)
+      Radiant::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -101,9 +115,9 @@ module Radiant
       load_radiant_gem
       super
     end
-      
+
     def load_error_message
-     "Please reinstall the Radiant gem with the command 'gem install radiant'."
+      "Please reinstall the Radiant gem with the command 'gem install radiant'."
     end
 
     def load_radiant_gem
@@ -113,13 +127,17 @@ module Radiant
         gem 'radiant'
       end
     rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Radiant #{version} gem. Please `gem install -v=#{version} radiant`, update your RADIANT_GEM_VERSION setting in config/environment.rb for the Radiant version you do have installed, or comment out RADIANT_GEM_VERSION to use the latest version installed.)
-      exit 1
+      if load_error.message =~ /Could not find RubyGem radiant/
+        STDERR.puts %(Missing the Radiant #{version} gem. Please `gem install -v=#{version} radiant`, update your RADIANT_GEM_VERSION setting in config/environment.rb for the Radiant version you do have installed, or comment out RADIANT_GEM_VERSION to use the latest version installed.)
+        exit 1
+      else
+        raise
+      end
     end
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion rescue nil      
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -133,16 +151,15 @@ module Radiant
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
-          $stderr.puts %(Radiant requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          $stderr.puts %Q(Radiant requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
         end
 
       rescue LoadError
-        $stderr.puts %(Radiant requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        $stderr.puts %Q(Radiant requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
 

data/config/compass.config

@@ -0,0 +1,18 @@
+project_type = :rails
+project_path = Compass::AppIntegration::Rails.root
+
+http_path             = "/"
+http_stylesheets_path = "/stylesheets"
+http_images_path      = "/images"
+http_javascripts_path = "/javascripts"
+
+sass_dir              = "public/stylesheets/sass"
+css_dir               = "public/stylesheets"
+images_dir            = "public/images"
+javascripts_dir       = "public/javascripts"
+
+environment = Compass::AppIntegration::Rails.env
+
+relative_assets = true
+
+output_style = :compressed

data/config/environment.rb

@@ -20,9 +20,10 @@ Radiant::Initializer.run do |config|
   # config.extensions = [ :all ]
   
   # By default, only English translations are loaded. Remove any of these from
-  # the list below if you'd like to provide any of the supported languages
-  config.extensions -= [:dutch_language_pack, :french_language_pack, :german_language_pack,
-                        :italian_language_pack, :japanese_language_pack, :russian_language_pack]
+  # the list below if you'd like to provide any of the additional options
+  config.ignore_extensions [:dutch_language_pack, :french_language_pack, :german_language_pack,
+                            :italian_language_pack, :japanese_language_pack, :russian_language_pack,
+                            :debug]
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
@@ -78,6 +79,12 @@ Radiant::Initializer.run do |config|
       html
     end
   end
+  
+  config.gem 'haml', :version => '3.0.25'
+  config.gem 'compass', :version => '~> 0.10.6'
+  config.gem 'will_paginate', :version => '~> 2.3.11'
+  config.gem 'delocalize', :version => '0.2.3'
+  config.gem 'paperclip', :version => '~> 2.3.3'
 
   config.after_initialize do
     # Add new inflection rules using the following format:
@@ -85,6 +92,4 @@ Radiant::Initializer.run do |config|
       inflect.uncountable 'config'
     end
   end
-  
-  config.gem 'will_paginate', :version => '~> 2.3.11', :source => 'http://gemcutter.org'
 end

data/config/environments/cucumber.rb

@@ -21,9 +21,9 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem 'cucumber-rails',   :lib => false, :version => '>=0.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
-config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
-config.gem 'webrat',           :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
-config.gem 'rspec',            :lib => false, :version => '>=1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails',      :lib => false, :version => '>=1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+config.gem 'cucumber-rails',   :lib => false, :version => '~>0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
+config.gem 'database_cleaner', :lib => false, :version => '~>0.6.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
+config.gem 'webrat',           :lib => false, :version => '~>0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem 'rspec',            :lib => false, :version => '~>1.3.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem 'rspec-rails',      :lib => false, :version => '~>1.3.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
 

data/config/environments/test.rb

@@ -30,9 +30,9 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem 'cucumber-rails',   :lib => false, :version => '>=0.2.4' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
-config.gem 'database_cleaner', :lib => false, :version => '>=0.4.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
-config.gem 'webrat',           :lib => false, :version => '>=0.6.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
-config.gem 'rspec',            :lib => false, :version => '>=1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails',      :lib => false, :version => '>=1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+config.gem 'cucumber-rails',   :lib => false, :version => '~>0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
+config.gem 'database_cleaner', :lib => false, :version => '~>0.6.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
+config.gem 'webrat',           :lib => false, :version => '~>0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem 'rspec',            :lib => false, :version => '~>1.3.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem 'rspec-rails',      :lib => false, :version => '~>1.3.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
 

data/config/initializers/compass.rb

@@ -0,0 +1,3 @@
+require 'compass'
+require 'compass/app_integration/rails'
+Compass::AppIntegration::Rails.initialize!