cms-fortress 1.1.8 → 1.2.0

data/app/helpers/cms/fortress/application_helper.rb

@@ -23,13 +23,13 @@ module Cms
       def back_path
         case controller_name
         when "pages"
-          admin_cms_site_pages_path
+          comfy_admin_cms_site_pages_path
         when "files"
-          admin_cms_site_files_path
+          comfy_admin_cms_site_files_path
         when "layouts"
-          admin_cms_site_layouts_path
+          comfy_admin_cms_site_layouts_path
         when "snippets"
-          admin_cms_site_snippets_path
+          comfy_admin_cms_site_snippets_path
         else
           ""
         end
@@ -50,14 +50,14 @@ module Cms
       def image_item(m)
         styles = {original: m.file.url}
         m.file.styles.keys.each {|k,v| styles[k] = m.file.url(k) }
-        image_tag m.file.url(:cms_thumb), alt: m.label, class: 'editor-image', data: styles
+        link_to image_tag(m.file.url(:cms_thumb), alt: m.label, class: 'editor-image', data: styles), "#"
       end
 
       def image_styles(m)
         links = []
-        links << link_to("Orig", m.file.url, class: 'badge badge-info editor-image-style', target: '_blank', title: "Select original size")
+        links << link_to("Original", m.file.url, class: 'label label-primary editor-image-style', target: '_blank', title: "Select original size")
         i = 0
-        m.file.styles.each {|k,v| links << link_to("#{ i+=1 }", m.file.url(k), class: 'badge badge-info editor-image-style', target: '_blank', title: "Select #{ k.to_s.titleize }") }
+        m.file.styles.each {|k,v| links << link_to("#{ i+=1 }", m.file.url(k), class: 'label label-primary editor-image-style', target: '_blank', title: "Select #{ k.to_s.titleize }") }
         raw links.join(" ")
       end
 

data/app/models/cms/page_workflow.rb

@@ -1,7 +1,7 @@
 class Cms::PageWorkflow < ActiveRecord::Base
   self.table_name = 'cms_page_workflows'
 
-  belongs_to :page, :foreign_key => 'cms_page_id'
+  belongs_to :page, :class_name => 'Comfy::Cms::Page', :foreign_key => 'cms_page_id'
 
   after_save do |record|
     record.page.update_attribute(:is_published, record.page_published?)

data/app/models/cms_ability.rb

@@ -26,17 +26,17 @@ class CmsAbility
             when 'settings.roles'
               can :manage, Cms::Fortress::Role
             when 'settings.sites'
-              can :manage, Cms::Site
+              can :manage, Comfy::Cms::Site
             when 'settings.users'
               can :manage, Cms::Fortress::User
             when 'contents.pages'
-              can :manage, Cms::Page
+              can :manage, Comfy::Cms::Page
             when 'contents.files'
-              can :manage, Cms::File
+              can :manage, Comfy::Cms::File
             when 'designs.layouts'
-              can :manage, Cms::Layout
+              can :manage, Comfy::Cms::Layout
             when 'designs.snippets'
-              can :manage, Cms::Snippet
+              can :manage, Comfy::Cms::Snippet
             else
               setup_role(role_detail, user) if defined?(setup_role)
           end

data/app/views/cms/fortress/roles/_form.html.haml

@@ -1,19 +1,6 @@
-= form_for @cms_fortress_role, :html => {:class => 'form-horizontal'} do |f|
-  - if @cms_fortress_role.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@cms_fortress_role.errors.count, "error")} prohibited this role from being saved:"
-      %ul
-        - @cms_fortress_role.errors.full_messages.each do |msg|
-          %li= msg
+= form.text_field :name
+= form.text_area :description, :rows => 2
+
+= form.form_group :class => 'form-actions' do
+  = form.submit @cms_fortress_role.new_record? ? 'Create' : 'Update', :class => 'btn btn-primary'
 
-  .control-group
-    = f.label :name, :class => 'control-label'
-    .controls
-      = f.text_field :name, :class => 'input-large'
-  .control-group
-    = f.label :description, :class => 'control-label'
-    .controls
-      = f.text_area :description, :rows => 2, :class => 'input-xxlarge'
-  .form-actions
-    = f.submit 'Save', :class => 'btn btn-primary'
-    = link_to 'Cancel', cms_fortress_roles_path, :class => 'btn'

