cms-fortress 1.1.8 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (54) hide show
  1. data/Gemfile +1 -1
  2. data/Gemfile.lock +82 -74
  3. data/VERSION +1 -1
  4. data/app/assets/javascripts/cms/fortress/media.js.coffee +2 -2
  5. data/app/assets/stylesheets/cms/fortress/admin_overrides.css +8 -14
  6. data/app/assets/stylesheets/cms/fortress/session.css +1 -3
  7. data/app/assets/stylesheets/cms/fortress/themes/wide.css.scss +5 -1
  8. data/app/controllers/cms/fortress/admin_controller.rb +4 -4
  9. data/app/controllers/cms/fortress/roles_controller.rb +5 -4
  10. data/app/controllers/cms/fortress/users_controller.rb +5 -3
  11. data/app/helpers/cms/fortress/application_helper.rb +7 -7
  12. data/app/models/cms/page_workflow.rb +1 -1
  13. data/app/models/cms_ability.rb +5 -5
  14. data/app/views/cms/fortress/roles/_form.html.haml +5 -18
  15. data/app/views/cms/fortress/roles/edit.html.haml +5 -1
  16. data/app/views/cms/fortress/roles/index.html.haml +4 -4
  17. data/app/views/cms/fortress/roles/new.html.haml +5 -1
  18. data/app/views/cms/fortress/roles/show.html.haml +3 -3
  19. data/app/views/cms/fortress/shared/_media_items.html.haml +6 -9
  20. data/app/views/cms/fortress/shared/_mediaboxes.html.haml +11 -9
  21. data/app/views/cms/fortress/shared/_menu.html.haml +43 -0
  22. data/app/views/cms/fortress/shared/_navbar.html.haml +10 -7
  23. data/app/views/cms/fortress/shared/_page_extend.html.haml +2 -2
  24. data/app/views/cms/fortress/shared/_page_extend_js.html.haml +1 -1
  25. data/app/views/cms/fortress/themes/wide/_body.html.haml +11 -9
  26. data/app/views/cms/fortress/themes/wide/{_admin_topnav.html.haml → _menu.html.haml} +1 -0
  27. data/app/views/cms/fortress/users/_form.html.haml +9 -34
  28. data/app/views/cms/fortress/users/edit.html.haml +7 -2
  29. data/app/views/cms/fortress/users/index.html.haml +6 -4
  30. data/app/views/cms/fortress/users/new.html.haml +5 -1
  31. data/app/views/cms/fortress/users/sessions/new.html.haml +12 -8
  32. data/app/views/{admin → comfy/admin}/cms/pages/_form.html.haml +16 -18
  33. data/app/views/comfy/admin/cms/partials/_body_before.html.haml +1 -0
  34. data/app/views/layouts/cms/fortress/session.html.haml +15 -0
  35. data/app/views/layouts/comfy/admin/cms/_body.html.haml +22 -0
  36. data/app/views/layouts/{admin → comfy/admin}/cms/_footer.html.haml +0 -0
  37. data/app/views/layouts/{admin → comfy/admin}/cms/_head.html.haml +10 -6
  38. data/app/views/layouts/{admin → comfy/admin}/cms/_left.html.haml +3 -6
  39. data/cms-fortress.gemspec +14 -19
  40. data/db/migrate/05_add_caching_info_to_pages.rb +1 -1
  41. data/lib/cms-fortress.rb +5 -5
  42. data/lib/cms/fortress/application_controller_methods.rb +6 -6
  43. data/lib/cms/fortress/content_renderer.rb +11 -1
  44. data/lib/cms/fortress/rails/engine.rb +14 -14
  45. metadata +14 -19
  46. data/app/assets/javascripts/cms/fortress/bootstrap.js +0 -2280
  47. data/app/assets/stylesheets/cms/fortress/bootstrap-responsive.css +0 -1109
  48. data/app/assets/stylesheets/cms/fortress/bootstrap.css +0 -6167
  49. data/app/views/admin/cms/partials/_body_before.html.haml +0 -1
  50. data/app/views/cms/fortress/shared/_admin_topnav.html.haml +0 -37
  51. data/app/views/layouts/admin/cms/.DS_Store +0 -0
  52. data/app/views/layouts/admin/cms/_body.html.haml +0 -22
  53. data/app/views/layouts/cms/fortress/default.html.erb +0 -96
  54. data/app/views/layouts/cms/fortress/session.html.erb +0 -31
