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
@@ -1 +0,0 @@
1
- = render :partial => 'cms/fortress/shared/admin_topnav'
@@ -1,37 +0,0 @@
1
- .navbar.navbar-inverse.navbar-fixed-top
2
- .navbar-inner.nav-height
3
- .navbar-container
4
- %button.btn.btn-navbar{'type' => 'button', 'data-toggle' => 'collapse', 'data-target' => '.nav-collapse'}
5
- %span.icon-bar
6
- %span.icon-bar
7
- %span.icon-bar
8
- %a.brand{'href' => '#'}= t('cms.fortress.title')
9
- .nav-collapse.collapse
10
- %ul.nav
11
- - if default_theme?
12
- - if @site && !@site.new_record?
13
- - if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
14
- = topnav_item t("cms.fortress.contents"), |
15
- @site && !@site.new_record? ? admin_cms_site_pages_path(@site) : admin_cms_sites_pages_path, |
16
- content_page?
17
-
18
- - if Cms::Fortress.configuration.design_resources.any? {|resource| can? :view, "designs.#{resource[:name]}" }
19
- = topnav_item t("cms.fortress.design"), |
20
- @site && !@site.new_record? ? admin_cms_site_layouts_path(@site) : admin_cms_sites_pages_path, |
21
- design_page?
22
-
23
- - if Cms::Fortress.configuration.settings_resources.any? {|resource| can? :view, "settings.#{resource[:name]}" }
24
- = topnav_item t("cms.fortress.settings"), admin_cms_sites_path, admin_page?
25
-
26
- - else
27
- = themed_partial('admin_topnav')
28
-
29
- = render 'cms/fortress/admin/topnav'
30
- %ul.nav.nav-pill.pull-right
31
- - if current_cms_fortress_user
32
- %li
33
- = link_to "#{ current_cms_fortress_user.email } ::", "#"
34
- %li
35
- = link_to "Logout", destroy_cms_fortress_user_session_path, :method => 'delete'
36
-
37
-
Binary file
@@ -1,22 +0,0 @@
1
- %body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify} theme-#{ Cms::Fortress.configuration.theme.to_s }"}
2
-
3
- = render 'admin/cms/partials/body_before'
4
-
5
- - if default_theme?
6
- .body-wrapper
7
- .left-column
8
- .left-column-content
9
- = render :partial => 'layouts/admin/cms/left'
10
- .right-column
11
- .right-column-content
12
- = render :partial => 'layouts/admin/cms/right'
13
- .center-column
14
- = render :partial => 'layouts/admin/cms/center'
15
-
16
- = render :partial => 'layouts/admin/cms/footer'
17
-
18
- - else
19
- = themed_partial('body')
20
-
21
- = render partial: 'cms/fortress/shared/mediaboxes'
22
- = render :partial => 'layouts/admin/cms/footer_js'
@@ -1,96 +0,0 @@
1
-
2
- <!DOCTYPE html>
3
- <html lang="en">
4
- <head>
5
- <meta charset="utf-8">
6
- <title>Sign in &middot; Twitter Bootstrap</title>
7
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
8
- <meta name="description" content="">
9
- <meta name="author" content="">
10
-
11
- <!-- Le styles -->
12
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
13
- <style type="text/css">
14
- body {
15
- padding-top: 40px;
16
- padding-bottom: 40px;
17
- background-color: #f5f5f5;
18
- }
19
-
20
- .form-signin {
21
- max-width: 300px;
22
- padding: 19px 29px 29px;
23
- margin: 0 auto 20px;
24
- background-color: #fff;
25
- border: 1px solid #e5e5e5;
26
- -webkit-border-radius: 5px;
27
- -moz-border-radius: 5px;
28
- border-radius: 5px;
29
- -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
30
- -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
31
- box-shadow: 0 1px 2px rgba(0,0,0,.05);
32
- }
33
- .form-signin .form-signin-heading,
34
- .form-signin .checkbox {
35
- margin-bottom: 10px;
36
- }
37
- .form-signin input[type="text"],
38
- .form-signin input[type="password"] {
39
- font-size: 16px;
40
- height: auto;
41
- margin-bottom: 15px;
42
- padding: 7px 9px;
43
- }
44
-
45
- </style>
46
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
47
-
48
- <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
49
- <!--[if lt IE 9]>
50
- <script src="../assets/js/html5shiv.js"></script>
51
- <![endif]-->
52
-
53
- <!-- Fav and touch icons -->
54
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
55
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
56
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
57
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
58
- <link rel="shortcut icon" href="../assets/ico/favicon.png">
59
- </head>
60
-
61
- <body>
62
-
63
- <div class="container">
64
-
65
- <form class="form-signin">
66
- <h2 class="form-signin-heading">Please sign in</h2>
67
- <input type="text" class="input-block-level" placeholder="Email address">
68
- <input type="password" class="input-block-level" placeholder="Password">
69
- <label class="checkbox">
70
- <input type="checkbox" value="remember-me"> Remember me
71
- </label>
72
- <button class="btn btn-large btn-primary" type="submit">Sign in</button>
73
- </form>
74
-
75
- </div> <!-- /container -->
76
-
77
- <!-- Le javascript
78
- ================================================== -->
79
- <!-- Placed at the end of the document so the pages load faster -->
80
- <script src="../assets/js/jquery.js"></script>
81
- <script src="../assets/js/bootstrap-transition.js"></script>
82
- <script src="../assets/js/bootstrap-alert.js"></script>
83
- <script src="../assets/js/bootstrap-modal.js"></script>
84
- <script src="../assets/js/bootstrap-dropdown.js"></script>
85
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
86
- <script src="../assets/js/bootstrap-tab.js"></script>
87
- <script src="../assets/js/bootstrap-tooltip.js"></script>
88
- <script src="../assets/js/bootstrap-popover.js"></script>
89
- <script src="../assets/js/bootstrap-button.js"></script>
90
- <script src="../assets/js/bootstrap-collapse.js"></script>
91
- <script src="../assets/js/bootstrap-carousel.js"></script>
92
- <script src="../assets/js/bootstrap-typeahead.js"></script>
93
-
94
- </body>
95
- </html>
96
-
@@ -1,31 +0,0 @@
1
-
2
- <!DOCTYPE html>
3
- <html lang="en">
4
- <head>
5
- <meta charset="utf-8">
6
- <title><%= t('cms.fortress.title') %></title>
7
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
8
- <meta name="description" content="">
9
- <meta name="author" content="">
10
-
11
- <%= stylesheet_link_tag 'cms/fortress/session.css' %>
12
-
13
- <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
14
- <!--[if lt IE 9]>
15
- <%= javascript_include_tag 'html5shiv.js' %>
16
- <![endif]-->
17
-
18
- </head>
19
-
20
- <body>
21
-
22
- <div class="container">
23
-
24
- <%= yield %>
25
- </div>
26
-
27
- <%= javascript_include_tag 'cms/fortress/cms_fortress' %>
28
- </body>
29
- </html>
30
-
31
-