refinerycms 0.9.7.7 → 0.9.7.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. data/.gitignore +4 -3
  2. data/Gemfile +11 -7
  3. data/Rakefile +1 -1
  4. data/bin/refinerycms +10 -2
  5. data/changelog.md +11 -0
  6. data/config/amazon_s3.yml.example +2 -2
  7. data/config/cucumber.yml +3 -3
  8. data/config/environments/cucumber.rb +0 -4
  9. data/config/environments/production.rb +2 -2
  10. data/config/rackspace_cloudfiles.yml.example +10 -9
  11. data/features/refinery/dashboard.feature +1 -1
  12. data/features/step_definitions/refinery/core_steps.rb +51 -0
  13. data/features/step_definitions/web_steps.rb +0 -52
  14. data/features/support/env.rb +76 -52
  15. data/lib/gemspec.rb +1 -1
  16. data/lib/tasks/cucumber.rake +3 -3
  17. data/public/javascripts/jquery/jquery.html5-placeholder-shim.js +7 -2
  18. data/public/javascripts/refinery/admin.js +8 -3
  19. data/readme.md +30 -127
  20. data/todo.md +4 -11
  21. data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +1 -1
  22. data/vendor/plugins/attachment_fu/test/database.yml +2 -2
  23. data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb +10 -3
  24. data/vendor/plugins/authentication/app/views/admin/users/_user.html.erb +2 -1
  25. data/vendor/plugins/authentication/config/locales/nb.yml +44 -44
  26. data/vendor/plugins/dashboard/config/locales/nb.yml +10 -7
  27. data/vendor/plugins/images/app/helpers/admin/images_helper.rb +1 -1
  28. data/vendor/plugins/images/app/views/admin/images/_form.html.erb +14 -7
  29. data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb +2 -1
  30. data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb +2 -1
  31. data/vendor/plugins/images/config/locales/da.yml +4 -6
  32. data/vendor/plugins/images/config/locales/de.yml +4 -6
  33. data/vendor/plugins/images/config/locales/en.yml +4 -6
  34. data/vendor/plugins/images/config/locales/es.yml +4 -6
  35. data/vendor/plugins/images/config/locales/fr.yml +4 -6
  36. data/vendor/plugins/images/config/locales/it.yml +4 -6
  37. data/vendor/plugins/images/config/locales/nb.yml +22 -19
  38. data/vendor/plugins/images/config/locales/nl.yml +4 -6
  39. data/vendor/plugins/images/config/locales/pt-BR.yml +4 -6
  40. data/vendor/plugins/images/config/locales/sl.yml +4 -6
  41. data/vendor/plugins/inquiries/config/locales/nb.yml +35 -25
  42. data/vendor/plugins/model_translations/test/model_translations_test.rb +1 -1
  43. data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb +19 -4
  44. data/vendor/plugins/pages/config/locales/nb.yml +71 -29
  45. data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb +1 -1
  46. data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb +6 -4
  47. data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb +1 -1
  48. data/vendor/plugins/refinery/config/locales/nb.yml +28 -31
  49. data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb +1 -0
  50. data/vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nb.yml +16 -0
  51. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +6 -1
  52. data/vendor/plugins/refinery/lib/refinery.rb +1 -1
  53. data/vendor/plugins/refinery/lib/tasks/refinery.rake +65 -7
  54. data/{lib/refinery → vendor/plugins/refinery/lib}/tasks/refinery.rb +2 -4
  55. data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +9 -0
  56. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb +3 -1
  57. data/vendor/plugins/refinery_settings/config/locales/nb.yml +31 -9
  58. data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb +3 -1
  59. data/vendor/plugins/resources/config/locales/nb.yml +8 -7
  60. metadata +7 -6
  61. data/lib/refinery/tasks/refinery.rake +0 -59
@@ -10,6 +10,8 @@ class RefinerySetting < ActiveRecord::Base
10
10
  12
11
11
  end
12
12
 
13
+ before_save :check_restriction
14
+
13
15
  after_save do |setting|
14
16
  if self.column_names.include?('scoping')
15
17
  cache_write(setting.name, setting.scoping.presence, setting.value)
@@ -98,6 +100,7 @@ class RefinerySetting < ActiveRecord::Base
98
100
  end
99
101
 
100
102
  setting.save
103
+ cache_write(setting.name, setting.scoping, setting.value)
101
104
  end
102
105
 
103
106
  # Below is not very nice, but seems to be required
@@ -137,4 +140,10 @@ class RefinerySetting < ActiveRecord::Base
137
140
  eval "Proc.new{#{self.callback_proc_as_string} }" if RefinerySetting.column_names.include?('callback_proc_as_string') && self.callback_proc_as_string.present?
