plok 2.0.1 → 2.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/log.rb +1 -1
- data/app/models/queued_task.rb +1 -1
- data/config/plok.yml +9 -0
- data/lib/generators/plok/sidebar/sidebar_generator.rb +4 -4
- data/lib/plok/search/result_objects/base.rb +2 -2
- data/lib/plok/version.rb +1 -1
- metadata +7 -9
- data/app/assets/stylesheets/plok/backend/bs5/_autocomplete.scss +0 -43
- data/app/assets/stylesheets/plok/backend/bs5/_sidebar.scss +0 -86
- data/app/assets/stylesheets/plok/backend/bs5/_sidebar_compact.scss +0 -66
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 494f1d799cfb7d01f8a2733482a1aa423f00a433991af5e8b5e6f2098d51e8b4
|
4
|
+
data.tar.gz: c8d493e1cd94e635e3d7d66618c4f2f1db4d8c0cf49b385c5b8b29d572dc6808
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 554a2c4a79444a71fa5f1ab0c995d493cfdd59a4e0179e04e1671110851479259273a3e5b1b0ce865c8c54a0191a759c50152e26e50e1a5e52440cad70d9bf8d
|
7
|
+
data.tar.gz: 0a5cf142976023431ddc60ac5b58d50f09dcdca47badd8652c9ed4df98bca814247b63539a8d745647323608a40edca2c5e5c3f539cf74085e3a5d3ec31a22d4
|
data/app/models/log.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
class Log < ActiveRecord::Base
|
2
2
|
belongs_to :loggable, polymorphic: true
|
3
3
|
|
4
|
-
serialize :data, Hash
|
4
|
+
serialize :data, type: Hash
|
5
5
|
|
6
6
|
# TODO: A file column is currently used in Raamwinkel to link either PDFs or
|
7
7
|
# images to a log message. We'd prefer not use Uploader classes in Plok, so
|
data/app/models/queued_task.rb
CHANGED
data/config/plok.yml
ADDED
@@ -90,11 +90,11 @@ class Plok::SidebarGenerator < Rails::Generators::Base
|
|
90
90
|
end
|
91
91
|
|
92
92
|
def application_layout_file
|
93
|
-
if File.
|
93
|
+
if File.exist?("app/views/layouts/backend/#{options.css_framework}/application.html.erb")
|
94
94
|
return "app/views/layouts/backend/#{options.css_framework}/application.html.erb"
|
95
95
|
end
|
96
96
|
|
97
|
-
if File.
|
97
|
+
if File.exist?('app/views/layouts/backend/application.html.erb')
|
98
98
|
return 'app/views/layouts/backend/application.html.erb'
|
99
99
|
end
|
100
100
|
end
|
@@ -103,11 +103,11 @@ class Plok::SidebarGenerator < Rails::Generators::Base
|
|
103
103
|
namespace = 'stylesheets'
|
104
104
|
namespace = 'javascripts' if type.to_s == 'js'
|
105
105
|
|
106
|
-
if File.
|
106
|
+
if File.exist?("app/assets/#{namespace}/backend/#{options.css_framework}/application.#{type}")
|
107
107
|
return "app/assets/#{namespace}/backend/#{options.css_framework}/application.#{type}"
|
108
108
|
end
|
109
109
|
|
110
|
-
if File.
|
110
|
+
if File.exist?("app/assets/#{namespace}/backend/application.#{type}")
|
111
111
|
return "app/assets/#{namespace}/backend/application.#{type}"
|
112
112
|
end
|
113
113
|
end
|
@@ -64,8 +64,8 @@ module Plok
|
|
64
64
|
# TODO: This is a fallback for older Plok versions whose result object
|
65
65
|
# partials still reside in app/views/backens/search/*. Best to remove
|
66
66
|
# this at a later stage, but for now they can be backwards compatible.
|
67
|
-
if File.
|
68
|
-
return "#{namespace}/search
|
67
|
+
if File.exist?("app/views/#{namespace}/search/_#{partial_target}.html.erb")
|
68
|
+
return "#{namespace}/search"
|
69
69
|
end
|
70
70
|
|
71
71
|
"plok/search/result_objects/#{namespace}"
|
data/lib/plok/version.rb
CHANGED
metadata
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: plok
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Davy Hellemans
|
8
8
|
- Dave Lens
|
9
|
-
autorequire:
|
9
|
+
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2024-11-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -98,9 +98,6 @@ files:
|
|
98
98
|
- app/assets/stylesheets/plok/_autocomplete.scss
|
99
99
|
- app/assets/stylesheets/plok/_sidebar.scss
|
100
100
|
- app/assets/stylesheets/plok/_sidebar_compact.scss
|
101
|
-
- app/assets/stylesheets/plok/backend/bs5/_autocomplete.scss
|
102
|
-
- app/assets/stylesheets/plok/backend/bs5/_sidebar.scss
|
103
|
-
- app/assets/stylesheets/plok/backend/bs5/_sidebar_compact.scss
|
104
101
|
- app/controllers/catch_all_controller.rb
|
105
102
|
- app/controllers/plok/version_controller.rb
|
106
103
|
- app/models/concerns/plok/loggable.rb
|
@@ -110,6 +107,7 @@ files:
|
|
110
107
|
- app/models/search_index.rb
|
111
108
|
- app/models/search_module.rb
|
112
109
|
- config/initializers/module.rb
|
110
|
+
- config/plok.yml
|
113
111
|
- config/routes.rb
|
114
112
|
- db/migrate/20211008130809_create_plok_logs.rb
|
115
113
|
- db/migrate/20211015141837_create_plok_queued_tasks.rb
|
@@ -156,7 +154,7 @@ licenses:
|
|
156
154
|
- MIT
|
157
155
|
metadata:
|
158
156
|
allowed_push_host: https://rubygems.org
|
159
|
-
post_install_message:
|
157
|
+
post_install_message:
|
160
158
|
rdoc_options: []
|
161
159
|
require_paths:
|
162
160
|
- lib
|
@@ -171,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
171
169
|
- !ruby/object:Gem::Version
|
172
170
|
version: '0'
|
173
171
|
requirements: []
|
174
|
-
rubygems_version: 3.4.
|
175
|
-
signing_key:
|
172
|
+
rubygems_version: 3.4.19
|
173
|
+
signing_key:
|
176
174
|
specification_version: 4
|
177
175
|
summary: CMS basics
|
178
176
|
test_files: []
|
@@ -1,43 +0,0 @@
|
|
1
|
-
.ui-autocomplete {
|
2
|
-
width: 24rem !important;
|
3
|
-
padding: 0;
|
4
|
-
z-index: 9999;
|
5
|
-
filter: drop-shadow(5px 5px 5px #666);
|
6
|
-
}
|
7
|
-
|
8
|
-
// Shows up during autocompletion sometimes.
|
9
|
-
.ui-helper-hidden-accessible {
|
10
|
-
display: none;
|
11
|
-
}
|
12
|
-
|
13
|
-
li.ui-menu-item {
|
14
|
-
list-style: none;
|
15
|
-
cursor: pointer;
|
16
|
-
border-bottom: 1px solid #ccc;
|
17
|
-
padding: 5px;
|
18
|
-
|
19
|
-
&:last-child {
|
20
|
-
border: none;
|
21
|
-
margin-bottom: 0;
|
22
|
-
padding-bottom: 0;
|
23
|
-
}
|
24
|
-
|
25
|
-
&:hover {
|
26
|
-
background-color: $primary;
|
27
|
-
color: white !important;
|
28
|
-
}
|
29
|
-
|
30
|
-
a.ui-menu-item-wrapper {
|
31
|
-
border: none;
|
32
|
-
|
33
|
-
&.ui-state-active {
|
34
|
-
background: none;
|
35
|
-
color: inherit;
|
36
|
-
text-decoration: none;
|
37
|
-
|
38
|
-
.text-muted {
|
39
|
-
color: white !important;
|
40
|
-
}
|
41
|
-
}
|
42
|
-
}
|
43
|
-
}
|
@@ -1,86 +0,0 @@
|
|
1
|
-
.sidebar-menu {
|
2
|
-
bottom: 0;
|
3
|
-
position: fixed;
|
4
|
-
top: 0;
|
5
|
-
width: var(--sidebar-width);
|
6
|
-
transition: .5s;
|
7
|
-
z-index: 10;
|
8
|
-
|
9
|
-
a.logo {
|
10
|
-
display: block;
|
11
|
-
letter-spacing: 0.1em;
|
12
|
-
line-height: 45px;
|
13
|
-
text-decoration: none;
|
14
|
-
text-transform: uppercase;
|
15
|
-
}
|
16
|
-
|
17
|
-
a.home-icon {
|
18
|
-
display: none !important;
|
19
|
-
}
|
20
|
-
|
21
|
-
ul {
|
22
|
-
list-style-type: none;
|
23
|
-
padding-left: 0;
|
24
|
-
|
25
|
-
li {
|
26
|
-
cursor: pointer;
|
27
|
-
|
28
|
-
a {
|
29
|
-
color: #fff; // $color-contrast-light from the Bootstrap gem.
|
30
|
-
display: block;
|
31
|
-
font-size: 1rem;
|
32
|
-
padding: 10px;
|
33
|
-
padding-left: var(--sidebar-menu-item-left-margin);
|
34
|
-
text-decoration: none !important;
|
35
|
-
|
36
|
-
&:hover {
|
37
|
-
background-color: #6c757d; // $secondary from the Bootstrap gem.
|
38
|
-
}
|
39
|
-
}
|
40
|
-
|
41
|
-
&.top-level {
|
42
|
-
letter-spacing: .05em;
|
43
|
-
position: relative;
|
44
|
-
|
45
|
-
.fa {
|
46
|
-
font-size: 14px;
|
47
|
-
width: var(--sidebar-icon-width);
|
48
|
-
}
|
49
|
-
|
50
|
-
.text {
|
51
|
-
cursor: default;
|
52
|
-
font-size: 0.8rem;
|
53
|
-
padding: 16px 0 12px 0;
|
54
|
-
pointer-events: none;
|
55
|
-
text-transform: uppercase;
|
56
|
-
}
|
57
|
-
|
58
|
-
div[id^=nav-] {
|
59
|
-
h4 {
|
60
|
-
display: none;
|
61
|
-
}
|
62
|
-
|
63
|
-
ul li {
|
64
|
-
position: relative;
|
65
|
-
|
66
|
-
&::before {
|
67
|
-
content: '\25A1';
|
68
|
-
font-size: 0.4rem;
|
69
|
-
left: calc(var(--sidebar-menu-item-left-margin) + 15px);
|
70
|
-
position: absolute;
|
71
|
-
top: 15px;
|
72
|
-
}
|
73
|
-
|
74
|
-
a {
|
75
|
-
font-size: 0.8rem;
|
76
|
-
padding-left: calc(var(--sidebar-menu-item-left-margin) + var(--sidebar-icon-width) + 10px);
|
77
|
-
text-transform: uppercase;
|
78
|
-
}
|
79
|
-
}
|
80
|
-
}
|
81
|
-
|
82
|
-
}
|
83
|
-
}
|
84
|
-
}
|
85
|
-
|
86
|
-
}
|
@@ -1,66 +0,0 @@
|
|
1
|
-
.wrapper.compact {
|
2
|
-
.content {
|
3
|
-
margin-left: var(--sidebar-compact-width);
|
4
|
-
|
5
|
-
@include media-breakpoint-down(md) {
|
6
|
-
margin-left: 0;
|
7
|
-
}
|
8
|
-
}
|
9
|
-
|
10
|
-
.sidebar-menu {
|
11
|
-
width: var(--sidebar-compact-width);
|
12
|
-
|
13
|
-
@include media-breakpoint-down(md) {
|
14
|
-
width: 0;
|
15
|
-
}
|
16
|
-
|
17
|
-
a.logo {
|
18
|
-
display: none !important;
|
19
|
-
}
|
20
|
-
|
21
|
-
a.home-icon {
|
22
|
-
display: block !important;
|
23
|
-
}
|
24
|
-
|
25
|
-
ul li.top-level {
|
26
|
-
> a { // The icons in the compact view.
|
27
|
-
padding: 10px 0;
|
28
|
-
text-align: center;
|
29
|
-
}
|
30
|
-
|
31
|
-
h4 {
|
32
|
-
cursor: default;
|
33
|
-
display: inline-block;
|
34
|
-
font-size: .9rem;
|
35
|
-
padding: 13px 0 0 5px;
|
36
|
-
vertical-align: middle;
|
37
|
-
text-transform: uppercase;
|
38
|
-
}
|
39
|
-
|
40
|
-
ul li {
|
41
|
-
&::before {
|
42
|
-
left: calc(var(--sidebar-icon-width) - 5px);
|
43
|
-
}
|
44
|
-
|
45
|
-
a {
|
46
|
-
padding-left: calc(var(--sidebar-icon-width) + 10px);
|
47
|
-
|
48
|
-
&:hover {
|
49
|
-
background-color: $primary;
|
50
|
-
}
|
51
|
-
}
|
52
|
-
}
|
53
|
-
|
54
|
-
.fa { font-size: 20px; }
|
55
|
-
.text { display: none; }
|
56
|
-
|
57
|
-
.collapse {
|
58
|
-
background-color: $secondary;
|
59
|
-
left: var(--sidebar-compact-width);
|
60
|
-
position: absolute;
|
61
|
-
top: 0;
|
62
|
-
width: 240px;
|
63
|
-
}
|
64
|
-
}
|
65
|
-
}
|
66
|
-
}
|