@@ -2,14 +2,13 @@
2
2
 
3
3
  - content_for :right_column do
4
4
  #form-save.box
5
- - unless Cms::Fortress.configuration.enable_page_workflow
6
- %label.checkbox.inline
7
- %input{:type => 'checkbox'}
8
- = ::Cms::Page.human_attribute_name(:is_published)
9
- %button.btn.btn-small.btn-primary.pull-right
10
- = render :partial => 'admin/cms/files/index'
5
+ %label.checkbox-inline
6
+ %input{:type => 'checkbox'}
7
+ = ::Comfy::Cms::Page.human_attribute_name(:is_published)
8
+ %button.btn.btn-sm.btn-primary.pull-right
9
+ = render 'comfy/admin/cms/files/index'
11
10
 
12
- = render 'admin/cms/partials/page_form_before', :object => form
11
+ = render 'comfy/admin/cms/partials/page_form_before', :object => form
13
12
 
14
13
  = form.text_field :label, :data => {:slugify => @page.new_record?}
15
14
 
@@ -18,18 +17,18 @@
18
17
  - unless @page.new_record?
19
18
  = form.text_field :full_path, :id => 'full-path', :disabled => true
20
19
 
21
- - if (options = ::Cms::Layout.options_for_select(@site)).present?
22
- = form.select :layout_id, options, {}, 'data-url' => form_blocks_admin_cms_site_page_path(@site, @page.id.to_i)
23
-
24
- - if (options = ::Cms::Page.options_for_select(@site, @page)).present?
20
+ - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
21
+ = form.select :layout_id, options, {}, 'data-url' => form_blocks_comfy_admin_cms_site_page_path(@site, @page.id.to_i)
22
+
23
+ - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page)).present?
25
24
  = form.select :parent_id, options
26
25
 
27
- - if (options = ::Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
26
+ - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
28
27
  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
29
28
 
30
- = render 'admin/cms/partials/page_form_inner', :object => form
29
+ = render 'comfy/admin/cms/partials/page_form_inner', :object => form
31
30
 
32
- = render :partial => 'admin/cms/categories/form', :object => form
31
+ = render :partial => 'comfy/admin/cms/categories/form', :object => form
33
32
 
34
33
  = render :partial => 'form_blocks'
35
34
 
@@ -37,11 +36,10 @@
37
36
  = form.check_box :is_published, :label => t('.is_published')
38
37
  = render :partial => 'cms/fortress/shared/page_extend', :locals => {form: form}
39
38
 
40
- = render 'admin/cms/partials/page_form_after', :object => form
39
+ = render 'comfy/admin/cms/partials/page_form_after', :object => form
41
40
 
42
- .form-actions
43
- = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'
41
+ = form.form_group :class => 'form-actions' do
42
+ = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default'
44
43
  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
45
44
 
46
-
47
45
  = render :partial => 'cms/fortress/shared/page_extend_js'
@@ -0,0 +1 @@
1
+ = render :partial => 'cms/fortress/shared/menu'
@@ -0,0 +1,15 @@
1
+ !!!
2
+ %html{:lang => "en"}
3
+ %head
4
+ %meta{:charset => "utf-8"}/
5
+ %title= t('cms.fortress.title')
6
+ %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
7
+ %meta{:content => "", :name => "description"}/
8
+ %meta{:content => "", :name => "author"}/
9
+ = stylesheet_link_tag 'cms/fortress/session.css'
10
+ / HTML5 shim, for IE6-8 support of HTML5 elements
11
+ /[if lt IE 9]
12
+ = javascript_include_tag 'html5shiv.js'
13
+ %body
14
+ = yield
15
+ = javascript_include_tag 'cms/fortress/cms_fortress'
@@ -0,0 +1,22 @@
1
+ %body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify}"}
2
+
3
+ = render 'comfy/admin/cms/partials/body_before'
4
+
5
+ - if default_theme?
6
+ .body-wrapper
7
+ .left-column
8
+ .left-column-content
9
+ = render :partial => 'layouts/comfy/admin/cms/left'
10
+ .right-column
11
+ .right-column-content
12
+ = render :partial => 'layouts/comfy/admin/cms/right'
13
+ .center-column
14
+ = render :partial => 'layouts/comfy/admin/cms/center'
15
+
16
+ = render :partial => 'layouts/comfy/admin/cms/footer'
17
+
18
+ - else
19
+ = themed_partial('body')
20
+
21
+ = render partial: 'cms/fortress/shared/mediaboxes'
22
+ = render :partial => 'layouts/comfy/admin/cms/footer_js'
@@ -2,15 +2,16 @@
2
2
  %meta{'http-equiv' => "Content-type", :content => "text/html; charset=utf-8"}
