cms-fortress 1.3.0.rc2 → 1.3.0.rc3

data/README.rdoc

@@ -22,7 +22,7 @@ An extension for the awesome Comfortable Mexican Sofa (https://github.com/comfy/
 
 Add gem defintion to your Gemfile:
 
-  gem 'cms-fortress'
+  gem 'cms-fortress', '~> 1.3.0.rc3'
 
 Then from the Rails project's root run:
 
@@ -37,6 +37,16 @@ After that run your app and navigate to http://localhost:3000/cms-admin to start
     username: admin@cmsfortress.com
     password: 1234qwer
 
+===== Installing on project with Comfortable Mexican Sofa was already installed:
+
+    rails generate cms:fortress --no-comfy
+    rake db:migrate
+
+===== Upgrading older version of cms-fortress:
+
+    rails generate cms:fortress:upgrade
+    rake db:migrate
+
 ===Adding custom role details
 
 You can create a custom role ability via a three-step process.
@@ -66,6 +76,21 @@ You can create a custom role ability via a three-step process.
         :path => 'admin_my_role_details_path'
       }
       # the other two lists are "content_resources" and "design_resources"
+
+      #adding a super user only menu item
+      config.settings_resources << {
+        :name => 'my_role_detail',
+        :title => 'i18n.label.title', # this is passed to the t() function - can be plain text
+        :path => 'admin_my_role_details_path',
+        :super_user => true
+      }
+      
+      # adding a divider menu item (Wide Theme only)
+      config.content_resources << {name: 'divider'}
+      
+      #adding a menu header item (Wide Theme only)
+      config.content_resources << {name: 'dropdown-header', title: "i18n.my.header.label"}
+      
     end
 
 The path is eval'd at runtime, so you can use Rails helper methods such as
@@ -127,6 +152,6 @@ Afterwards you can run the tests by calling
 
 == Copyright
 
-Copyright (c) 2013 Melvin Sembrano. See LICENSE.txt for
+Copyright (c) 2014 Melvin Sembrano. See LICENSE.txt for
 further details.
 

data/app/assets/javascripts/cms/fortress/site_selector.js.coffee

@@ -0,0 +1,15 @@
+class SiteSelector
+  constructor: ->
+    @initialize_event_handler()
+
+  initialize_event_handler: ->
+    @site_selector()
+
+  site_selector: ->
+    ($ '#js_site_selector').on 'change', (event) =>
+      page_id       = ($ event.target).val()
+      locale        =  location.search
+      location.href = "/cms-admin/sites/#{page_id}/pages#{locale}"
+
+$ ->
+  site_selector = new SiteSelector

data/app/assets/javascripts/cms/fortress/themes/wide.js.coffee.erb

@@ -1,4 +1,5 @@
 #= require tinymce-jquery
+#= require '../site_selector'
 
 window.CMS.wysiwyg = ->
   `<%= tinymce_init %>`

data/app/assets/stylesheets/cms/fortress/admin_overrides.css

@@ -22,4 +22,9 @@
 
 .current-site-info {
   margin-top: -1.2em;
+  margin-bottom: 0.3em;
+}
+
+.site_selector {
+  width: 250px;
 }

data/app/assets/stylesheets/cms/fortress/themes/wide.css.scss

@@ -1,6 +1,15 @@
 body#comfy {
   background-color: inherit;
 
