refinerycms 0.9.7.6 → 0.9.7.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. data/.gitignore +50 -15
  2. data/bin/refinerycms +1 -1
  3. data/changelog.md +50 -37
  4. data/lib/refinery/tasks/refinery.rb +5 -1
  5. data/public/javascripts/jquery/jquery.corner.js +14 -12
  6. data/public/javascripts/jquery/jquery.html5-placeholder-shim.js +7 -5
  7. data/public/javascripts/refinery/admin.js +47 -26
  8. data/public/stylesheets/refinery/{ie.css → ie-less-than-8.css} +2 -1
  9. data/public/stylesheets/refinery/ie-less-than-9.css +26 -0
  10. data/public/stylesheets/refinery/refinery.css +5 -2
  11. data/vendor/plugins/authentication/app/controllers/users_controller.rb +39 -36
  12. data/vendor/plugins/authentication/app/models/user_mailer.rb +1 -1
  13. data/vendor/plugins/authentication/config/locales/da.yml +1 -1
  14. data/vendor/plugins/authentication/config/locales/de.yml +1 -1
  15. data/vendor/plugins/authentication/config/locales/en.yml +1 -1
  16. data/vendor/plugins/authentication/config/locales/es.yml +1 -1
  17. data/vendor/plugins/authentication/config/locales/fr.yml +1 -1
  18. data/vendor/plugins/authentication/config/locales/it.yml +1 -1
  19. data/vendor/plugins/authentication/config/locales/nb.yml +1 -1
  20. data/vendor/plugins/authentication/config/locales/nl.yml +1 -1
  21. data/vendor/plugins/authentication/config/locales/pt-BR.yml +1 -1
  22. data/vendor/plugins/authentication/config/locales/sl.yml +1 -1
  23. data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb +18 -7
  24. data/vendor/plugins/refinery/app/views/admin/_head.html.erb +5 -1
  25. data/vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/en.yml +1 -1
  26. data/vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nl.yml +1 -1
  27. data/vendor/plugins/refinery/lib/refinery.rb +10 -1
  28. data/vendor/plugins/refinery/lib/tasks/refinery.rake +4 -1
  29. data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb +19 -7
  30. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb +1 -1
  31. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb +1 -1
  32. data/vendor/plugins/resources/app/views/admin/resources/_existing_resource.html.erb +1 -3
  33. data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb +1 -1
  34. data/vendor/plugins/translate/{tasks → lib/tasks}/translate.rake +0 -0
  35. metadata +7 -6
data/.gitignore CHANGED
@@ -1,28 +1,63 @@
1
- public/system/*
2
- public/themes/*
3
- *.log
1
+ # Rails
2
+ .bundle
3
+ db/*.sqlite3
4
+ log/*.log
4
5
  tmp/**/*
5
- .DS_Store
6
+
7
+ # Documentation
6
8
  doc/api
7
9
  doc/app
8
10
  doc/*
9
- config/database.yml
10
- config/amazon_s3.yml
11
- config/rackspace_cloudfiles.yml
12
- nbproject
11
+ .yardoc
12
+ .yardopts
13
+
14
+ # Public Uploads
15
+ public/system/*
16
+ public/themes/*
17
+
18
+ # Public Cache
19
+ public/javascripts/cache
20
+ public/stylesheets/cache
21
+
22
+ # Vendor Cache
23
+ vendor/cache
24
+
25
+ # Acts as Indexed
13
26
  index/**/*
