spud_cms 0.8.6 → 0.8.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/app/controllers/spud/admin/pages_controller.rb +27 -1
  2. data/app/views/spud/admin/pages/_form.html.erb +1 -1
  3. data/app/views/spud/admin/pages/edit.html.erb +26 -2
  4. data/app/views/spud/admin/pages/new.html.erb +26 -2
  5. data/app/views/spud/admin/pages/show.html.erb +0 -3
  6. data/config/routes.rb +3 -0
  7. data/lib/spud_cms/version.rb +1 -1
  8. metadata +23 -23
data/app/controllers/spud/admin/pages_controller.rb CHANGED
@@ -54,8 +54,13 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
54
54
  end
55
55
 
56
56
  def create
57
+
57
58
  @page = SpudPage.new(params[:spud_page])
58
59
  @page.site_id = session[:admin_site]
60
+ if params[:preview] && params[:preview].to_i == 1
61
+ preview
62
+ return
63
+ end
59
64
  flash[:notice] = "Page Saved successfully" if @page.save
60
65
  respond_with @page,:location => spud_admin_pages_url
61
66
  end
@@ -90,7 +95,12 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
90
95
 
91
96
  def update
92
97
 
93
- if @page.update_attributes(params[:spud_page])
98
+ @page.attributes = params[:spud_page]
99
+ if params[:preview] && params[:preview].to_i == 1
100
+ preview
101
+ return
102
+ end
103
+ if @page.save
94
104
  flash[:notice] = "Page updated successfully!"
95
105
  redirect_to spud_admin_pages_url() and return
96
106
  else
@@ -100,6 +110,22 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
100
110
 
101
111
  end
102
112
 
113
+ def preview
114
+ # @page = SpudPage.new(params[:spud_page])
115
+ # @page.site_id = session[:admin_site]
116
+ layout = 'application'
117
+
118
+
119
+ if !@page.spud_template.blank?
120
+ if !@page.spud_template.base_layout.blank?
121
+ layout = @page.spud_template.base_layout
122
+ end
123
+ @inline = @page.spud_template.content
124
+ end
125
+ render :action => :show,:layout => layout
126
+
127
+ end
128
+
103
129
  def destroy
104
130
  status = 500
105
131
 
data/app/views/spud/admin/pages/_form.html.erb CHANGED
@@ -91,6 +91,6 @@
91
91
  <span class="help-inline">Have a note to make about this page while you work? Place it here for later.</span>
92
92
  </div>
93
93
  </div>
94
-
94
+ <%=hidden_field_tag "preview",:value => 0%>
95
95
  </fieldset>
96
96
 
data/app/views/spud/admin/pages/edit.html.erb CHANGED
@@ -1,8 +1,32 @@
1
- <%=form_for @page,:url => spud_admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal"} do |f|%>
1
+ <%=form_for @page,:url => spud_admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form",:target => "report" } do |f|%>
2
2
  <%=render :partial => "form",:locals => {:f => f}%>
3
3
  <div class="form-actions">
4
- <%=f.submit "Save Page", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
4
+ <%=f.submit "Save Page", :class=>"btn btn-primary btn-save",:onclick => "savePage();"%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
5
5
  </div>
6
6
  <%end%>
7
7
  <br />
8
+ <script type="text/javascript">
9
+ $(document).ready(function() {
10
+ $('input[type=submit].btn-preview').click(function(evt) {
11
+
12
+ $(this).button('reset')
13
+ $('#preview').val(1);
14
+ var form = $('form.page_form')[0];
15
+ form.onsubmit = function() {
16
+ window.open('about:blank','preview_window','width=500,height=400')
17
+ };
18
+ form.target = 'preview_window';
19
+
20
+ });
21
+
22
+ $('input[type=submit].btn-save').click(function(evt) {
23
+ $('#preview').val(0);
24
+ var form = $('form.page_form')[0];
25
+ form.onsubmit = null;
26
+ form.target = null;
27
+ });
28
+
29
+ });
30
+
31
+ </script>
8
32
 
data/app/views/spud/admin/pages/new.html.erb CHANGED
@@ -1,10 +1,34 @@
1
- <%=form_for @page,:url => spud_admin_pages_path(),:html=>{:class=>"form-horizontal"} do |f|%>
1
+ <%=form_for @page,:url => spud_admin_pages_path(),:html=>{:class=>"form-horizontal page_form"} do |f|%>
2
2
  <%=render :partial => "form",:locals => {:f => f}%>
3
3
  <div class="form-actions">
4
- <%=f.submit "Create Page", :class=>"btn btn-primary form-btn","data-loading-text"=>"Saving..."%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
4
+ <%=f.submit "Create Page", :class=>"btn btn-primary form-btn btn-save","data-loading-text"=>"Saving..."%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-primary btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
5
5
  </div>
6
6
 
7
7
  <%end%>
8
8
 
9
9
 
10
10
 
11
+ <script type="text/javascript">
12
+ $(document).ready(function() {
13
+ $('input[type=submit].btn-preview').click(function(evt) {
14
+
15
+ $(this).button('reset')
16
+ $('#preview').val(1);
17
+ var form = $('form.page_form')[0];
18
+ form.onsubmit = function() {
19
+ window.open('about:blank','preview_window','width=500,height=400')
20
+ };
21
+ form.target = 'preview_window';
22
+
23
+ });
24
+
25
+ $('input[type=submit].btn-save').click(function(evt) {
26
+ $('#preview').val(0);
27
+ var form = $('form.page_form')[0];
28
+ form.onsubmit = null;
29
+ form.target = null;
30
+ });
31
+
32
+ });
33
+
34
+ </script>
data/app/views/spud/admin/pages/show.html.erb CHANGED
@@ -20,6 +20,3 @@
20
20
  <%end%>