data/app/views/cms/fortress/roles/edit.html.haml

@@ -1,5 +1,9 @@
 .page-header
+  .btn-group.pull-right
+    = link_to 'Cancel', cms_fortress_roles_path, :class => 'btn btn-default'
+
   %h3= t('cms.fortress.roles.edit_title')
 
-= render 'form'
+= comfy_form_for @cms_fortress_role, url: {action: :update} do |form|
+  = render form
 

data/app/views/cms/fortress/roles/index.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to t('cms.fortress.roles.new_link'), new_cms_fortress_role_path, :class => 'btn pull-right'
+  = link_to t('cms.fortress.roles.new_link'), new_cms_fortress_role_path, :class => 'btn btn-primary btn-sm pull-right'
   %h2= t('cms.fortress.roles.title')
 
 %table.table.table-hover.table-bordered.table-striped
@@ -14,7 +14,7 @@
       %td= cms_fortress_role.description
       %td
         .btn-group.pull-right
-          = link_to 'Show Access Rights', cms_fortress_role, :class => 'btn btn-small btn-info'
-          = link_to 'Edit', edit_cms_fortress_role_path(cms_fortress_role), :class => 'btn btn-small btn-default'
-          = link_to 'Delete', cms_fortress_role, :method => :delete, :data => { :confirm => 'Are you sure?' }, :class => 'btn btn-small btn-danger'
+          = link_to 'Show Access Rights', cms_fortress_role, :class => 'btn btn-sm btn-info'
+          = link_to 'Edit', edit_cms_fortress_role_path(cms_fortress_role), :class => 'btn btn-sm btn-default'
+          = link_to 'Delete', cms_fortress_role, :method => :delete, :data => { :confirm => 'Are you sure?' }, :class => 'btn btn-sm btn-danger'
 

data/app/views/cms/fortress/roles/new.html.haml

@@ -1,5 +1,9 @@
 .page-header
+  .btn-group.pull-right
+    = link_to 'Cancel', cms_fortress_roles_path, :class => 'btn btn-default'
+
   %h3= t('cms.fortress.roles.new_title')
 
-= render 'form'
+= comfy_form_for @cms_fortress_role, url: {action: :create} do |form|
+  = render form
 

data/app/views/cms/fortress/roles/show.html.haml

@@ -1,9 +1,9 @@
 .page-header
   .btn-group.pull-right
     =# link_to t('.edit'), edit_cms_fortress_role_path(@cms_fortress_role), :class => 'btn'
-    = link_to t('cms.fortress.roles.load'), refresh_cms_fortress_role_path(@cms_fortress_role), :class => 'btn', :method => :post
-    = link_to t('cms.fortress.roles.back'), cms_fortress_roles_path, :class => 'btn'
-  %h2= "Role: #{ @cms_fortress_role.name }"
+    = link_to t('cms.fortress.roles.load'), refresh_cms_fortress_role_path(@cms_fortress_role), :class => 'btn btn-primary', :method => :post
+    = link_to t('cms.fortress.roles.back'), cms_fortress_roles_path, :class => 'btn btn-default'
+  %h3= "Role: #{ @cms_fortress_role.name }"
   %p= @cms_fortress_role.description
 
 

data/app/views/cms/fortress/shared/_media_items.html.haml

@@ -1,19 +1,19 @@
-%ul.thumbnails
+.row
   - media.each do |m|
     - if type.eql?(:image)
-      %li.span2
-        .thumbnail(href="#")
+      .col-xs-6.col-md-3
+        .thumbnail
           = image_item(m)
           .caption
             %p
               = image_styles(m)
 
     - elsif type.eql?(:video)
-      %li.span2
-        .thumbnail(href="#")
+      .col-xs-6.col-md-3
+        .thumbnail
 
           %a.editor-video(href='#{ m.file.url }')
-            %video(width='128' height='90')
+            %video(width='128' height='90' data-video-title="#{ m.label }")
               %source(src="#{ m.file.url }")
 
             %p
@@ -21,8 +21,5 @@
             %p
               %small
                 = truncate m.description, length: 60
-    - else
-
-
 
 

data/app/views/cms/fortress/shared/_mediaboxes.html.haml