14
- db/*.sqlite3
27
+
28
+ # Refinery Specific
15
29
  *.tmproj
16
30
  *.autobackupbyrefinery.*
17
31
  /refinerycms-*.gem
18
- public/javascripts/cache
19
- public/stylesheets/cache
20
- .yardoc/
21
- vendor/cache
22
- .bundle
32
+
33
+ # Mac
34
+ .DS_Store
35
+
36
+ # NetBeans
37
+ nbproject
38
+
39
+ # Redcar
40
+ .redcar
41
+ tags
42
+
43
+ # Rubinius
23
44
  *.rbc
45
+
46
+ # Vim
24
47
  *.swp
25
48
  *.swo
49
+
50
+ # RubyMine
51
+ .idea
52
+
53
+ # Backup
26
54
  *~
55
+
56
+ # Capybara Bug
27
57
  capybara-*html
28
- .idea
58
+
59
+ # Development Specific
60
+ # REMOVE IF UPLOADING TO SERVER
61
+ config/database.yml
62
+ config/amazon_s3.yml
63
+ config/rackspace_cloudfiles.yml
data/bin/refinerycms CHANGED
@@ -141,7 +141,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
141
141
  puts "---------\n\n"
142
142
  end
143
143
  else
144
- puts "\nPlease specify the path where you want to install Refinery. i.e. refinery /path/to/project [options]"
144
+ puts "\nPlease specify the path where you want to install Refinery. i.e. #{__FILE__.split(File::SEPARATOR).last} /path/to/project [options]"
145
145
  puts "\n"
146
146
  puts "Options:"
147
147
  puts "--force Forces the directory to be overriden if the directory already exists"
data/changelog.md CHANGED
@@ -1,66 +1,79 @@
1
+ ## 0.9.7.7 [20 July 2010]
2
+
3
+ - Fixed an issue in the plugin generator that saw locales being created with singular_name not the interpreted version. [Philip Arndt](http://github.com/parndt) and [Joe Sak](http://github.com/joemsak)
4
+ - Fixed an issue with non-MySQL databases. [Lee Irving](http://github.com/magpieuk)
5
+ - Refactored versioning and .gitignore file so that both are easier to follow and use. [Steven Heidel](http://github.com/stevenheidel)
6
+ - Added rake refinery:test_all command to run all tests Refinery has. [Steven Heidel](http://github.com/stevenheidel)
7
+ - Fixed deprecation warnings with translate rake tasks. [Steven Heidel](http://github.com/stevenheidel)
8
+ - Bugfixes, some IE compatibility. [Philip Arndt](http://github.com/parndt)
9
+ - Fix syntax errors in existing resource dialog. [David Jones](http://github.com/djones)
10
+ - Identified and fixed a positioning bug in dialogues [Joe Sak](http://github.com/joemsak) and [Philip Arndt](http://github.com/parndt)
11
+ - Fixed issue that was causing Refinery to load in rake tasks twice if they lived under ``"#{Rails.root}/vendor/plugins"``. [David Jones](http://github.com/djones) and [Philip Arndt](http://github.com/parndt)
12
+ - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.6...0.9.7.7)
13
+
1
14
  ## 0.9.7.6 [15 July 2010]
2
15
 
3
- - Bugfixes, fixed some failing tests. [Philip Arndt]
4
- - More pt-BR translation keys translated [Kivanio Barbosa]
5
- - Locked gems using Gemfile.lock [David Jones]
6
- - Changed 'refinery' task to 'refinerycms' as that is our gem's name. [Steven Heidel]
7
- - Fixed bug where settings were still considered restricted if NULL. [Steven Heidel]
8
- - Ensures that bundler is available before creating an application from a gem. [Philip Arndt]
9
- - Application generator (from gem) and application upgrade bin task (from 0.9.6) is now Ruby 1.9.2 compatible. [Philip Arndt]
10
- - bin/refinery-upgrade-from-096-to-097 will no longer allow you to run it if Gemfile is present and thus signifying an upgraded app. [Philip Arndt]
11
- - Cleaned up syntax, changed CSS involving dialogues [Philip Arndt]
16
+ - Bugfixes, fixed some failing tests. [Philip Arndt](http://github.com/parndt)
17
+ - More pt-BR translation keys translated. [Kivanio Barbosa](http://github.com/kivanio)
18
+ - Locked gems using ``Gemfile.lock``. [David Jones](http://github.com/djones)
19
+ - Changed 'refinery' task to 'refinerycms' as that is our gem's name. [Steven Heidel](http://github.com/stevenheidel)
20
+ - Fixed bug where settings were still considered restricted if NULL. [Steven Heidel](http://github.com/stevenheidel)
21
+ - Ensures that bundler is available before creating an application from a gem. [Philip Arndt](http://github.com/parndt)
22
+ - Application generator (from gem) and application upgrade bin task. (from 0.9.6) is now Ruby 1.9.2 compatible. [Philip Arndt](http://github.com/parndt)
23
+ - bin/refinery-upgrade-from-096-to-097 will no longer allow you to run it if Gemfile is present and thus signifying an upgraded app. [Philip Arndt](http://github.com/parndt)
24
+ - Cleaned up syntax, changed CSS involving dialogues. [Philip Arndt](http://github.com/parndt)
12
25
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.5...0.9.7.6)
13
26
 
14
27
  ## 0.9.7.5 [08 July 2010]
15
28
 
16
- - Wrote an upgrade task for migrating from 0.9.6.x releases of RefineryCMS. Just run refinery-update-096-to-097 inside your application's directory. [Philip Arndt]
17
- - Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found. [Philip Arndt]
18
- - Fixed a broken migration that would mean pages were missing upon upgrading. [Jesper Hvirring Henriksen]
19
- - More pt-BR translation keys translated. [Kivanio Barbosa]
29
+ - Wrote an upgrade task for migrating from 0.9.6.x releases of RefineryCMS. Just run refinery-update-096-to-097 inside your application's directory. [Philip Arndt](http://github.com/parndt)
30
+ - Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found. [Philip Arndt](http://github.com/parndt)
31
+ - Fixed a broken migration that would mean pages were missing upon upgrading. [Jesper Hvirring Henriksen](http://github.com/hvirring)
32
+ - More pt-BR translation keys translated. [Kivanio Barbosa](http://github.com/kivanio)
20
33
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.4...0.9.7.5)
21
34
 
22
35
  ## 0.9.7.4 [07 July 2010]
23
36
 
24
- - Fixed critical issue in the i18n routing pattern that was matching prefixes like /news/ as a locale incorrectly. [Philip Arndt]
37
+ - Fixed critical issue in the i18n routing pattern that was matching prefixes like /news/ as a locale incorrectly. [Philip Arndt](http://github.com/parndt)
25
38
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.3...0.9.7.4)
26
39
 
27
40
  ## 0.9.7.3 [07 July 2010]
28
41
 
29
- - Falls back to default locale when a translation key can not be located in the current locale, only in production mode. [Philip Arndt]
30
- - Fixed issue creating a Refinery site using bin/refinery where directory paths contained spaces. [Philip Arndt]
31
- - Fixed issue when using script/generate refinery surrounding the migration incorrectly using the plugin's title. [Philip Arndt]
32
- - Added verbose=true option when running rake refinery:update that prints out everything it's doing. [Philip Arndt]
42
+ - Falls back to default locale when a translation key can not be located in the current locale, only in production mode. [Philip Arndt](http://github.com/parndt)
43
+ - Fixed issue creating a Refinery site using bin/refinery where directory paths contained spaces. [Philip Arndt](http://github.com/parndt)
44
+ - Fixed issue when using script/generate refinery surrounding the migration incorrectly using the plugin's title. [Philip Arndt](http://github.com/parndt)
45
+ - Added verbose=true option when running rake refinery:update that prints out everything it's doing. [Philip Arndt](http://github.com/parndt)
33
46
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.2...0.9.7.3)
34
47
 
35
48
  ## 0.9.7.2 [06 July 2010]
36
49
 
37
- - Bugfixes with users and roles. [Philip Arndt and Amanda Wagener]
38
- - 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]
39
- - Refactored routing of i18n to allow different default frontend and backend locales. [Philip Arndt]
40
- - Added better grammar support for some i18n. [Halan Pinheiro]
41
- - Improved output of rake refinery:update task and removed bin/refinery-update-core task. [Steven Heidel]
42
- - Set config.ru to run in production RAILS_ENV by default. [Philip Arndt]
50
+ - Bugfixes with users and roles. [Philip Arndt](http://github.com/parndt) and [Amanda Wagener](http://github.com/awagener)
51
+ - 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](http://github.com/parndt)
52
+ - Refactored routing of i18n to allow different default frontend and backend locales. [Philip Arndt](http://github.com/parndt)
53
+ - Added better grammar support for some i18n. [Halan Pinheiro](http://github.com/halan)
54
+ - Improved output of rake refinery:update task and removed bin/refinery-update-core task. [Steven Heidel](http://github.com/stevenheidel)
55
+ - Set config.ru to run in production RAILS_ENV by default. [Philip Arndt](http://github.com/parndt)
43
56
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.1...0.9.7.2)
44
57
 
45
58
  ## 0.9.7.1 [03 July 2010]
46
59
 
47
- - Bugfixes in the gem installation method process. [Philip Arndt]
48
- - Made installing from gem faster. [Philip Arndt]
49
- - Provided example files for sqlite3, mysql and postgresql. [Philip Arndt]
50
- - Created option for specifying a database adapter (sqlite3, mysql or postgresql) when creating from Gem. [Philip Arndt]
51
- - Other bugfixes including UI consistency around signup. [Philip Arndt]
60
+ - Bugfixes in the gem installation method process. [Philip Arndt](http://github.com/parndt)
61
+ - Made installing from gem faster. [Philip Arndt](http://github.com/parndt)
62
+ - Provided example files for sqlite3, mysql and postgresql. [Philip Arndt](http://github.com/parndt)
63
+ - Created option for specifying a database adapter (sqlite3, mysql or postgresql) when creating from Gem. [Philip Arndt](http://github.com/parndt)
64
+ - Other bugfixes including UI consistency around signup. [Philip Arndt](http://github.com/parndt)
52
65
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7...0.9.7.1)
53
66
 
54
67
  ## 0.9.7 [02 July 2010]
55
68
 
56
- - Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn and Philip Arndt and many others]
57
- - Marketable URLs, such as "/contact". [Joshua Davey and Joe Sak].
58
- - Switched to bundler and rack. [Alex Coles and Philip Arndt]
59
- - Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel and Philip Arndt]
60
- - Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions. [Philip Arndt]
61
- - Added spam filtering to contact form. [David Jones]
62
- - Full Refinery UI redesign. [Resolve Digital]
63
- - User Role support. [Amanda Wagener and Philip Arndt]
69
+ - Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt) and many others
70
+ - Marketable URLs, such as "/contact". [Joshua Davey](http://github.com/jgdavey) and [Joe Sak](http://github.com/joemsak).
71
+ - Switched to bundler and rack. [Alex Coles](http://github.com/myabc) and [Philip Arndt](http://github.com/parndt)
72
+ - Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel](http://github.com/stevenheidel) and [Philip Arndt](http://github.com/parndt)
73
+ - Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions. [Philip Arndt](http://github.com/parndt)
74
+ - Added spam filtering to contact form. [David Jones](http://github.com/djones)
75
+ - Full Refinery UI redesign. [Resolve Digital](http://github.com/resolve)
76
+ - User Role support. [Amanda Wagener](http://github.com/awagener) and [Philip Arndt](http://github.com/parndt)
64
77
  - [See full list](http://github.com/resolve/refinerycms/compare/0.9.6.34...0.9.7)
65
78
  - [See blog post](http://refinerycms.com/blog/refinery-cms-0-9-7-released)
66
79
 
@@ -7,7 +7,11 @@ end
7
7
 
8
8
  # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
9
9
  if $refinery_gem_plugin_lib_paths.present?
10
- extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
10
+ paths = $refinery_gem_plugin_lib_paths.reject do |path|
11
+ path =~ /^#{Rails.root.join('vendor', 'plugins')}/
12
+ end
13
+
14
+ extra_rake_tasks << paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
11
15
  end
12
16
 
13
17
  extra_rake_tasks << Dir[Rails.root.join("lib", "refinery", "tasks", "*.rake").to_s]
@@ -109,20 +109,10 @@
109
109
 
110
110
  $.fn.corner = function(options) {
111
111
  // in 1.3+ we can fix mistakes with the ready state
112
- if ((elements = this).length == 0) {
113
- if (!$.isReady && this.selector) {
114
- var s = this.selector,
115
- c = this.context;
116
- $(function() {
117
- $(s, c).corner(options);
118
- });
119
- }
120
- return this;
121
- }
122
-
112
+ var elements = this;
123
113
  // help IE *yet again*.
124
114
  if ($.browser.msie && $.browser.version < 9) {
125
- elements = elements.not('.button');
115
+ elements = elements.not('input, .button');
126
116
  /*
127
117
  (inputs = elements.find('input.button')).removeClass('button');
128
118
  elements = elements.not('input');
@@ -135,6 +125,17 @@
135
125
  */
