optimacms 0.1.44 → 0.1.45
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/optimacms/admin/mediafiles_controller.rb +2 -2
- data/app/views/optimacms/admin/mediafiles/index.html.erb +11 -0
- data/app/views/optimacms/admin/shared/_leftmenu.html.haml +27 -21
- data/app/views/optimacms/admin/templates/index.html.haml +1 -1
- data/lib/optimacms/admin_menu/admin_menu.rb +20 -0
- data/lib/optimacms/concerns/admin_menu/admin_menu.rb +43 -0
- data/lib/optimacms/engine.rb +10 -0
- data/lib/optimacms/page_services/page_route_service.rb +5 -5
- data/lib/optimacms/version.rb +1 -1
- data/spec/dummy/lib/optimacms/admin_menu/admin_menu.rb +19 -0
- data/spec/dummy/log/development.log +4410 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/0c01383de62960e3667c7bf3788ecdb6 +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/2a9369c8d28de014045a120b692e8139 +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/452d7e35d5a012ae12fa7346fcf2239b +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/6f943f22c610e6417422e4a13e0bcc0d +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/7c886717bced4d59ab89e012b52f40de +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/8956737a82f17db48d50e13f133aeefc +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/a5c68a2aec806face32c749f380f1e14 +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/aaba73a43e02d8c6550bae851f17e7a0 +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/e11970a225a09526aac3f76d7ee91822 +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/ee9a23832dc2a49ee6ec6d3f1d6a0e1f +0 -0
- data/spec/dummy/tmp/cache/assets/development/sprockets/f7f3056583a2454471a4a5f7200dcefa +0 -0
- metadata +24 -4
- data/spec/dummy/tmp/pids/server.pid +0 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 65831efe4910af3d1f846aeb87d9fc78c9c4e073
|
|
4
|
+
data.tar.gz: 805d5b553eef154a6e6b32f6af58a7b453c59658
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ccd4c3ed35c121e526675255e1da45ccb5dd7a105c7eb496519d50c20d17fc658ac08ab20bfa4cd8f05796843544499fc69e03bcaa0f3015fcea51531fedfaee
|
|
7
|
+
data.tar.gz: c62e758468c99437736795bc037086f0b461ea4dd7a3834fdb5fee828b06db7a40c72c4e7b6910d0a42d203d40bbbb8a2df7bc7d8caff985ff505bb61174c07f
|
|
@@ -2,8 +2,8 @@ module Optimacms
|
|
|
2
2
|
class Admin::MediafilesController < Admin::AdminBaseController
|
|
3
3
|
skip_before_filter :verify_authenticity_token, :only => ['elfinder']
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
layout 'optimacms/admin/layouts/basic'
|
|
5
|
+
layout 'optimacms/admin/layouts/blank'
|
|
6
|
+
#layout 'optimacms/admin/layouts/basic'
|
|
7
7
|
#layout 'optimacms/admin/layouts/elfinder'
|
|
8
8
|
|
|
9
9
|
def index
|
|
@@ -3,10 +3,12 @@
|
|
|
3
3
|
<head>
|
|
4
4
|
<title>File Manager</title>
|
|
5
5
|
|
|
6
|
+
|
|
6
7
|
<link rel="stylesheet" type="text/css" media="screen" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/smoothness/jquery-ui.css" />
|
|
7
8
|
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
|
|
8
9
|
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
|
|
9
10
|
|
|
11
|
+
|
|
10
12
|
<script type="text/javascript" src="/elfinder/js/elfinder.min.js"></script>
|
|
11
13
|
<script src="/elfinder/js/proxy/elFinderSupportVer1.js" type="text/javascript" charset="utf-8"></script>
|
|
12
14
|
<script type="text/javascript" src="/elfinder/js/i18n/elfinder.ru.js"></script>
|
|
@@ -14,9 +16,18 @@
|
|
|
14
16
|
<link rel="stylesheet" type="text/css" media="screen" href="/elfinder/css/elfinder.min.css">
|
|
15
17
|
<link rel="stylesheet" type="text/css" media="screen" href="/elfinder/css/theme.css">
|
|
16
18
|
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
17
22
|
</head>
|
|
18
23
|
<body>
|
|
19
24
|
|
|
25
|
+
Back to admin:
|
|
26
|
+
<%=link_to 'Pages', pages_path%>
|
|
27
|
+
|
|
|
28
|
+
<%=link_to 'Templates', templates_path%>
|
|
29
|
+
<br>
|
|
30
|
+
|
|
20
31
|
<div id="elfinder"></div>
|
|
21
32
|
|
|
22
33
|
<script type="text/javascript">
|
|
@@ -3,32 +3,38 @@
|
|
|
3
3
|
%li
|
|
4
4
|
=link_to 'Dashboard', dashboard_path
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
6
|
+
- Optimacms::AdminMenu::AdminMenu.get_menu.each_with_index do |m, ind|
|
|
7
|
+
%li
|
|
8
|
+
=link_to "#submenu#{ind}", :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu#{ind}" do
|
|
9
|
+
%span #{m[:title]}
|
|
10
|
+
%b.arrow.fa.fa-angle-down.for-expanded
|
|
11
|
+
%b.arrow.fa.fa-angle-left.for-collapsed
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
-#%li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
|
|
18
|
-
%li=link_to 'Media', mediafiles_path
|
|
13
|
+
%ul.submenu.collapse{id: "submenu#{ind}"}
|
|
14
|
+
- if m[:submenu]
|
|
15
|
+
- m[:submenu].each do |sm|
|
|
16
|
+
- u = sm[:route] ? send("#{sm[:route]}_path") : '#'
|
|
19
17
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
%span News
|
|
23
|
-
%b.arrow.fa.fa-angle-down.for-expanded
|
|
24
|
-
%b.arrow.fa.fa-angle-left.for-collapsed
|
|
18
|
+
%li
|
|
19
|
+
=link_to sm[:title], u
|
|
25
20
|
|
|
26
|
-
%ul#submenu2.submenu.collapse
|
|
27
|
-
%li=link_to 'News', "#"
|
|
28
|
-
%li=link_to 'Categories', "#"
|
|
29
21
|
|
|
30
22
|
|
|
31
|
-
%li
|
|
23
|
+
%li.active
|
|
24
|
+
-#
|
|
25
|
+
=link_to '#submenu1', :"data-toggle"=>"collapse", :"aria-expanded"=>"true", :"aria-controls"=>"submenu1" do
|
|
26
|
+
%span Content
|
|
27
|
+
%b.arrow.fa.fa-angle-down.for-expanded
|
|
28
|
+
%b.arrow.fa.fa-angle-left.for-collapsed
|
|
29
|
+
|
|
30
|
+
%ul#submenu1.submenu.collapse.in
|
|
31
|
+
%li=link_to 'Pages', pages_path
|
|
32
|
+
%li=link_to 'Templates', templates_path
|
|
33
|
+
-#%li=link_to 'Layouts', layouts_path
|
|
34
|
+
-#%li=link_to 'Data Blocks - NOT WORK', 'datablocks_path'
|
|
35
|
+
%li=link_to 'Media', mediafiles_path
|
|
36
|
+
|
|
37
|
+
-#%li
|
|
32
38
|
=link_to '#submenu_system', :"data-toggle"=>"collapse", :"aria-expanded"=>"false", :"aria-controls"=>"submenu_system" do
|
|
33
39
|
%span System
|
|
34
40
|
%b.arrow.fa.fa-angle-down.for-expanded
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
module Optimacms
|
|
2
|
+
module AdminMenu
|
|
3
|
+
class AdminMenu
|
|
4
|
+
include Optimacms::Concerns::AdminMenu::AdminMenu
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
#include ActionView::Helpers
|
|
8
|
+
#include ActionDispatch::Routing
|
|
9
|
+
#include Rails.application.routes.url_helpers
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
end
|
|
19
|
+
end
|
|
20
|
+
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
module Optimacms::Concerns::AdminMenu::AdminMenu
|
|
2
|
+
extend ActiveSupport::Concern
|
|
3
|
+
|
|
4
|
+
included do
|
|
5
|
+
|
|
6
|
+
end
|
|
7
|
+
|
|
8
|
+
module ClassMethods
|
|
9
|
+
def get_menu_basic
|
|
10
|
+
[
|
|
11
|
+
{title: 'Content', route: nil, submenu: [
|
|
12
|
+
{title: 'Pages', route: :pages},
|
|
13
|
+
{title: 'Templates', route: :templates},
|
|
14
|
+
{title: 'Media', route: :mediafiles}
|
|
15
|
+
]
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
]
|
|
19
|
+
end
|
|
20
|
+
|
|
21
|
+
def get_menu
|
|
22
|
+
get_menu_basic + get_menu_custom + get_menu_system
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
def get_menu_custom
|
|
26
|
+
[]
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
def get_menu_system
|
|
30
|
+
[
|
|
31
|
+
{title: 'System', route: nil, submenu: [
|
|
32
|
+
{title: 'App', route: :app_sys},
|
|
33
|
+
{title: 'Maintenance', route: false},
|
|
34
|
+
{title: 'Backups', route: false},
|
|
35
|
+
{title: 'Info', route: false}
|
|
36
|
+
]
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
]
|
|
40
|
+
|
|
41
|
+
end
|
|
42
|
+
end
|
|
43
|
+
end
|
data/lib/optimacms/engine.rb
CHANGED
|
@@ -4,6 +4,12 @@ module Optimacms
|
|
|
4
4
|
isolate_namespace Optimacms
|
|
5
5
|
|
|
6
6
|
|
|
7
|
+
#config.to_prepare do
|
|
8
|
+
# Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
|
|
9
|
+
# require_dependency(c)
|
|
10
|
+
# end
|
|
11
|
+
#end
|
|
12
|
+
|
|
7
13
|
config.watchable_dirs['lib'] = [:rb] if Rails.env.development?
|
|
8
14
|
config.watchable_dirs['app/helpers'] = [:rb] if Rails.env.development?
|
|
9
15
|
|
|
@@ -17,6 +23,10 @@ module Optimacms
|
|
|
17
23
|
|
|
18
24
|
config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/"]
|
|
19
25
|
config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/**/"]
|
|
26
|
+
|
|
27
|
+
#config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/concerns/"]
|
|
28
|
+
#config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/concerns/**/"]
|
|
29
|
+
|
|
20
30
|
config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/optimacms/"]
|
|
21
31
|
config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/optimacms/**/"]
|
|
22
32
|
config.autoload_paths += Dir["#{Optimacms::Engine.root}/lib/optimacms/page_services/*.rb"]
|
|
@@ -105,8 +105,8 @@ module Optimacms
|
|
|
105
105
|
end
|
|
106
106
|
|
|
107
107
|
def self.get_url_vars(url, page_row)
|
|
108
|
-
return
|
|
109
|
-
return
|
|
108
|
+
return {} if page_row.nil?
|
|
109
|
+
return {} if url.blank?
|
|
110
110
|
|
|
111
111
|
parsed_url = page_row.parsed_url.sub '/', '\/'
|
|
112
112
|
|
|
@@ -131,15 +131,15 @@ module Optimacms
|
|
|
131
131
|
return res
|
|
132
132
|
else
|
|
133
133
|
#user_error('Keys and values has different number of elements');
|
|
134
|
-
return
|
|
134
|
+
return {}
|
|
135
135
|
end
|
|
136
136
|
|
|
137
137
|
elsif m_params_in_url.count == 0
|
|
138
138
|
# no variables found, and parsed_url has no variables => return empty []
|
|
139
|
-
return
|
|
139
|
+
return {}
|
|
140
140
|
else
|
|
141
141
|
# smth wrong
|
|
142
|
-
return
|
|
142
|
+
return {}
|
|
143
143
|
end
|
|
144
144
|
|
|
145
145
|
end
|
data/lib/optimacms/version.rb
CHANGED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
module Optimacms
|
|
2
|
+
module AdminMenu
|
|
3
|
+
class AdminMenu
|
|
4
|
+
include Optimacms::Concerns::AdminMenu::AdminMenu
|
|
5
|
+
|
|
6
|
+
def self.get_menu_custom
|
|
7
|
+
[
|
|
8
|
+
{title: 'News', route: nil, submenu: [
|
|
9
|
+
{title: 'News', route: :pages},
|
|
10
|
+
{title: 'Categories', route: :templates},
|
|
11
|
+
]
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
]
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
end
|
|
18
|
+
end
|
|
19
|
+
end
|