refinerycms 0.9.6.34 → 0.9.7

data/test/fixtures/user_plugins.yml

@@ -1,36 +1,32 @@
-quentin_images:
+# TODO: I don't think we need this one
+quentin_refinery:
   user: quentin
-  title: Images
-  
-quentin_inquiries:
+  name: refinery_core
+
+quentin_dialogs:
   user: quentin
-  title: Inquiries
-  
-quentin_users:
+  name: refinery_dialogs
+
+quentin_images:
   user: quentin
-  title: Users
-  
-quentin_news:
+  name: refinery_images
+
+quentin_inquiries:
   user: quentin
-  title: News
+  name: refinery_inquiries
 
 quentin_pages:
   user: quentin
-  title: Pages
+  name: refinery_pages
 
-quentin_dialogs:
+quentin_resources:
   user: quentin
-  title: Dialogs
-  
+  name: refinery_resources
+
 quentin_settings:
   user: quentin
-  title: Settings
-  
-quentin_resources:
-  user: quentin
-  title: Resources
-  
-# TODO: I don't think we need this one  
-quentin_refinery:
+  name: refinery_settings
+
+quentin_users:
   user: quentin
-  title: Refinery
+  name: refinery_users

data/test/functional/dashboard_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'admin/dashboard_controller'
 
 class Admin::DashboardController; def rescue_action(e) raise e end; end
@@ -9,6 +9,7 @@ class DashboardControllerTest < ActionController::TestCase
 
   def setup
     @controller = Admin::DashboardController.new
+    users(:quentin).add_role(:refinery)
     login_as(:quentin)
   end
 

data/test/functional/images_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'admin/images_controller'
 
 class Admin::ImagesController; def rescue_action(e) raise e end; end
@@ -9,6 +9,7 @@ class ImagesControllerTest < ActionController::TestCase
 
   def setup
     @controller = Admin::ImagesController.new
+    users(:quentin).add_role(:refinery)
     login_as(:quentin)
   end
 
@@ -16,7 +17,7 @@ class ImagesControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_not_nil assigns(:images)
-    assert assigns(:images).size, Image.count
+    assert_equal assigns(:images).size, Image.count
   end
 
   def test_new_image_form
@@ -25,14 +26,6 @@ class ImagesControllerTest < ActionController::TestCase
     assert_not_nil assigns(:url_override)
   end
 
-  def test_search
-    get :index, :search => "Car"
-
-    assert 1, assigns(:images).size
-    assert images(:the_world), assigns(:images).first
-    assert_not_nil assigns(:images)
-  end
-
   def test_should_require_login_and_redirect
     logout
 

data/test/unit/image_test.rb

@@ -13,7 +13,7 @@ class ImageTest < ActiveSupport::TestCase
   end
 
   def test_per_page
-    assert_equal 18, Image.per_page(dialog = true)
+    assert_equal 12, Image.per_page(dialog = true)
     assert_equal 20, Image.per_page # dialog = false
   end
 

data/test/unit/inquiry_test.rb

@@ -7,23 +7,23 @@ class InquiryTest < ActiveSupport::TestCase
   def setup
     @new_inquiry = Inquiry.new
     @bad_email_inquiry = Inquiry.new(:email => "foo.bar.com", :name => "Dave")
-    @valid_inquiry = Inquiry.new(:email => "foo@bar.com", :name => "Dave")
+    @valid_inquiry = Inquiry.new(:email => "foo@bar.com", :name => "Dave", :message => "msg")
     @full_valid_inquiry = Inquiry.new(:email => "foo@bar.com", :name => "Dave", :phone => "3232332", :message => "message")
   end
 
   def test_should_force_name_and_email_to_be_valid
     assert !@new_inquiry.save
 
-    assert_equal "can't be blank", @new_inquiry.errors.on('name')
-    assert_equal "must be valid", @new_inquiry.errors.on('email')
+    assert_equal I18n.translate("activerecord.errors.messages.blank"), @new_inquiry.errors.on('name')
+    assert_equal I18n.translate("activerecord.errors.messages.invalid"), @new_inquiry.errors.on('email')
 
     assert_nil @new_inquiry.errors.on('phone')
-    assert_nil @new_inquiry.errors.on('message')
+    assert_equal I18n.translate("activerecord.errors.messages.blank"), @new_inquiry.errors.on('message')
 
     assert !@bad_email_inquiry.save
-    assert_equal "must be valid", @bad_email_inquiry.errors.on('email')
+    assert_equal I18n.translate("activerecord.errors.messages.invalid"), @bad_email_inquiry.errors.on('email')
     assert_nil @bad_email_inquiry.errors.on('phone')
-    assert_nil @bad_email_inquiry.errors.on('message')
+    assert_equal I18n.translate("activerecord.errors.messages.blank"), @bad_email_inquiry.errors.on('message')
     assert_nil @bad_email_inquiry.errors.on('name')
 
     assert @valid_inquiry.save

data/test/unit/page_test.rb

@@ -45,7 +45,7 @@ class PageTest < ActiveSupport::TestCase
   end
 
   def test_should_have_custom_url_override
-    assert_equal({:controller => "/inquiries/new"}, pages(:contact_us).url) # the contact us page links to the inquiries plugin form
+    assert_equal({:controller => "/contact"}, pages(:contact_us).url) # the contact us page links to the inquiries plugin form
     assert_equal({:controller => "/"}, pages(:home_page).url) # the home page has a special "/" url
     assert_equal "http://www.resolvedigital.co.nz", pages(:resolve_digital_page).url # this page links to an external url
   end
@@ -56,6 +56,36 @@ class PageTest < ActiveSupport::TestCase
     # test seems to reduce the id instead e.g. /pages/234423
   end
 
+  def test_should_have_paramaterized_url
+    # Save the page to generate the friendly_id slug
+    pages(:products).save
+    assert_equal "products", pages(:products).to_param
+  end
+
+  def test_should_have_nested_url
+    pages(:blue_jelly).save
+    pages(:products).save
+    assert_equal ['products','blue-jelly'], pages(:blue_jelly).nested_url # returns ancestors' to_param with its own
+  end
+
+  def test_regular_url_should_include_path
+    pages(:blue_jelly).save
+    pages(:products).save
+    assert_equal ['products','blue-jelly'], pages(:blue_jelly).url[:path]
+  end
+
+  def test_friendly_id_default_reserved_words
+    reserved_words = Page.friendly_id_config.reserved_words
+    %W(session login logout refinery users admin pages wymiframe).each do |page_slug|
+      assert reserved_words.include?(page_slug), "missing #{page_slug}"
+    end
+  end
+
+  def test_reserved_words_raise_exception
+    # Normally, FriendlyId protects it's reserved words. We should catch these somehow.
+    assert_nothing_raised(FriendlyId::ReservedError) { Page.create(:title => "Refinery") }
+  end
+
   def test_drafts
     assert_equal false, pages(:draft_page).live? # the draft page is indeed a draft
     assert_equal true, pages(:home_page).live? # the home page is not a draft

data/test/unit/refinery_setting_test.rb

@@ -33,7 +33,7 @@ class RefinerySettingTest < ActiveSupport::TestCase
   end
 
   def test_per_page
-    assert_equal 10, RefinerySetting.per_page
+    assert_equal 12, RefinerySetting.per_page
   end
 
   def test_boolean_settings

data/themes/demolicious/stylesheets/application.css

@@ -1,6 +1,6 @@
 @import url('/stylesheets/refinery/application.css');
-/*  
-    Override default refinery application CSS below. 
+/*
+    Override default refinery application CSS below.
     Formatting applies to all frontend.
 */
 body {
@@ -11,7 +11,7 @@ body {
     margin-top: 36px;
 }
 #body_content_left {
-    width: 544px;
+    width: 574px;
 }
 #body_content_right {
     width: 396px;
@@ -24,8 +24,8 @@ body {
     padding: 0px;
     margin: 0px;
 }
-#body, #header_content, #footer_content {
-    width: 960px;
+#body, #header_content, #footer_content, #site_bar_content {
+    width: 990px;
     margin: 0px auto;
 }
 #header {
@@ -51,23 +51,27 @@ body {
     right: 0px;
     padding: 0px;
 }
-#menu li {
+#language_switcher {
+    float:right;
+    padding-top:15px;
+}
+#menu li, #menu > a, #menu div {
     float: left;
     list-style: none;
     position: relative;
 }
-#menu li a, #menu li:hover ul li a {
+#menu a, #menu li:hover ul li a, #menu a:hover nav a {
     color: #969792;
     display: block;
     padding: 10px 18px;
     text-decoration: none;
     cursor: pointer;
 }
-#menu li.selected a, #menu li:hover a, #menu li a:hover, #menu li ul li a:hover {
+#menu li.selected a, #menu li:hover a, #menu li a:hover, #menu li ul li a:hover, #menu div.selected a, #menu a.selected, #menu a:hover, #menu div:hover > a {
     color: #32322b;
     background: white;
 }
-#menu li ul {
+#menu li ul, #menu nav {
     position: absolute;
     left: -99999px;
     padding: 0px;
@@ -76,10 +80,10 @@ body {
     max-width: 300px;
     background: white;
 }
-#menu li ul li {
+#menu li ul li, #menu nav a {
     float: left;
 }
-#menu li:hover ul {
+#menu li:hover ul, #menu div:hover nav {
     left: auto;
 }
 #footer {
@@ -91,4 +95,11 @@ body {
     padding-top: 94px;
     background: url('/images/refinery/logo.png') 0px 80px no-repeat;
     text-align: right;
-}
+}
+.inquiries .field input, .inquiries textarea {
+  border: 1px solid #75766f;
+  margin-left: 0px;
+}
+.inquiries textarea {
+  width: 375px;
+}

data/themes/demolicious/stylesheets/formatting.css

@@ -3,11 +3,11 @@
     Override default refinery formatting below. 
     Formatting applies to backend WYSIWYG editors and all frontend. 
 */
-body {
+body, input, textarea, select, p, li, blockquote {
     font-family: Verdana;
     font-size: 12px;
 }
-#body_content_left *, #body_content_right * {
+#body_content_left *, #body_content_right *, .page_part_body, .page_part_side_body {
     line-height: 22px;
     color: #585858;
 }
@@ -17,7 +17,7 @@ h1, #body_content h1, h1#body_content_page_title {
     font-weight: normal;
     font-family: "Trebuchet MS", Trebuchet;
 }
-#body_content_left p, #body_content_right p {
+#body_content_left p, #body_content_right p, .page_part_body p, .page_part_side_body p {
     margin-bottom: 12px;
 }
 h2, h3 {

data/themes/demolicious/stylesheets/home.css

@@ -2,7 +2,4 @@
 /* 
     Override default refinery homepage styles here. 
     These only apply to the homepage of your site. 
-*/
-#body_content {
-    margin-top: 1px;
-}
+*/

data/themes/demolicious/views/layouts/application.html.erb

@@ -2,17 +2,17 @@
 <html>
   <%= render :partial => "/shared/head", :locals => {:theme => true} %>
   <body>
-    <%= render :partial => "/shared/site_bar" if logged_in? %>
-    <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
+    <%= render :partial => "/shared/site_bar" %>
     <div id='page_container'>
-      <div id='page' class='clearfix'>
-        <div id='header' class='clearfix'>
+      <div id='page'>
+        <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
+        <div id='header'>
           <%= render :partial => "/shared/header" %>
         </div>
         <div id='body' class='clearfix'>
           <%= yield %>
         </div>
-        <div id='footer' class='clearfix'>
+        <div id='footer'>
           <%= render :partial => "/shared/footer" %>
         </div>
       </div>

data/themes/demolicious/views/pages/home.html.erb

@@ -1 +1 @@
-<%= render :partial => "/shared/content_page", :locals => {:show_submenu => false} %>
+<%= render :partial => "/shared/content_page" %>

data/themes/hemingway/stylesheets/application.css

@@ -42,7 +42,7 @@ body{
 }
 
 /* This class sets the width and position for all rows */
