Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: refinery/refinerycms
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.9.7.1
Choose a base ref
...
head repository: refinery/refinerycms
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.9.7.2
Choose a head ref

Commits on Jul 3, 2010

  1. Localize log out link

    peterz authored and parndt committed Jul 3, 2010
    Copy the full SHA
    704cc51 View commit details
  2. Added some tr for pt-BR

    halan committed Jul 3, 2010
    Copy the full SHA
    fad681d View commit details
  3. Change in pt-BR Inquéritos to Contatos, couse it more usual. And adde…

    …d some fixes in pr-BR tr
    halan committed Jul 3, 2010
    Copy the full SHA
    709072c View commit details

Commits on Jul 4, 2010

  1. Copy the full SHA
    f19fe33 View commit details

Commits on Jul 5, 2010

  1. merge contributions for pt-BR

    parndt committed Jul 5, 2010
    Copy the full SHA
    5bfd7cc View commit details
  2. consolidate keys into correct places and add defaults for switch to w…

    …ebsite and switch to website editor
    parndt committed Jul 5, 2010
    Copy the full SHA
    36f4600 View commit details
  3. Fix broken/missing/incorrect locale keys and make the rake translate:…

    …lost_in_translation_all task look up only Refinery's i18n locales.
    parndt committed Jul 5, 2010
    Copy the full SHA
    27c14c3 View commit details
  4. No missing translations for any locales but some of the translations …

    …are google translated ones so please if you speak one of these, check out what we are saying.
    parndt committed Jul 5, 2010
    1
    Copy the full SHA
    3912974 View commit details
  5. Copy the full SHA
    7bc4f49 View commit details
  6. 2
    Copy the full SHA
    f6047e6 View commit details

Commits on Jul 6, 2010

  1. Fix issue where we were checking against objects which doesn't always…

    … produce the correct results.
    parndt committed Jul 6, 2010
    Copy the full SHA
    5fc9f93 View commit details
  2. Copy the full SHA
    ceeda4f View commit details
  3. Refactor i18n somewhat and made the translate task actually pick up a…

    …ll of the missing keys.
    
    This reveals an average of 55 missing keys for each locale.
    
    Requires urgent attention from those who can translate.
    
    If you can help, please run rake translate:lost_in_translate LOCALE=en while subtituting en for the locale you can translate.
    parndt committed Jul 6, 2010
    2
    Copy the full SHA
    1f9a7ff View commit details
  4. Copy the full SHA
    63a078f View commit details
  5. A little fix in page tr to pt-BR

    halan authored and parndt committed Jul 6, 2010
    Copy the full SHA
    4fb9f9a View commit details
  6. Copy the full SHA
    d3d384b View commit details
  7. Copy the full SHA
    31a3efc View commit details
  8. Copy the full SHA
    a88ea5c View commit details
  9. Copy the full SHA
    3688185 View commit details
  10. Copy the full SHA
    fd03122 View commit details
  11. Be a little quieter when installing refinery by supressing refinery:u…

    …pdate output. This way the user is not confused by multiple 'actions required'.
    stevenheidel authored and parndt committed Jul 6, 2010
    Copy the full SHA
    dfd94f6 View commit details
  12. Removed refinery-update-core as it has been deprecated in favour of r…

    …ake refinery:update.
    stevenheidel authored and parndt committed Jul 6, 2010
    Copy the full SHA
    76abb4e View commit details
  13. update gemspec support files.

    parndt committed Jul 6, 2010
    Copy the full SHA
    6131f70 View commit details
  14. cleanup following commits

    parndt committed Jul 6, 2010
    Copy the full SHA
    3ccb37c View commit details
  15. Copy the full SHA
    d4b6801 View commit details
  16. Copy the full SHA
    e635062 View commit details
  17. Tidy up, hook into search css for english, set production mode in con…

    …fig.ru by default and increment version number.
    parndt committed Jul 6, 2010
    1
    Copy the full SHA
    281271d View commit details