@@ -1,13 +1,15 @@
-#media-box-dialog.modal.hide(tabindex="-1" role="dialog" aria-labelledby="Image Selector" aria-hidden="true")
-  .modal-header
-    %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") x
-    %h5.title Image Selector
-  #modal-body.modal-body
-    =# render partial: 'cms/fortress/shared/media_items', locals: {media: media}
+#media-box-dialog.modal.fade
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") x
+        %h5.title Image Selector
+      #modal-body.modal-body
+        =# render partial: 'cms/fortress/shared/media_items', locals: {media: media}
 
-  .modal-footer
-    %small.muted
-      Click the thumbnail to insert item to the selected editor.
+      .modal-footer
+        %small.muted
+          Click the thumbnail to insert item to the selected editor.
 
 :coffeescript
   CmsFortress.media.imagesPath = "#{ media_files_path(:image) }"

data/app/views/cms/fortress/shared/_menu.html.haml

@@ -0,0 +1,43 @@
+%nav.navbar.navbar-default(role="navigation")
+  .container-fluid
+    .navbar-header
+      %button.navbar-toggle(type="button" data-toggle="collapse" data-target="#main-nav")
+        %span.sr-only Toggle Navigation
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      %a.navbar-brand(href="#")= t('cms.fortress.title')
+
+    .collapse.navbar-collapse#main-nav
+      %ul.nav.navbar-nav
+        - if default_theme?
+          - if @site && !@site.new_record?
+            - if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
+              = topnav_item t("cms.fortress.contents"), |
+                @site && !@site.new_record? ? comfy_admin_cms_site_pages_path(@site) : comfy_admin_cms_sites_pages_path, |
+                content_page?
+
+            - if Cms::Fortress.configuration.design_resources.any? {|resource| can? :view, "designs.#{resource[:name]}" }
+              = topnav_item t("cms.fortress.design"), |
+                @site && !@site.new_record? ? comfy_admin_cms_site_layouts_path(@site) : comfy_admin_cms_sites_pages_path, |
+                design_page?
+
+            - if Cms::Fortress.configuration.settings_resources.any? {|resource| can? :view, "settings.#{resource[:name]}" }
+              = topnav_item t("cms.fortress.settings"), comfy_admin_cms_sites_path, admin_page?
+
+        - else
+          = themed_partial('menu')
+
+        = render 'cms/fortress/admin/topnav'
+
+      - if current_cms_fortress_user
+        .btn-group.pull-right(style="margin-top: 8px;")
+          %button.btn.btn-default.dropdown-toggle(type="button" data-toggle="dropdown")
+            = current_cms_fortress_user.email
+            %span.caret
+          %ul.dropdown-menu(role="menu")
+            %li
+              = link_to "Logout", destroy_cms_fortress_user_session_path, :method => 'delete'
+
+
+

data/app/views/cms/fortress/shared/_navbar.html.haml

@@ -1,10 +1,13 @@
-.navbar.navbar-inverse.navbar-fixed-top
-  .navbar-inner
-    .container
-      %button.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse", :type => "button"}
+%nav.navbar.navbar-default(role="navigation")
+  .container-fluid
+    .navbar-header
+      %button.navbar-toggle(type="button" data-toggle="collapse" data-target="#main-nav")
+        %span.sr-only Toggle Navigation
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      %a.brand{:href => "#"}= t('cms.fortress.title')
-      .nav-collapse.collapse
-      / /.nav-collapse
+      %a.navbar-brand(href="#")= t('cms.fortress.title')
+
+    .collapse.navbar-collapse#main-nav
+      %ul.nav.navbar-nav
+

data/app/views/cms/fortress/shared/_page_extend.html.haml

@@ -1,7 +1,7 @@
 - if Cms::Fortress.configuration.enable_page_workflow
-  = form.fields_for :page_workflow do |wf|
+  = form.fields_for :page_workflow, control_col: "col-sm-4" do |wf|
     = wf.select :status_id, Cms::PageWorkflow.statuses_for_select(can?(:manage, 'contents.page.publish'), can?(:manage, 'contents.page.review')), {}, {class: "status-control"}
     = wf.text_field :published_date, label: 'Published', class: "status-control", :data => {:utc_date => (@page.page_workflow.published_date.nil? ? Time.now : @page.page_workflow.published_date).strftime("%d %B, %Y") }
 
 - if Cms::Fortress.configuration.enable_page_caching
