optimacms 0.1.34 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af38a4fa9a81bdada06d16f387634f6909d3fe0e
-  data.tar.gz: c89c6bbb8a8437d4a4462078f9025acf6c57a48b
+  metadata.gz: 38988f238025c66a2d5ce6aa29d9aa44fa8c12f6
+  data.tar.gz: 2d52afa77828c9cf7eb7e479fed6ede2805dd630
 SHA512:
-  metadata.gz: 9453f80617abf58a68fb85d1ef11dc62d10db2345c45e2687460b4844b9f292fe6b0c3b8a50773b6d285616e0acaa15bcd2c80d798c6be615254518e2bf5ccff
-  data.tar.gz: 70f282bca6e3df8361a0532c9d4e8601ba8f1a09ebd9445dadaa45acd58f952f9eb7427b0a095d76f290f7e0d45a6365a16cfe0e1602f3ab59edf547431c2817
+  metadata.gz: 5807d02977790f7f5b462b7502b11dfffaea57f98c75d1e9fbbe684114af78e70a5e6618f04489dfdd12747221a12d9cd3a4aab9a6ed28a15c36bae5cc217237
+  data.tar.gz: 3a58168544a0d1d9f2f940aab414d93f2d56ff7dcc024d11d79cca73f07d539ea10ee8e4d85fbf1fe9350909b22c2071fdadac7d498fec31fbf94b6d1f719996

data/app/controllers/optimacms/admin/admin_base_controller.rb

@@ -13,9 +13,6 @@ module Optimacms
 
 
       #### modal
-
-
-
       def set_layout_modal_old
         if @modal==1
           self.class.layout false
@@ -24,6 +21,8 @@ module Optimacms
       end
 
 
+      ### devise
+
       def after_sign_in_path_for(resource)
         if resource.is_a?(CmsAdminUser)
           dashboard_path
@@ -34,6 +33,13 @@ module Optimacms
       end
 
 
+      ### redirects
+      def redirect_to_res(res)
+        v_res = res ? 1 : 0
+        redirect_to res_common_path(res: v_res)
+      end
+
     end
+
   end
 end

data/app/controllers/optimacms/admin/app_sys_controller.rb

@@ -0,0 +1,19 @@
+module Optimacms
+  class Admin::AppSysController < Admin::AdminBaseController
+
+    def index
+
+    end
+
+
+
+
+    def restart
+      @res = Optimacms::Sys::AppFunctions.restart
+
+
+      redirect_to_res @res
+    end
+  end
+end
+

data/app/controllers/optimacms/admin/common_controller.rb

@@ -0,0 +1,14 @@
+class Optimacms::Admin::CommonController < Optimacms::Admin::AdminBaseController
+
+  before_filter :init_data
+
+  def init_data
+    @res = params[:res].to_i
+  end
+
+
+  def res
+
+  end
+end
+

data/app/controllers/optimacms/admin/pages_controller.rb

@@ -8,7 +8,7 @@ module Optimacms
 
 
     def index
-      @items = model.by_filter(@filter)
+      @items = model.includes(:template).by_filter(@filter)
       #@items = model.where(@filter.where).order(@filter.order_string).page(@filter.page)
 
       #

data/app/views/optimacms/admin/app_sys/index.html.haml

@@ -0,0 +1,2 @@
+%h2 Restart app
+=link_to 'Restart', restart_app_sys_path, :class=>'btn btn-primary btn-sm'

data/app/views/optimacms/admin/common/res.html.haml

@@ -0,0 +1,9 @@
+%h1 Result
+
+- if @res==1
+  .alert.alert-success
+    Operation done successfully
+- else
+  .alert.alert-danger
+    Error occurred
+

data/app/views/optimacms/admin/pages/index.html.haml

@@ -44,6 +44,7 @@
       = link_to 'Title', '#'
     %th Name
     %th URL
+    %th Template
     %th Commands
 
   - @items.each do |item|
@@ -59,6 +60,15 @@
         =item.name
       %td
         =item.url
+      %td
+        - if item.template
+          =link_to edit_template_path(item.template) do
+            =item.template.title
+          %br
+          =item.template.basepath
+        - else
+          N/A
+
       %td
         =link_to 'Edit', (item.is_folder? ? editfolder_page_path(item) : edit_page_path(item))
         =link_to 'Delete', page_path(item), :method => :delete, data: { confirm: 'Are you sure?' }

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

@@ -14,7 +14,7 @@
       %li=link_to 'Pages', pages_path
       %li=link_to 'Templates', templates_path
       -#%li=link_to 'Layouts', layouts_path
-      %li=link_to 'Data Blocks', 'datablocks_path'
+      %li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
       %li=link_to 'Media', mediafiles_path
 
   %li
@@ -26,3 +26,16 @@
     %ul#submenu2.submenu.collapse
       %li=link_to 'News', "#"
       %li=link_to 'Categories', "#"
+
+
+  %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
+      %b.arrow.fa.fa-angle-left.for-collapsed
+
+    %ul#submenu_system.submenu_system.collapse
+      %li=link_to 'App', app_sys_path
+      %li=link_to 'Maintenance', "#"
+      %li=link_to 'Backups', "#"
+      %li=link_to 'Info', "#"

data/config/routes.rb

@@ -6,6 +6,8 @@ Optimacms::Engine.routes.draw do
 
     get '/' => 'dashboard#index', as: :dashboard
 
+    get '/res' => 'common#res', as: :res_common
+
     resources :pages do
       collection do
         post 'search'
@@ -46,6 +48,13 @@ Optimacms::Engine.routes.draw do
     match '/media_elfinder' => 'mediafiles#elfinder', via: [:get, :post]
 
 
+    resources :app_sys do
+      collection do
+        get :restart
+      end
+
+    end
+
 
   end
 

data/lib/optimacms/sys/app_functions.rb

@@ -0,0 +1,12 @@
+module Optimacms
+  module Sys
+    class AppFunctions
+      def self.restart
+
+        system("touch tmp/restart.txt")
+
+        true
+      end
+    end
+  end
+end

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.34"
+  VERSION = "0.1.36"
 end