-.inside{
+.inside, #site_bar_content {
   width:80%;
   min-width:65em;
   max-width:85em;

data/themes/hemingway/views/layouts/application.html.erb

@@ -2,6 +2,7 @@
 <html>
   <%= render :partial => "/shared/head", :locals => {:theme => true} %>
   <body>
+    <%= render :partial => "/shared/site_bar" %>
     <div id="header">
       <div class="inside">
         <h2>

data/todo.md

@@ -2,10 +2,6 @@
 
 What are some of the known things that need to be done?
 
-## Internationalization
-
-We've got a branch for it and we need to merge that into the master.
-
 ## Tests
 
 * Add unit test coverage for user, user plugin and user mailer
@@ -14,4 +10,22 @@ We've got a branch for it and we need to merge that into the master.
 
 # Rails 3.0 Support
 
-We've started an effort to move to Rails 3.0 - that just needs to be completed.
+We've started an effort to move to Rails 3.0 - that just needs to be completed.
+
+# Improve the Generator
+
+We need to have support for build in Refinery field types like "image". So I could run
+
+  ./script/generate refinery staff name:string bio:text mugshot:image
+  
+And it will automatically create a form field that pops open the image picker on the staff form.
+
+There is now a partial to easily call an image picker.
+
+# I18n support
+
+* Check all the views for missing translations
+  - Write a small tool that extracts t('.whatever') and check which translation keys are missing, or which keys are not used at all.
+* Translate models and model attributes used in forms (Rails 2.3.8 supports translation form labels!)
+* Javascript messages etc:
+  - http://github.com/fnando/i18n-js

data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb

@@ -12,17 +12,17 @@ class Admin::UsersController < Admin::BaseController
 
   def new
     @user = User.new
-    @selected_plugin_titles = []
+    @selected_plugin_names = []
   end
 
   def create
     @user = User.new(params[:user])
-    @selected_plugin_titles = params[:user][:plugins] || []
+    @selected_plugin_names = params[:user][:plugins] || []
+    @user.add_role(:refinery)
 
     if @user.save
-      @user.plugins = @selected_plugin_titles
-      flash[:notice] = "'#{@user.login}' was successfully created."
-      redirect_to :action => 'index'
+      @user.plugins = @selected_plugin_names
+      redirect_to :action => 'index', :notice => t('refinery.crudify.created', :what => @user.login)
     else
       render :action => 'new'
     end
@@ -30,22 +30,21 @@ class Admin::UsersController < Admin::BaseController
 
   def edit
     @user = User.find params[:id]
-    @selected_plugin_titles = @user.plugins.collect{|p| p.title}
+    @selected_plugin_names = @user.plugins.collect{|p| p.name}
   end
 
   def update
-    @selected_plugin_titles = params[:user][:plugins]
+    @selected_plugin_names = params[:user][:plugins]
     # Prevent the current user from locking themselves out of the User manager
-    if current_user.id == @user.id and !params[:user][:plugins].include?("Users")
-      flash.now[:error] = "You cannot remove the 'Users' plugin from the currently logged in account."
+    if current_user.id == @user.id and !params[:user][:plugins].include?("refinery_users")
+      flash.now[:error] = t('admin.users.update.cannot_remove_user_plugin_from_current_user')
       render :action => "edit"
     else
-      @previously_selected_plugins_titles = @user.plugins.collect{|p| p.title}
+      @previously_selected_plugin_names = @user.plugins.collect{|p| p.name}
       if @user.update_attributes params[:user]
-        flash[:notice] = "'#{@user.login}' was successfully updated."
-        redirect_to admin_users_url
+        redirect_to admin_users_url, :notice => t('refinery.crudify.updated', :what => @user.login)
       else
-        @user.plugins = @previously_selected_plugins_titles
+        @user.plugins = @previously_selected_plugin_names
         @user.save
         render :action => 'edit'
       end
@@ -54,12 +53,8 @@ class Admin::UsersController < Admin::BaseController
 
 protected
 
-  def can_create_public_user
-    User.count == 0
-  end
-
   def load_available_plugins
-    @available_plugins = Refinery::Plugins.registered.in_menu.titles.sort
+    @available_plugins = ::Refinery::Plugins.registered.in_menu.collect{|a| {:name => a.name, :title => a.title} }.sort_by {|a| a[:title]}
   end
 
 end