136
126
  }
137
127
 
128
+ if (elements.length == 0) {
129
+ if (!$.isReady && this.selector) {
130
+ var s = this.selector,
131
+ c = this.context;
132
+ $(function() {
133
+ $(s, c).corner(options);
134
+ });
135
+ }
136
+ return this;
137
+ }
138
+
138
139
  return elements.each(function(index) {
139
140
  var $this = $(this);
140
141
  // meta values override options
@@ -204,6 +205,7 @@
204
205
 
205
206
  if (typeof this.style.zoom != undefined) this.style.zoom = 1;
206
207
  // force 'hasLayout' in IE
208
+ // TODO: IE is losing its border in some cases though still rounding it, investigate.
207
209
  if (!keep) this.style.border = 'none';
208
210
  strip.style.borderColor = cc || gpc(this.parentNode);
209
211
  var cssHeight = $(this).outerHeight();
@@ -9,10 +9,11 @@
9
9
  var config = {
10
10
  color: '#888',
11
11
  cls: '',
12
- lr_padding:4
12
+ lr_padding:4,
13
+ selector: 'input[placeholder], textarea[placeholder]'
13
14
  };
14
15
  $.extend(config,opts);
15
- !this.browser_supported() && $('input[placeholder]')._placeholder_shim(config);
16
+ !this.browser_supported() && $(config.selector)._placeholder_shim(config);
16
17
  }
17
18
  }});
18
19
 
@@ -48,8 +49,7 @@
48
49
  textAlign: 'left',
49
50
  color: config.color,
50
51
  cursor: 'text',
51
- fontSize: $(this).css('font-size'),
52
- lineHeight: $(this).css('height')
52
+ fontSize: $(this).css('font-size')
53
53
  })
54
54
  .css(calcPositionCss(this))
55
55
  .attr('for', this.id)
@@ -77,5 +77,7 @@
77
77
  })(jQuery);
78
78
 
79
79
  $(document).ready(function() {
80
- $.placeholder.shim();
80
+ if ($.placeholder) {
81
+ $.placeholder.shim();
82
+ }
81
83
  });
@@ -10,6 +10,9 @@ $(document).ready(function(){
10
10
  });
11
11
 