Showing with 437 additions and 359 deletions.
  1. +2 −2 Gemfile
  2. +2 −2 bin/refinery
  3. +0 −126 bin/refinery-update-core
  4. +13 −0 changelog.md
  5. +2 −0 config.ru
  6. +2 −2 db/migrate/20100522020225_rename_permissions_for_resources_plugin_to_files.rb
  7. +3 −6 lib/gemspec.rb
  8. +8 −0 public/javascripts/refinery/admin.js
  9. +24 −2 public/stylesheets/refinery/refinery.css
  10. +4 −7 refinerycms.gemspec
  11. +5 −5 vendor/plugins/authentication/app/models/user.rb
  12. +3 −3 vendor/plugins/authentication/app/views/users/forgot.html.erb
  13. +2 −2 vendor/plugins/authentication/app/views/users/reset.html.erb
  14. +12 −0 vendor/plugins/authentication/config/locales/da.yml
  15. +2 −0 vendor/plugins/authentication/config/locales/de.yml
  16. +5 −0 vendor/plugins/authentication/config/locales/en.yml
  17. +15 −3 vendor/plugins/authentication/config/locales/es.yml
  18. +2 −0 vendor/plugins/authentication/config/locales/fr.yml
  19. +12 −0 vendor/plugins/authentication/config/locales/it.yml
  20. +12 −0 vendor/plugins/authentication/config/locales/nb.yml
  21. +12 −0 vendor/plugins/authentication/config/locales/nl.yml
  22. +36 −5 vendor/plugins/authentication/config/locales/pt-BR.yml
  23. +1 −1 vendor/plugins/authentication/lib/authenticated_system.rb
  24. +8 −2 vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb
  25. +11 −4 vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb
  26. +4 −2 vendor/plugins/dashboard/config/locales/da.yml
  27. +4 −2 vendor/plugins/dashboard/config/locales/de.yml
  28. +7 −2 vendor/plugins/dashboard/config/locales/en.yml
  29. +8 −2 vendor/plugins/dashboard/config/locales/es.yml
  30. +4 −2 vendor/plugins/dashboard/config/locales/fr.yml
  31. +4 −2 vendor/plugins/dashboard/config/locales/it.yml
  32. +4 −2 vendor/plugins/dashboard/config/locales/nb.yml
  33. +4 −2 vendor/plugins/dashboard/config/locales/nl.yml
  34. +10 −3 vendor/plugins/dashboard/config/locales/pt-BR.yml
  35. +4 −2 vendor/plugins/dashboard/config/locales/sl.yml
  36. +30 −13 vendor/plugins/i18n/lib/i18n.rb
  37. +5 −5 vendor/plugins/i18n/lib/i18n_filter.rb
  38. +1 −1 vendor/plugins/images/app/views/admin/images/index.html.erb
  39. +4 −7 vendor/plugins/images/config/locales/es.yml
  40. +1 −1 vendor/plugins/images/config/locales/pt-BR.yml
  41. +5 −0 vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb
  42. +0 −11 vendor/plugins/inquiries/app/views/admin/inquiry_settings/_inquiry_setting.html.erb
  43. +0 −21 vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb
  44. +4 −3 vendor/plugins/inquiries/config/locales/da.yml
  45. +3 −2 vendor/plugins/inquiries/config/locales/de.yml
  46. +1 −0 vendor/plugins/inquiries/config/locales/en.yml
  47. +3 −2 vendor/plugins/inquiries/config/locales/es.yml
  48. +3 −2 vendor/plugins/inquiries/config/locales/fr.yml
  49. +3 −2 vendor/plugins/inquiries/config/locales/it.yml
  50. +3 −3 vendor/plugins/inquiries/config/locales/nb.yml
  51. +3 −2 vendor/plugins/inquiries/config/locales/nl.yml
  52. +23 −19 vendor/plugins/inquiries/config/locales/pt-BR.yml
  53. +11 −1 vendor/plugins/pages/config/locales/pt-BR.yml
  54. +1 −1 vendor/plugins/pages/config/locales/sl.yml
  55. +1 −1 vendor/plugins/refinery/app/views/layouts/admin.html.erb
  56. +1 −2 vendor/plugins/refinery/app/views/shared/_site_bar.html.erb
  57. +4 −1 vendor/plugins/refinery/app/views/shared/admin/_search.html.erb
  58. +5 −3 vendor/plugins/refinery/config/locales/da.yml
  59. +5 −3 vendor/plugins/refinery/config/locales/de.yml
  60. +5 −3 vendor/plugins/refinery/config/locales/en.yml
  61. +5 −3 vendor/plugins/refinery/config/locales/es.yml
  62. +2 −3 vendor/plugins/refinery/config/locales/fr.yml
  63. +5 −3 vendor/plugins/refinery/config/locales/it.yml
  64. +5 −3 vendor/plugins/refinery/config/locales/nb.yml
  65. +2 −3 vendor/plugins/refinery/config/locales/nl.yml
  66. +8 −2 vendor/plugins/refinery/config/locales/pt-BR.yml
  67. +2 −4 vendor/plugins/refinery/config/locales/sl.yml
  68. +1 −1 vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb
  69. +1 −1 vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb
  70. +1 −1 vendor/plugins/refinery/lib/refinery.rb
  71. +3 −3 vendor/plugins/refinery/lib/refinery/application_controller.rb
  72. +1 −1 vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb
  73. +0 −1 vendor/plugins/refinery_settings/config/locales/sl.yml
  74. +1 −1 vendor/plugins/resources/app/views/admin/resources/index.html.erb
  75. +0 −2 vendor/plugins/resources/config/locales/da.yml
  76. +4 −3 vendor/plugins/resources/config/locales/en.yml
  77. +0 −2 vendor/plugins/resources/config/locales/es.yml
  78. +0 −2 vendor/plugins/resources/config/locales/fr.yml
  79. +0 −1 vendor/plugins/resources/config/locales/it.yml
  80. +0 −2 vendor/plugins/resources/config/locales/nb.yml
  81. +0 −2 vendor/plugins/resources/config/locales/nl.yml
  82. +0 −2 vendor/plugins/resources/config/locales/pt-BR.yml
  83. +0 −2 vendor/plugins/resources/config/locales/sl.yml
  84. +20 −9 vendor/plugins/translate/tasks/translate.rake
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ gem 'acts_as_indexed', '= 0.6.2', :require => 'acts_as_indexed', :git => 'git://
gem 'authlogic', '= 2.1.5', :require => 'authlogic'
gem 'friendly_id', '= 3.0.6', :require => 'friendly_id'
gem 'rails', '= 2.3.8'
gem 'rmagick', '~> 2.13.1'
gem 'rmagick', '~> 2.12.2'
gem 'truncate_html', '= 0.3.2', :require => 'truncate_html'
gem 'will_paginate', '= 2.3.14', :require => 'will_paginate'

