cms-fortress 1.3.0.rc3 → 1.3.0

data/.gitignore

@@ -64,3 +64,5 @@ log/
 00_create_cms.rb
 
 /db/development.sqlite3
+
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cms-fortress (1.2.2)
+    cms-fortress (1.3.0)
       aasm (~> 3.2)
       cancan (>= 1.6.9)
       comfortable_mexican_sofa (~> 1.12.0)
@@ -14,28 +14,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (3.2.0)
-    actionmailer (4.0.5)
-      actionpack (= 4.0.5)
+    aasm (3.2.1)
+    actionmailer (4.0.6)
+      actionpack (= 4.0.6)
       mail (~> 2.5.4)
-    actionpack (4.0.5)
-      activesupport (= 4.0.5)
+    actionpack (4.0.6)
+      activesupport (= 4.0.6)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     active_link_to (1.0.2)
       actionpack
-    activemodel (4.0.5)
-      activesupport (= 4.0.5)
+    activemodel (4.0.6)
+      activesupport (= 4.0.6)
       builder (~> 3.1.0)
-    activerecord (4.0.5)
-      activemodel (= 4.0.5)
+    activerecord (4.0.6)
+      activemodel (= 4.0.6)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.5)
+      activesupport (= 4.0.6)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.5)
+    activesupport (4.0.6)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -78,7 +78,7 @@ GEM
       rails-i18n (~> 4.0.0)
       sass-rails (>= 4.0.3)
       tinymce-rails (>= 4.0.0)
-    delayed_job (4.0.1)
+    delayed_job (4.0.2)
       activesupport (>= 3.0, < 4.2)
     devise (3.2.4)
       bcrypt (~> 3.0)
@@ -86,9 +86,9 @@ GEM
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
-    execjs (2.2.0)
+    execjs (2.2.1)
     haml (4.0.5)
       tilt
     haml-rails (0.5.3)
@@ -96,19 +96,19 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (3.0.0)
+    hashie (3.1.0)
     hike (1.2.3)
     i18n (0.6.9)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.1)
-    kaminari (0.16.0)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kramdown (1.3.3)
+    kramdown (1.4.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -142,20 +142,20 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.5)
-      actionmailer (= 4.0.5)
-      actionpack (= 4.0.5)
-      activerecord (= 4.0.5)
-      activesupport (= 4.0.5)
+    rails (4.0.6)
+      actionmailer (= 4.0.6)
+      actionpack (= 4.0.6)
+      activerecord (= 4.0.6)
+      activesupport (= 4.0.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.5)
-      sprockets-rails (~> 2.0.0)
+      railties (= 4.0.6)
+      sprockets-rails (~> 2.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
-    railties (4.0.5)
-      actionpack (= 4.0.5)
-      activesupport (= 4.0.5)
+    railties (4.0.6)
+      actionpack (= 4.0.6)
+      activesupport (= 4.0.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -177,7 +177,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.1.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -185,7 +185,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tinymce-rails (4.0.28.1)
+    tinymce-rails (4.0.28.2)
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)

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

@@ -0,0 +1,8 @@
+#= require tinymce-jquery
+#= require '../site_selector'
+
+window.CMS.wysiwyg = function () {
+    return <%= tinymce_init %>
+}
+
+

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

@@ -11,8 +11,8 @@ module Cms::Fortress::ApplicationHelper
      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}
+  def dashboard_widget(title, collection, partial="cms/fortress/shared/dashboard_widget")
+    render partial: partial, locals: {title: title, collection: collection}
   end
 
   def role_display(command)

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

@@ -22,13 +22,16 @@ module Cms::Fortress::SprocketHelper
       #{configuration_from_options(options)},
       selector: 'textarea[data-cms-rich-text]',
       link_list: CmsFortress.media.othersUrl(),
+
       setup: function(ed) {
+
         ed.addButton('image', {
           title: 'Insert Image',
           onclick: function() {
             return CmsFortress.media.showImageDialog(ed);
           }
         });
+
         return ed.addButton('fmedia', {
           tooltip: 'Insert Video',
           icon: 'media',
@@ -37,7 +40,9 @@ module Cms::Fortress::SprocketHelper
             return CmsFortress.media.showVideoDialog(ed);
           }
         });
+
       }
+
     });
   EOF
   end
@@ -46,7 +51,11 @@ module Cms::Fortress::SprocketHelper
 
   def configuration_from_options(options)
     options.map do |k, v|
-      v.is_a?(Array) ? "#{k}: #{v}" : "#{k}: '#{v}'"
+      v.is_a?(Array) ? "#{k}: #{v}" : "#{k}: #{boolean_value(v)}"
     end.join(',')
   end
+
+  def boolean_value(v)
+    [true, false].include?(v) ? "#{v}" : "'#{v}'"
+  end
 end

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