12
12
  init_interface = function() {
13
+ if (parent && parent.document.location.href != document.location.href) {
14
+ $('body#dialog_container.dialog').addClass('iframed');
15
+ }
13
16
  $('input:submit:not(.button)').addClass('button');
14
17
 
15
18
  $('.button, #editor_switch a').corner('6px');
@@ -32,22 +35,26 @@ init_interface = function() {
32
35
  /*overlay = $("<div class='wym_loading_overlay'>&nbsp;</div>")
33
36
  .css({'height': textarea.height(), 'width': textarea.width()});
34
37
  textarea.before(overlay);*/
35
- if ((instance = WYMeditor.INSTANCES[$(textarea.next('.wym_box').find('iframe').attr('id').split('_')).last().get(0)]) != null) {
36
- textarea.parent().next().find('input, textarea').keydown($.proxy(function(e) {
37
- shiftHeld = e.shiftKey;
38
- if (shiftHeld && e.keyCode == $.ui.keyCode.TAB) {
39
- this._iframe.contentWindow.focus();
40
- e.preventDefault();
41
- }
42
- }, instance)).keyup(function(e) {
43
- shiftHeld = false;
44
- });
45
- textarea.parent().prev().find('input, textarea').keydown($.proxy(function(e) {
46
- if (e.keyCode == $.ui.keyCode.TAB) {
47
- this._iframe.contentWindow.focus();
48
- e.preventDefault();
49
- }
50
- }, instance));
38
+ if ((instance = WYMeditor.INSTANCES[$((textarea.next('.wym_box').find('iframe').attr('id')||'').split('_')).last().get(0)]) != null) {
39
+ if ((next = textarea.parent().next()) != null && next.length > 0) {
40
+ next.find('input, textarea').keydown($.proxy(function(e) {
41
+ shiftHeld = e.shiftKey;
42
+ if (shiftHeld && e.keyCode == $.ui.keyCode.TAB) {
43
+ this._iframe.contentWindow.focus();
44
+ e.preventDefault();
45
+ }
46
+ }, instance)).keyup(function(e) {
47
+ shiftHeld = false;
48
+ });
49
+ }
50
+ if ((prev = textarea.parent().prev()) != null && prev.length > 0) {
51
+ prev.find('input, textarea').keydown($.proxy(function(e) {
52
+ if (e.keyCode == $.ui.keyCode.TAB) {
53
+ this._iframe.contentWindow.focus();
54
+ e.preventDefault();
55
+ }
56
+ }, instance));
57
+ }
51
58
  }
52
59
  });
53
60
 
@@ -94,15 +101,29 @@ init_flash_messages = function(){
94
101
  init_modal_dialogs = function(){
95
102
  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor)
96
103
  {
97
- $(anchor).click(function(e){
98
- iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "&amp;app_dialog=true" + "'></iframe>").corner('8px');
104
+ $(anchor).data({
105
+ 'dialog-width': parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0), 928)||928
106
+ , 'dialog-height': parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0), 473)||473
107
+ , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
108
+ }).attr('href', $(anchor).attr('href').replace(/(\&(amp\;)?)?dialog\=true/, '')
109
+ .replace(/(\&(amp\;)?)?width\=\d+/, '')
110
+ .replace(/(\&(amp\;)?)?height\=\d+/, '')
111
+ .replace(/(\?&(amp\;)?)/, '?')
112
+ .replace(/\?$/, ''))
113
+ .click(function(e){
114
+ $anchor = $(this);
115
+ iframe_src = (iframe_src = $anchor.attr('href'))
116
+ + (iframe_src.indexOf('?') > -1 ? '&amp;' : '?')
117
+ + 'app_dialog=true&amp;dialog=true';
118
+
119
+ iframe = $("<iframe id='dialog_iframe' src='" + iframe_src + "'></iframe>").corner('8px');
99
120
  iframe.dialog({
100
- title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null
121
+ title: $anchor.data('dialog-title')
101
122
  , modal: true
102
123
  , resizable: false
103
124
  , autoOpen: true
104
- , width: (parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0))||928)
105
- , height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473)
125
+ , width: $anchor.data('dialog-width')
126
+ , height: $anchor.data('dialog-height')
106
127
  , open: onOpenDialog
107
128
  , close: onCloseDialog
108
129
  });
@@ -163,7 +184,7 @@ init_submit_continue = function(){
163
184
  $(this).attr('data-changes-made', true);
164
185
  });
165
186
 
166
- if ((continue_editing = $('#continue_editing')).length > 0 && continue_editing.attr('rel') != 'no-prompt') {
187
+ if ((continue_editing_button = $('#continue_editing')).length > 0 && continue_editing_button.attr('rel') != 'no-prompt') {
167
188
  $('#editor_switch a').click(function(e) {
168
189
  if ($('form[data-changes-made]').length > 0) {
169
190
  if (!confirm("Any changes you've made will be lost. Are you sure you want to continue without saving?")) {
@@ -286,10 +307,10 @@ init_tooltips = function(args){
286
307
  })
287
308
  });
288
309
  if ($(element).attr('tooltip') == null) {
289
- $(element).attr({'tooltip': $(element).attr('title'), 'title': ''});
310
+ $(element).attr('tooltip', $(element).attr('title'));
290
311
  }
291
312
  // wipe clean the title on any children too.
292
- $(element).children('img').attr('title', '');
313
+ $(element).add($(element).children('img')).attr('title', null);
293
314
  });
294
315
  }
295
316
 
@@ -639,8 +660,8 @@ var image_dialog = {
639
660
  image_dialog.set_image(this);
640
661
  });
641
662
  //Select any currently selected, just uploaded...
642
- if ((selected_image = $('#existing_image_area_content ul li.selected img')).length > 0) {
643
- image_dialog.set_image(selected_image.first());
663
+ if ((selected_img = $('#existing_image_area_content ul li.selected img')).length > 0) {
664
+ image_dialog.set_image(selected_img.first());
644
665
  }
645
666
  }
646
667
 
@@ -14,7 +14,8 @@
14
14
  padding-left: 8px;
15
15
  padding-right: 8px;
16
16
  }
17
- body.login input.larger, body.login input.larger:focus {
17
+ body.login .field input.larger, body.login .field input.larger:focus {
18
18
  background-image: none !important;
19
19
  padding: 0px;
20
+ line-height: 30px;
20
21
  }
@@ -0,0 +1,26 @@
1
+ /*
2
+ #content .form-actions .form-actions-left a.button {
3
+ height: 19px;
4
+ line-height: 19px;
5
+ padding-top: 3px;
6
+ padding-bottom: 3px;
7
+ }
8
+ #site_bar #editor_switch a {
9
+ height: 26px;
10
+ padding-top: 4px;
11
+ padding-bottom: 4px;
12
+ line-height: 26px;
13
+ }
14
+ .search_form input.button {
15
+ padding-left: 8px;
16
+ padding-right: 8px;
17
+ }
18
+ */
19
+ body.login .field input.larger, body.login .field input.larger:focus {
20
+ line-height: 30px;
21
+ }
22
+ /*
23
+ background-image: none !important;
24
+ padding: 0px;
25
+ }
26
+ */
@@ -1102,7 +1102,7 @@ a#toggle_advanced_options:hover {
1102
1102
  margin-top: 10px;
1103
1103
  height: 45px;
1104
1104
  }