138
141
  end
139
142
 
143
+ private
144
+
145
+ def check_restriction
146
+ self.restricted = false if restricted.nil?
147
+ end
148
+
140
149
  end
@@ -36,6 +36,8 @@
36
36
  :f => f,
37
37
  :continue_editing => false,
38
38
  :hide_cancel => from_dialog?,
39
- :submit_button_title => t('.restart_may_be_in_order')
39
+ :submit_button_title => t('.restart_may_be_in_order'),
40
+ :delete_title => t('admin.refinery_settings.refinery_setting.remove'),
41
+ :delete_confirmation => t('admin.refinery_settings.refinery_setting.confirm', :title => h(@refinery_setting.name).titleize)
40
42
  } %>
41
43
  <% end -%>
@@ -1,23 +1,45 @@
1
1
  nb:
2
2
  activerecord:
3
3
  models:
4
- refinery_setting: Refinery instilling
4
+ refinery_setting: Refinery innstilling
5
5
  attributes:
6
6
  refinery_setting:
7
7
  name: Navn
8
8
  value: Verdi
9
+ restricted: Begrenset
9
10
  admin:
10
11
  refinery_settings:
11
12
  refinery_setting:
12
- edit: 'Rediger denne instillingen'
13
- confirm: 'Er du sikker på at du ønsker å fjerne denne instillingen for alltid?'
14
- remove: 'Fjern denne instillingen for alltid'
13
+ edit: 'Rediger denne innstillingen'
14
+ confirm: 'Er du sikker på at du ønsker å fjerne denne innstillingen permanent?'
15
+ remove: 'Fjern denne innstillingen permanent'
15
16
  index:
16
- new: Opprett ny instilling
17
- empty_set: Det er ingen instillinger enda.
18
- create_first: "Trykk {{link}} for å legge til din første instilling."
17
+ new: Opprett en ny innstilling
18
+ empty_set: Det er ingen innstillinger enda.
19
+ create_first: "Klikk '{{link}}' for å legge til din første innstilling."
19
20
  form:
20
- restart_may_be_in_order: "<strong>Ver oppmerksom</strong> at du kanskje starte nettsiden din nytt for at instillingen skal ha effekt."
21
+ restart_may_be_in_order: "<strong>Merk</strong> at du kan komme til å trenge å restarte websiden for at denne innstillingen skal tre i kraft."
22
+ yes_make_this_setting_restricted: "Ja, la denne innstillingen kun endres av superbrukere."
23
+ help:
24
+ restricted: "Dette gjør det slik at denne innstillingen kun kan sees og endres av brukere som er superbrukere (som deg)."
25
+ help:
26
+ activity_show_limit: Dette begrenser antall hendelser som vises på Skrivebordet.
27
+ analytics_page_code: "Denne koden aktiverer Google Analytics på websiden din. Om denne verdien er satt til blank eller 'UA-xxxxxx-x' så er Google Analytics ikke aktivert, og ingen hendelser blir sporet."
28
+ image_dialogue_sizes: "Denne innstillingen gjelder 'Sett inn Bilde' dialogen. Du må implementere de forskjellige bildestørrelsene i tillegg til å endre dette."
29
+ image_thumbnails: "Om du endrer denne innstillingen så må du regenerere bildene ved å kjøre 'rake images:regenerate' (eller 'rake images:update' om du kun har lagt til flere bildestørrelser). Ellers vil denne innstillingen ikke gjelde for eksisterende bilder."
30
+ menu_hide_children: "Gjem alle undersider fra menyen (om noen finnes)."
31
+ new_page_parts: "Gjør det mulig å legge til nye sideseksjoner."
32
+ page_title: "Svært avanserte alternativer for å sette tittelen på siden. Her kan du legge inn tilpassede CSS klasser eller en annen tag for å legge til brødsmuler."
33
+ page_advanced_options_include_seo: "Dette kontrollerer hvor vidt SEO (Søkemotor Optimalisering) vises i den avanserte seksjonen når man redigerer en side."
34
+ preferred_image_view: "Dette kontrollerer hvilken visning bilde-tillegget viser eksisterende bilder i - rute for 'Rutenett', og liste for 'Liste'. Det er en knapp som automatiserer dene prosessen under bilde-tillegget."
35
+ refinery_enable_backend_reordering: "Du kan fjerne muligheten for å endre rekkefølgen tilleggene vises her."
36
+ refinery_menu_cache_action_suffix: "Dette kontrollerer nøkkelen som brukes for å 'cache' siden meny. Dersom du bruker et tema på siden så kan det være bedre å la denne stå på sin standardvedri ettersom temaet vil løse dette."
37
+ show_contact_privacy_link: "Du kan gjemme eller vise lenken til din 'privacy policy' på forespørsel skjemaet, ved siden av 'Send Forespørsel' knappen."
38
+ site_name: "Dette er navnet på websiden din, og det vil vises i headeren, i Refinery kontrollpanelet, og i footeren sammen med copyright teksten i noen temaer."
39
+ theme: "Skriv inn navnet på temaet du ønsker å benytte. Dette vil ta øyeblikkelig effekt, og navnet må være nøyaktig det samme som et eksisterende tema for at dette skal virke."
40
+ use_google_ajax_libraries: "Om du ønsker å bruke Google sin AJAX CDN (Content Delivery Network) så setter du denne til 'true'."
41
+ use_marketable_urls: "Forander adressene på websiden fra '/pages/om' til '/om', og behandler automatisk konflikter med andre tillegg."
42
+ use_resource_caching: "Det er anbefalt å aktivere dette i produksjon ettersom det pakker inn javascript og stylesheet filer i enkeltpakker for å redusere antall forespørsler som må gjøres, og dermed øke hastigheten på websiden."
21
43
  plugins:
22
44
  refinery_settings:
23
- title: Instillinger
45
+ title: Innstillinger
@@ -21,7 +21,9 @@
21
21
  :locals => {
22
22
  :f => f,
23
23
  :continue_editing => false,
24
- :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?)
24
+ :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?),
25
+ :delete_title => t('admin.resources.resource.delete.title'),
26
+ :delete_confirmation => t('admin.resources.resource.delete.message', :title => @resource.filename)
25
27
  } %>
26
28
 
27
29
  <% if @app_dialog -%>
@@ -1,9 +1,9 @@
1
1
  nb:
2
2
  plugins:
3
3
  refinery_files:
4
- title: Ressurser
4
+ title: Filer
5
5
  must_choose_file: Du må velge en fil å laste opp
6
- file_should_be_smaller_than_max_file_size: Filene må være mindre enn {{max_file_size}}
6
+ file_should_be_smaller_than_max_file_size: "Filene må være mindre enn {{max_file_size}}"
7
7
  admin:
8
8
  resources:
9
9
  form:
@@ -13,20 +13,21 @@ nb:
13
13
  replace: ", erstatt den med denne..."
14
14
  maximum_file_size: "The maximum file size is {{megabytes}} megabytes."
15
15
  resource:
16
- download: Last ned denne filen ({{size}})
16
+ download: "Last ned denne filen ({{size}})"
17
17
  edit: Rediger denne filen
18
18
  delete:
19
19
  message: "Er du sikker på at du ønsker å slette '{{title}}'?"
20
- title: Fjern denne filen for alltid
20
+ title: Fjern denne filen permanent
21
21
  index:
22
22
  upload_new: Last Opp Ny Fil
23
23
  no_files_yet: Det er ingen filer her enda. Trykk "Last Opp Ny Fil" for å legge til din første fil.
24
24
  insert:
25
- existing_file: Eksisterende Fil
25
+ existing: Eksisterende Fil
26
26
  new: Ny Fil
27
- link_to_resource: 'Link til denne ressursen'
28
27
  previous: Forrige
29
28
  next: Neste
30
- submit_insert: Sett inn
31
29
  or: eller
32
30
  cancel: Avbryt
31
+ existing_resource:
32
+ link_to_resource: 'Link til denne Ressursen'
33
+ submit_insert: Sett inn
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 11
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 9
9
9
  - 7
10
- - 7
11
- version: 0.9.7.7
10
+ - 8
11
+ version: 0.9.7.8
12
12
  platform: ruby
13
13
  authors:
14
14
  - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
20
 
21
- date: 2010-07-20 00:00:00 +12:00
21
+ date: 2010-07-23 00:00:00 +12:00
22
22
  default_executable:
23
23
  dependencies: []
24
24
 
@@ -112,6 +112,7 @@ files:
112
112
  - features/refinery/manage_refinery_settings.feature
113
113
  - features/refinery/manage_users.feature
114
114
  - features/refinery/site_bar.feature
115
+ - features/step_definitions/refinery/core_steps.rb
115
116
  - features/step_definitions/refinery/page_steps.rb
116
117
  - features/step_definitions/refinery/user_steps.rb
117
118
  - features/step_definitions/web_steps.rb
@@ -120,8 +121,6 @@ files:
120
121
  - features/support/negative_expectations_helper.rb
121
122
  - features/support/paths.rb
122
123
  - lib/gemspec.rb
123
- - lib/refinery/tasks/refinery.rake
124
- - lib/refinery/tasks/refinery.rb
125
124
  - lib/refinery_initializer.rb
126
125
  - lib/tasks/cucumber.rake
127
126
  - lib/tasks/rspec.rake
@@ -963,6 +962,7 @@ files:
963
962
  - vendor/plugins/refinery/lib/generators/refinery/README
964
963
  - vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb
965
964
  - vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/en.yml
965
+ - vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nb.yml
966
966
  - vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nl.yml
967
967
  - vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb
968
968
  - vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb
@@ -997,6 +997,7 @@ files:
997
997
  - vendor/plugins/refinery/lib/refinery.rb
998
998
  - vendor/plugins/refinery/lib/tasks/doc.rake
999
999
  - vendor/plugins/refinery/lib/tasks/refinery.rake
1000
+ - vendor/plugins/refinery/lib/tasks/refinery.rb
1000
1001
  - vendor/plugins/refinery/lib/tasks/yard.rake
1001
1002
  - vendor/plugins/refinery/plugins.md
1002
1003
  - vendor/plugins/refinery/rails/init.rb
@@ -1,59 +0,0 @@
1
- desc 'Removes trailing whitespace across the entire application.'
2
- task :whitespace do
3
- sh %{find . -name '*.*rb' -exec sed -i '' 's/\t/ /g' {} \\; -exec sed -i '' 's/ *$//g' {} \\; }
4
- end
5
-
6
- namespace :test do
7
- desc "Run the tests that ship with Refinery to ensure any changes you've made haven't caused instability."
8
- task :refinery do
9
- errors = %w(test:refinery:units test:refinery:functionals test:refinery:integration).collect do |task|
10
- begin
11
- Rake::Task[task].invoke
12
- nil
13
- rescue => e
14
- task
15
- end
16
- end.compact
17
- abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any?
18
- end
19
- namespace :refinery do
20
- Rake::TestTask.new(:units => 'db:test:prepare') do |t|
21
- t.libs += [Refinery.root.join('test').to_s,
22
- Dir[Rails.root.join('vendor', 'plugins', '**', 'test').to_s]].flatten
23
- t.pattern = [Refinery.root.join('test', 'unit', '**', '*_test.rb').to_s,
24
- Rails.root.join('vendor', 'plugins', '**', 'test', '**', '*_test.rb').to_s]
25
- t.verbose = true
26
- ENV['RAILS_ROOT'] = Rails.root.to_s
27
- end
28
- Rake::Task['test:refinery:units'].comment = 'Run the unit tests in Refinery.'
29
-
30
- Rake::TestTask.new(:functionals => 'db:test:prepare') do |t|
31
- t.libs += [Refinery.root.join('test').to_s,
32
- Dir[Rails.root.join('vendor', 'plugins', '**', 'test').to_s]].flatten
33
- t.pattern = [Refinery.root.join('test', 'functional', '**', '*_test.rb').to_s,
34
- Rails.root.join('vendor', 'plugins', '**', 'functional', '**', '*_test.rb').to_s]
35
- t.verbose = true
36
- ENV['RAILS_ROOT'] = Rails.root.to_s
37
- end
38
- Rake::Task['test:refinery:functionals'].comment = 'Run the functional tests in Refinery.'
39
-
40
- Rake::TestTask.new(:integration => 'db:test:prepare') do |t|
41
- t.libs += [Refinery.root.join('test').to_s,
42
- Dir[Rails.root.join('vendor', 'plugins', '**', 'test').to_s]].flatten
43
- t.pattern = [Refinery.root.join('test', 'integration', '**', '*_test.rb').to_s,
44
- Rails.root.join('vendor', 'plugins', '**', 'integration', '**', '*_test.rb').to_s]
45
- t.verbose = true
46
- ENV['RAILS_ROOT'] = Rails.root.to_s
47
- end
48
- Rake::Task['test:refinery:integration'].comment = 'Run the integration tests in Refinery.'
49
-
50
- Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
51
- t.libs << Refinery.root.join('test').to_s
52
- t.pattern = Refinery.root.join('test', 'performance', '**', '*_test.rb')
53
- t.verbose = true
54
- t.options = '-- --benchmark'
55
- ENV['RAILS_ROOT'] = Rails.root.to_s
56
- end
57
- Rake::Task['test:refinery:benchmark'].comment = 'Benchmark the performance tests in Refinery'
58
- end
59
- end