3
3
  %title= ComfortableMexicanSofa.config.cms_title
4
4
  = csrf_meta_tag
5
-
5
+
6
6
  = stylesheet_link_tag 'comfortable_mexican_sofa/application'
7
7
  = stylesheet_link_tag 'comfortable_mexican_sofa/admin/application'
8
- = stylesheet_link_tag 'cms/fortress/bootstrap'
9
- = stylesheet_link_tag 'cms/fortress/bootstrap-responsive'
10
- = stylesheet_link_tag 'cms/fortress/admin_overrides'
8
+
9
+ = stylesheet_link_tag "cms/fortress/admin_overrides"
10
+
11
11
  - unless default_theme?
12
12
  = stylesheet_link_tag "cms/fortress/themes/#{ theme_name }"
13
13
 
14
+
14
15
  = javascript_include_tag 'comfortable_mexican_sofa/application'
15
16
  = javascript_include_tag 'comfortable_mexican_sofa/admin/application'
16
17
  = javascript_include_tag 'cms/fortress/media'
@@ -18,6 +19,9 @@
18
19
  - unless default_theme?
19
20
  = javascript_include_tag "cms/fortress/themes/#{ theme_name }"
20
21
 
22
+
21
23
  = yield :head
22
-
23
- = render 'admin/cms/partials/html_head'
24
+
25
+ = render 'comfy/admin/cms/partials/html_head'
26
+
27
+
@@ -1,5 +1,4 @@
1
-
2
- = render '/admin/cms/partials/navigation_before'
1
+ = render 'comfy/admin/cms/partials/navigation_before'
3
2
 
4
3
  %ul.navigation
5
4
  - if admin_page?
@@ -28,13 +27,11 @@
28
27
  = leftnav_item t(resource[:title]), path
29
28
 
30
29
  = render 'cms/fortress/admin/left_contents_nav'
31
-
32
30
  = cms_hook :navigation
33
31
 
34
32
  - else
35
33
  = render 'cms/fortress/admin/left_nav'
36
34
 
35
+ = render 'comfy/admin/cms/partials/navigation_inner'
37
36
 
38
- = render '/admin/cms/partials/navigation_inner'
39
-
40
- = render '/admin/cms/partials/navigation_after'
37
+ = render 'comfy/admin/cms/partials/navigation_after'
data/cms-fortress.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "cms-fortress"
8
- s.version = "1.1.8"
8
+ s.version = "1.2.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Melvin Sembrano"]
12
- s.date = "2014-04-28"
12
+ s.date = "2014-05-20"
13
13
  s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
14
14
  s.email = "melvinsembrano@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -24,14 +24,11 @@ Gem::Specification.new do |s|
24
24
  "README.rdoc",
25
25
  "Rakefile",
26
26
  "VERSION",
27
- "app/assets/javascripts/cms/fortress/bootstrap.js",
28
27
  "app/assets/javascripts/cms/fortress/cms_fortress.js",
29
28
  "app/assets/javascripts/cms/fortress/media.js.coffee",
30
29
  "app/assets/javascripts/cms/fortress/themes/wide.js.coffee",
31
30
  "app/assets/javascripts/html5shiv.js",
32
31
  "app/assets/stylesheets/cms/fortress/admin_overrides.css",
33
- "app/assets/stylesheets/cms/fortress/bootstrap-responsive.css",
34
- "app/assets/stylesheets/cms/fortress/bootstrap.css",
35
32
  "app/assets/stylesheets/cms/fortress/session.css",
36
33
  "app/assets/stylesheets/cms/fortress/themes/wide.css.scss",
37
34
  "app/controllers/cms/fortress/admin_controller.rb",
@@ -46,8 +43,6 @@ Gem::Specification.new do |s|
46
43
  "app/models/cms/fortress/user.rb",
47
44
  "app/models/cms/page_workflow.rb",
48
45
  "app/models/cms_ability.rb",
49
- "app/views/admin/cms/pages/_form.html.haml",
50
- "app/views/admin/cms/partials/_body_before.html.haml",
51
46
  "app/views/cms/fortress/admin/_left_contents_nav.html.haml",
