dm_cms 4.2.3.9 → 4.2.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3db5ee05c48bfa0f3f505b4ce857b0de3bdaaea2
-  data.tar.gz: dc44057669badf50fa81684c89dc49e9727e7df7
+  metadata.gz: 98b4d1df67ba08c8d217be36f506c9397fcbedb8
+  data.tar.gz: 978bec9c13db543562c1ebc06d0fc90ea1557ef5
 SHA512:
-  metadata.gz: a03df7b89cf0178891f734764dbe99ab8021caa3ccb524304eb284171b641b5c8df51bcf9c0f1664d0a830f6a0f6976ced13b2d5b34a793edcb592688550551d
-  data.tar.gz: aad14a8d226dec597afc87a3bd45837fa37b9d1c0818f42c84ae4d352916cfdf464a17813a282b1bd61d1df6c5fda3029eb9bcf783a5d3f9bffada1b898d3c17
+  metadata.gz: b74d812b33a4a1e48b633a5049c254be5403fcf3261b62751d07920a97708d4349ca049a222dc60270fa46b3d7140d2af768b53ad6d2d914431f794acaf5782a
+  data.tar.gz: 5e35ee2f5f40a40c6c741295866f401c21993e3a86a734aa043a8b32654cee6eacf573814b8ccdc7b3afb76e37b91eb8879322b48fe82dadec3a537e530e0c60

data/app/controllers/dm_cms/pages_controller.rb

@@ -46,6 +46,8 @@ class DmCms::PagesController < DmCms::ApplicationController
       redirect_to "/#{DmCore::Language.locale}/#{@current_page.link}"
     when 'link'
       redirect_to @current_page.link
+    when 'link-new-window'
+      redirect_to @current_page.link
     when 'divider'
       render text: 'Not a real page'
     end

data/app/helpers/dm_cms/pages_helper.rb

@@ -86,7 +86,7 @@ module DmCms::PagesHelper
     if (root = options[:include_root])
       active          = (current_page?(root) ? options[:active_class] : nil)
       active_found  ||= !active.nil?
-      menu_str       += content_tag :li, link_to(root.menutitle, dm_cms.showpage_url(root.slug)), class: active
+      menu_str       += content_tag :li, page_link(root), class: active
     end
     pages.each do |page, children|
       if allow_page_in_menu?(page)
@@ -94,7 +94,7 @@ module DmCms::PagesHelper
         active                  = (submenu_active || current_page?(page) ? options[:active_class] : nil)
         active_found          ||= !active.nil?
         menu_str += content_tag(:li, class: active) do
-          link_to(page.menutitle, dm_cms.showpage_url(page.slug)) + 
+          page_link(page) + 
           submenu.html_safe
         end
       end
@@ -111,7 +111,7 @@ module DmCms::PagesHelper
     if (root = options[:include_root])
       active          = (current_page?(root) ? options[:active_class] : nil)
       active_found  ||= !active.nil?
-      menu_str       += content_tag :li, link_to(root.menutitle, dm_cms.showpage_url(root.slug)), class: active
+      menu_str       += content_tag :li, page_link(root), class: active
     end
     pages.each do |page, children|
       if allow_page_in_menu?(page)
@@ -120,11 +120,11 @@ module DmCms::PagesHelper
         active_found          ||= !active.nil?
         if !submenu.blank?
           menu_str += content_tag(:li, class: ['dropdown', active].join(' ')) do
-            link_to(''.html_safe + page.menutitle + ' <b class="caret"></b>'.html_safe, dm_cms.showpage_url(page.slug), class: 'dropdown-toggle', data: {toggle: 'dropdown'}) + 
+            page_link(page, ''.html_safe + page.menutitle + ' <b class="caret"></b>'.html_safe, class: 'dropdown-toggle', data: {toggle: 'dropdown'}) +
             submenu.html_safe
           end
         else
-          menu_str += content_tag :li, link_to(page.menutitle, dm_cms.showpage_url(page.slug)), class: active
+          menu_str += content_tag :li, page_link(page), class: active
         end
       end
     end
@@ -161,9 +161,16 @@ module DmCms::PagesHelper
   
   # return a link to the page's slug, with the passed in link text
   #------------------------------------------------------------------------------
-  def page_link(page, text = nil)
+  def page_link(page, text = nil, options = {})
     text ||= page.menutitle
-    link_to text, dm_cms.showpage_url(page.slug)
+    case page.pagetype
+    when 'link'
+      link_to text, page.link || dm_cms.showpage_url(page.slug), options
+    when 'link-new-window'
+      link_to text, page.link || dm_cms.showpage_url(page.slug), options.merge(target: '_blank')
+    else
+      link_to text, dm_cms.showpage_url(page.slug), options
+    end
   end
   
   private

data/app/models/cms_page.rb

@@ -48,7 +48,7 @@ class CmsPage < ActiveRecord::Base
   validates_length_of     :template, :maximum => 50
   
   # --- list of pagetypes
-  PAGETYPE = ['content', 'pagelink', 'controller/action', 'link', 'divider']
+  PAGETYPE = [['Regular content', 'content'], ["Link to interior page using it's slug", 'pagelink'], ['Link to external page with url', 'link'], ['Link to external page with url (open in new window)', 'link-new-window'], ['Menu divider (no content)', 'divider'], ['Controller/Action (rarely used)', 'controller/action']]
 
   # Base the slug on the default locale
   #------------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_cms
 version: !ruby/object:Gem::Version
-  version: 4.2.3.9
+  version: 4.2.3.10
 platform: ruby
 authors:
 - Brett Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.9
+        version: 4.2.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.9
+        version: 4.2.3.10
 - !ruby/object:Gem::Dependency
   name: meta-tags-helpers
   requirement: !ruby/object:Gem::Requirement