@@ -5,7 +5,7 @@
         %button.btn.btn-default.btn-sm.dropdown-toggle(type='button' data-toggle="dropdown")
           %small.site-button-label
             %em
-              = t('.current_site')
+              = t('cms.fortress.current_site')
           %strong.site-button-label
             = current_site
           %b.caret
@@ -16,7 +16,7 @@
       .btn.btn-default.btn-sm
         %small.site-button-label
           %em
-            = t('.current_site')
+            = t('cms.fortress.current_site')
         %strong.site-button-label
           = current_site
 
@@ -39,9 +39,9 @@
 
 :coffeescript
   ### iconize delete and edit links ###
-  $(".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 div.btn-group a:contains(Delete)").prepend("<span class='glyphicon glyphicon-remove' /> ").attr("title", "Delete") #.tooltip(placement: 'left')
+  $(".wide-body div.btn-group a:contains(Edit)").prepend("<span 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='glyphicon glyphicon-file' /> New Page").attr("title", "Create New Page").tooltip(placement: 'left')
 

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

@@ -12,7 +12,7 @@
       %ul.nav.navbar-nav
 
         - if @site && !@site.new_record?
-          %li= topnav_item "Dashboard", dashboard_site_path, current_page?(dashboard_site_path)
+          %li= topnav_item t("cms.fortress.admin.dashboard.title"), dashboard_site_path, current_page?(dashboard_site_path)
 
           - if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
             %li.dropdown(class="#{ "active" if content_page? }")

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.0.rc3"
+  s.version   = "1.3.0"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2014-06-19"
+  s.date              = "2014-06-28"
   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/da.yml

@@ -0,0 +1,129 @@
+da:
+  cms:
+    fortress:
+      page_title: CMS Fortress Admin
+      title: CMS Fortress
+      contents: Contents
+      design: Design
+      admin: Admin
+      login: Logout
+      logout: Logout
+      create: Create
+      update: Update
+      delete: Delete
+      edit: Edit
+      are_you_sure: Are you sure?
+      cancel: Cancel
+      published: Published
+      published_date: Published At
+      schedule_date: Scheduled Publication
+      cache_timeout: Cached Timeout
+      toggle_navigation: Toggle Navigation
+      image_selector: Image Selector
+      insert_item: Click the thumbnail to insert item to the selected editor.
+      settings: Settings
+      current_site: Current Site
+
+      admin:
+
+        dashboard:
+          title: Dashboard
+          draft_widget: Draft Pages
+          reviewed_widget: Reviewed Pages
+          updated_pages: Recently Updated Pages
+
+        sites:
+          menu_header: "Site/ %{site_name}"
+        super_user:
+          title: Super Users
+          menu_header: Super Users Only
+
+        users: Users
+        not_authorized: You are not authorized to access this functionality
+        settings_dashboard: Settings Dashboard
+        roles: Roles
+        design_dashboard: Design Dashboard
+        design_related_information: This page will show design related information.
+        content_dashboard: Content Dashboard
+        content_related_information: "This page will show contents related information (history, graphs, analytics and etc.)"
+        errors:
+          missing_roles_yaml_file: "The configuration file config/roles.yml is missing."
+
+      roles:
+        title: Roles
+        new_link: New Role
+        edit_title: Edit Role
+        new_title: Create New Role
+        back: Back
+        load: Load New Roles
+        role: Role
+        show: Show
+        manage: Manage
+        save: Save
+        description: Description
+        show_access_rights: Show Access Rights
+        name: Name
+        contents: Contents
+        designs: Designs
+        settings: Settings
+        files: Files
+        page: Page
+        publish: publish
+        review: review
+        pages: Pages
+        layouts: Layouts
+        snippets: Snippets
+        roles: Roles
+        sites: Sites
+        users: Users
+
+      users:
+        title: Users
+        new_link: New User
+        new_super_link: New Super User
+        edit_title: Edit User
+        new_title: Create New User
+        last_name: Lastname
+        first_name: Firstname
+        email: Email
+        role: Role
+        sessions:
+          new:
+            sign_in: Sign In
+            email_address: Email Address
+            password: Password
+            remember_me: Remember me
+
+  comfy:
+    admin:
+      cms:
+        pages:
+          form:
+            review: Approve
+            reviewed: Reviewed
+            schedule: Publish Date
+            publish: Publish Now
+            published: Published
+            draft: save as draft
+            drafted: Draft
+            reset: Reset to Draft
+
+  activerecord:
+    attributes:
+      cms/fortress/user:
+        last_name: Lastname
+        first_name: Firstname
+        email: Email
+        role_id: Role
+        password: Password
+        password_confirmation: Password Confirmation
+      cms/fortress/role:
+        name: Name
+        description: Description
+      cms/fortress/role_detail:
+        contents: Contents
+      comfy/cms/page:
+        full_path: Path
+        parent_id: Parent page
+        slug: Slug
+