52
47
  "app/views/cms/fortress/admin/_left_designs_nav.html.haml",
53
48
  "app/views/cms/fortress/admin/_left_nav.html.haml",
@@ -64,27 +59,27 @@ Gem::Specification.new do |s|
64
59
  "app/views/cms/fortress/roles/index.html.haml",
65
60
  "app/views/cms/fortress/roles/new.html.haml",
66
61
  "app/views/cms/fortress/roles/show.html.haml",
67
- "app/views/cms/fortress/shared/_admin_topnav.html.haml",
68
62
  "app/views/cms/fortress/shared/_media_items.html.haml",
69
63
  "app/views/cms/fortress/shared/_mediaboxes.html.haml",
64
+ "app/views/cms/fortress/shared/_menu.html.haml",
70
65
  "app/views/cms/fortress/shared/_navbar.html.haml",
71
66
  "app/views/cms/fortress/shared/_page_extend.html.haml",
72
67
  "app/views/cms/fortress/shared/_page_extend_js.html.haml",
73
- "app/views/cms/fortress/themes/wide/_admin_topnav.html.haml",
74
68
  "app/views/cms/fortress/themes/wide/_body.html.haml",
69
+ "app/views/cms/fortress/themes/wide/_menu.html.haml",
75
70
  "app/views/cms/fortress/users/_form.html.haml",
76
71
  "app/views/cms/fortress/users/edit.html.haml",
77
72
  "app/views/cms/fortress/users/index.html.haml",
78
73
  "app/views/cms/fortress/users/new.html.haml",
79
74
  "app/views/cms/fortress/users/sessions/.DS_Store",
80
75
  "app/views/cms/fortress/users/sessions/new.html.haml",
81
- "app/views/layouts/admin/cms/.DS_Store",
82
- "app/views/layouts/admin/cms/_body.html.haml",
83
- "app/views/layouts/admin/cms/_footer.html.haml",
84
- "app/views/layouts/admin/cms/_head.html.haml",
85
- "app/views/layouts/admin/cms/_left.html.haml",
86
- "app/views/layouts/cms/fortress/default.html.erb",
87
- "app/views/layouts/cms/fortress/session.html.erb",
76
+ "app/views/comfy/admin/cms/pages/_form.html.haml",
77
+ "app/views/comfy/admin/cms/partials/_body_before.html.haml",
78
+ "app/views/layouts/cms/fortress/session.html.haml",
79
+ "app/views/layouts/comfy/admin/cms/_body.html.haml",
80
+ "app/views/layouts/comfy/admin/cms/_footer.html.haml",
81
+ "app/views/layouts/comfy/admin/cms/_head.html.haml",
82
+ "app/views/layouts/comfy/admin/cms/_left.html.haml",
88
83
  "cms-fortress.gemspec",
89
84
  "config/initializers/cms_fortress.rb",
90
85
  "config/locales/en.yml",
@@ -140,7 +135,7 @@ Gem::Specification.new do |s|
140
135
 
141
136
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
142
137
  s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
143
- s.add_runtime_dependency(%q<comfortable_mexican_sofa>, ["~> 1.11.0"])
138
+ s.add_runtime_dependency(%q<comfortable_mexican_sofa>, ["~> 1.12.0"])
144
139
  s.add_runtime_dependency(%q<devise>, ["~> 3.2"])
145
140
  s.add_runtime_dependency(%q<cancan>, [">= 1.6.9"])
146
141
  s.add_runtime_dependency(%q<delayed_job>, ["~> 4"])
@@ -151,7 +146,7 @@ Gem::Specification.new do |s|
151
146
  s.add_development_dependency(%q<simplecov>, [">= 0"])
152
147
  else
153
148
  s.add_dependency(%q<rails>, [">= 4.0.0"])
154
- s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.11.0"])
149
+ s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.12.0"])
155
150
  s.add_dependency(%q<devise>, ["~> 3.2"])
156
151
  s.add_dependency(%q<cancan>, [">= 1.6.9"])
157
152
  s.add_dependency(%q<delayed_job>, ["~> 4"])
@@ -163,7 +158,7 @@ Gem::Specification.new do |s|
163
158
  end
164
159
  else
165
160
  s.add_dependency(%q<rails>, [">= 4.0.0"])