1105
- .dialog .dialog_area {
1105
+ .dialog form {
1106
1106
  margin-bottom: 45px;
1107
1107
  }
1108
1108
  .dialog .dialog_area > div > .field label:first-child, .dialog .dialog_area > div > label:first-child {
@@ -1131,7 +1131,7 @@ a#toggle_advanced_options:hover {
1131
1131
  position: relative;
1132
1132
  }
1133
1133
  #dialog_container #content .form-actions, .ui-dialog .form-actions, .dialog_container .form-actions {
1134
- position: fixed;
1134
+ position: absolute;
1135
1135
  bottom: 0px;
1136
1136
  left: 0px;
1137
1137
  right: 0px;
@@ -1140,6 +1140,9 @@ a#toggle_advanced_options:hover {
1140
1140
  border-bottom: 0px;
1141
1141
  width: auto;
1142
1142
  }
1143
+ #dialog_container.dialog.iframed #content .form-actions {
1144
+ position: fixed;
1145
+ }
1143
1146
  #existing_image_area {
1144
1147
  padding-top:6px;
1145
1148
  }
@@ -18,50 +18,52 @@ class UsersController < ApplicationController
18
18
 
19
19
  # This method should only be used to create the first Refinery user.
20
20
  def create
21
- begin
22
- # protects against session fixation attacks, wreaks havoc with request forgery protection.
23
- # uncomment at your own risk:
24
- # reset_session
25
- @user = User.new(params[:user])
26
- @selected_plugin_titles = params[:user][:plugins] || []
27
-
28
- @user.save if @user.valid?
29
-
30
- if @user.errors.empty?
31
- @user.add_role(:refinery)
32
- @user.plugins = @selected_plugin_titles
33
- @user.save
34
- UserSession.create!(@user)
35
- if Role[:refinery].users.count == 1
36
- # this is the superuser if this user is the only user.
37
- current_user.add_role(:superuser)
38
- current_user.save
39
-
40
- # set this user as the recipient of inquiry notifications
41
- if (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
42
- notification_recipients.update_attributes({
43
- :value => current_user.email,
44
- :destroyable => false
45
- })
46
- end
21
+ # protects against session fixation attacks, wreaks havoc with request forgery protection.
22
+ # uncomment at your own risk:
23
+ # reset_session
24
+ @user = User.new(params[:user])
25
+ @selected_plugin_titles = params[:user][:plugins] || []
26
+
27
+ @user.save if @user.valid?
28
+
29
+ if @user.errors.empty?
30
+ @user.add_role(:refinery)
31
+ @user.plugins = @selected_plugin_titles
32
+ @user.save
33
+ UserSession.create!(@user)
34
+ if Role[:refinery].users.count == 1
35
+ # this is the superuser if this user is the only user.
36
+ current_user.add_role(:superuser)
37
+ current_user.save
38
+
39
+ # set this user as the recipient of inquiry notifications
40
+ if (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
41
+ notification_recipients.update_attributes({
42
+ :value => current_user.email,
43
+ :destroyable => false
44
+ })
47
45
  end
46
+ end
48
47
 
49
- redirect_back_or_default(admin_root_url)
50
- flash[:message] = "<h2>#{t('users.create.welcome', :who => current_user.login).gsub(/\.$/, '')}.</h2>".html_safe
48
+ flash[:message] = "<h2>#{t('users.create.welcome', :who => current_user.login).gsub(/\.$/, '')}.</h2>".html_safe
51
49
 
52
- site_name_setting = RefinerySetting.find_or_create_by_name('site_name', :value => "Company Name")
53
- if site_name_setting.value.to_s =~ /^(|Company\ Name)$/ or Role[:refinery].users.count == 1
54
- flash[:message] << "<p>#{t('users.setup_website_name', :link => edit_admin_refinery_setting_url(site_name_setting))}</p>".html_safe
55
- end
56
- else
57
- render :action => 'new'
50
+ site_name_setting = RefinerySetting.find_or_create_by_name('site_name', :value => "Company Name")
51
+ if site_name_setting.value.to_s =~ /^(|Company\ Name)$/ or Role[:refinery].users.count == 1
52
+ flash[:message] << "<p>#{t('users.setup_website_name',
53
+ :link => edit_admin_refinery_setting_url(site_name_setting, :dialog => true),
54
+ :title => t('admin.refinery_settings.refinery_setting.edit'))}</p>".html_safe
58
55
  end
56
+
57
+ redirect_back_or_default(admin_root_url)
58
+ else
59
+ render :action => 'new'
59
60
  end
60
61
  end
61
62
 
62
63
  def forgot
63
64
  if request.post?
64
- if (params[:user].present? and params[:user][:email].present? and user = User.find_by_email(params[:user][:email])).present?
65
+ if (params[:user].present? and params[:user][:email].present? and
66
+ user = User.find_by_email(params[:user][:email])).present?
65
67
  user.deliver_password_reset_instructions!(request)
66
68
  flash[:notice] = t('users.forgot.email_reset_sent')
67
69
  redirect_back_or_default new_session_url
@@ -70,7 +72,8 @@ class UsersController < ApplicationController
70
72
  if (email = params[:user][:email]).blank?
71
73
  flash.now[:error] = t('users.forgot.blank_email')
72
74
  else
73
- flash.now[:error] = t('users.forgot.email_not_associated_with_account', :email => params[:user][:email])
75
+ flash.now[:error] = t('users.forgot.email_not_associated_with_account',
76
+ :email => params[:user][:email])
74
77
  end
75
78
  end
76
79
  end
@@ -2,7 +2,7 @@ class UserMailer < ActionMailer::Base
2
2
 
3
3
  def reset_notification(user, request)
4
4
  setup_email(user)
