imagine_cms 3.0.1 → 3.0.2
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -2
- data/app/assets/javascripts/imagine.js +1 -3
- data/app/controllers/management/users_controller.rb +1 -1
- data/app/helpers/cms_application_helper.rb +2 -2
- data/app/views/management/cms/_edit_page.html.erb +5 -5
- data/lib/imagine_cms/version.rb +1 -1
- data/test/imagine_cms_test.rb +8 -0
- metadata +2 -3
- data/Gemfile.lock +0 -119
data/.gitignore
CHANGED
@@ -382,8 +382,6 @@ function showDatePicker(object, method_prefix) {
|
|
382
382
|
var el = $('date_picker_' + object + '_' + method_prefix + 'main');
|
383
383
|
el.hide();
|
384
384
|
el.style.position = 'absolute';
|
385
|
-
/* el.style.left = (coords[0] - 120) + 'px';*/
|
386
|
-
/* el.style.top = (coords[1] + 14) + 'px';*/
|
387
385
|
el.show();
|
388
386
|
}
|
389
387
|
|
@@ -652,7 +650,7 @@ function hideDojoDialog(id) {
|
|
652
650
|
|
653
651
|
function editProperties(url, titleText) {
|
654
652
|
$('properties_dialog_content').innerHTML = 'Loading...';
|
655
|
-
new Ajax.Updater('properties_dialog_content', url, {asynchronous:true, evalScripts:true});
|
653
|
+
new Ajax.Updater('properties_dialog_content', url, {method:'get', asynchronous:true, evalScripts:true});
|
656
654
|
|
657
655
|
showDojoDialog('properties_dialog', titleText);
|
658
656
|
}
|
@@ -863,7 +863,7 @@ module CmsApplicationHelper
|
|
863
863
|
"'&exclude_days=#{exclude_days.join(',')}' + " +
|
864
864
|
"'&onchange=#{escape_javascript(options[:onchange])}' + " +
|
865
865
|
"'&object=#{object}' + " +
|
866
|
-
"'&method_prefix=#{method_prefix}', {asynchronous:true, evalScripts:true})"
|
866
|
+
"'&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true})"
|
867
867
|
|
868
868
|
ret = <<EOF
|
869
869
|
<span><a href="#" onclick="showDatePicker('#{object}', '#{method_prefix}'); return false;"><span id="date_picker_#{object}_#{method_prefix}_value">#{default_value.strftime('%a %m/%d/%y')}</span></a></span>
|
@@ -926,7 +926,7 @@ EOF
|
|
926
926
|
"'&year=' + $('event_calendar_year_sel').value + " +
|
927
927
|
"'&min_time=#{start_date.to_i}&max_time=#{end_date.to_i}" +
|
928
928
|
"&calendar_id=#{calendar_id}&css_prefix=#{css_prefix}" +
|
929
|
-
"&popout_direction=#{popout_direction.to_s}', {asynchronous:true, evalScripts:true})"
|
929
|
+
"&popout_direction=#{popout_direction.to_s}', {method:'get', asynchronous:true, evalScripts:true})"
|
930
930
|
|
931
931
|
# keep all this junk in sync with what's in UtilController
|
932
932
|
@month = Time.now.month
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<script type="text/javascript">
|
2
2
|
attrlist = new Array(<%= @attrs.size %>)
|
3
3
|
|
4
|
-
|
4
|
+
<%- @attrs.each_with_index do |attr, i| -%>
|
5
5
|
attrlist[<%= i %>]="<%=h attr %>"
|
6
|
-
|
6
|
+
<%- end -%>
|
7
7
|
</script>
|
8
8
|
|
9
9
|
<div id="save_errors" class="error"></div>
|
10
10
|
|
11
11
|
<%= form_remote_tag :url => { :action => 'edit_page', :id => @pg },
|
12
|
-
|
13
|
-
|
12
|
+
:loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';",
|
13
|
+
:html => { :onsubmit => 'teardownTextFieldHints();' } do %>
|
14
14
|
<table>
|
15
15
|
<col width="120"><col width="*"><col width="5">
|
16
16
|
<%- if (@pg.id || 2) > 1 -%>
|
@@ -56,7 +56,7 @@
|
|
56
56
|
<%= date_picker :pg, :article_date, :default_value => (@pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %>
|
57
57
|
</td>
|
58
58
|
<td width="120">
|
59
|
-
<div id="div_article_end_date"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? '' : 'style="display: none"' %>>– <%= date_picker :pg, :article_end_date, :default_value => (@pg.article_end_date || @pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %></div>
|
59
|
+
<div id="div_article_end_date"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? '' : 'style="display: none"'.html_safe %>>– <%= date_picker :pg, :article_end_date, :default_value => (@pg.article_end_date || @pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %></div>
|
60
60
|
</td>
|
61
61
|
<td align="right" width="180">
|
62
62
|
<input type="checkbox" name="use_article_date_range" value="1" onclick="$('div_article_end_date').toggle();"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? ' checked="checked"' : '' %> /><label for="use_article_date_range">Use date range</label>
|
data/lib/imagine_cms/version.rb
CHANGED
data/test/imagine_cms_test.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: imagine_cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-12-
|
12
|
+
date: 2012-12-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -180,7 +180,6 @@ files:
|
|
180
180
|
- .gitignore
|
181
181
|
- .rvmrc
|
182
182
|
- Gemfile
|
183
|
-
- Gemfile.lock
|
184
183
|
- README.rdoc
|
185
184
|
- Rakefile
|
186
185
|
- app/assets/images/codepress/line-numbers.png
|
data/Gemfile.lock
DELETED
@@ -1,119 +0,0 @@
|
|
1
|
-
PATH
|
2
|
-
remote: .
|
3
|
-
specs:
|
4
|
-
imagine_cms (3.0.0.beta11)
|
5
|
-
acts_as_tree (~> 1.1)
|
6
|
-
aws-s3 (~> 0.6.3)
|
7
|
-
mini_magick (~> 3.3)
|
8
|
-
net-dns (~> 0.7.1)
|
9
|
-
prototype-rails (~> 3.2.0)
|
10
|
-
rails (~> 3.2.0)
|
11
|
-
rinku (~> 1.7.2)
|
12
|
-
rmagick
|
13
|
-
|
14
|
-
GEM
|
15
|
-
remote: http://rubygems.org/
|
16
|
-
specs:
|
17
|
-
actionmailer (3.2.8)
|
18
|
-
actionpack (= 3.2.8)
|
19
|
-
mail (~> 2.4.4)
|
20
|
-
actionpack (3.2.8)
|
21
|
-
activemodel (= 3.2.8)
|
22
|
-
activesupport (= 3.2.8)
|
23
|
-
builder (~> 3.0.0)
|
24
|
-
erubis (~> 2.7.0)
|
25
|
-
journey (~> 1.0.4)
|
26
|
-
rack (~> 1.4.0)
|
27
|
-
rack-cache (~> 1.2)
|
28
|
-
rack-test (~> 0.6.1)
|
29
|
-
sprockets (~> 2.1.3)
|
30
|
-
activemodel (3.2.8)
|
31
|
-
activesupport (= 3.2.8)
|
32
|
-
builder (~> 3.0.0)
|
33
|
-
activerecord (3.2.8)
|
34
|
-
activemodel (= 3.2.8)
|
35
|
-
activesupport (= 3.2.8)
|
36
|
-
arel (~> 3.0.2)
|
37
|
-
tzinfo (~> 0.3.29)
|
38
|
-
activeresource (3.2.8)
|
39
|
-
activemodel (= 3.2.8)
|
40
|
-
activesupport (= 3.2.8)
|
41
|
-
activesupport (3.2.8)
|
42
|
-
i18n (~> 0.6)
|
43
|
-
multi_json (~> 1.0)
|
44
|
-
acts_as_tree (1.2.0)
|
45
|
-
activerecord (>= 3.0.0)
|
46
|
-
arel (3.0.2)
|
47
|
-
aws-s3 (0.6.3)
|
48
|
-
builder
|
49
|
-
mime-types
|
50
|
-
xml-simple
|
51
|
-
builder (3.0.4)
|
52
|
-
erubis (2.7.0)
|
53
|
-
hike (1.2.1)
|
54
|
-
i18n (0.6.1)
|
55
|
-
journey (1.0.4)
|
56
|
-
jquery-rails (2.1.3)
|
57
|
-
railties (>= 3.1.0, < 5.0)
|
58
|
-
thor (~> 0.14)
|
59
|
-
json (1.7.5)
|
60
|
-
mail (2.4.4)
|
61
|
-
i18n (>= 0.4.0)
|
62
|
-
mime-types (~> 1.16)
|
63
|
-
treetop (~> 1.4.8)
|
64
|
-
mime-types (1.19)
|
65
|
-
mini_magick (3.4)
|
66
|
-
subexec (~> 0.2.1)
|
67
|
-
multi_json (1.3.7)
|
68
|
-
net-dns (0.7.1)
|
69
|
-
polyglot (0.3.3)
|
70
|
-
prototype-rails (3.2.1)
|
71
|
-
rails (~> 3.2)
|
72
|
-
rack (1.4.1)
|
73
|
-
rack-cache (1.2)
|
74
|
-
rack (>= 0.4)
|
75
|
-
rack-ssl (1.3.2)
|
76
|
-
rack
|
77
|
-
rack-test (0.6.2)
|
78
|
-
rack (>= 1.0)
|
79
|
-
rails (3.2.8)
|
80
|
-
actionmailer (= 3.2.8)
|
81
|
-
actionpack (= 3.2.8)
|
82
|
-
activerecord (= 3.2.8)
|
83
|
-
activeresource (= 3.2.8)
|
84
|
-
activesupport (= 3.2.8)
|
85
|
-
bundler (~> 1.0)
|
86
|
-
railties (= 3.2.8)
|
87
|
-
railties (3.2.8)
|
88
|
-
actionpack (= 3.2.8)
|
89
|
-
activesupport (= 3.2.8)
|
90
|
-
rack-ssl (~> 1.3.2)
|
91
|
-
rake (>= 0.8.7)
|
92
|
-
rdoc (~> 3.4)
|
93
|
-
thor (>= 0.14.6, < 2.0)
|
94
|
-
rake (0.9.2.2)
|
95
|
-
rdoc (3.12)
|
96
|
-
json (~> 1.4)
|
97
|
-
rinku (1.7.2)
|
98
|
-
rmagick (2.13.1)
|
99
|
-
sprockets (2.1.3)
|
100
|
-
hike (~> 1.2)
|
101
|
-
rack (~> 1.0)
|
102
|
-
tilt (~> 1.1, != 1.3.0)
|
103
|
-
sqlite3 (1.3.6)
|
104
|
-
subexec (0.2.2)
|
105
|
-
thor (0.16.0)
|
106
|
-
tilt (1.3.3)
|
107
|
-
treetop (1.4.12)
|
108
|
-
polyglot
|
109
|
-
polyglot (>= 0.3.1)
|
110
|
-
tzinfo (0.3.35)
|
111
|
-
xml-simple (1.1.2)
|
112
|
-
|
113
|
-
PLATFORMS
|
114
|
-
ruby
|
115
|
-
|
116
|
-
DEPENDENCIES
|
117
|
-
imagine_cms!
|
118
|
-
jquery-rails
|
119
|
-
sqlite3
|