166
- s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.11.0"])
161
+ s.add_dependency(%q<comfortable_mexican_sofa>, ["~> 1.12.0"])
167
162
  s.add_dependency(%q<devise>, ["~> 3.2"])
168
163
  s.add_dependency(%q<cancan>, [">= 1.6.9"])
169
164
  s.add_dependency(%q<delayed_job>, ["~> 4"])
@@ -1,5 +1,5 @@
1
1
  class AddCachingInfoToPages < ActiveRecord::Migration
2
2
  def change
3
- add_column :cms_pages, :cached_timeout, :integer, :default => 0
3
+ add_column :comfy_cms_pages, :cached_timeout, :integer, :default => 0
4
4
  end
5
5
  end
data/lib/cms-fortress.rb CHANGED
@@ -34,20 +34,20 @@ module Cms
34
34
  @enable_page_caching = true
35
35
  @content_resources = [
36
36
  {:name => 'pages', :title => 'admin.cms.base.pages',
37
- :path => 'admin_cms_site_pages_path(@site) if @site && !@site.new_record?'},
37
+ :path => 'comfy_admin_cms_site_pages_path(@site) if @site && !@site.new_record?'},
38
38
  {:name => 'files', :title => 'admin.cms.base.files',
39
- :path => 'admin_cms_site_files_path(@site) if @site && !@site.new_record?'}
39
+ :path => 'comfy_admin_cms_site_files_path(@site) if @site && !@site.new_record?'}
40
40
  ]
41
41
  @design_resources = [
42
42
  {:name => 'layouts', :title => 'admin.cms.base.layouts',
43
- :path => 'admin_cms_site_layouts_path(@site) if @site && !@site.new_record?'
43
+ :path => 'comfy_admin_cms_site_layouts_path(@site) if @site && !@site.new_record?'
44
44
  },
45
45
  {:name => 'snippets', :title => 'admin.cms.base.snippets',
46
- :path => 'admin_cms_site_snippets_path(@site) if @site && !@site.new_record?'}
46
+ :path => 'comfy_admin_cms_site_snippets_path(@site) if @site && !@site.new_record?'}
47
47
  ]
48
48
  @settings_resources = [
49
49
  {:name => 'sites', :title => 'admin.cms.base.sites',
50
- :path => 'admin_cms_sites_path'},
50
+ :path => 'comfy_admin_cms_sites_path'},
51
51
  {:name => 'roles', :title => 'cms.fortress.roles.title',
52
52
  :path => 'cms_fortress_roles_path'},