21
21
  <%end%>
22
22
  <%end%>
23
- <span class="spud_admin_edit_controls">
24
- <%=link_to 'Edit',edit_spud_admin_page_path(:id => @page.id)%>&nbsp;|&nbsp;<%=link_to 'Back',spud_admin_pages_path()%>
25
- </span>
data/config/routes.rb CHANGED
@@ -4,6 +4,9 @@ Rails.application.routes.draw do
4
4
  resources :pages do
5
5
  get :page_parts, :on => :collection
6
6
  get :clear, :on => :collection
7
+ member do
8
+ post 'preview'
9
+ end
7
10
  end
8
11
  resources :templates
9
12
 
data/lib/spud_cms/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Cms
3
- VERSION = "0.8.6"
3
+ VERSION = "0.8.7"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spud_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.6
4
+ version: 0.8.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-05-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70347848370980 !ruby/object:Gem::Requirement
16
+ requirement: &70342597642680 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70347848370980
24
+ version_requirements: *70342597642680
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: spud_core
27
- requirement: &70347848370420 !ruby/object:Gem::Requirement
27
+ requirement: &70342597642140 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
35
35
  version: 0.9.0
36
36
  type: :runtime
37
37
  prerelease: false
38
- version_requirements: *70347848370420
38
+ version_requirements: *70342597642140
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: spud_permalinks
41
- requirement: &70347848369440 !ruby/object:Gem::Requirement
41
+ requirement: &70342597641260 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ~>
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: 0.0.4
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *70347848369440
49
+ version_requirements: *70342597641260
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: codemirror-rails
52
- requirement: &70347848368880 !ruby/object:Gem::Requirement
52
+ requirement: &70342597640760 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
57
57
  version: '0'
58
58
  type: :runtime
59
59
  prerelease: false
60
- version_requirements: *70347848368880
60
+ version_requirements: *70342597640760
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: mysql2
63
- requirement: &70347848368140 !ruby/object:Gem::Requirement
63
+ requirement: &70342597640060 !ruby/object:Gem::Requirement
64
64
  none: false
65
65
  requirements:
66
66
  - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
68
68
  version: '0'
69
69
  type: :development
70
70
  prerelease: false
71
- version_requirements: *70347848368140
71
+ version_requirements: *70342597640060
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: rspec
74
- requirement: &70347848367540 !ruby/object:Gem::Requirement
74
+ requirement: &70342597639400 !ruby/object:Gem::Requirement
75
75
  none: false
76
76
  requirements:
77
77
  - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
79
79
  version: '0'
80
80
  type: :development
81
81
  prerelease: false
82
- version_requirements: *70347848367540
82
+ version_requirements: *70342597639400
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec-rails
85
- requirement: &70347848366980 !ruby/object:Gem::Requirement
85
+ requirement: &70342597638820 !ruby/object:Gem::Requirement
86
86
  none: false
87
87
  requirements:
88
88
  - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
90
90
  version: '0'
91
91
  type: :development
92
92
  prerelease: false
93
- version_requirements: *70347848366980
93
+ version_requirements: *70342597638820
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: factory_girl
96
- requirement: &70347848365900 !ruby/object:Gem::Requirement
96
+ requirement: &70342597638140 !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
99
  - - =
@@ -101,10 +101,10 @@ dependencies:
101
101
  version: 2.5.0
102
102
  type: :development
103
103
  prerelease: false
104
- version_requirements: *70347848365900
104
+ version_requirements: *70342597638140
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: mocha
107
- requirement: &70347848365140 !ruby/object:Gem::Requirement
107
+ requirement: &70342597637080 !ruby/object:Gem::Requirement
108
108
  none: false
109
109
  requirements:
110
110
  - - =
@@ -112,10 +112,10 @@ dependencies:
112
112
  version: 0.10.3
113
113
  type: :development
114
114
  prerelease: false
115
- version_requirements: *70347848365140
115
+ version_requirements: *70342597637080
116
116
  - !ruby/object:Gem::Dependency
117
117
  name: database_cleaner
118
- requirement: &70347848658680 !ruby/object:Gem::Requirement
118
+ requirement: &70342597652700 !ruby/object:Gem::Requirement
119
119
  none: false
120
120
  requirements:
121
121
  - - =
@@ -123,7 +123,7 @@ dependencies:
123
123
  version: 0.7.1
124
124
  type: :development
125
125
  prerelease: false
126
- version_requirements: *70347848658680
126
+ version_requirements: *70342597652700
127
127
  description: Spud CMS is a full-featured light weight modular cms engine as a part
128
128
  of the spud suite of rails gems. This particular gem comes with page management,
129
129
  administrative dashboard, template management, menu management and more. It is also
@@ -257,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
257
257
  version: '0'
258
258
  segments:
259
259
  - 0
260
- hash: 1774263535679382460
260
+ hash: -2359263101530837589
261
261
  required_rubygems_version: !ruby/object:Gem::Requirement
262
262
  none: false
263
263
  requirements:
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
266
266
  version: '0'
267
267
  segments:
268
268
  - 0
269
- hash: 1774263535679382460
269
+ hash: -2359263101530837589
270
270
  requirements: []
271
271
  rubyforge_project:
272
272
  rubygems_version: 1.8.15