data/config/locales/de.yml

@@ -22,7 +22,7 @@ de:
       image_selector: Bildauswahl
       insert_item: Ein Bild anklicken um es in den ausgewählten Editor einzufügen.
       settings: Einstellungen
-      site_selector: "Seite auswählen: "
+      current_site: Aktuelle Seite
 
       admin:
         dashboard:
@@ -97,9 +97,12 @@ de:
         pages:
           form:
             review: Freigeben
+            reviewed: Freigegeben
             schedule: Publizierung planen
             publish: Jetzt publizieren
+            published: Publiziert
             draft: Als Entwurf speichern
+            drafted: Entwurf
             reset: Auf Entwurf zurücksetzen
 
   activerecord:

data/config/locales/en.yml

@@ -22,6 +22,7 @@ en:
       image_selector: Image Selector
       insert_item: Click the thumbnail to insert item to the selected editor.
       settings: Settings
+      current_site: Current Site
 
       admin:
 
@@ -99,9 +100,12 @@ en:
         pages:
           form:
             review: Approve
+            reviewed: Reviewed
             schedule: Publish Date
             publish: Publish Now
+            published: Published
             draft: save as draft
+            drafted: Draft
             reset: Reset to Draft
 
   activerecord:

data/config/locales/es.yml

@@ -0,0 +1,129 @@
+es:
+  cms:
+    fortress:
+      page_title: CMS Fortress Admin
+      title: CMS Fortress
+      contents: Contenido
+      design: Diseño
+      admin: Administración
+      login: Inicio de sesión
+      logout: Salir
+      create: Crear
+      update: Actualización
+      delete: Borrar
+      edit: Editar
+      are_you_sure: ¿Está seguro?
+      cancel: Cancelar
+      published: Publicado
+      published_date: Publicado En
+      schedule_date: Scheduled Publication
+      cache_timeout: Tiempo de espera de caché
+      toggle_navigation: Toggle Navigation
+      image_selector: Image Selector
+      insert_item: Click the thumbnail to insert item to the selected editor.
+      settings: Configuración
+      current_site: Sitio Actual
+
+      admin:
+
+        dashboard:
+          title: Salpicadero
+          draft_widget: Proyecto de Páginas
+          reviewed_widget: Comentado Páginas
+          updated_pages: Páginas Actualizado Recientemente
+
+        sites:
+          menu_header: "Sitio/ %{site_name}"
+        super_user:
+          title: Estupendo Usuarios
+          menu_header: único Estupendo Usuario
+
+        users: Users
+        not_authorized: You are not authorized to access this functionality
+        settings_dashboard: Settings Dashboard
+        roles: Roles
+        design_dashboard: Design Dashboard
+        design_related_information: This page will show design related information.
+        content_dashboard: Content Dashboard
+        content_related_information: "This page will show contents related information (history, graphs, analytics and etc.)"
+        errors:
+          missing_roles_yaml_file: "The configuration file config/roles.yml is missing."
+
+      roles:
+        title: Rol
+        new_link: Nuevo Rol
+        edit_title: Editar Rol
+        new_title: Crear nuevo Rol
+        back: Espalda
+        load: Cargue Nuevo Rol
+        role: Rol
+        show: Mostar
+        manage: Gestionar
+        save: Ahorrar
+        description: Description
+        show_access_rights: Mostrar Derechos de Consulta
+        name: Nombre
+        contents: Contenido
+        designs: Diseño
+        settings: Configuración
+        files: Archivos
+        page: Página
+        publish: Publicar
+        review: Revisión
+        pages: Páginas
+        layouts: Layouts
+        snippets: Snippets
+        roles: Rol
+        sites: Sitios
+        users: Usuarios
+
+      users:
+        title: Usuarios
+        new_link: Nuevo Usuario
+        new_super_link: Nuevo Estupendo Usuario
+        edit_title: Edit User
+        new_title: Create New User
+        last_name: Lastname
+        first_name: Firstname
+        email: Email
+        role: Role
+        sessions:
+          new:
+            sign_in: Sign In
+            email_address: Email Address
+            password: Password
+            remember_me: Remember me
+
+  comfy:
+    admin:
+      cms:
+        pages:
+          form:
+            review: Approve
+            reviewed: Reviewed
+            schedule: Publish Date
+            publish: Publish Now
+            published: Published
+            draft: save as draft
+            drafted: Draft
+            reset: Reset to Draft
+
+  activerecord:
+    attributes:
+      cms/fortress/user:
+        last_name: Lastname
+        first_name: Firstname
+        email: Email
+        role_id: Role
+        password: Password
+        password_confirmation: Password Confirmation
+      cms/fortress/role:
+        name: Name
+        description: Description
+      cms/fortress/role_detail:
+        contents: Contents
+      comfy/cms/page:
+        full_path: Path
+        parent_id: Parent page
+        slug: Slug
+