+  small.site-button-label {
+    color: #999;
+  }
+
+  strong.site-button-label {
+    margin-left: 10px;
+    margin-right: 1em;
+  }
+
 /**
   font-size: 13px;
   line-height: 18px;

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

@@ -3,6 +3,14 @@ require 'cms/fortress/error'
 
 module Cms::Fortress::ApplicationHelper
 
+  def current_site
+    @site.label
+  end
+
+  def super_user?
+     current_cms_fortress_user && current_cms_fortress_user.type.eql?(:super_user)
+  end
+
   def dashboard_widget(title, collection)
     render partial: "cms/fortress/shared/dashboard_widget", locals: {title: title, collection: collection}
   end

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

@@ -10,22 +10,18 @@ module Cms::Fortress::SprocketHelper
     end
 
     options = {
-      menubar: 'tools format view',
-      toolbar1: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | fullscreen code',
-      toolbar2: '',
-      plugins: "['code', 'fullscreen', 'media', 'link', 'table']",
-      language: 'en'
+      menubar: "tools format view",
+      toolbar1: "insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | fullscreen code | image fmedia link",
+      toolbar2: "",
+      plugins: ["code", "fullscreen", "media", "link", "table"],
+      language: "en"
     }.stringify_keys.merge(config)
 
   <<-EOF
   tinymce.init({
+      #{configuration_from_options(options)},
       selector: 'textarea[data-cms-rich-text]',
-      menubar: '#{ options['menubar'] }',
-      toolbar1: '#{ options['toolbar1'] } | image fmedia link',
-      toolbar2: '#{ options['toolbar2'] }',
-      plugins: #{ options['plugins'] },
       link_list: CmsFortress.media.othersUrl(),
-      language: '#{ options['language'] }',
       setup: function(ed) {
         ed.addButton('image', {
           title: 'Insert Image',
@@ -46,4 +42,11 @@ module Cms::Fortress::SprocketHelper
   EOF
   end
 
+  private
+
+  def configuration_from_options(options)
+    options.map do |k, v|
+      v.is_a?(Array) ? "#{k}: #{v}" : "#{k}: '#{v}'"
+    end.join(',')
+  end
 end

data/app/helpers/comfy/admin/cms/pages_helper.rb

@@ -19,4 +19,24 @@ module Comfy::Admin::Cms::PagesHelper
         "30 days" => 30.days
     }.map {|k,v| [k, v.to_i] }
   end
+
+  def site_selector
+    select_tag(
+        :sites,
+        options_for_select(sites_for_select, params[:site_id]),
+        {class: 'form-control input-sm site_selector', id: 'js_site_selector'}
+    )
+  end
+
+  def sites_for_select
+    all_sites.map { |site| [site.label, site.id] }
+  end
+
+  def all_sites
+    Comfy::Cms::Site.all
+  end
+
+  def multiple_sites?
+    all_sites.size > 1
+  end
 end

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

@@ -1,7 +1,25 @@
 - unless @site.nil? || @site.new_record?
   .container-fluid.current-site-info
-    %span.label.label-primary
-      = @site.label
+    - if super_user? && multiple_sites?
+      .btn-group(style="margin-top: 8px;")
+        %button.btn.btn-default.btn-sm.dropdown-toggle(type='button' data-toggle="dropdown")
+          %small.site-button-label
+            %em
+              = t('.current_site')
+          %strong.site-button-label
+            = current_site
+          %b.caret
+        %ul.dropdown-menu
+          - all_sites.each do |site|
+            = topnav_item site.label, comfy_admin_cms_site_pages_path(site), @site.id.eql?(site.id)
+    - else
+      .btn.btn-default.btn-sm
+        %small.site-button-label
+          %em
+            = t('.current_site')
+        %strong.site-button-label
+          = current_site
+
 
 .container-fluid.wide-body
   - if controller_name.eql?('revisions')

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

@@ -55,9 +55,9 @@
                     = topnav_resource_item("settings", resource)
 
 
-
         = 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")

data/app/views/comfy/admin/cms/pages/_form.html.haml

@@ -11,7 +11,7 @@
 - if Cms::Fortress.configuration.enable_page_workflow && !@page.new_record?
   .container-fluid
     .btn-group
-      %span.btn.btn-success= @page.aasm_state.titleize
+      %span.btn.btn-success= t('.' + @page.aasm_state)
       - page_actions(@page).each do |page_action|
         = form.button t('.'+page_action.to_s), :class => 'btn btn-default', :value => page_action, :name => 'transition'
   %hr

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.0.rc2"
+  s.version   = "1.3.0.rc3"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2014-06-12"
+  s.date              = "2014-06-19"
   s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email             = "melvinsembrano@gmail.com"
   s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]

data/config/locales/de.yml

@@ -15,12 +15,14 @@ de:
       are_you_sure: Sind Sie sicher?
       cancel: Abbrechen
       published: Publiziert
-      published_date: geplante Veröffentlichung
+      published_date: Publiziert am
+      schedule_date: geplante Publizierung
       cache_timeout: Cache Dauer
       toggle_navigation: Navigation einklappen
       image_selector: Bildauswahl
       insert_item: Ein Bild anklicken um es in den ausgewählten Editor einzufügen.
       settings: Einstellungen
+      site_selector: "Seite auswählen: "
 
       admin:
         dashboard:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
+  version: 1.3.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -283,8 +283,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/assets/javascripts/cms/fortress/cms_fortress.js
 - app/assets/javascripts/cms/fortress/media.js.coffee
+- app/assets/javascripts/cms/fortress/site_selector.js.coffee
 - app/assets/javascripts/cms/fortress/themes/wide.js.coffee.erb
 - app/assets/javascripts/html5shiv.js
 - app/assets/stylesheets/cms/fortress/admin_overrides.css