optimacms 0.3.12 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94eb258622853601f467367f1a821ad01b10edc
-  data.tar.gz: 3a3bfcda5eb7f62453bc49b8c9cab749cc1eca24
+  metadata.gz: 2c78c55f40238f997024bc3a620885a07746e624
+  data.tar.gz: a9c3a41430babb3e5441a8207ff3fcfca02d98c6
 SHA512:
-  metadata.gz: ce803274751ba85bb66b7273ace3660e70812ab335dfb80a5071d9609a2fcc28c5bd7218f40d38c5feb2acc8335f1ae5c8be46bcb0741f101e982ba6dfa436dd
-  data.tar.gz: 4b92bddf56f1fd1aecbb63d65aac4cef22b37adba50364014567145659d051c8db414a6c6e0014833ad1ec63f1ce9102e45489042974e94f30553e3c12b865e2
+  metadata.gz: 3c5e82dfd98058e67797611c527050a8031205d4383fd4614c5d388a250dfa0381de700cb1de271ff50d72aa3a881c1bb7a9efa5980bc58ce3953083983b877b
+  data.tar.gz: 1f8d1fc288e0d1379ae43b541d202a0b5eda2c44fdbf058a333fe5bb989bc834192d3597b8e829f76b6671a1baa6384174e66a929ddb4919559ee7f8c18a29b2

data/app/assets/javascripts/optimacms/admin.js

@@ -1,6 +1,8 @@
 //= require jquery2
 //= require jquery_ujs
-//= require tether
-//= require optimacms/bootstrap4
+
+//= require popper.js/dist/umd/popper.js
+//= require bootstrap/dist/js/bootstrap
+
 //= require bootstrap3-typeahead.min
 //= require bootstrap-autocomplete-input.min

data/app/assets/javascripts/optimacms/application.js

@@ -1,6 +1,8 @@
 //= require jquery2
 //= require jquery_ujs
-//= require tether
-//= require optimacms/bootstrap4
+
+//= require popper.js/dist/umd/popper.js
+//= require bootstrap/dist/js/bootstrap
+
 //= require bootstrap3-typeahead.min
 //= require bootstrap-autocomplete-input.min

data/app/assets/stylesheets/optimacms/admin_common.scss

@@ -1,10 +1,8 @@
 @import "font-awesome";
 
 @import "admin_variables";
-@import "../bootstrap4/bootstrap";
 
-// old
-//@import "bootstrap_variables";
-//@import "bootstrap_custom";
-//@import "bootstrap_and_overrides";
+@import 'bootstrap/dist/css/bootstrap';
+
+
 

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

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

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

@@ -1,6 +1,6 @@
 module Optimacms
   class Admin::MediafilesController < Admin::AdminBaseController
-    skip_before_filter :verify_authenticity_token, :only => ['elfinder']
+    skip_before_action :verify_authenticity_token, :only => ['elfinder']
 
     layout 'optimacms/admin/layouts/blank'
     #layout 'optimacms/admin/layouts/basic'

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

@@ -0,0 +1,25 @@
+module Optimacms
+  class Admin::RailsLogsController < Admin::AdminBaseController
+
+  def index
+
+  end
+
+  def list_logs
+    name = params[:name]
+
+    send "list_logs_#{name}"
+  end
+
+  def list_logs_app
+    @path = File.join(Rails.root, 'log', Rails.env + ".log")
+    @filename = File.basename(@path)
+
+    @text = `tail -n 2000 #{@path}`
+
+    render :template => "optimacms/admin/rails_logs/list_logs_app.html.haml"
+  end
+
+
+end
+end

data/app/controllers/optimacms/dev_controller.rb

@@ -1,7 +1,7 @@
 module Optimacms
   class DevController < ApplicationController
 
-    before_filter :check_env
+    before_action :check_env
 
     def check_env
       return false unless Rails.env.development?

data/app/controllers/optimacms/elfinder_controller.rb

@@ -2,7 +2,7 @@ require 'el_finder/action'
 
 module Optimacms
   class ElfinderController < ApplicationController
-    skip_before_filter :verify_authenticity_token, :only => ['elfinder']
+    skip_before_action :verify_authenticity_token, :only => ['elfinder']
 
     def index
        render :layout => false

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

@@ -0,0 +1,11 @@
+.page-header
+  .row
+    .col-md-7
+      %h1
+        Rails logs
+        %small
+          <i class="ace-icon fa fa-angle-double-right"></i>
+          view logs
+%ul
+  %li
+    = link_to "Rails logs", Optimacms::Engine.routes.url_helpers.list_logs_path(:name => 'app')

data/app/views/optimacms/admin/rails_logs/list_logs_app.html.haml

@@ -0,0 +1,11 @@
+.page-header
+  .row
+    .col-md-7
+      %h1
+        Rails logs
+      %p
+      %b file:
+      =@path
+
+%textarea{:style => "width: 100%;", rows: 30}
+  = @text

data/app/views/optimacms/admin/templates/_form_content_translation.html.haml

@@ -123,6 +123,7 @@
     });
 
     function init_editor(id){
+
       //var editor = ace.edit("content");
       var editor = ace.edit(id);
       editor.setTheme("ace/theme/chrome");
@@ -140,7 +141,7 @@
       @languages.map do |lang|
         name = lang=='' ? 'def' : lang
         "editors[\"#{name}\"] = init_editor(\"content-#{name}\");"
-      end.join(' ')
+      end.join(' ').html_safe
     }
 
 

data/app/views/optimacms/admin_page_edit/block_edit.html.haml

@@ -1,12 +1,16 @@
-.admin_edit_box
-  .commands
-    =link_to "/admin/templates/#{row_tpl.id}/edit", target: "_blank", class: "link" do
-      Edit
-      %b=row_tpl.title
-
-  =render file: filename
-
-/ data
--#html_links = links_data.map{|r| r[:link_html]}.join("<br>").html_safe
-
--#((link_to "edit block", "/admin/templates/#{row_tpl.id}/edit", target: "_blank")+"<br>".html_safe+html_links).html_safe
+.admin_edit_box
+  .commands
+    - if row_tpl
+      =link_to "/admin/templates/#{row_tpl.id}/edit", target: "_blank", class: "link" do
+        Edit
+        %b=row_tpl.title
+    - else
+      file #{filename}
+
+
+  =render file: filename
+
+/ data
+-#html_links = links_data.map{|r| r[:link_html]}.join("<br>").html_safe
+
+-#((link_to "edit block", "/admin/templates/#{row_tpl.id}/edit", target: "_blank")+"<br>".html_safe+html_links).html_safe

data/config/initializers/assets.rb

@@ -1,6 +1,12 @@
+# yarn
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
+
+#
 Rails.application.config.assets.precompile += %w( bootstrap4/bootstrap.css )
 
 Rails.application.config.assets.precompile += %w( tinymce-jquery.js )
 Rails.application.config.assets.precompile += %w( optimacms/tinymce.css )
-Rails.application.config.assets.precompile += %w(tinymce/plugins/advimage/plugin.js tinymce/plugins/uploadimage/plugin.js tinymce/plugins/uploadimage/langs/en.js )
-Rails.application.config.assets.precompile += %w( optimacms/admin_site.css)
+Rails.application.config.assets.precompile += %w( tinymce/plugins/advimage/plugin.js tinymce/plugins/uploadimage/plugin.js tinymce/plugins/uploadimage/langs/en.js )
+
+Rails.application.config.assets.precompile += %w( optimacms/admin_site.css optimacms/admin.js )

data/config/routes.rb

@@ -109,15 +109,11 @@ Optimacms::Engine.routes.draw do
       get 'assets_precompile'
     end
 
-=begin
-    resources :maintenance2 do
-      collection do
-        get :restart
-        get :info
-      end
 
+    # logs
+    resources :rails_logs, only: [:index] do
     end
-=end
+    get 'rails_logs/:name', to: "rails_logs#list_logs", as: 'list_logs'
 
 
   end

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

@@ -42,6 +42,14 @@ module Optimacms::Concerns::AdminMenu::AdminMenu
 
     def get_menu_system
       [
+          {
+              title: 'Logs', url: nil,
+              submenu: [
+                  {title: 'Rails logs', url: Optimacms::Engine.routes.url_helpers.rails_logs_path},
+
+              ]
+          },
+
           {title: 'System', url: nil, submenu: [
               {title: 'Maintenance', url: Optimacms::Engine.routes.url_helpers.maintenance_path},
               {title: 'Backups', url: false},

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
-module Optimacms
-  VERSION = "0.3.12"
-end
+module Optimacms
+  VERSION = "0.3.15"
+end

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,17 +1,8 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
+//= require jquery2
 //= require jquery_ujs
 
-//= require tether
-//= require bootstrap-sprockets
+//= require popper.js/dist/umd/popper.js
+//= require bootstrap/dist/js/bootstrap
+
+//= require bootstrap3-typeahead.min
+//= require bootstrap-autocomplete-input.min

data/spec/dummy/app/assets/stylesheets/application.scss

@@ -1,4 +1,4 @@
-@import "bootstrap";
+@import 'bootstrap/dist/css/bootstrap';
 
 /* html */
 html,

data/spec/dummy/app/controllers/application_controller.rb

@@ -4,8 +4,8 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
 
-  #before_filter :authenticate_beta if Rails.env.development? && Rails.application.config.TEST_ADMIN_PWD!=''
-  #before_filter :authenticate_beta if Rails.env.development?
+  #before_action :authenticate_beta if Rails.env.development? && Rails.application.config.TEST_ADMIN_PWD!=''
+  #before_action :authenticate_beta if Rails.env.development?
 
   def authenticate_beta
     authenticate_or_request_with_http_basic('Administration') do |username, password|

data/spec/dummy/config/application.rb

@@ -28,7 +28,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    #config.active_record.raise_in_transactional_callbacks = true
 
     config.autoload_paths += Dir["#{config.root}/lib/"]
     config.autoload_paths += Dir["#{config.root}/lib/**/"]

data/spec/dummy/config/database.yml

@@ -1,14 +1,4 @@
-# MySQL.  Versions 5.0+ are recommended.
-#
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-#
+
 default: &default
   adapter: mysql2
   encoding: utf8
@@ -19,7 +9,12 @@ default: &default
 
 development:
   <<: *default
-  database: my_cms
+
+  host: <%= Rails.application.secrets.db_host %>
+  database: <%= Rails.application.secrets.db_name %>
+  username: <%= Rails.application.secrets.db_user %>
+  password: <%= Rails.application.secrets.db_password %>
+
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/spec/dummy/config/initializers/assets.rb

@@ -3,6 +3,9 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+# yarn
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
 

data/spec/dummy/config/secrets.yml

@@ -13,6 +13,12 @@
 development:
   secret_key_base: e135e2b53ab10b0afff68c3f7f0d96e491146342113ab6e1c38409af772139d5317e3da8946ef9f6e6474eb937bc86c11ffe8406c2f9c2369fb6ec1a5b9c4d3b
 
+  db_host: 51.1.0.11
+  db_name: my_cms
+  db_user: root
+  db_password: FriendlyDdata0
+
+
 test:
   secret_key_base: 8ab08b04db9f09047e4333306df25eab59472443ee5574b8fd0feb8873b17f97afe924e3380ad50f6197718707d8c474cd7578bd9deb6f708b83072e5e89226f