5
- subject I18n.translate('.link_to_reset_your_password')
5
+ subject I18n.translate('user_mailer.link_to_reset_your_password')
6
6
  @body[:url] = reset_users_url(:host => request.host_with_port,
7
7
  :reset_code => user.perishable_token)
8
8
  end
@@ -32,7 +32,7 @@ da:
32
32
  hello_please_sign_in: Hej! Du skal logge ind
33
33
  sign_in: log ind
34
34
  users:
35
- setup_website_name: "Lad os først give websitet et navn. <a href='{{link}}'>Her</a> kan du rette navnet"
35
+ setup_website_name: "Lad os først give websitet et navn. <a href='{{link}}' name='{{title}}'>Her</a> kan du rette navnet"
36
36
  signup_disabled: Brugeroprettelse er deaktiveret
37
37
  new:
38
38
  fill_form: Indtast dine oplysninger, så vi kan få dig i gang med Refinery.
@@ -36,7 +36,7 @@ de:
36
36
  reset:
37
37
  code_invalid: "Es tut uns leid, aber diese Reset-Code ist abgelaufen oder ungültig. Wenn Sie Probleme versuchen Kopieren und Einfügen der URL aus Ihrem E-Mail in Ihrem Browser oder ein Neustart des Passwort-Reset-Prozess."
38
38
  successful: "Passwort zurücksetzen erfolgreich {{email}}"
39
- setup_website_name: "Lassen Sie uns der Website als Erstes einen Namen geben. <a href='{{link}}'>Hier</a> können Sie den Namen Ihrer Website bearbeiten."
39
+ setup_website_name: "Lassen Sie uns der Website als Erstes einen Namen geben. <a href='{{link}}' name='{{title}}'>Hier</a> können Sie den Namen Ihrer Website bearbeiten."
40
40
  signup_disabled: Benutzerregistrierung ist deaktiviert
41
41
  new:
42
42
  fill_form: "Füllen Sie das Formular unten mit Ihren Angaben aus, damit wir loslegen können."
@@ -27,7 +27,7 @@ en:
27
27
  sign_in: Sign in
28
28
  forgot_password: I forgot my password
29
29
  users:
30
- setup_website_name: "First let's give the site a name. <a href='{{link}}'>Go here</a> to edit your website's name"
30
+ setup_website_name: "First let's give the site a name. <a href='{{link}}' name='{{title}}'>Go here</a> to edit your website's name"
31
31
  signup_disabled: User signup is disabled
32
32
  new:
33
33
  fill_form: Fill out your details below so that we can get you started.
@@ -59,7 +59,7 @@ es:
59
59
  hello_please_sign_in: Hola! Por favor, iniciar sesión
60
60
  sign_in: Iniciar sesión
61
61
  users:
62
- setup_website_name: "Lo primero es proporcionar un nombre para el sitio web.<br/><a href='{{link}}'>Pulse aquí</a> editar el nombre del sitio web"
62
+ setup_website_name: "Lo primero es proporcionar un nombre para el sitio web.<br/><a href='{{link}}' name='{{title}}'>Pulse aquí</a> editar el nombre del sitio web"
63
63
  signup_disabled: El registro de usuario ha sido deshabilitado.
64
64
  new:
65
65
  fill_form: Rellene el siguiente formulario con su información de usuario para comenzar.
@@ -33,7 +33,7 @@ fr:
33
33
  hello_please_sign_in: Bonjour! S'il vous plaît signer po
34
34
  sign_in: Identifiez-vous
35
35
  users:
36
- setup_website_name: "Pour commencer, donnez un nom au site. <a href='{{link}}'>Allez ici</a> pour modifier le nom de votre site."
36
+ setup_website_name: "Pour commencer, donnez un nom au site. <a href='{{link}}' name='{{title}}'>Allez ici</a> pour modifier le nom de votre site."
37
37
  signup_disabled: "L'inscription d'utilisateur est désactivé"
38
38
  new:
39
39
  fill_form: Remplissez le formulaire ci-dessous avec vos information afin que nous puissions vous aider à démarrer.
@@ -29,7 +29,7 @@ it:
29
29
  sign_in: Entra
30
30
  hello_please_sign_in: "Ciao! Accedi per favore."
31
31
  users:
32
- setup_website_name: "Prima di tutto dare al sito un nome. <a href='{{link}}'>Vai qui</a> per modificare il nome del tuo sito web"
32
+ setup_website_name: "Prima di tutto dare al sito un nome. <a href='{{link}}' name='{{title}}'>Vai qui</a> per modificare il nome del tuo sito web"
33
33
  signup_disabled: Iscriviti utente è disattivato
34
34
  new:
35
35
  fill_form: Compila il form sottostante con i tuoi dati in modo che possiamo iniziare.
@@ -29,7 +29,7 @@ nb:
29
29
  hello_please_sign_in: Hei! Vennligst logg inn
30
30
  sign_in: Logg på
31
31
  users:
32
- setup_website_name: "Først la oss gi siden et navn. <a href='{{link}}'>Gå her</a> for å redigere siden din sitt navn"
32
+ setup_website_name: "Først la oss gi siden et navn. <a href='{{link}}' name='{{title}}'>Gå her</a> for å redigere siden din sitt navn"
33
33
  signup_disabled: Brukerpåmelding er deaktivert
34
34
  new:
35
35
  fill_form: Fyll ut skjemaet under med detaljene dine så vi kan få deg startet.
@@ -45,7 +45,7 @@ nl:
45
45
  hello_please_sign_in: Hallo! Gelieve in te loggen
46
46
  sign_in: Log in
47
47
  users:
48
- setup_website_name: "Laten we eerst de website een naam geven. <a href='{{link}}'>Klik hier</a> om de naam van de website te bewerken"
48
+ setup_website_name: "Laten we eerst de website een naam geven. <a href='{{link}}' name='{{title}}'>Klik hier</a> om de naam van de website te bewerken"
49
49
  signup_disabled: Het registreren van gebruikers is uitgeschakeld
50
50
  new:
51
51
  fill_form: Vul het onderstaande formulier in, zodat u kan beginnen.
@@ -27,7 +27,7 @@ pt-BR:
27
27
  sign_in: Entrar
28
28
  forgot_password: Esqueci minha senha
29
29
  users:
30
- setup_website_name: "Primeiro vamos dar um nome ao site. <a href='{{link}}'>Clique aqui</a> para editar o nome do seu site"
30
+ setup_website_name: "Primeiro vamos dar um nome ao site. <a href='{{link}}' name='{{title}}'>Clique aqui</a> para editar o nome do seu site"
31
31
  signup_disabled: Cadastro de usuários está desabilitado
32
32
  new:
33
33
  fill_form: Preencha o formulário abaixo com seus detalhes pra que você possa começar.
@@ -31,7 +31,7 @@ sl:
31
31
  or: ali
32
32
  forgot_password: Pozabil sem geslo
33
33
  users:
34
- setup_website_name: "Najprej morate poimenovati stran. <a href='{{link}}'>Pojdite sem</a> kjer lahko uredite naslov vaše strani."
34
+ setup_website_name: "Najprej morate poimenovati stran. <a href='{{link}}' name='{{title}}'>Pojdite sem</a> kjer lahko uredite naslov vaše strani."
35
35
  signup_disabled: Registracija uporabnikov je onemogočena
36
36
  new:
37
37
  fill_form: Izpolnite spodnji obrazec z vašimi podatki.
@@ -6,31 +6,42 @@
6
6
  <div id='actions'>
7
7
  <h2><%= t('.quick_tasks').titleize %></h2>
8
8
  <ul>
9
- <%# I8N: How to translate tab names? %>
10
9
  <% if Refinery::Plugins.active.names.include?("refinery_pages") %>
11
10
  <li>
12
- <%= link_to t('.add_a_new_page'), new_admin_page_url(:only_path => true),
11
+ <%= link_to t('.add_a_new_page'),
12
+ new_admin_page_url(:only_path => true),
13
13
  :class => "add_icon" %>
14
14
  </li>
15
15
  <li>
16
- <%= link_to t('.update_a_page'), admin_pages_url(:only_path => true),
16
+ <%= link_to t('.update_a_page'),
17
+ admin_pages_url(:only_path => true),
17
18
  :class => "edit_icon" %>
18
19
  </li>
19
20
  <% end %>
20
21
  <% if Refinery::Plugins.active.names.include?("refinery_resources") %>
21
22
  <li>
22
- <%= link_to t('.upload_a_file'), new_admin_resource_url(:dialog => true, :width => 600, :height => 300, :only_path => true),
23
+ <%= link_to t('.upload_a_file'),
24
+ new_admin_resource_url(:dialog => true,
25
+ :width => 600,
26
+ :height => 300,
27
+ :only_path => true),
23
28
  :class => "add_icon" %>
24
29
  </li>
25
30
  <% end %>
26
31
  <% if Refinery::Plugins.active.names.include?("refinery_images") %>
27
32
  <li>
28
- <%= link_to t('.upload_a_image'), new_admin_image_url(:dialog => true, :width => 600, :height => 300, :only_path => true),
33
+ <%= link_to t('.upload_a_image'),
34
+ new_admin_image_url(:dialog => true,
35
+ :width => 600,
36
+ :height => 300,
37
+ :only_path => true),
29
38
  :class => "add_icon" %>
30
39
  </li>
31
40
  <% end %>
32
41
  <li>
33
- <%= link_to t('.see_home_page'), root_url, :class => "go_icon", :target => "_blank" %>
42
+ <%= link_to t('.see_home_page'), root_url,
43
+ :class => "go_icon",
44
+ :target => "_blank" %>
34
45
  </li>
35
46
  </ul>
36
47
 
@@ -47,7 +58,7 @@
47
58
  <% Refinery::I18n.locales.reject{|key, value| key.to_sym == ::I18n.locale}.sort_by{|key, value| value}.each do |locale_key, locale_title| %>
48
59
  <li>
49
60
  <%= link_to locale_title,
50
- params.dup.tap { |p| p[:set_locale] = locale_key }, # Use the current params, just change the locale
61
+ params.dup.tap { |p| p[:set_locale] = locale_key },
51
62
  :style => "background-image: url('/images/refinery/icons/flags/#{locale_key}.png');" %>
52
63
  </li>
53
64
  <% end %>
@@ -41,6 +41,10 @@
41
41
  'refinery/admin',
42
42
  :cache => (js_caching ? "cache/admin" : false) %>
43
43
 
44
- <%= "<!--[if lt IE 8]>#{stylesheet_link_tag 'refinery/ie'}<![endif]-->".html_safe if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
44
+ <% if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
45
+ <%= "<!--[if lt IE 8]>#{stylesheet_link_tag 'refinery/ie-less-than-8'}<![endif]-->".html_safe %>
46
+ <%= "<!--[if IE 8]>#{stylesheet_link_tag 'refinery/ie-less-than-9'}<![endif]-->".html_safe %>
47
+ <% end %>
48
+
45
49
  <%= yield :head %>
46
50
  </head>
@@ -7,7 +7,7 @@ en:
7
7
  reorder_done: Done Reordering <%= $title_name.pluralize %>
8
8
  sorry_no_results: Sorry! There are no results found.
9
9
  no_items_yet: There are no <%= plural_name %> yet. Click "Create a new <%= $title_name %>" to add your first <%= $title_name.downcase %>.
10
- singular_name:
10
+ <%= singular_name %>:
11
11
  view_live: View this <%= $title_name.downcase %> live <br/><em>(opens in a new window)</em>
12
12
  edit: Edit this <%= $title_name.downcase %>
13
13
  delete: Remove this <%= $title_name.downcase %> forever
@@ -7,7 +7,7 @@ nl:
7
7
  reorder_done: Klaar met het wijzingen van de volgorde van de <%= $title_name.pluralize %>
8
8
  sorry_no_results: Helaas! Er zijn geen resultaten gevonden.
9
9
  no_items_yet: Er zijn nog geen <%= plural_name %>. Druk op 'Maak een nieuwe <%= $title_name %>' om de eerste aan te maken.
10
- singular_name:
10
+ <%= singular_name %>:
11
11
  view_live: Bekijk deze <%= $title_name.downcase %> op de website <br/><em>(opent een nieuw venster)</em>
12
12
  edit: Bewerk deze <%= $title_name.downcase %>
13
13
  delete: Verwijder deze <%= $title_name.downcase %> voor eeuwig
@@ -24,8 +24,17 @@ module Refinery
24
24
  end
25
25
 
26
26
  class Version
27
+ class << self
28
+ attr_reader :major, :minor, :tiny, :build
29
+ end
30
+
31
+ @major = 0
32
+ @minor = 9
33
+ @tiny = 7
34
+ @build = 7
35
+
27
36
  def self.to_s
