optimacms 0.1.28 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee7e2a04857fa28ad4149d8afad96c0fd8530cf
-  data.tar.gz: 87ae1a3f8cc53df939860161547aed5bac5d33f2
+  metadata.gz: 353479f1ae94c50832c1965cc45701d6f03d5d19
+  data.tar.gz: 05b974c6e72a258fc7631f420c5cdfbe62a192a6
 SHA512:
-  metadata.gz: 6f0eac7054f320b77b04a0e5fc36c0e3e73368004c06b062ae177f89ff01e70765b9e38a115d29ec4df3bd1de844be2f3f7defb5e1b9b1613256ce85400cceff
-  data.tar.gz: e2b3209e1a4222622e586e00153bf346c520a5c4d4f7d4a0f834309dc2b552551801ab474ea9f3dcb9ea303908e996355ce31a41af1045654e5c5317a2a3e761
+  metadata.gz: 8c0bcb2730876ad11509ec858bcb51e81b4bd21a591618a93c1f76b5976bd6c04f61550319f408cc29a2fa54e61a9a1f99bf77c4205259dc93284583ca4384f2
+  data.tar.gz: 938403ff48dd802ea3fde5c0f472e93ae13da27a3b97ad9b8aa9a4b95f8373d032896105235ff5d8a73ed5ff04e62f2cf38ada8b75cd93b88c323d60ddb7b3c4

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

@@ -14,7 +14,9 @@ module Optimacms
 
       #### modal
 
-      def set_layout_modal
+
+
+      def set_layout_modal_old
         if @modal==1
           self.class.layout false
         end

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

@@ -0,0 +1,42 @@
+module Optimacms
+  class Admin::MediafilesController < Admin::AdminBaseController
+    skip_before_filter :verify_authenticity_token, :only => ['elfinder']
+
+    #layout 'optimacms/admin/layouts/blank'
+    layout 'optimacms/admin/layouts/basic'
+    #layout 'optimacms/admin/layouts/elfinder'
+
+    def index
+      #render :layout => false
+    end
+
+    def elfinder
+      dirpath = Optimacms.files_dir_path
+      rootpath = File.join(Rails.public_path, dirpath)
+      rooturl = '/'+dirpath
+
+      h, r = ElFinder::Connector.new(
+          :root => rootpath,
+          :url => rooturl,
+          :perms => {
+              #/^(Welcome|README)$/ => {:read => true, :write => false, :rm => false},
+              '.' => {:read => true, :write => true, :rm => true}, # '.' is the proper way to specify the home/root directory.
+              #/^test$/ => {:read => true, :write => true, :rm => false},
+              #'logo.png' => {:read => true},
+              #/\.png$/ => {:read => false} # This will cause 'logo.png' to be unreadable.
+              # Permissions err on the safe side. Once false, always false.
+          },
+          :thumbs => true
+      ).run(params)
+
+      headers.merge!(h)
+
+      if r.empty?
+        (render :nothing => true) and return
+      end
+
+      render :json => r, :layout => false
+    end
+
+  end
+end

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

@@ -1,21 +1,26 @@
-#require_dependency "../../../../lib/optimacms/filters/form_filter.rb"
-
 module Optimacms
   class Admin::TemplatesController < Admin::AdminBaseController
 
     before_action :set_item, only: [:show, :edit, :update, :destroy]
     before_action :init_common
     before_action :init_data_form, only: [:new, :edit, :newfolder, :editfolder, :newattach]
-    #before_action :init_tabledata, :only => [:index, :search]
-
-    before_action :set_layout_modal
+    #before_action :set_layout_modal
 
 
     def init_common
       @modal = (params[:modal] || 0).to_i
+      set_layout_modal(@modal)
 
     end
 
+    def set_layout_modal(modal)
+      if modal.to_i==1
+        #self.class.layout false
+      end
+
+    end
+
+
     def index
       #@filter.clear_data
 

data/app/controllers/optimacms/elfinder_controller.rb