53
53
  {:name => 'users', :title => 'cms.fortress.users.title',
@@ -4,7 +4,7 @@ module Cms
4
4
 
5
5
  def after_sign_in_path_for(resource)
6
6
  if resource.class.eql?(Cms::Fortress::User)
7
- admin_cms_path
7
+ comfy_admin_cms_path
8
8
  else
9
9
  begin
10
10
  stored_location_for(resource) || send("after_sign_in_path_for_#{ resource.class.name.underscore }", resource)
@@ -17,7 +17,7 @@ module Cms
17
17
  def after_sign_out_path_for(resource_or_scope)
18
18
  # request.referrer
19
19
  if resource_or_scope.eql?(:cms_fortress_user)
20
- admin_cms_path
20
+ comfy_admin_cms_path
21
21
  else
22
22
  begin
23
23
  stored_location_for(resource_or_scope) || send("after_sign_out_path_for_#{ resource_or_scope.to_s }", resource_or_scope)
@@ -46,14 +46,14 @@ module Cms
46
46
  rescue_from CanCan::AccessDenied do |ex|
47
47
  # if cannot view page check if can on files
48
48
  if controller_name.eql?('pages')
49
- if can? :view, Cms::File
50
- redirect_to admin_cms_site_files_path
49
+ if can? :view, Comfy::Cms::File
50
+ redirect_to comfy_admin_cms_site_files_path
51
51
  else
52
52
  redirect_to cms_fortress_unauthorised_path
53
53
  end
54
54
  elsif controller_name.eql?('layouts')
55
- if can? :view, Cms::Snippet
56
- redirect_to admin_cms_site_snippets_path
55
+ if can? :view, Comfy::Cms::Snippet
56
+ redirect_to comfy_admin_cms_site_snippets_path
57
57
  else
58
58
  redirect_to cms_fortress_unauthorised_path
59
59
  end
@@ -5,6 +5,16 @@ module Cms
5
5
  def self.included(base)
6
6
 
7
7
  base.class_eval do
8
+ =begin
9
+ def render_html(status = 200)
10
+ if @cms_layout = @cms_page.layout
11
+ app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
12
+ render :inline => @cms_page.content_cache, :layout => app_layout, :status => status, :content_type => 'text/html'
13
+ else
14
+ render :text => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
15
+ end
16
+ end
17
+ =end
8
18
 
9
19
  def render_html(status = 200)
10
20
  cached_timeout = @cms_page.cached_timeout.to_i
@@ -17,7 +27,7 @@ module Cms
17
27
  if @cms_layout = @cms_page.layout
18
28
 
19
29
  app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
20
- render(:inline => @cms_page.content, :layout => app_layout, :status => status, :content_type => 'text/html') unless cached_timeout > 0 && performed?
30
+ render(:inline => @cms_page.content_cache, :layout => app_layout, :status => status, :content_type => 'text/html') unless cached_timeout > 0 && performed?
21
31
  else
22
32
  render :text => I18n.t('cms.content.layout_not_found'), :status => 404
23
33
  end
@@ -7,34 +7,34 @@ module Cms
7
7
  # Devise::SessionsController.layout "cms/fortress/session"
8
8
  ApplicationController.helper(Cms::Fortress::ApplicationHelper)
9
9
 
10
- Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
11
- Cms::Page.send(:include, Cms::Fortress::PageMethods)
12
- Cms::File.send(:include, Cms::Fortress::FileMethods)
10
+ Comfy::Cms::ContentController.send(:include, Cms::Fortress::ContentRenderer)
11
+ Comfy::Cms::Page.send(:include, Cms::Fortress::PageMethods)
12
+ Comfy::Cms::File.send(:include, Cms::Fortress::FileMethods)
13
13
 
14
14
  # Insert Roles
15
- Admin::Cms::SitesController.class_eval do
15
+ Comfy::Admin::Cms::SitesController.class_eval do
16
16
  before_action do
17
- authorize! :manage, Cms::Site
17
+ authorize! :manage, Comfy::Cms::Site
18
18
  end
19
19
  end
20
- Admin::Cms::LayoutsController.class_eval do
20
+ Comfy::Admin::Cms::LayoutsController.class_eval do
21
21
  before_action do
22
- authorize! :manage, Cms::Layout
22
+ authorize! :manage, Comfy::Cms::Layout
23
23
  end
24
24
  end
25
- Admin::Cms::SnippetsController.class_eval do
25
+ Comfy::Admin::Cms::SnippetsController.class_eval do
26
26
  before_action do
27
- authorize! :manage, Cms::Snippet
27
+ authorize! :manage, Comfy::Cms::Snippet
28
28
  end
29
29
  end
30
- Admin::Cms::PagesController.class_eval do
30
+ Comfy::Admin::Cms::PagesController.class_eval do
31
31
  before_action do
32
- authorize! :manage, Cms::Page
32
+ authorize! :manage, Comfy::Cms::Page
33
33
  end
34
34
  end
35
- Admin::Cms::FilesController.class_eval do
35
+ Comfy::Admin::Cms::FilesController.class_eval do
36
36
  before_action do
37
- authorize! :manage, Cms::File
37
+ authorize! :manage, Comfy::Cms::File
38
38
  end
39
39
  end
40
40
 
@@ -47,7 +47,7 @@ module Cms
47
47
  end
48
48
 
49
49
  initializer :assets do |config|
50
- Rails.application.config.assets.precompile += %w( cms/fortress/bootstrap.css cms/fortress/bootstrap-responsive.css cms/fortress/bootstrap.js cms/fortress/admin_overrides.css cms/fortress/session.css cms/fortress/themes/wide.css cms/fortress/themes/wide.js cms/fortress/media.js)
50
+ Rails.application.config.assets.precompile += %w( cms/fortress/admin_overrides.css cms/fortress/session.css cms/fortress/themes/wide.css cms/fortress/themes/wide.js cms/fortress/media.js html5shiv.js cms/fortress/cms_fortress.js)
51
51
  end
52
52
  end
53
53
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cms-fortress
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.8
4
+ version: 1.2.0
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: 2014-04-28 00:00:00.000000000 Z
12
+ date: 2014-05-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.11.0
37
+ version: 1.12.0
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.11.0
45
+ version: 1.12.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: devise
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -186,14 +186,11 @@ files:
186
186
  - README.rdoc
187
187
  - Rakefile
188
188
  - VERSION
189
- - app/assets/javascripts/cms/fortress/bootstrap.js
190
189
  - app/assets/javascripts/cms/fortress/cms_fortress.js
191
190
  - app/assets/javascripts/cms/fortress/media.js.coffee
192
191
  - app/assets/javascripts/cms/fortress/themes/wide.js.coffee
193
192
  - app/assets/javascripts/html5shiv.js
194
193
  - app/assets/stylesheets/cms/fortress/admin_overrides.css
195
- - app/assets/stylesheets/cms/fortress/bootstrap-responsive.css
196
- - app/assets/stylesheets/cms/fortress/bootstrap.css
197
194
  - app/assets/stylesheets/cms/fortress/session.css
198
195
  - app/assets/stylesheets/cms/fortress/themes/wide.css.scss
199
196
  - app/controllers/cms/fortress/admin_controller.rb
@@ -208,8 +205,6 @@ files:
208
205
  - app/models/cms/fortress/user.rb
209
206
  - app/models/cms/page_workflow.rb
210
207
  - app/models/cms_ability.rb
211
- - app/views/admin/cms/pages/_form.html.haml
212
- - app/views/admin/cms/partials/_body_before.html.haml
213
208
  - app/views/cms/fortress/admin/_left_contents_nav.html.haml
214
209
  - app/views/cms/fortress/admin/_left_designs_nav.html.haml
215
210
  - app/views/cms/fortress/admin/_left_nav.html.haml
@@ -226,27 +221,27 @@ files:
226
221
  - app/views/cms/fortress/roles/index.html.haml
227
222
  - app/views/cms/fortress/roles/new.html.haml
228
223
  - app/views/cms/fortress/roles/show.html.haml
229
- - app/views/cms/fortress/shared/_admin_topnav.html.haml
230
224
  - app/views/cms/fortress/shared/_media_items.html.haml
231
225
  - app/views/cms/fortress/shared/_mediaboxes.html.haml
226
+ - app/views/cms/fortress/shared/_menu.html.haml
232
227
  - app/views/cms/fortress/shared/_navbar.html.haml
233
228
  - app/views/cms/fortress/shared/_page_extend.html.haml
234
229
  - app/views/cms/fortress/shared/_page_extend_js.html.haml
235
- - app/views/cms/fortress/themes/wide/_admin_topnav.html.haml
236
230
  - app/views/cms/fortress/themes/wide/_body.html.haml
231
+ - app/views/cms/fortress/themes/wide/_menu.html.haml
237
232
  - app/views/cms/fortress/users/_form.html.haml
238
233
  - app/views/cms/fortress/users/edit.html.haml
239
234
  - app/views/cms/fortress/users/index.html.haml
240
235
  - app/views/cms/fortress/users/new.html.haml
241
236
  - app/views/cms/fortress/users/sessions/.DS_Store
242
237
  - app/views/cms/fortress/users/sessions/new.html.haml
243
- - app/views/layouts/admin/cms/.DS_Store
244
- - app/views/layouts/admin/cms/_body.html.haml
245
- - app/views/layouts/admin/cms/_footer.html.haml
246
- - app/views/layouts/admin/cms/_head.html.haml
247
- - app/views/layouts/admin/cms/_left.html.haml
248
- - app/views/layouts/cms/fortress/default.html.erb
249
- - app/views/layouts/cms/fortress/session.html.erb
238
+ - app/views/comfy/admin/cms/pages/_form.html.haml
239
+ - app/views/comfy/admin/cms/partials/_body_before.html.haml
240
+ - app/views/layouts/cms/fortress/session.html.haml
241
+ - app/views/layouts/comfy/admin/cms/_body.html.haml
242
+ - app/views/layouts/comfy/admin/cms/_footer.html.haml
243
+ - app/views/layouts/comfy/admin/cms/_head.html.haml
244
+ - app/views/layouts/comfy/admin/cms/_left.html.haml
250
245
  - cms-fortress.gemspec
251
246
  - config/initializers/cms_fortress.rb
252
247
  - config/locales/en.yml
@@ -305,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
305
300
  version: '0'
306
301
  segments:
307
302
  - 0
308
- hash: 3074787598781083281
303
+ hash: -1799834263641452871
309
304
  required_rubygems_version: !ruby/object:Gem::Requirement
310
305
  none: false
311
306
  requirements: