refinerycms 0.9.7 → 0.9.7.1

data/.gitignore

@@ -18,7 +18,6 @@ db/*.sqlite3
 public/javascripts/cache
 public/stylesheets/cache
 .yardoc/
-refinerycms.gemspec
 vendor/cache
 .bundle
 *.rbc

data/Gemfile

@@ -1,10 +1,12 @@
 source :rubygems
 
 # Specify the database driver as appropriate for your application (only one is necessary).
-gem 'mysql', :require => 'mysql'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+# Defaults to sqlite3. Don't remove any of these below in the core or gems won't install.
+gem 'sqlite3-ruby', :require => 'sqlite3' #db_adapter=sqlite3
+#gem 'mysql', :require => 'mysql' #db_adapter=mysql
+#gem 'pg' #db_adapter=postgresql
 
-# Specify your favourite web server (only one).
+# Specify your favourite web server (only one) - not required.
 #gem 'unicorn', :group => :development
 #gem 'mongrel', :group => :development
 
@@ -40,7 +42,7 @@ end
 
 #===REQUIRED FOR REFINERY GEM INSTALL===
 # Leave the gem below disabled (commented out) if you're not using the gem install method.
-#gem 'refinerycms',    '= 0.9.7.dev'
+#gem 'refinerycms',    '= 0.9.7.1'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:

data/bin/refinery

@@ -5,8 +5,13 @@ require 'fileutils'
 refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
 unless (app_path = ARGV.shift).nil? or app_path.length == 0
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
-  rails_root = (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2)) ? Dir.getwd : app_path
-  if File.exists? rails_root
+  if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))
+    rails_root = Dir.getwd
+  else
+    rails_root = app_path =~ /^\// ? app_path : File.expand_path(File.join(Dir.getwd, app_path.gsub(/^\.\//, '')))
+  end
+  
+  if File.directory?(rails_root)
     if ARGV.include?("--force")
       # remove the contents of the current directory
       Dir[File.join(rails_root, "*")].each {|dir| FileUtils::rm_rf(dir, :secure => true) }
@@ -15,20 +20,30 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     end
   end
 
-  unless File.exists? rails_root and !ARGV.include?("--force")
+  unless File.directory?(rails_root) and !ARGV.include?("--force")
     # make the application path directory
     FileUtils::makedirs rails_root
 
     # copy in all of the relevant directories and root files.
-    to_copy = %w(app config db lib public themes script license.md Rakefile readme.md VERSION Gemfile .gitignore).map do |dir|
-      refinery_root.join(dir).to_s
+    to_copy = %w(app config db lib public themes script *.md Rakefile .gitignore config.ru asdas).map do |dir|
+      (new_file_path = refinery_root.join(dir)).exist? ? new_file_path.to_s : nil
     end
-    FileUtils::cp_r to_copy, rails_root, :verbose => false
+    FileUtils::cp_r to_copy.compact, rails_root, :verbose => false
 
     # ensure lib/refinery_initializer.rb and lib/gemspec.rb don't make it in.
     FileUtils::rm File.join(%W(#{rails_root} lib refinery_initializer.rb)) if File.exists?(File.join(%W(#{rails_root} lib refinery_initializer.rb)))
     FileUtils::rm File.join(%W(#{rails_root} lib gemspec.rb)) if File.exists?(File.join(%W(#{rails_root} lib gemspec.rb)))
 
+    # copy the appropriate database adapter as specified (or not)
+    db_adapter = 'sqlite3'
+    if ARGV.collect{|a| a.split('=').first}.include?('--database')
+      ARGV.each do |arg|
+        arg_parts = arg.split('=')
+        db_adapter = arg_parts.last if arg_parts.first == '--database'
+      end
+    end
+    FileUtils::cp File.join(%W(#{rails_root} config database.yml.#{db_adapter})), File.join(%W(#{rails_root} config database.yml.example))
+    
     # add in the config files
     %w(database amazon_s3 rackspace_cloudfiles).each do |config|
       FileUtils::move File.join(%W(#{rails_root} config #{config}.yml.example)), File.join(%W(#{rails_root} config #{config}.yml))
@@ -45,7 +60,9 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
           line.gsub!("your_production_#{config}", "#{app_name}_production")
         end
         # write the new content into the file.
-        File.open(File.join(%W(#{rails_root} config #{config}.yml)), "w").puts(lines.join("\n"))
+        config_file = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "w")
+        config_file.puts(lines.join("\n"))
+        config_file.close
       end
     end
 
@@ -61,35 +78,65 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
       match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
       line.gsub!(match, new_digest) unless match.nil?
     end
-    # write the new content into the file.
-    File.open(File.join(%W(#{rails_root} config #{app_config_file})), "w").puts(lines.join("\n"))
+    
+    # write the new content into the config file.
+    app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "w")
+    app_config.puts(lines.join("\n"))
+    app_config.close
 
     # read in the Gemfile and write it back out with the refinerycms gem enabled.
-    lines = File.open(File.join(%W(#{rails_root} Gemfile)), "r").read.split("\n")
-    lines.each do |line|
+    (lines = refinery_root.join('Gemfile').open('r').read.split("\n")).each do |line|
       line.gsub!("#gem 'refinerycms'", "gem 'refinerycms'")
+      
+      # Ensure that the correct database gem libraries are included for the database adapter
+      # that the user has specified in the refinery install command.
+      if line =~ /\#db\_adapter\=/
+        if line =~ %r{#db_adapter=#{db_adapter}}
+          line.gsub!(/^(\#*\ ?gem)/, 'gem')
+        else
+          line.gsub!(/^(\ ?gem)/, '#gem')
+        end
+      end
     end
+
     # write the new content into the file.
-    File.open(File.join(%W(#{rails_root} Gemfile)), "w").puts(lines.join("\n"))
+    app_gemfile = File.open(File.join(%W(#{rails_root} Gemfile)), "w")
+    app_gemfile.puts(lines.join("\n"))
+    app_gemfile.close
 
     puts "\n---------"
     puts "Refinery successfully installed in '#{rails_root}'!\n\n"
-
+    
+    # automate..
+    Dir.chdir(rails_root) do
+      puts "Installing gem requirements using bundler..\n"
+      puts (cmd="bundle install --without test")
+      puts `#{cmd}`
+      
+      puts "\n\nSetting up your development database..\n"
+      puts (cmd="rake -f #{File.join(rails_root, 'Rakefile')} db:setup")
+      puts `#{cmd}`
+      
+      puts "\n\nUpdating some core refinery files..\n"
+      puts (cmd="rake -f #{File.join(rails_root, 'Rakefile')} refinery:update")
+      puts `#{cmd}`
+    end
+    
     # output helpful messages.
-    puts "=== ACTION REQUIRED ==="
-    puts "\nNow run these commands:"
+    puts "\n=== ACTION REQUIRED ==="
+    puts "Now you can launch your webserver using:"
     puts "\ncd #{rails_root}"
-    puts "bundle install"
-    puts "rake db:setup"
-    puts "rake refinery:update"
-    puts "\nunicorn_rails -p3000"
-    puts "or"
-    puts "ruby script/server"
-    puts "\nThis will install all the required gems, set up your database, and launches the  webserver."
+    puts "script/server"
+    puts "\nThis will launch the built-in webserver at port 3000."
     puts "You can now see your site running in your browser at http://localhost:3000"
     puts "\nThanks for installing Refinery, enjoy creating your new application!"
     puts "---------\n\n"
   end
 else
-  puts "Please specify the path where you want to install Refinery. i.e. refinery /path/to/project"
+  puts "\nPlease specify the path where you want to install Refinery. i.e. refinery /path/to/project [options]"
+  puts "\n"
+  puts "Options:"
+  puts "--force             Forces the directory to be overriden if the directory already exists"
+  puts "--database=name     Preconfigure for selected database (options: mysql/postgresql/sqlite3 - default: sqlite3)."
+  puts "\n"
 end

data/changelog.md

@@ -1,313 +1,328 @@
-===0.9.7 [02 July 2010]
+## 0.9.7.1 [03 July 2010]
+
+- Bugfixes in the gem installation method process. [Philip Arndt]
+- Made installing from gem faster. [Philip Arndt]
+- Provided example files for sqlite3, mysql and postgresql. [Philip Arndt]
+- Created option for specifying a database adapter (sqlite3, mysql or postgresql) when creating from Gem. [Philip Arndt]
+- Other bugfixes including UI consistency around signup. [Philip Arndt]
+
+## 0.9.7 [02 July 2010]
 
 - Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn and Philip Arndt and many others]
 - Marketable URLs, such as /contact [Joshua Davey and Joe Sak].
 - Switched to bundler and rack. [Alex Coles and Philip Arndt]
 - Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel and Philip Arndt]
-- Added spam filtering to contact form [djones]
-- Full Refinery UI redesign [Resolve Digital]
-- User Role support [Amanda Nicholas and Philip Arndt]
+- Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions [Philip Arndt]
+- Added spam filtering to contact form. [djones]
+- Full Refinery UI redesign. [Resolve Digital]
+- User Role support. [Amanda Wagener and Philip Arndt]
 
-===0.9.6.34 [09 May 2010]
+## 0.9.6.34 [09 May 2010]
 
 - Bugfixes.
 
-===0.9.6.33 [06 May 2010]
+## 0.9.6.33 [06 May 2010]
 
 - Bugfixes.
 
-===0.9.6.32 [05 May 2010]
+## 0.9.6.32 [05 May 2010]
 
 - Bugfixes.
 
-===0.9.6.31 [19 April 2010]
+## 0.9.6.31 [19 April 2010]
 
 - Bugfixes.
 
-===0.9.6.30 [15 April 2010]
+## 0.9.6.30 [15 April 2010]
 
 - Bugfixes.
 
-===0.9.6.29 [14 April 2010]
+## 0.9.6.29 [14 April 2010]
 
 - Bugfixes.
 
-===0.9.6.28 [12 April 2010]
+## 0.9.6.28 [12 April 2010]
 
 - Bugfixes.
 
-===0.9.6.27 [12 April 2010]
+## 0.9.6.27 [12 April 2010]
 
 - Bugfixes.
 
-===0.9.6.26 [07 April 2010]
+## 0.9.6.26 [07 April 2010]
 
 - Bugfixes.
 
-===0.9.6.25 [01 April 2010]
+## 0.9.6.25 [01 April 2010]
 
 - Bugfixes.
 
-===0.9.6.24 [26 March 2010]
+## 0.9.6.24 [26 March 2010]
 
 - Bugfixes.
 
-===0.9.6.23 [26 March 2010]
+## 0.9.6.23 [26 March 2010]
 
 - Bugfixes.
 
-===0.9.6.22 [26 March 2010]
+## 0.9.6.22 [26 March 2010]
 
 - Bugfixes.
 
-===0.9.6.21 [23 March 2010]
+## 0.9.6.21 [23 March 2010]
 
 - Bugfixes.
 
-===0.9.6.19 [03 March 2010]
+## 0.9.6.19 [03 March 2010]
 
 - Bugfixes.
 
-===0.9.6.18 [02 March 2010]
+## 0.9.6.18 [02 March 2010]
 
 - Bugfixes.
 
-===0.9.6.17 [02 March 2010]
+## 0.9.6.17 [02 March 2010]
 
 - Bugfixes.
 
-===0.9.6.16 [02 March 2010]
+## 0.9.6.16 [02 March 2010]
 
 - Bugfixes.
 
-===0.9.6.15 [01 March 2010]
+## 0.9.6.15 [01 March 2010]
 
 - Bugfixes.
 
-===0.9.6.14 [24 February 2010]
+## 0.9.6.14 [24 February 2010]
 
 - Bugfixes.
 
-===0.9.6.13 [23 February 2010]
+## 0.9.6.13 [23 February 2010]
 
 - Bugfixes.
 
-===0.9.6.12 [16 February 2010]
+## 0.9.6.12 [16 February 2010]
 
 - Bugfixes.
 
-===0.9.6.11 [16 February 2010]
+## 0.9.6.11 [16 February 2010]
 
 - Bugfixes.
 
-===0.9.6.10 [15 February 2010]
+## 0.9.6.10 [15 February 2010]
 
 - Bugfixes.
 
-===0.9.6.9 [15 February 2010]
+## 0.9.6.9 [15 February 2010]
 
 - Bugfixes.
 
-===0.9.6.8 [14 February 2010]
+## 0.9.6.8 [14 February 2010]
 
 - Bugfixes.
 
-===0.9.6.7 [10 February 2010]
+## 0.9.6.7 [10 February 2010]
 
 - Bugfixes.
 
-===0.9.6.6 [10 February 2010]
+## 0.9.6.6 [10 February 2010]
 
 - Bugfixes.
 
-===0.9.6.5 [08 February 2010]
+## 0.9.6.5 [08 February 2010]
 
 - Bugfixes.
 
-===0.9.6.4 [07 February 2010]
+## 0.9.6.4 [07 February 2010]
 
 - Bugfixes.
 
-===0.9.6.3 [07 February 2010]
+## 0.9.6.3 [07 February 2010]
 
 - Bugfixes.
 
-===0.9.6.2 [04 February 2010]
+## 0.9.6.2 [04 February 2010]
 
 - Bugfixes.
 
-===0.9.6.1 [04 February 2010]
+## 0.9.6.1 [04 February 2010]
 
 - Bugfixes.
 
-===0.9.6 [04 February 2010]
+## 0.9.6 [04 February 2010]
 
 - Minor release.
 
-===0.9.5.31 [27 January 2010]
+## 0.9.5.31 [27 January 2010]
 
 - Bugfixes.
 
-===0.9.5.30 [24 January 2010]
+## 0.9.5.30 [24 January 2010]
 
 - Bugfixes.
 
-===0.9.5.29 [23 December 2009]
+## 0.9.5.29 [23 December 2009]
 
 - Bugfixes.
 
-===0.9.5.28 [17 December 2009]
+## 0.9.5.28 [17 December 2009]
 
 - Bugfixes.
 
-===0.9.5.27 [16 December 2009]
+## 0.9.5.27 [16 December 2009]
 
 - Bugfixes.
 
-===0.9.5.26 [13 December 2009]
+## 0.9.5.26 [13 December 2009]
 
 - Bugfixes.
 
-===0.9.5.25 [09 December 2009]
+## 0.9.5.25 [09 December 2009]
 
 - Bugfixes.
 
-===0.9.5.24 [08 December 2009]
+## 0.9.5.24 [08 December 2009]
 
 - Bugfixes.
 
-===0.9.5.23 [07 December 2009]
+## 0.9.5.23 [07 December 2009]
 
 - Bugfixes.
 
-===0.9.5.22 [07 December 2009]
+## 0.9.5.22 [07 December 2009]
 
 - Bugfixes.
 
-===0.9.5.21 [06 December 2009]
+## 0.9.5.21 [06 December 2009]
 
 - Bugfixes.
 
-===0.9.5.20 [03 December 2009]
+## 0.9.5.20 [03 December 2009]
 
 - Bugfixes.
 
-===0.9.5.19 [30 November 2009]
+## 0.9.5.19 [30 November 2009]
 
 - Bugfixes.
 
-===0.9.5.18 [29 November 2009]
+## 0.9.5.18 [29 November 2009]
 
 - Bugfixes.
 
-===0.9.5.16 [26 November 2009]
+## 0.9.5.16 [26 November 2009]
 
 - Bugfixes.
 
-===0.9.5.15 [22 November 2009]
+## 0.9.5.15 [22 November 2009]
 
 - Bugfixes.
 
-===0.9.5.14 [19 November 2009]
+## 0.9.5.14 [19 November 2009]
 
 - Bugfixes.
 
-===0.9.5.13 [18 November 2009]
+## 0.9.5.13 [18 November 2009]
 
 - Bugfixes.
 
-===0.9.5.12 [18 November 2009]
+## 0.9.5.12 [18 November 2009]
 
 - Bugfixes.
 
-===0.9.5.11 [18 November 2009]
+## 0.9.5.11 [18 November 2009]
 
 - Bugfixes.
 
-===0.9.5.10 [17 November 2009]
+## 0.9.5.10 [17 November 2009]
 
 - Bugfixes.
 
-===0.9.5.9 [16 November 2009]
+## 0.9.5.9 [16 November 2009]
 
 - Bugfixes.
 
-===0.9.5.8 [15 November 2009]
+## 0.9.5.8 [15 November 2009]
 
 - Bugfixes.
 
-===0.9.5.7 [09 November 2009]
+## 0.9.5.7 [09 November 2009]
 
 - Bugfixes.
 
-===0.9.5.6 [09 November 2009]
+## 0.9.5.6 [09 November 2009]
 
 - Bugfixes.
 
-===0.9.5.5 [08 November 2009]
+## 0.9.5.5 [08 November 2009]
 
 - Bugfixes.
 
-===0.9.5.4 [04 November 2009]
+## 0.9.5.4 [04 November 2009]
 
 - Bugfixes.
 
-===0.9.5.3 [04 November 2009]
+## 0.9.5.3 [04 November 2009]
 
 - Bugfixes.
 
-===0.9.5.2 [04 November 2009]
+## 0.9.5.2 [04 November 2009]
 
 - Bugfixes.
 
-===0.9.5.1 [03 November 2009]
+## 0.9.5.1 [03 November 2009]
 
 - Bugfixes.
 
-===0.9.5 [03 November 2009]
+## 0.9.5 [03 November 2009]
 
 - Minor release.
 
-===0.9.4.4 [29 October 2009]
+## 0.9.4.4 [29 October 2009]
 
 - Bugfixes.
 
-===0.9.4.3 [19 October 2009]
+## 0.9.4.3 [19 October 2009]
 
 - Bugfixes.
 
-===0.9.4.2 [19 October 2009]
+## 0.9.4.2 [19 October 2009]
 
 - Bugfixes.
 
-===0.9.4 [15 October 2009]
+## 0.9.4 [15 October 2009]
 
 - Minor release.
 
-===0.9.3 [11 October 2009]
+## 0.9.3 [11 October 2009]
 
-- Minor release.
+- Optimise loading of WYM Editors
+- Supported more plugins' menu matches
 
-===0.9.2.2 [08 October 2009]
+## 0.9.2.2 [08 October 2009]
 
 - Bugfixes.
 
-===0.9.2.1 [08 October 2009]
+## 0.9.2.1 [08 October 2009]
 
-- Bugfixes.
+- Fix bug with using instance_methods vs using methods to detect whether friendly_id is present.
 
-===0.9.2 [08 October 2009]
+## 0.9.2 [08 October 2009]
 
-- Minor release.
+- Update rails gem requirement to 2.3.4.
 
-===0.9.1.2 [07 October 2009]
+## 0.9.1.2 [07 October 2009]
 
-- Bugfixes.
+- Updated JS libraries and added lots of convenience methods.
 
-===0.9.1.1 [05 October 2009]
+## 0.9.1.1 [05 October 2009]
 
-- Bugfixes.
+- HTML & CSS changes.
+
+## 0.9.1 [04 October 2009]
+
+- Bugfixes
+- Renamed project from Refinery to refinerycms and released as a gem.
 
-===0.9.1 [04 October 2009]
+## 0.9 [29 May 2009]
 
 - Initial public release.

data/config/{database.yml.example → database.yml.mysql}

@@ -17,8 +17,8 @@ cucumber: &cucumber
   <<: *test
 
 production: &production
-  database: your_production_database
   adapter: mysql
   host: localhost
+  database: your_production_database
   username: your_production_database_login
   password: your_production_database_password

data/config/database.yml.postgresql

@@ -0,0 +1,57 @@
+# PostgreSQL. Versions 7.4 and 8.x are supported.
+#
+# Install the ruby-postgres driver:
+#   gem install ruby-postgres
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+login: &login
+  adapter: postgresql
+  encoding: unicode
+  username: postgres
+  password: postgres
+  pool: 5
+  
+development: &development
+  database: your_local_database
+  <<: *login
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # The server defaults to notice.
+  #min_messages: warning
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
+  database: your_test_database
+  <<: *login
+
+# Warning: The database defined as "cucumber" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+cucumber: &cucumber
+  database: your_cucumber_database
+  <<: *login
+
+production: &production
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+  database: your_production_database
+  username: your_production_database_login
+  password: your_production_database_password

data/config/database.yml.sqlite3

@@ -0,0 +1,26 @@
+# SQLite version 3.x
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  timeout: 5000
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  timeout: 5000
+
+# Warning: The database defined as 'cucumber' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+cucumber:
+  adapter: sqlite3
+  database: db/cucumber.sqlite3
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  timeout: 5000

data/lib/gemspec.rb

@@ -5,7 +5,7 @@ files = %w( .gitignore .yardopts Gemfile Rakefile changelog.md readme.md license
   files += Dir.glob("#{dir}/**/*")
 end
 
-files.reject!{|f| !File.exist?(f) or f =~ /^(public\/system)|(config\/database.yml$)|(.*\/cache)|(.*\.sqlite3?)|(.+\.rbc)/}
+files.reject!{|f| !File.exist?(f) or f =~ /^(public\/system)|(config\/database.yml$)|(.*\/cache)|(db\/.*\.sqlite3?)|(.+\.rbc)/}
 
 gemspec = <<EOF
 Gem::Specification.new do |s|

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

@@ -22,7 +22,7 @@ class Admin::UsersController < Admin::BaseController
 
     if @user.save
       @user.plugins = @selected_plugin_names
-      redirect_to :action => 'index', :notice => t('refinery.crudify.created', :what => @user.login)
+      redirect_to(admin_users_url, :notice => t('refinery.crudify.created', :what => @user.login))
     else
       render :action => 'new'
     end

data/vendor/plugins/authentication/app/views/users/new.html.erb

@@ -17,10 +17,19 @@
     <%= f.label :password_confirmation %>
     <%= f.password_field :password_confirmation, :class => 'larger widest' %>
   </div>
+
   <% if just_installed? %>
     <% Refinery::Plugins.registered.in_menu.names.sort.each do |plugin| -%>
       <%= hidden_field_tag 'user[plugins][]', plugin, :id => "plugins_#{plugin.downcase.gsub(" ", "_")}" %>
     <% end -%>
   <% end -%>
-  <p><%= submit_tag t('.sign_up') %></p>
+
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :submit_continue => false,
+               :submit_button_text => t('.sign_up'),
+               :hide_delete => true,
+               :hide_cancel => true
+             }%>
 <% end -%>

data/vendor/plugins/authentication/config/locales/sl.yml

@@ -22,8 +22,9 @@ sl:
     login_failed: Oprostite, vaše geslo ali uporabniško ime je bilo napačno.
     logged_out: Uspešno ste se odjavili.
     new:
+      hello_please_sign_in: "Pozdravljeni! Prosimo prijavite se."
       login: Uporabniško ime
-      log_in: Prijavi se
+      sign_in: Prijavi se
       cancel: Prekliči
       password: Geslo
       remember_me: Zapomni se me
@@ -71,8 +72,8 @@ sl:
       user_session: SejaUporabnika
     attributes:
       user_session:
-        login: uporabniško ime
-        email: email
-        password: geslo
+        login: Uporabniško ime
+        email: Email
+        password: Geslo
         remember_me: zapomni se me
         incorrect: "Oprostite, {{login_field}} ali geslo je bilo napačno."

data/vendor/plugins/images/config/locales/sl.yml

@@ -11,16 +11,16 @@ sl:
         image: Slika
         use_current_image: Uporabi trenutno sliko
         or: ali