@@ -9,7 +9,7 @@ module Optimacms
     end
 
     def elfinder
-      dirpath = Optimacms.files_dir_path || 'uploads'
+      dirpath = Optimacms.files_dir_path
       rootpath = File.join(Rails.public_path, dirpath)
       rooturl = '/'+dirpath
 

data/app/views/optimacms/admin/layouts/application.html.haml

@@ -0,0 +1,17 @@
+!!! Strict
+%html
+  %head
+    %title= h(yield(:title) || "Admin Area" )
+    = yield(:head)
+
+    = csrf_meta_tag
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+    = stylesheet_link_tag    "optimacms/admin", media: "all"
+    = stylesheet_link_tag    "optimacms/admin_tpl", media: "all"
+
+    = javascript_include_tag "optimacms/application"
+    = javascript_include_tag "optimacms/admin"
+
+  %body.no-skin
+    = yield :main

data/app/views/optimacms/admin/layouts/basic.html.haml

@@ -0,0 +1,20 @@
+- content_for :main do
+  #wrapper
+    = render 'optimacms/admin/shared/top'
+
+    .main-container
+      #sidebar.sidebar
+        = render 'optimacms/admin/shared/leftmenu'
+
+      .main-content
+        .main-content-inner
+          = render 'optimacms/admin/shared/breadcrumbs'
+          = render 'optimacms/admin/shared/flash'
+
+          .page-content
+            = yield
+
+
+  = render 'optimacms/admin/shared/footer'
+
+= render :template => 'optimacms/admin/layouts/application'

data/app/views/optimacms/admin/layouts/blank.html.haml

@@ -0,0 +1 @@
+=yield

data/app/views/optimacms/admin/layouts/main.html.haml

@@ -1,33 +1,6 @@
-!!! Strict
-%html
-  %head
-    %title= h(yield(:title) || "Admin Area" )
-    = yield(:head)
+- modal = (@modal || 0).to_i
+- if modal==1
+  = render :template => 'optimacms/admin/layouts/modal'
+- else
+  = render :template => 'optimacms/admin/layouts/basic'
 
-    = csrf_meta_tag
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-
-    = stylesheet_link_tag    "optimacms/admin", media: "all"
-    = stylesheet_link_tag    "optimacms/admin_tpl", media: "all"
-
-    = javascript_include_tag "optimacms/application"
-    = javascript_include_tag "optimacms/admin"
-
-  %body.no-skin
-    #wrapper
-      = render 'optimacms/admin/shared/top'
-
-      .main-container
-        #sidebar.sidebar
-          = render 'optimacms/admin/shared/leftmenu'
-
-        .main-content
-          .main-content-inner
-            = render 'optimacms/admin/shared/breadcrumbs'
-            = render 'optimacms/admin/shared/flash'
-
-            .page-content
-              = yield
-
-
-    = render 'optimacms/admin/shared/footer'

data/app/views/optimacms/admin/layouts/modal.html.haml

@@ -0,0 +1,4 @@
+- content_for :main do
+  = yield
+
+= render :template => 'optimacms/admin/layouts/application'

data/app/views/optimacms/admin/mediafiles/index.html.erb

@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>File Manager</title>
+
+  <link rel="stylesheet" type="text/css" media="screen" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/smoothness/jquery-ui.css" />
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
+
+  <script type="text/javascript" src="/elfinder/js/elfinder.min.js"></script>
+  <script src="/elfinder/js/proxy/elFinderSupportVer1.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" src="/elfinder/js/i18n/elfinder.ru.js"></script>
+
+  <link rel="stylesheet" type="text/css" media="screen" href="/elfinder/css/elfinder.min.css">
+  <link rel="stylesheet" type="text/css" media="screen" href="/elfinder/css/theme.css">
+
+</head>
+<body>
+
+<div id="elfinder"></div>
+
+<script type="text/javascript">
+  var FileBrowserDialogue = {
+    init: function() {
+    // Here goes your code for setting your custom things onLoad.
+    },
+    mySubmit: function (URL) {
+      // pass selected file path to TinyMCE
+      parent.tinymce.activeEditor.windowManager.getParams().setUrl(URL);
+
+      // close popup window
+      parent.tinymce.activeEditor.windowManager.close();
+    }
+  }
+
+  $().ready(function() {
+    var rails_csrf = {};
+    rails_csrf[$('meta[name=csrf-param]').attr('content')] = $('meta[name=csrf-token]').attr('content');
+
+    var elf = $('#elfinder').elfinder({
+      // set your elFinder options here
+      url: '/cmsadmin/media_elfinder',  // connector URL
+      transport : new elFinderSupportVer1(),
+
+      getFileCallback: function(file) { // editor callback
+        // file.url - commandsOptions.getfile.onlyURL = false (default)
+        // file     - commandsOptions.getfile.onlyURL = true
+        FileBrowserDialogue.mySubmit(file); // pass selected file path to TinyMCE
+      }
+    }).elfinder('instance');
+  });
+</script>
+
+</body>
+</html>

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

@@ -11,22 +11,18 @@
       %b.arrow.fa.fa-angle-left.for-collapsed
 
     %ul#submenu1.submenu.collapse.in
-      %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 '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 'Media', mediafiles_path
 
   %li
     =link_to '#submenu2', :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu2" do
-      %span Products
+      %span News
       %b.arrow.fa.fa-angle-down.for-expanded
       %b.arrow.fa.fa-angle-left.for-collapsed
 
     %ul#submenu2.submenu.collapse
-      %li=link_to 'Templates', "typography.html"
-      %li=link_to 'Templates', "typography.html"
-      %li=link_to 'Templates', "typography.html"
+      %li=link_to 'News', "#"
+      %li=link_to 'Categories', "#"

data/config/routes.rb

@@ -41,6 +41,12 @@ Optimacms::Engine.routes.draw do
 
     resources :layouts
 
+    resources :mediafiles, only: [:index]
+    #get '/elfinder_manager', to: 'elfinder#index'
+    match '/media_elfinder' => 'mediafiles#elfinder', via: [:get, :post]
+
+
+
   end
 
   # dev

data/lib/optimacms/page_services/page_data.rb

@@ -16,7 +16,7 @@ module Optimacms
       include PageProcessService
 
       def controller_class
-        Object.const_get controller.to_s.classify+'Controller'
+        Object.const_get controller.to_s.camelize+'Controller'
       end
 
       def url_vars

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.28"
+  VERSION = "0.1.31"
 end

data/lib/optimacms.rb

@@ -4,5 +4,9 @@ require "optimacms/engine"
 module Optimacms
   mattr_accessor :files_dir_path
 
+  def files_dir_path
+    @@files_dir_path || 'uploads'
+  end
+
 
 end

data/test/dummy/app/views/home/index.html.haml

@@ -10,6 +10,7 @@
 
 %ul
   %li= link_to '/about.html', '/about.html'
+  %li= link_to '/text1.html', '/text1.html'
   %li= link_to '/news.html', '/news.html'
   %li= link_to '/news-p2.html', '/news-p2.html'
   %li= link_to '/newsitem-5.html', '/newsitem-5.html'

data/test/dummy/app/views/pages/text1.html

@@ -0,0 +1,2 @@
+<p>1</p>
+<p><img src="/img/funny-cats-and-kittens-wallpapers-12.jpg" alt="" width="640" height="480" /></p>

data/test/dummy/config/environments/development.rb

@@ -13,7 +13,9 @@ Rails.application.configure do
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
+
   config.action_controller.perform_caching = false
+  config.action_view.cache_template_loading = false
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false

data/test/dummy/config/environments/production.rb

@@ -12,7 +12,11 @@ Rails.application.configure do
 
   # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
+
+  # caching
+  config.action_controller.perform_caching = false
+
+  config.action_view.cache_template_loading = false
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.