@@ -42,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.1'
#gem 'refinerycms', '= 0.9.7.2'
#===END OF REFINERY GEM INSTALL REQUIREMENTS===

# Bundle gems for certain environments:
4 changes: 2 additions & 2 deletions bin/refinery
Original file line number Diff line number Diff line change
@@ -118,7 +118,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
puts `#{cmd}`

puts "\n\nUpdating some core refinery files..\n"
puts (cmd="rake -f #{File.join(rails_root, 'Rakefile')} refinery:update")
puts (cmd="rake -f #{File.join(rails_root, 'Rakefile')} refinery:update from_installer=true")
puts `#{cmd}`
end

@@ -139,4 +139,4 @@ else
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
end
126 changes: 0 additions & 126 deletions bin/refinery-update-core

This file was deleted.

13 changes: 13 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
## 0.9.7.2 [06 July 2010]

- Bugfixes with users and roles [Philip Arndt and Amanda Wagener]
- Fixed the rake translate:lost_in_translation LOCALE=en and rake translate:lost_in_translation_all tasks so that they accurately reflect the missing i18n translation keys. [Philip Arndt]
- Refactored routing of i18n to allow different default frontend and backend locales. [Philip Arndt]
- Added better grammar support for some i18n [Halan Pinheiro]
- Improved output of rake refinery:update task and removed bin/refinery-update-core task. [Steven Heidel]
- Set config.ru to run in production RAILS_ENV by default [Philip Arndt]
- [See full list](https://github.com/resolve/refinerycms/compare/0.9.7.1...0.9.7.2)

## 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]
- [See full list](https://github.com/resolve/refinerycms/compare/0.9.7...0.9.7.1)

## 0.9.7 [02 July 2010]

@@ -16,6 +27,8 @@
- Added spam filtering to contact form. [djones]
- Full Refinery UI redesign. [Resolve Digital]
- User Role support. [Amanda Wagener and Philip Arndt]
- [See full list](https://github.com/resolve/refinerycms/compare/0.9.6.34...0.9.7)
- [See blog post](http://refinerycms.com/blog/refinery-cms-0-9-7-released)

## 0.9.6.34 [09 May 2010]

2 changes: 2 additions & 0 deletions config.ru
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ENV["RAILS_ENV"] ||= "production"
require File.expand_path("../config/application", __FILE__)

use Rails::Rack::LogTailer
use Rails::Rack::Static

run ActionController::Dispatcher.new
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@ class RenamePermissionsForResourcesPluginToFiles < ActiveRecord::Migration
def self.up
UserPlugin.find_all_by_title("Resources").each do |up|
up.update_attribute(:title, "Files")
end
end if UserPlugin.column_names.include?('title')
end

def self.down
UserPlugin.find_by_title("Files").each do |up|
up.update_attribute(:title, "Resources")
end
end if UserPlugin.column_names.include?('title')
end

end
9 changes: 3 additions & 6 deletions lib/gemspec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
require File.expand_path('../../vendor/plugins/refinery/lib/refinery.rb', __FILE__)
files = %w( .gitignore .yardopts Gemfile Rakefile changelog.md readme.md license.md todo.md public/.htaccess config.ru )
files = %w( .gitignore .yardopts Gemfile Rakefile *.md public/.htaccess config.ru ).map { |file| Dir[file] }.flatten
%w(app bin config db features lib public script test themes vendor).sort.each do |dir|
files += Dir.glob("#{dir}/**/*")
end
@@ -18,7 +18,7 @@
s.homepage = %q{http://refinerycms.com}
s.authors = %w(Resolve\\ Digital David\\ Jones Philip\\ Arndt)
s.require_paths = %w(lib)
s.executables = %w(refinery refinery-update-core)
s.executables = %w(refinery)
s.files = [
'#{files.join("',\n '")}'
@@ -29,7 +29,4 @@
end
EOF

if File.exist?(file = "refinerycms.gemspec")
File.delete(file)
end
File.open(file, 'w') { |f| f.puts gemspec }
File.open(File.expand_path("../../refinerycms.gemspec", __FILE__), 'w').puts(gemspec)
8 changes: 8 additions & 0 deletions public/javascripts/refinery/admin.js
Original file line number Diff line number Diff line change
@@ -58,6 +58,14 @@ init_interface = function() {
if (last_item_offset && ((last_item_offset.left + last_item.outerWidth() - $('#menu').offset().left + 5) < $('#page_container').outerWidth())) {
$("#page_container:not('.login #page_container')").corner('5px tr');
}

$('#current_locale li a').click(function(e) {
$('#current_locale li a span').each(function(span){
$(this).css('display', $(this).css('display') == 'none' ? '' : 'none');
});
$('#other_locales').animate({opacity: 'toggle', height: 'toggle'}, 250);
e.preventDefault();
});
}

init_delete_confirmations = function() {
26 changes: 24 additions & 2 deletions public/stylesheets/refinery/refinery.css
Original file line number Diff line number Diff line change
@@ -252,7 +252,7 @@ body.login #page_container div.remember_me {
}
body.login #page_container div.forgot_password {
float: right;
width: 200px;
width: 250px;
}
body.login label, body.login a {
font-size: 14px;
@@ -972,7 +972,13 @@ ul#menu.reordering_menu li a {
line-height: 18px;
padding: 2px;
font-size: 16px;
width: 200px;
width: 180px;
}
.pt-BR #search {
width: 187px;
}
.en #search {
width: 210px;
}
.search_form {
position: relative;
@@ -1369,6 +1375,22 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
line-height: 20px;
}

#actions ul#current_locale {
margin-top: 30px;
}
#current_locale li a {
position: relative;
}
#current_locale li a span {
position: absolute;
right: 9px;
border-bottom: 1px dotted #727272;
}