-        replace_image: Jo zamenjaj s tole ...
+        replace_image: jo zamenjaj z ...
         current_image: Trenutna Slika
-        maximum_image_size: "The maximum image size is {{megabytes}} megabytes."
+        maximum_image_size: "Največja dovoljena velikost slike je lahko {{megabytes}} megabajtov."
       index:
         create_new_image: Ustvari Novo Sliko
         no_images_yet: Trenutno še ni nobene slike. Za prenos prve slike kliknite "Ustvari Novo Sliko".
         view:
-          switch_to: Preklopi v {{view_name}} pogled
+          switch_to: Preklopi pogled v {{view_name}}
           list: seznam
-          grid: mrežni
+          grid: mrežo
         search:
           results_for: Iskalni rezultati za {{query}}
       grid_view:

data/vendor/plugins/inquiries/config/locales/sl.yml

@@ -32,9 +32,10 @@ sl:
         closed: "Povpraševanje '{{inquiry}}' je zaprto"
         reopened: "Povpraševanje '{{inquiry}}' je ponovno odprto"
       index:
+        no_inquiries: Trenutno še ni nobenega povpraševanja.
+      submenu:
         update_notified: Uredi prejemnike obvestila
         edit_confirmation_email: Uredni potrditveni email
-        no_inquiries: Trenutno še ni nobenega povpraševanja.
       show:
         details: Podrobnosti
         click_to_email: Pošlji email sporočilo

data/vendor/plugins/refinery/app/views/welcome.html.erb

@@ -8,4 +8,9 @@
 <p>
   <%= t('.lets_start') %>
 </p>
-<%= button_to t('.continue'), new_user_url %>
+
+<div class='form-actions'>
+  <div class='form-actions-left'>
+    <%= button_to t('.continue'), new_user_url %>
+  </div>
+</div>

data/vendor/plugins/refinery/config/locales/sl.yml

@@ -53,7 +53,7 @@ sl:
         current: "Trenutna {{what}}"
         download_current: "Prenesi trenutno {{what}}"
         opens_in_new_window: Odpri v novem oknu
-        remove_current: "Odstrani trnutno {{what}}"
+        remove_current: "Odstrani trenutno {{what}}"
         resource: vir
     message:
       close: Zapri

data/vendor/plugins/refinery/lib/refinery.rb

@@ -27,7 +27,7 @@ module Refinery
     MAJOR = 0
     MINOR = 9
     TINY = 7
-    BUILD = nil
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  version: 0.9.7
+  - 1
+  version: 0.9.7.1
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +12:00
+date: 2010-07-03 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -52,7 +53,9 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/cucumber.yml
-- config/database.yml.example
+- config/database.yml.mysql
+- config/database.yml.postgresql
+- config/database.yml.sqlite3
 - config/environment.rb
 - config/environments/cucumber.rb
 - config/environments/development.rb