28
- %q{0.9.7.6}
37
+ [@major, @minor, @tiny, @build].compact.join('.')
29
38
  end
30
39
  end
31
40
 
@@ -1,5 +1,8 @@
1
1
  namespace :refinery do
2
-
2
+
3
+ desc "Run all refinery tests, including test-unit, rspec, and cucumber"
4
+ task :test_all => [:test, :spec, :cucumber]
5
+
3
6
  desc "Override files for use in an application"
4
7
  task :override => :environment do
5
8
  require 'fileutils'
@@ -1,6 +1,10 @@
1
1
  class Admin::RefinerySettingsController < Admin::BaseController
2
2
 
3
- crudify :refinery_setting, :title_attribute => :title, :order => "name ASC", :searchable => false
3
+ crudify :refinery_setting,
4
+ :title_attribute => :title,
5
+ :order => "name ASC",
6
+ :searchable => false,
7
+ :redirect_to_url => :redirect_to_where?
4
8
 
5
9
  before_filter :sanitise_params, :only => [:create, :update]
6
10
  after_filter :fire_setting_callback, :only => [:update]
@@ -12,18 +16,26 @@ class Admin::RefinerySettingsController < Admin::BaseController
12
16
  end
13
17
 
14
18
  def find_all_refinery_settings
15
- @refinery_settings = RefinerySetting.find :all,
16
- :order => "name ASC",
17
- :conditions => current_user.has_role?(:superuser) ? nil : ["restricted IS NOT ?", true]
19
+ @refinery_settings = RefinerySetting.find(:all,
20
+ {
21
+ :order => "name ASC",
22
+ :conditions => (["restricted <> ?", true] unless current_user.has_role?(:superuser))
23
+ })
18
24
  end
19
25
 
20
26
  def paginate_all_refinery_settings
21
- @refinery_settings = RefinerySetting.paginate :page => params[:page],
22
- :order => "name ASC",
23
- :conditions => current_user.has_role?(:superuser) ? nil : ["restricted IS NOT ?", true]
27
+ @refinery_settings = RefinerySetting.paginate({
28
+ :page => params[:page],
29
+ :order => "name ASC",
30
+ :conditions => (["restricted <> ?", true] unless current_user.has_role?(:superuser))
31
+ })
24
32
  end
25
33
 
26
34
  private
35
+ def redirect_to_where?
36
+ (from_dialog? && session[:return_to].present?) ? session[:return_to] : admin_refinery_settings_url
37
+ end
38
+
27
39
  # this fires before an update or create to remove any attempts to pass sensitive arguments.
28
40
  def sanitise_params
29
41
  params.delete(:callback_proc_as_string)
@@ -3,7 +3,7 @@
3
3
  <div class='field'>
4
4
  <% if action_name =~ /(new)|(create)/ %>
5
5
  <%= f.label :name %>
6
- <%= f.text_field :name, :class => "larger", :size => from_dialog? ? 50 : 67 %>
6
+ <%= f.text_field :name, :class => "larger widest" %>
7
7
  <% else %>
8
8
  <label for='refinery_setting_value'>Name</label>
9
9
  <label class='stripped' for='refinery_setting_value'>
@@ -1,7 +1,7 @@
1
1
  <div id='actions'>
2
2
  <ul>
3
3
  <li>
4
- <%= link_to t('.new'), new_admin_refinery_setting_url(:dialog => true, :width => 725, :height => 425), :class => "add_icon" %>
4
+ <%= link_to t('.new'), new_admin_refinery_setting_url(:dialog => true, :width => 725, :height => 475), :class => "add_icon" %>
5
5
  </li>
6
6
  </ul>
7
7
  </div>
@@ -20,12 +20,10 @@
20
20
  <%= render :partial => "/shared/admin/form_actions",
21
21
  :locals => {
22
22
  :f => nil,
23
- :cancel_text => ,
24
23
  :cancel_url => admin_resources_url,
25
24
  :submit_button_text => t('.submit_insert'),
26
- :hide_cancel => false,
25
+ :hide_cancel => true,
27
26
  :hide_delete => true,
28
- :cancel_title => '',
29
27
  :paginate => {
30
28
  :collection => @resources,
31
29
  :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog? }
@@ -20,7 +20,7 @@
20
20
  </div>
21
21
 
22
22
  <div id='dialog_main'>
23
- <% if any_resources or user_can_modify_images %>
23
+ <% if any_resources or user_can_modify_resources %>
24
24
  <%= render :partial => 'existing_resource' if any_resources %>
25
25
 
26
26
  <% if user_can_modify_resources %>
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: 23
4
+ hash: 21
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 9
9
9
  - 7
10
- - 6
11
- version: 0.9.7.6
10
+ - 7
11
+ version: 0.9.7.7
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-15 00:00:00 +12:00
21
+ date: 2010-07-20 00:00:00 +12:00
22
22
  default_executable:
23
23
  dependencies: []
24
24
 
@@ -535,7 +535,8 @@ files:
535
535
  - public/stylesheets/refinery/application.css
536
536
  - public/stylesheets/refinery/formatting.css
537
537
  - public/stylesheets/refinery/home.css
538
- - public/stylesheets/refinery/ie.css
538
+ - public/stylesheets/refinery/ie-less-than-8.css
539
+ - public/stylesheets/refinery/ie-less-than-9.css
539
540
  - public/stylesheets/refinery/refinery.css
540
541
  - public/stylesheets/refinery/site_bar.css
541
542
  - public/stylesheets/refinery/theme.css
@@ -1052,6 +1053,7 @@ files:
1052
1053
  - vendor/plugins/themes/rails/init.rb
1053
1054
  - vendor/plugins/themes/readme.md
1054
1055
  - vendor/plugins/translate/init.rb
1056
+ - vendor/plugins/translate/lib/tasks/translate.rake
1055
1057
  - vendor/plugins/translate/lib/translate/file.rb
1056
1058
  - vendor/plugins/translate/lib/translate/keys.rb
1057
1059
  - vendor/plugins/translate/lib/translate/log.rb
@@ -1061,7 +1063,6 @@ files:
1061
1063
  - vendor/plugins/translate/Rakefile
1062
1064
  - vendor/plugins/translate/README
1063
1065
  - vendor/plugins/translate/REFINERY_README
1064
- - vendor/plugins/translate/tasks/translate.rake
1065
1066
  has_rdoc: true
1066
1067
  homepage: http://refinerycms.com
1067
1068
  licenses: []