tb_cms 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773d54e061bae66da7a726bd1204e195c626ddf9
-  data.tar.gz: c60846a1053e1d62c2091feb66578637a254a175
+  metadata.gz: 8489bda6705051746c0d9bfc282aa87958d6b94e
+  data.tar.gz: b5d332e0e887e04ec5ce00b1f6d19d20e8768ea5
 SHA512:
-  metadata.gz: 4a4fcfb5e1b6253a1158769d7ec43c75a53bb7d1de301538ad752124849d40de1adc3af18521d81360eae4bb66dee959107b71aade0c6c9c65aa20a4810ecb63
-  data.tar.gz: aac2216c171d43169fe28a9699d77c6f95b9cfad6bf12b4975ca942529aa0677ce94b41ecbc427b1743108562b86c2a8cff08a8729cf98a9b2427e53f4d681ec
+  metadata.gz: 2e3b9246f237eabdb5465c408b0c8635c18733bf388fcc574da2faaaba2ec4d1f0fa206c1c5ab27b212b09684d76d4e5e4fc9d6bfb08f8cabd07bcd2ab4294e1
+  data.tar.gz: dce96636d73c406842425ec2a3905b68b92a0d005c21bb2468d2ad7a9a85fe53d816b545e4fe1af01d2539a16e0b142fc72496790eb7cac9b75208cef96b803e

data/README.md

@@ -37,12 +37,15 @@ A page layout is essentially a plain old Rails layout file with a little bit of
     #html: Left
     #html: Right
     %>
-    <div class="left">
-      <%= yield :left %>
-    </div>
-    <div class="right">
-      <%= yield :right %>
-    </div>
+    <%= content_for :body do %>
+      <div class="left">
+        <%= yield :left %>
+      </div>
+      <div class="right">
+        <%= yield :right %>
+      </div>
+    <% end %>
+    <%= render :template => "/layouts/application" %>
 
 You may also use the `spud:cms:layout` generator to quickly generate a layout file.
 

data/app/helpers/cms/application_helper.rb

@@ -259,6 +259,39 @@ private
 		return content.html_safe
 	end
 
+  def sp_list_menu_subnav(options={})
+    return_string = ""
+    base_path = request.path[1..-1]
+    menu_name = "navigation"
+    classes = "subnav"
+
+    menu_name = options[:name] if options.has_key?(:name);
+    classes = options[:class] if options.has_key?(:class);
+
+    menu = SpudMenu.where(name: menu_name).first
+
+    if !menu.blank?
+      menu_item = menu.spud_menu_items_combined
+        .joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)")
+        .where([
+          "#{SpudPage.table_name}.url_name = :base_path OR #{SpudMenuItem.table_name}.url = :base_path_slash",
+          {:base_path => base_path, :base_path_slash => "/#{base_path}"}
+        ]).first
+
+      if !menu_item.blank?
+        begin
+          if menu_item.spud_menu_items.count > 0
+            return_string = sp_list_menu({class: classes, name: menu_name, start_menu_item_id: menu_item.id})
+          else
+            return_string = sp_list_menu({class: classes, name: menu_name, start_menu_item_id: menu_item.parent_id})
+          end
+        rescue
+          return_string = ""
+        end
+      end
+    end
+    return return_string
+  end
 
 	def layout_options
     layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.1.4"
+		VERSION = "1.1.5"
 	end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: tb_core
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: tb_liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement