spud_cms 0.8.2 → 0.8.4

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 (7) hide show
  1. data/app/assets/javascripts/spud/admin/cms/application.js +4 -1
  2. data/app/controllers/pages_controller.rb +10 -0
  3. data/app/controllers/spud/cms/sitemaps_controller.rb +5 -0
  4. data/app/views/pages/show.html.erb +1 -1
  5. data/lib/spud_cms/version.rb +1 -1
  6. metadata +24 -25
  7. data/app/assets/javascripts/spud/admin/cms.js +0 -2
data/app/assets/javascripts/spud/admin/cms/application.js CHANGED
@@ -7,13 +7,16 @@
7
7
  // Place all the behaviors and hooks related to the matching controller here.
8
8
  // All this logic will automatically be available in application.js.
9
9
 
10
- $(function() {
10
+ $(document).ready(function() {
11
11
  // initWysiwym();
12
12
  initTinyMCE();
13
13
  $("#spud_page_template_id").bind('change', function() {
14
14
  var $this = $(this);
15
15
  $.get($this.attr("data-source"), { template: $this.val() }, function(data) {
16
16
  $('.formtabs').tabs('destroy');
17
+ console.log($("#page_partials_form"))
18
+
19
+ $('textarea.tinymce').each(function() {$(this).tinymce().execCommand('mceRemoveControl',false,this.id)});
17
20
  $("#page_partials_form").replaceWith(data)
18
21
  initFormTabs();
19
22
  initTinyMCE();
data/app/controllers/pages_controller.rb CHANGED
@@ -10,6 +10,16 @@ class PagesController < ApplicationController
10
10
  end
11
11
  def show
12
12
  url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
13
+
14
+ # MultiSite Code Block
15
+ if params[:id].blank? && Spud::Core.multisite_mode_enabled
16
+ site_config = Spud::Core.site_config_for_host(request.host_with_port)
17
+ if !site_config.blank?
18
+ cms_config = Spud::Cms.site_config_for_short_name(site_config[:short_name])
19
+ url_name = cms_config[:root_page_name] if !cms_config.blank? && !cms_config[:root_page_name].blank?
20
+ end
21
+ end
22
+
13
23
  @page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_template,:spud_page_partials])
14
24
 
15
25
  # MultiSite Code Block
data/app/controllers/spud/cms/sitemaps_controller.rb CHANGED
@@ -3,6 +3,11 @@ class Spud::Cms::SitemapsController < Spud::ApplicationController
3
3
  caches_page :show,:expires_in => 1.day
4
4
  def show
5
5
  @pages = SpudPage.published_pages.public.order(:spud_page_id)
6
+ if Spud::Core.multisite_mode_enabled
7
+ site_config = Spud::Core.site_config_for_host(request.host_with_port)
8
+ @pages = @pages.site(!site_config.blank? ? site_config[:site_id] : nil)
9
+ end
10
+ @pages = @pages.all
6
11
  respond_with @pages
7
12
  end
8
13
  end
data/app/views/pages/show.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <%=content_for :title do%>
2
- <%= @page.name %> | <%=Spud::Core.site_name%>
2
+ <%= @page.name %> | <%=current_site_name%>
3
3
  <% end %>
4
4
  <%=content_for :head do%>
5
5
  <%if !@page.meta_description.blank?%>
data/lib/spud_cms/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Cms
3
- VERSION = "0.8.2"
3
+ VERSION = "0.8.4"
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.2
4
+ version: 0.8.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-03 00:00:00.000000000 Z
12
+ date: 2012-04-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70301795307200 !ruby/object:Gem::Requirement
16
+ requirement: &70201539255800 !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: *70301795307200
24
+ version_requirements: *70201539255800
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: spud_core
27
- requirement: &70301795304360 !ruby/object:Gem::Requirement
27
+ requirement: &70201539254980 !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: *70301795304360
38
+ version_requirements: *70201539254980
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: spud_permalinks
41
- requirement: &70301795302800 !ruby/object:Gem::Requirement
41
+ requirement: &70201539251720 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ~>
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: 0.0.3
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *70301795302800
49
+ version_requirements: *70201539251720
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: codemirror-rails
52
- requirement: &70301795301820 !ruby/object:Gem::Requirement
52
+ requirement: &70201539250700 !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: *70301795301820
60
+ version_requirements: *70201539250700
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: mysql2
63
- requirement: &70301795312320 !ruby/object:Gem::Requirement
63
+ requirement: &70201539452300 !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: *70301795312320
71
+ version_requirements: *70201539452300
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: rspec
74
- requirement: &70301795308200 !ruby/object:Gem::Requirement
74
+ requirement: &70201539450120 !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: *70301795308200
82
+ version_requirements: *70201539450120
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec-rails
85
- requirement: &70301795350780 !ruby/object:Gem::Requirement
85
+ requirement: &70201539448560 !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: *70301795350780
93
+ version_requirements: *70201539448560
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: factory_girl
96
- requirement: &70301795349580 !ruby/object:Gem::Requirement
96
+ requirement: &70201539447060 !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: *70301795349580
104
+ version_requirements: *70201539447060
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: mocha
107
- requirement: &70301795346240 !ruby/object:Gem::Requirement
107
+ requirement: &70201539481120 !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: *70301795346240
115
+ version_requirements: *70201539481120
116
116
  - !ruby/object:Gem::Dependency
117
117
  name: database_cleaner
118
- requirement: &70301795344340 !ruby/object:Gem::Requirement
118
+ requirement: &70201539480120 !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: *70301795344340
126
+ version_requirements: *70201539480120
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
@@ -140,7 +140,6 @@ files:
140
140
  - app/assets/images/spud/admin/pages_thumb.png
141
141
  - app/assets/images/spud/admin/templates_thumb.png
142
142
  - app/assets/javascripts/spud/admin/cms/application.js
143
- - app/assets/javascripts/spud/admin/cms.js
144
143
  - app/assets/stylesheets/spud/admin/cms/application.css
145
144
  - app/assets/stylesheets/spud/admin/cms.css
146
145
  - app/controllers/pages_controller.rb
@@ -258,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
258
257
  version: '0'
259
258
  segments:
260
259
  - 0
261
- hash: 575884119774919315
260
+ hash: 1017003456342110681
262
261
  required_rubygems_version: !ruby/object:Gem::Requirement
263
262
  none: false
264
263
  requirements:
@@ -267,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
267
266
  version: '0'
268
267
  segments:
269
268
  - 0
270
- hash: 575884119774919315
269
+ hash: 1017003456342110681
271
270
  requirements: []
272
271
  rubyforge_project:
273
272
  rubygems_version: 1.8.15
data/app/assets/javascripts/spud/admin/cms.js DELETED
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.