-  = form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: 'Cached Timeout'}, {class: 'status-control'}
+  = form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: 'Cached Timeout', control_col: "col-sm-4"}, {class: 'status-control'}

data/app/views/cms/fortress/shared/_page_extend_js.html.haml

@@ -1,7 +1,7 @@
 :coffeescript
   dateControl = $("#page_page_workflow_attributes_published_date")
   wkControl = $("#page_page_workflow_attributes_status_id")
-  parentControl = $("#page_page_workflow_attributes_published_date").parents(".control-group:first")
+  parentControl = $("#page_page_workflow_attributes_published_date").parents(".form-group:first")
 
   dateControl.val(dateControl.data("utcDate")).datepicker(dateFormat: "d MM, yy")
 

data/app/views/cms/fortress/themes/wide/_body.html.haml

@@ -1,17 +1,19 @@
-.wide-body
-  = render :partial => 'layouts/admin/cms/center'
-= render :partial => 'layouts/admin/cms/footer'
+.container.wide-body
+  = render :partial => 'layouts/comfy/admin/cms/center'
+
+= render :partial => 'layouts/comfy/admin/cms/footer'
 
 :coffeescript
   ### iconize delete and edit links ###
-  $(".wide-body div.btn-group a:contains(Delete)").html("<i class='icon-remove icon-white' />").attr("title", "Delete").tooltip(placement: 'left')
-  $(".wide-body div.btn-group a:contains(Edit)").html("<i class='icon-edit' />").attr("title", "Edit").tooltip(placement: 'left')
-  $(".wide-body div.btn-group a:contains(Add Child)").html("<i class='icon-plus' /> Child").attr("title", "Add Child").tooltip(placement: 'left')
+  $(".wide-body div.btn-group a:contains(Delete)").html("<i class='glyphicon glyphicon-remove' />").attr("title", "Delete").tooltip(placement: 'left')
+  $(".wide-body div.btn-group a:contains(Edit)").html("<i class='glyphicon glyphicon-edit' />").attr("title", "Edit").tooltip(placement: 'left')
+  $(".wide-body div.btn-group a:contains(Add Child)").html("<i class='glyphicon glyphicon-plus' /> Child").attr("title", "Add Child").tooltip(placement: 'left')
 
-  $(".wide-body .page-header a:contains(Create New Page)").html("<i class='icon-file' /> New Page").attr("title", "Create New Page").tooltip(placement: 'left')
+  $(".wide-body .page-header a:contains(Create New Page)").html("<i class='glyphicon glyphicon-file' /> New Page").attr("title", "Create New Page").tooltip(placement: 'left')
 
   # New Page
   index_path = "#{ back_path }"
   $(".wide-body .page-header h2:contains(New), .wide-body .page-header h2:contains(Editing)").parent()
-    .prepend('<a class="btn pull-right" href="' + index_path + '" title="" data-original-title="Create New Page"><i class="icon-list"></i> Back</a> ')
-
+    .prepend('<a class="btn btn-default pull-right" href="' + index_path + '" title="" data-original-title="Create New Page"><i class="glyphicon glyphicon-chevron-left"></i> Back</a> ')
+  
+  $(".wide-body .page-header .btn").removeClass("pull-right").wrapAll("<div class='btn-group pull-right'></div>")

data/app/views/cms/fortress/themes/wide/{_admin_topnav.html.haml → _menu.html.haml}

@@ -42,3 +42,4 @@
               = topnav_item t(resource[:title]), path, current_page?(path)
 
 
+

data/app/views/cms/fortress/users/_form.html.haml