#other_locales li:first-child {
margin-top: 0px;
}

/* cornering */
.button, #editor_switch a, #editor_switch span {
border-radius: 6px;
11 changes: 4 additions & 7 deletions refinerycms.gemspec
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
s.version = %q{0.9.7.1}
s.version = %q{0.9.7.2}
s.description = %q{A beautiful open source Ruby on Rails content manager for small business. Easy to extend, easy to use, lightweight and all wrapped up in a super slick UI.}
s.date = %q{2010-07-03}
s.date = %q{2010-07-06}
s.summary = %q{A beautiful open source Ruby on Rails content manager for small business.}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.authors = %w(Resolve\ Digital David\ Jones Philip\ Arndt)
s.require_paths = %w(lib)
s.executables = %w(refinery refinery-update-core)
s.executables = %w(refinery)

s.files = [
'.gitignore',
'.yardopts',
'Gemfile',
'Rakefile',
'changelog.md',
'readme.md',
'license.md',
'readme.md',
'todo.md',
'public/.htaccess',
'config.ru',
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
'app/helpers',
'app/helpers/application_helper.rb',
'bin/refinery',
'bin/refinery-update-core',
'config/acts_as_indexed_config.rb',
'config/amazon_s3.yml.example',
'config/application.rb',
@@ -979,11 +978,9 @@ Gem::Specification.new do |s|
'vendor/plugins/inquiries/app/views/admin/inquiries/spam.html.erb',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings/_inquiry_setting.html.erb',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings/_subject_form.html.erb',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings/edit.html.erb',
'vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb',
'vendor/plugins/inquiries/app/views/inquiries',
'vendor/plugins/inquiries/app/views/inquiries/new.html.erb',
'vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb',
10 changes: 5 additions & 5 deletions vendor/plugins/authentication/app/models/user.rb
Original file line number Diff line number Diff line change
@@ -59,13 +59,13 @@ def can_delete?(user_to_delete = self)
end

def add_role(title)
unless self.has_role?(role = Role[title.to_s])
self.roles << role
end
raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
self.roles << Role[title] unless self.has_role?(title)
end

def has_role?(role)
self.roles.include?(role.is_a?(Role) ? role : Role[role.to_s])
def has_role?(title)
raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
(role = Role.find_by_title(title.to_s.camelize)).present? and self.roles.collect{|r| r.id}.include?(role.id)
end

end
6 changes: 3 additions & 3 deletions vendor/plugins/authentication/app/views/users/forgot.html.erb
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<% content_for :header, "Please enter the email address for your account." %>
<% content_for :header, t('.enter_email_address') %>

<% form_for :user do |f| -%>
<%= f.error_messages %>

<div class='field'>
<%= f.text_field :email, :class => "larger widest",
:placeholder => "Email Address" %>
:placeholder => t('.email_address', :default => t('authlogic.attributes.user_session.email')) %>
</div>

<%= render :partial => "/shared/admin/form_actions",
:locals => {
:f => f,
:continue_editing => false,
:submit_button_text => "Reset password",
:submit_button_text => t('.reset_password'),
:cancel_url => login_url
} -%>
<% end -%>
Loading