optimacms 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a13abb9d39daef0ee0fdcf82b2122b4f6709ec
-  data.tar.gz: b68bb6791d978c9d52727b546b00b80eb437e88f
+  metadata.gz: 7a3b72dcd0b59b42609b966ddc806f278ceabae6
+  data.tar.gz: 0f66f5e11501cb16557e9f8e8fff2cc7d3ed7f05
 SHA512:
-  metadata.gz: 2acac0958ffc5df3492bb24d45552d732d35d9eac0557db0e962fe1d0e803d33ef5837827c777039441efabb7a3e1e25bdeb1cd7d08fda475be900366b42c498
-  data.tar.gz: 9ceea88a144d429ae8c1e18ca2b3bacc71157e5731a8a7a62a87dff8cd409db8c784a2a21369928f1c282e93cc28a37ebf70d619753e35009dc43bb8773c4ca9
+  metadata.gz: b7820c2fbb3780fde47c95faa3945d6dde9bcca02b9c78c5e047cc7eaf78217de71570c83051f0ae5cd3b5451b0e01e8aac29373479790634a6a8e2be4505115
+  data.tar.gz: d19cda2b7e2cd045c4d7b19b1639c0384f45728934f4f639a3999477af56bd9762819c11f503cee3e38ca9153b3704bcf213d85dcd0857b0a42e492c1468c63e

data/app/views/optimacms/admin/shared/_leftmenu.html.haml

@@ -13,15 +13,17 @@
       %ul.submenu.collapse{id: "submenu#{ind}"}
         - if m[:submenu]
           - m[:submenu].each do |sm|
-            - u = sm[:route] ? send("#{sm[:route]}_path") : '#'
+            - u = sm[:route] ? send("#{sm[:route]}_path") : sm[:url]
+            - next if u.nil? || u===false
 
             %li
               =link_to sm[:title], u
 
 
 
-  %li.active
-    -#
+  -#
+    %li.active
+
       =link_to '#submenu1', :"data-toggle"=>"collapse", :"aria-expanded"=>"true", :"aria-controls"=>"submenu1" do
         %span Content
         %b.arrow.fa.fa-angle-down.for-expanded
@@ -34,7 +36,7 @@
         -#%li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
         %li=link_to 'Media', mediafiles_path
 
-  -#%li
+    -#%li
     =link_to '#submenu_system', :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu_system" do
       %span System
       %b.arrow.fa.fa-angle-down.for-expanded

data/lib/optimacms/concerns/admin_menu/admin_menu.rb

@@ -8,10 +8,10 @@ module Optimacms::Concerns::AdminMenu::AdminMenu
   module ClassMethods
     def get_menu_basic
       [
-          {title: 'Content', route: nil, submenu: [
-              {title: 'Pages', route: :pages},
-              {title: 'Templates', route: :templates},
-              {title: 'Media', route: :mediafiles}
+          {title: 'Content', url: nil, submenu: [
+              {title: 'Pages', url: Optimacms::Engine.routes.url_helpers.pages_path},
+              {title: 'Templates', url: Optimacms::Engine.routes.url_helpers.templates_path},
+              {title: 'Media', url: Optimacms::Engine.routes.url_helpers.mediafiles_path}
           ]
           }
 
@@ -28,11 +28,11 @@ module Optimacms::Concerns::AdminMenu::AdminMenu
 
     def get_menu_system
       [
-          {title: 'System', route: nil, submenu: [
-              {title: 'App', route: :app_sys},
-              {title: 'Maintenance', route: false},
-              {title: 'Backups', route: false},
-              {title: 'Info', route: false}
+          {title: 'System', url: nil, submenu: [
+              {title: 'App', url: Optimacms::Engine.routes.url_helpers.app_sys_path},
+              {title: 'Maintenance', url: false},
+              {title: 'Backups', url: false},
+              {title: 'Info', url: false}
           ]
           }
 

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.47"
+  VERSION = "0.1.48"
 end

data/spec/dummy/app/controllers/optimacms/admin/news_controller.rb

@@ -1,5 +1,7 @@
 class Optimacms::Admin::NewsController < Optimacms::Admin::AdminBaseController
   def index
 
+    x = 0
+
   end
 end

data/spec/dummy/lib/optimacms/admin_menu/admin_menu.rb

@@ -6,12 +6,13 @@ module Optimacms
       def self.get_menu_custom
         [
             {title: 'News', route: nil, submenu: [
-                {title: 'News', route: :admin_news_index},
-                {title: 'Categories', route: :templates},
+                {title: 'News', url: Rails.application.routes.url_helpers.admin_news_index_path},
+                {title: 'Categories', url: Rails.application.routes.url_helpers.admin_news_index_path},
             ]
             }
 
         ]
+
       end
 
     end