imagine_cms 3.0.23.1 → 3.0.24

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +15 -0
  2. data/.ruby-version +1 -1
  3. data/app/assets/javascripts/builder.js +19 -54
  4. data/app/assets/stylesheets/management.css +4 -3
  5. data/app/controllers/management/users_controller.rb +3 -2
  6. data/app/helpers/cms_application_helper.rb +2 -2
  7. data/app/views/management/default/index.html.erb +1 -1
  8. data/lib/imagine_cms/version.rb +1 -1
  9. metadata +5 -27
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MzE4MzlhZDNlZTY5OTQ5YjU4NDEzNmU1ZjFlODQ2NzgzODY0MjFkYw==
5
+ data.tar.gz: !binary |-
6
+ MGQ2ZDgwOWQxNzc4OWMxZTJjZDFjMTMwNzgwNzliYTcwNGY3MjYzZg==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ ZTVjMTlhMDUzY2RkYmMyNjQ3ZjlmZmYzYTAzYTUwMmVmOWRiZmQ5YjZjNmNl
10
+ ODczNzQyZWVlNjdiNzAxNTNmZGUyYmQ0Y2U5N2Y5NDZhOTQyNjliZWM2OGMz
11
+ M2IyYTkyZTI4NzdiYmE0NjgxMmEyMzFmNTE4ZWRlNzZlYTMwNWE=
12
+ data.tar.gz: !binary |-
13
+ ODkwODRjNDQxYjljODk1MzRiMWU3ODNiNTE4YmM0N2IzNGE4Nzk2YzQ2OTZk
14
+ YmVmNDU0NDcxMDQ0YmJlZjExNmMzMzI2NzJlZTk2ZWE5OWQ5N2Q0YzZlYmQ0
15
+ ZGI5ZWIyZjBjNzU0M2YzOTE2M2I4MDhiNmQ4N2RiOWNlNTU4NTU=
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- ruby-1.9.3-p429
1
+ ruby-1.9.3-p484
data/app/assets/javascripts/builder.js CHANGED
@@ -1,9 +1,6 @@
1
- // script.aculo.us builder.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
2
-
3
- // Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
1
+ // Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
4
2
  //
5
- // script.aculo.us is freely distributable under the terms of an MIT-style license.
6
- // For details, see the script.aculo.us web site: http://script.aculo.us/
3
+ // See scriptaculous.js for full license.
7
4
 
8
5
  var Builder = {
9
6
  NODEMAP: {
@@ -26,7 +23,7 @@ var Builder = {
26
23
  // due to a Firefox bug
27
24
  node: function(elementName) {
28
25
  elementName = elementName.toUpperCase();
29
-
26
+
30
27
  // try innerHTML approach
31
28
  var parentTag = this.NODEMAP[elementName] || 'div';
32
29
  var parentElement = document.createElement(parentTag);
@@ -34,22 +31,21 @@ var Builder = {
34
31
  parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
35
32
  } catch(e) {}
36
33
  var element = parentElement.firstChild || null;
37
-
34
+
38
35
  // see if browser added wrapping tags
39
- if(element && (element.tagName.toUpperCase() != elementName))
36
+ if(element && (element.tagName != elementName))
40
37
  element = element.getElementsByTagName(elementName)[0];
41
-
38
+
42
39
  // fallback to createElement approach
43
40
  if(!element) element = document.createElement(elementName);
44
-
41
+
45
42
  // abort if nothing could be created
46
43
  if(!element) return;
47
44
 
48
45
  // attributes (or text)
49
46
  if(arguments[1])
50
47
  if(this._isStringOrNumber(arguments[1]) ||
51
- (arguments[1] instanceof Array) ||
52
- arguments[1].tagName) {
48
+ (arguments[1] instanceof Array)) {
53
49
  this._children(element, arguments[1]);
54
50
  } else {
55
51
  var attrs = this._attributes(arguments[1]);
@@ -62,75 +58,44 @@ var Builder = {
62
58
  // workaround firefox 1.0.X bug
63
59
  if(!element) {
64
60
  element = document.createElement(elementName);
65
- for(attr in arguments[1])
61
+ for(attr in arguments[1])
66
62
  element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
67
63
  }
68
- if(element.tagName.toUpperCase() != elementName)
64
+ if(element.tagName != elementName)
69
65
  element = parentElement.getElementsByTagName(elementName)[0];
70
- }
71
- }
66
+ }
67
+ }
72
68
 
73
69
  // text, or array of children
74
70
  if(arguments[2])
75
71
  this._children(element, arguments[2]);
76
72
 
77
- return $(element);
73
+ return element;
78
74
  },
79
75
  _text: function(text) {
80
76
  return document.createTextNode(text);
81
77
  },
82
-
83
- ATTR_MAP: {
84
- 'className': 'class',
85
- 'htmlFor': 'for'
86
- },
87
-
88
78
  _attributes: function(attributes) {
89
79
  var attrs = [];
90
80
  for(attribute in attributes)
91
- attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
92
- '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
81
+ attrs.push((attribute=='className' ? 'class' : attribute) +
82
+ '="' + attributes[attribute].toString().escapeHTML() + '"');
93
83
  return attrs.join(" ");
94
84
  },
95
85
  _children: function(element, children) {
96
- if(children.tagName) {
97
- element.appendChild(children);
98
- return;
99
- }
100
86
  if(typeof children=='object') { // array can hold nodes and text
101
87
  children.flatten().each( function(e) {
102
88
  if(typeof e=='object')
103
- element.appendChild(e);
89
+ element.appendChild(e)
104
90
  else
105
91
  if(Builder._isStringOrNumber(e))
106
92
  element.appendChild(Builder._text(e));
107
93
  });
108
94
  } else
109
- if(Builder._isStringOrNumber(children))
110
- element.appendChild(Builder._text(children));
95
+ if(Builder._isStringOrNumber(children))
96
+ element.appendChild(Builder._text(children));
111
97
  },
112
98
  _isStringOrNumber: function(param) {
113
99
  return(typeof param=='string' || typeof param=='number');
114
- },
115
- build: function(html) {
116
- var element = this.node('div');
117
- $(element).update(html.strip());
118
- return element.down();
119
- },
120
- dump: function(scope) {
121
- if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
122
-
123
- var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
124
- "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
125
- "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
126
- "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
127
- "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
128
- "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
129
-
130
- tags.each( function(tag){
131
- scope[tag] = function() {
132
- return Builder.node.apply(Builder, [tag].concat($A(arguments)));
133
- };
134
- });
135
100
  }
136
- };
101
+ }
data/app/assets/stylesheets/management.css CHANGED
@@ -84,9 +84,10 @@ h2 { margin: 0px 0px 8px 0px; color: #506D91;
84
84
 
85
85
  h3 { margin: 0px 0px 8px 0px; color: #666666;
86
86
  font-size: 14px; line-height: 16px; font-weight: normal; }
87
-
88
- .error { font-size: 12px; line-height: 14px; color: #E10E12; }
89
- .notice { font-size: 12px; line-height: 14px; color: #3131FF; }
87
+
88
+ .alert { font-size: 12px; line-height: 14px; margin-bottom: 20px; }
89
+ .error { color: #E10E12; }
90
+ .notice { color: #3131FF; }
90
91
 
91
92
  a { font-weight: bold; }
92
93
  a:link { text-decoration: underline; color: #506D91; }
data/app/controllers/management/users_controller.rb CHANGED
@@ -32,7 +32,8 @@ class Management::UsersController < Management::ApplicationController
32
32
  flash[:notice] = "User created successfully. Please check the boxes below to set this user's permissions, then click Save when you are done."
33
33
  redirect_to :action => 'edit', :id => @user.id
34
34
  else
35
- flash.now[:error] = @user.errors.full_messages
35
+ flash.now[:error] = @user.errors.full_messages.join('; ')
36
+ render :action => 'new'
36
37
  end
37
38
  end
38
39
  end
@@ -75,7 +76,7 @@ class Management::UsersController < Management::ApplicationController
75
76
  redirect_to :controller => '/manage/default', :action => 'index'
76
77
  end
77
78
  else
78
- flash.now[:error] = @user.errors.full_messages
79
+ flash.now[:error] = @user.errors.full_messages.join('; ')
79
80
  render :action => 'edit'
80
81
  end
81
82
  end
data/app/helpers/cms_application_helper.rb CHANGED
@@ -719,10 +719,10 @@ module CmsApplicationHelper
719
719
  def flash_message
720
720
  output = ''.html_safe
721
721
  if (flash[:error] || @error || '') != ''
722
- output << content_tag('div', :class => 'alert alert-error error') { flash[:error] || @error }
722
+ output << content_tag('div', flash[:error] || @error, :class => 'alert alert-error error')
723
723
  end
724
724
  if (flash[:notice] || @notice || '') != ''
725
- output << content_tag('div', :class => 'alert alert-info notice') { flash[:notice] || @notice }
725
+ output << content_tag('div', flash[:notice] || @notice, :class => 'alert alert-info notice')
726
726
  end
727
727
  output
728
728
  end
data/app/views/management/default/index.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%- if user_has_permission?(:manage_cms) || user_has_permission(:manage_users) -%>
1
+ <%- if user_has_permission?(:manage_cms) || user_has_permission?(:manage_users) -%>
2
2
  <h2>
3
3
  Manage Your Site
4
4
  </h2>
data/lib/imagine_cms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ImagineCms
2
- VERSION = "3.0.23.1"
2
+ VERSION = "3.0.24"
3
3
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: imagine_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.23.1
5
- prerelease:
4
+ version: 3.0.24
6
5
  platform: ruby
7
6
  authors:
8
7
  - Aaron Namba
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-09-16 00:00:00.000000000 Z
11
+ date: 2013-12-12 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: prototype-rails
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ~>
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ~>
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: aws-s3
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ~>
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ~>
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: rmagick
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ! '>='
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ! '>='
76
67
  - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: mini_magick
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ~>
84
74
  - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ~>
92
81
  - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: rubyzip
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - <
100
88
  - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - <
108
95
  - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: rinku
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - ~>
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - ~>
124
109
  - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: net-dns
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - ~>
132
116
  - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
134
118
  type: :runtime
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - ~>
140
123
  - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: acts_as_tree
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
129
  - - ~>
148
130
  - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
150
132
  type: :runtime
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
136
  - - ~>
156
137
  - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: sqlite3
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
143
  - - ! '>='
164
144
  - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
166
146
  type: :development
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
150
  - - ! '>='
172
151
  - !ruby/object:Gem::Version
@@ -524,27 +503,26 @@ files:
524
503
  homepage: https://github.com/anamba/imagine_cms
525
504
  licenses:
526
505
  - AGPLv3
506
+ metadata: {}
527
507
  post_install_message:
528
508
  rdoc_options: []
529
509
  require_paths:
530
510
  - lib
531
511
  required_ruby_version: !ruby/object:Gem::Requirement
532
- none: false
533
512
  requirements:
534
513
  - - ! '>='
535
514
  - !ruby/object:Gem::Version
536
515
  version: 1.9.3
537
516
  required_rubygems_version: !ruby/object:Gem::Requirement
538
- none: false
539
517
  requirements:
540
518
  - - ! '>='
541
519
  - !ruby/object:Gem::Version
542
520
  version: 1.8.11
543
521
  requirements: []
544
522
  rubyforge_project: imagine_cms
545
- rubygems_version: 1.8.25
523
+ rubygems_version: 2.1.11
546
524
  signing_key:
547
- specification_version: 3
525
+ specification_version: 4
548
526
  summary: Imagine Content Management System for Rails
549
527
  test_files:
550
528
  - test/dummy/README.rdoc