@@ -1,35 +1,10 @@
-= form_for(@cms_fortress_user, :html => {:class => 'form-horizontal'}) do |f| 
-  - if @cms_fortress_user.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@cms_fortress_user.errors.count, "error")} prohibited this user from being saved:"
-      %ul
-        - @cms_fortress_user.errors.full_messages.each do |msg|
-          %li= msg
-  .control-group
-    = f.label :last_name, :class => 'control-label'
-    .controls
-      = f.text_field :last_name
-  .control-group
-    = f.label :first_name, :class => 'control-label'
-    .controls
-      = f.text_field :first_name
-  .control-group
-    = f.label :email, :class => 'control-label'
-    .controls
-      = f.text_field :email
-  .control-group
-    = f.label :role_id, :class => 'control-label'
-    .controls
-      = f.select :role_id, Cms::Fortress::Role.all.collect {|role| [role.name, role.id]}
-  .control-group
-    = f.label :password, :class => 'control-label'
-    .controls
-      = f.password_field :password
-  .control-group
-    = f.label :password_confirmation, :class => 'control-label'
-    .controls
-      = f.password_field :password_confirmation
-  .form-actions
-    = f.submit 'Save', :class => 'btn btn-primary'
-    = link_to 'Cancel', cms_fortress_users_path, :class => 'btn'
+= form.text_field :last_name
+= form.text_field :first_name
+= form.text_field :email
+= form.select :role_id, Cms::Fortress::Role.all.collect {|role| [role.name, role.id]}
+= form.password_field :password
+= form.password_field :password_confirmation
+
+= form.form_group :class => 'form-actions' do
+  = form.submit @cms_fortress_user.new_record? ? 'Create' : 'Update', :class => 'btn btn-primary'
 

data/app/views/cms/fortress/users/edit.html.haml

@@ -1,5 +1,10 @@
 .page-header
-  %h3= t('cms.fortress.users.edit_title')
+  .btn-group.pull-right
+    = link_to "Cancel", cms_fortress_users_path, class: 'btn btn-default btn-sm'
+
+  %h3= t('cms.fortress.users.new_title')
+
+= comfy_form_for @cms_fortress_user, url: {action: :update} do |form|
+  = render form
 
-= render 'form'
 

data/app/views/cms/fortress/users/index.html.haml

@@ -1,6 +1,8 @@
 .page-header
-  = link_to t('cms.fortress.users.new_link'), new_cms_fortress_user_path, :class => 'btn pull-right'
-  %h2= t('cms.fortress.users.title')
+  .btn-group.pull-right
+    = link_to t('cms.fortress.users.new_link'), new_cms_fortress_user_path, :class => 'btn btn-primary btn-sm'
+
+  %h3= t('cms.fortress.users.title')
 
 %table.table.table-hover.table-bordered
   %tr
@@ -19,6 +21,6 @@
       %td= cms_fortress_user.role.name
       %td
         .btn-group.pull-right
-          = link_to 'Edit', edit_cms_fortress_user_path(cms_fortress_user), :class => 'btn btn-small btn-default'
-          = link_to 'Delete', cms_fortress_user, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-small btn-danger'
+          = link_to 'Edit', edit_cms_fortress_user_path(cms_fortress_user), :class => 'btn btn-sm btn-default'
+          = link_to 'Delete', cms_fortress_user, method: :delete, data: { confirm: 'Are you sure?' }, :class => 'btn btn-sm btn-danger'
 

data/app/views/cms/fortress/users/new.html.haml

@@ -1,5 +1,9 @@
 .page-header
+  .btn-group.pull-right
+    = link_to "Cancel", cms_fortress_users_path, class: 'btn btn-default btn-sm'
+
   %h3= t('cms.fortress.users.new_title')
 
-= render 'form'
+= comfy_form_for @cms_fortress_user, url: {action: :create} do |form|
+  = render form
 

data/app/views/cms/fortress/users/sessions/new.html.haml

@@ -1,11 +1,15 @@
 = render :partial => 'cms/fortress/shared/navbar'
-= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "form-signin" }) do |f|
-  %h3.form-signin-heading Sign in
-  = f.email_field :email, :autofocus => true, :placeholder => "Email address", :class => "input-block-level"
-  = f.password_field :password, :placeholder => "Password", :class => "input-block-level"
+= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:role => "form", :class => "form-signin" }) do |f|
+  %h3.form-signin-heading Sign In
+  .form-group
+    = f.email_field :email, :autofocus => true, :placeholder => "Email Address", :class => "form-control"
+  .form-group
+    = f.password_field :password, :placeholder => "Password", :class => "form-control"
+
   - if devise_mapping.rememberable?
-    %label.checkbox
-      = f.check_box :remember_me
-      Remember me
-  = f.submit "Sign in", :class => "btn btn-primary"
+    .checkbox
+      %label.checkbox
+        = f.check_box :remember_me
+        Remember me
+  = f.submit "Sign in", :class => "btn btn-primary btn-md"
   = render "devise/shared/links"