cms-fortress 1.0.5 → 1.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/VERSION +1 -1
  2. data/app/controllers/cms/fortress/roles_controller.rb +1 -1
  3. data/app/helpers/cms/fortress/application_helper.rb +1 -0
  4. data/app/views/cms/fortress/admin/contents.html.haml +4 -0
  5. data/app/views/cms/fortress/admin/design.html.haml +4 -1
  6. data/app/views/cms/fortress/admin/settings.html.haml +5 -1
  7. data/app/views/cms/fortress/shared/_admin_topnav.html.haml +3 -3
  8. data/cms-fortress.gemspec +2 -1
  9. data/lib/cms/fortress/routes/admin.rb +1 -0
  10. metadata +3 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.5
1
+ 1.0.6
data/app/controllers/cms/fortress/roles_controller.rb CHANGED
@@ -67,7 +67,7 @@ class Cms::Fortress::RolesController < Admin::Cms::BaseController
67
67
 
68
68
  respond_to do |format|
69
69
  if @cms_fortress_role.update_attributes(role_params)
70
- format.html { redirect_to cms_fortress_roles_path, notice: 'Role was successfully updated.' }
70
+ format.html { redirect_to @cms_fortress_role, notice: 'Role was successfully updated.' }
71
71
  format.json { head :no_content }
72
72
  else
73
73
  format.html { render action: "edit" }
data/app/helpers/cms/fortress/application_helper.rb CHANGED
@@ -17,6 +17,7 @@ module Cms
17
17
  end
18
18
 
19
19
  def content_page?
20
+ controller_name.eql?('admin') && %{contents}.include?(action_name) ||
20
21
  controller_name.eql?('pages') ||
21
22
  controller_name.eql?('files')
22
23
  end
data/app/views/cms/fortress/admin/contents.html.haml ADDED
@@ -0,0 +1,4 @@
1
+ %h3 Contents Dashboard
2
+ %p
3
+ %small This page will show contents related information (history, graphs, analytics and etc.)
4
+ %hr
data/app/views/cms/fortress/admin/design.html.haml CHANGED
@@ -1 +1,4 @@
1
- %h2 Design Dashboard
1
+ %h3 Design Dashboard
2
+ %p
3
+ %small This page will show design related information.
4
+ %hr
data/app/views/cms/fortress/admin/settings.html.haml CHANGED
@@ -1 +1,5 @@
1
- %h2 Settings Dashboard
1
+ %h3 Settings Dashboard
2
+ %p
3
+ %small This page will show settings related information.
4
+ %hr
5
+
data/app/views/cms/fortress/shared/_admin_topnav.html.haml CHANGED
@@ -11,14 +11,14 @@
11
11
  - if @site && !@site.new_record?
12
12
  - if can? :view, 'contents'
13
13
  %li{:class => content_page? ? 'active' : ''}
14
- = link_to t("cms.fortress.contents"), admin_cms_site_pages_path(@site)
14
+ = link_to t("cms.fortress.contents"), cms_fortress_contents_path # admin_cms_site_pages_path(@site)
15
15
 
16
16
  - if can? :view, 'designs'
17
17
  %li{:class => design_page? ? 'active' : ''}
18
- = link_to t("cms.fortress.design"), admin_cms_site_layouts_path(@site)
18
+ = link_to t("cms.fortress.design"), cms_fortress_design_path #(:site_id => @site)
19
19
  - if can? :view, 'settings'
20
20
  %li{:class => admin_page? ? 'active' : ''}
21
- = link_to t("cms.fortress.settings"), admin_cms_sites_path
21
+ = link_to t("cms.fortress.settings"), cms_fortress_settings_path
22
22
  %ul.nav.nav-pill.pull-right
23
23
  - if current_cms_fortress_user
24
24
  %li
data/cms-fortress.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "cms-fortress"
8
- s.version = "1.0.5"
8
+ s.version = "1.0.6"
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"]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
47
47
  "app/views/.DS_Store",
48
48
  "app/views/admin/cms/pages/_form.html.haml",
49
49
  "app/views/admin/cms/partials/_body_before.html.haml",
50
+ "app/views/cms/fortress/admin/contents.html.haml",
50
51
  "app/views/cms/fortress/admin/design.html.haml",
51
52
  "app/views/cms/fortress/admin/roles.html.haml",
52
53
  "app/views/cms/fortress/admin/settings.html.haml",
data/lib/cms/fortress/routes/admin.rb CHANGED
@@ -13,6 +13,7 @@ class ActionDispatch::Routing::Mapper
13
13
 
14
14
  get 'settings' => 'admin#settings', :as => 'cms_fortress_settings'
15
15
  get 'design' => 'admin#design', :as => 'cms_fortress_design'
16
+ get 'contents' => 'admin#contents', :as => 'cms_fortress_contents'
16
17
  get 'settings/users' => 'admin#users', :as => 'cms_fortress_user_settings'
17
18
  get 'unauthorised' => 'admin#unauthorised', :as => 'cms_fortress_unauthorised'
18
19
 
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.0.5
4
+ version: 1.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -193,6 +193,7 @@ files:
193
193
  - app/views/.DS_Store
194
194
  - app/views/admin/cms/pages/_form.html.haml
195
195
  - app/views/admin/cms/partials/_body_before.html.haml
196
+ - app/views/cms/fortress/admin/contents.html.haml
196
197
  - app/views/cms/fortress/admin/design.html.haml
197
198
  - app/views/cms/fortress/admin/roles.html.haml
198
199
  - app/views/cms/fortress/admin/settings.html.haml
@@ -264,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
264
265
  version: '0'
265
266
  segments:
266
267
  - 0
267
- hash: 2392009849821988709
268
+ hash: 124089653421059147
268
269
  required_rubygems_version: !ruby/object:Gem::Requirement
269
270
  none: false
270
271
  requirements: