trestle 0.9.3 → 0.9.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -0
- data/.travis.yml +18 -4
- data/CONTRIBUTING.md +38 -0
- data/Gemfile +12 -4
- data/README.md +6 -1
- data/app/assets/bundle/trestle/bundle.css +9 -9
- data/app/assets/bundle/trestle/bundle.js +47 -45
- data/app/assets/bundle/trestle/fa-brands-400.eot +0 -0
- data/app/assets/bundle/trestle/fa-brands-400.svg +801 -654
- data/app/assets/bundle/trestle/fa-brands-400.ttf +0 -0
- data/app/assets/bundle/trestle/fa-brands-400.woff +0 -0
- data/app/assets/bundle/trestle/fa-brands-400.woff2 +0 -0
- data/app/assets/bundle/trestle/fa-regular-400.eot +0 -0
- data/app/assets/bundle/trestle/fa-regular-400.svg +93 -95
- data/app/assets/bundle/trestle/fa-regular-400.ttf +0 -0
- data/app/assets/bundle/trestle/fa-regular-400.woff +0 -0
- data/app/assets/bundle/trestle/fa-regular-400.woff2 +0 -0
- data/app/assets/bundle/trestle/fa-solid-900.eot +0 -0
- data/app/assets/bundle/trestle/fa-solid-900.svg +1175 -1079
- data/app/assets/bundle/trestle/fa-solid-900.ttf +0 -0
- data/app/assets/bundle/trestle/fa-solid-900.woff +0 -0
- data/app/assets/bundle/trestle/fa-solid-900.woff2 +0 -0
- data/app/assets/bundle/trestle/flatpickr/ar-dz.js +1 -0
- data/app/assets/bundle/trestle/flatpickr/ar.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/at.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/az.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/be.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/bg.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/bn.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/bs.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/cat.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ckb.js +1 -0
- data/app/assets/bundle/trestle/flatpickr/cs.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/cy.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/da.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/de.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/default.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/eo.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/es.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/et.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/fa.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/fi.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/fo.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/fr.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ga.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/gr.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/he.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/hi.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/hr.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/hu.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/hy.js +1 -0
- data/app/assets/bundle/trestle/flatpickr/id.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/is.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/it.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ja.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ka.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/km.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ko.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/kz.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/lt.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/lv.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/mk.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/mn.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ms.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/my.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/nl.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/nn.js +1 -0
- data/app/assets/bundle/trestle/flatpickr/no.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/pa.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/pl.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/pt.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ro.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/ru.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/si.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/sk.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/sl.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/sq.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/sr-cyr.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/sr.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/sv.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/th.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/tr.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/uk.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/uz.js +1 -0
- data/app/assets/bundle/trestle/flatpickr/uz_latn.js +1 -0
- data/app/assets/bundle/trestle/flatpickr/vn.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/zh-tw.js +1 -1
- data/app/assets/bundle/trestle/flatpickr/zh.js +1 -1
- data/app/assets/javascripts/trestle/i18n.js.erb +1 -1
- data/app/controllers/trestle/admin_controller.rb +23 -25
- data/app/controllers/trestle/application_controller.rb +10 -12
- data/app/controllers/trestle/dashboard_controller.rb +11 -13
- data/app/controllers/trestle/resource_controller.rb +5 -7
- data/app/helpers/trestle/avatar_helper.rb +6 -2
- data/app/helpers/trestle/container_helper.rb +12 -4
- data/app/helpers/trestle/hook_helper.rb +1 -27
- data/app/helpers/trestle/layout_helper.rb +20 -0
- data/app/helpers/trestle/navigation_helper.rb +23 -0
- data/app/helpers/trestle/params_helper.rb +4 -1
- data/app/helpers/trestle/table_helper.rb +15 -0
- data/app/helpers/trestle/url_helper.rb +1 -11
- data/app/views/layouts/trestle/admin.html.erb +2 -2
- data/app/views/trestle/flash/_alert.html.erb +3 -1
- data/app/views/trestle/flash/_debug.html.erb +13 -8
- data/app/views/trestle/flash/_flash.html.erb +1 -1
- data/app/views/trestle/resource/_scopes.html.erb +17 -8
- data/app/views/trestle/resource/index.html.erb +2 -2
- data/app/views/trestle/shared/_sidebar.html.erb +4 -5
- data/app/views/trestle/table/_pagination.html.erb +1 -1
- data/config/locales/vi.rb +18 -0
- data/config/locales/vi.yml +101 -0
- data/config/routes.rb +1 -1
- data/frontend/css/components/_alerts.scss +31 -0
- data/frontend/css/components/_avatar.scss +14 -0
- data/frontend/css/components/_buttons.scss +0 -1
- data/frontend/css/components/_datepicker.scss +1 -0
- data/frontend/css/components/_fields.scss +5 -0
- data/frontend/css/components/_modal.scss +2 -0
- data/frontend/css/components/_scopes.scss +66 -21
- data/frontend/css/components/_table.scss +4 -0
- data/frontend/css/components/_tags.scss +2 -0
- data/frontend/css/components/_timestamp.scss +1 -1
- data/frontend/css/layout/_content.scss +5 -2
- data/frontend/css/layout/_sidebar.scss +3 -2
- data/frontend/css/variables/_bootstrap.scss +1 -0
- data/frontend/css/variables/_trestle.scss +25 -5
- data/frontend/js/components/dialog.js +8 -3
- data/frontend/js/components/navigation.js +63 -0
- data/frontend/js/components/pagination.js +51 -0
- data/frontend/js/components/sidebar.js +4 -7
- data/frontend/js/index.js +1 -0
- data/frontend/theme/trestle/theme/_defaults.scss +4 -4
- data/lib/generators/trestle/install/templates/_theme.scss +1 -1
- data/lib/generators/trestle/install/templates/trestle.rb.erb +6 -1
- data/lib/trestle/adapters/active_record_adapter.rb +16 -0
- data/lib/trestle/admin.rb +12 -2
- data/lib/trestle/engine.rb +3 -6
- data/lib/trestle/evaluation_context.rb +11 -3
- data/lib/trestle/form/automatic.rb +2 -0
- data/lib/trestle/form/field.rb +20 -13
- data/lib/trestle/form/fields/collection_select.rb +1 -1
- data/lib/trestle/form/fields/date_picker.rb +9 -3
- data/lib/trestle/form/fields/file_field.rb +1 -1
- data/lib/trestle/form/fields/form_group.rb +18 -5
- data/lib/trestle/form/fields/grouped_collection_select.rb +1 -1
- data/lib/trestle/form/fields/range_field.rb +2 -4
- data/lib/trestle/form/fields/select.rb +2 -3
- data/lib/trestle/form/fields/static_field.rb +2 -2
- data/lib/trestle/form/fields/tag_select.rb +1 -1
- data/lib/trestle/form/fields/time_zone_select.rb +1 -1
- data/lib/trestle/form/renderer.rb +9 -4
- data/lib/trestle/hook/helpers.rb +33 -0
- data/lib/trestle/hook/set.rb +32 -0
- data/lib/trestle/hook.rb +3 -29
- data/lib/trestle/navigation/group.rb +4 -0
- data/lib/trestle/registry.rb +61 -0
- data/lib/trestle/reloader.rb +26 -6
- data/lib/trestle/resource/builder.rb +3 -2
- data/lib/trestle/resource/collection.rb +1 -5
- data/lib/trestle/resource.rb +4 -3
- data/lib/trestle/scopes/block.rb +9 -8
- data/lib/trestle/scopes/definition.rb +22 -0
- data/lib/trestle/scopes/scope.rb +6 -2
- data/lib/trestle/scopes.rb +37 -8
- data/lib/trestle/table/automatic.rb +7 -0
- data/lib/trestle/version.rb +1 -1
- data/lib/trestle.rb +29 -14
- data/package.json +21 -24
- data/webpack.config.js +40 -49
- data/yarn.lock +3129 -4810
- metadata +22 -6
@@ -0,0 +1,18 @@
|
|
1
|
+
{
|
2
|
+
vi: {
|
3
|
+
date: {
|
4
|
+
formats: {
|
5
|
+
trestle_date: proc { |date| "%d/%m/%Y" },
|
6
|
+
trestle_calendar: "%d/%m/%Y"
|
7
|
+
}
|
8
|
+
},
|
9
|
+
|
10
|
+
time: {
|
11
|
+
formats: {
|
12
|
+
trestle_date: proc { |time| "%d/%m/%Y" },
|
13
|
+
trestle_time: "%H:%M",
|
14
|
+
trestle_time_with_seconds: "%H:%M:%S"
|
15
|
+
}
|
16
|
+
}
|
17
|
+
}
|
18
|
+
}
|
@@ -0,0 +1,101 @@
|
|
1
|
+
vi:
|
2
|
+
trestle:
|
3
|
+
title: "Trestle Admin"
|
4
|
+
footer: "Powered by Trestle"
|
5
|
+
version: "Version"
|
6
|
+
|
7
|
+
helpers:
|
8
|
+
page_entries_info:
|
9
|
+
one_page:
|
10
|
+
display_entries:
|
11
|
+
zero: "Không có %{entry_name} được tìm thấy"
|
12
|
+
one: "Hiển thị <strong>1</strong> %{entry_name}"
|
13
|
+
other: "Hiển thị <strong>tất cả %{count}</strong> %{entry_name}"
|
14
|
+
|
15
|
+
more_pages:
|
16
|
+
display_entries: "Hiển thị %{entry_name} <strong>%{first} - %{last}</strong> của <b>%{total}</b>"
|
17
|
+
|
18
|
+
onboarding:
|
19
|
+
welcome: "Welcome to Trestle"
|
20
|
+
no_admins: "To begin, please create an admin within <code>app/admin</code>."
|
21
|
+
no_template: "To customize this template, please create <code>%{path}</code>."
|
22
|
+
no_form: "Please define a form block or create a <code>_form.html</code> partial."
|
23
|
+
|
24
|
+
ui:
|
25
|
+
toggle_navigation: "Toggle navigation"
|
26
|
+
toggle_sidebar: "Toggle sidebar"
|
27
|
+
toggle_dropdown: "Toggle dropdown"
|
28
|
+
|
29
|
+
dialog:
|
30
|
+
error: "Yêu cầu chưa hoàn thành."
|
31
|
+
|
32
|
+
confirmation:
|
33
|
+
title: "Bạn có chắc?"
|
34
|
+
delete: "Xoá"
|
35
|
+
cancel: "Huỷ"
|
36
|
+
|
37
|
+
file:
|
38
|
+
choose_file: "Chọn tập tin..."
|
39
|
+
browse: "Tải lên"
|
40
|
+
|
41
|
+
admin:
|
42
|
+
titles:
|
43
|
+
index: "Danh sách %{pluralized_model_name}"
|
44
|
+
new: "Tạo mới %{model_name}"
|
45
|
+
edit: Chỉnh sửa %{model_name}"
|
46
|
+
|
47
|
+
buttons:
|
48
|
+
new: "Tạo mới %{model_name}"
|
49
|
+
save: "Lưu %{model_name}"
|
50
|
+
delete: "Xoá %{model_name}"
|
51
|
+
show: "Xem %{model_name}"
|
52
|
+
edit: "Chỉnh sửa %{model_name}"
|
53
|
+
ok: "Đồng ý"
|
54
|
+
|
55
|
+
breadcrumbs:
|
56
|
+
home: "Trang Chủ"
|
57
|
+
|
58
|
+
flash:
|
59
|
+
create:
|
60
|
+
success:
|
61
|
+
title: "Thành công!"
|
62
|
+
message: "%{lowercase_model_name} được tạo mới thành công!"
|
63
|
+
|
64
|
+
failure:
|
65
|
+
title: "Cảnh báo!"
|
66
|
+
message: "Vui lòng chính xác các thông tin bên dưới!"
|
67
|
+
|
68
|
+
update:
|
69
|
+
success:
|
70
|
+
title: "Thành công!"
|
71
|
+
message: "%{lowercase_model_name} đã được cập nhật thành công!"
|
72
|
+
|
73
|
+
failure:
|
74
|
+
title: "Cảnh báo!"
|
75
|
+
message: "Vui lòng chính xác các thông tin bên dưới!."
|
76
|
+
|
77
|
+
destroy:
|
78
|
+
success:
|
79
|
+
title: "Thành công!"
|
80
|
+
message: "%{lowercase_model_name} đã được xoá thành công!"
|
81
|
+
|
82
|
+
failure:
|
83
|
+
title: "Cảnh báo!"
|
84
|
+
message: "Không thể xoá %{lowercase_model_name}."
|
85
|
+
|
86
|
+
table:
|
87
|
+
headers:
|
88
|
+
id: "ID"
|
89
|
+
|
90
|
+
form:
|
91
|
+
select:
|
92
|
+
prompt: "- Chọn %{attribute_name} -"
|
93
|
+
|
94
|
+
format:
|
95
|
+
blank: "Chưa có"
|
96
|
+
|
97
|
+
datepicker:
|
98
|
+
formats:
|
99
|
+
date: "m/d/Y"
|
100
|
+
datetime: "m/d/Y h:i K"
|
101
|
+
time: "h:i K"
|
data/config/routes.rb
CHANGED
@@ -32,13 +32,18 @@
|
|
32
32
|
|
33
33
|
.alert-icon {
|
34
34
|
margin-right: $alert-padding-x;
|
35
|
+
|
35
36
|
font-size: 40px;
|
37
|
+
width: 40px;
|
38
|
+
|
39
|
+
text-align: center;
|
36
40
|
|
37
41
|
@include media-breakpoint-down(sm) {
|
38
42
|
margin-left: $alert-padding-x * 0.25;
|
39
43
|
margin-right: $alert-padding-x * 0.75;
|
40
44
|
|
41
45
|
font-size: 32px;
|
46
|
+
width: 32px;
|
42
47
|
}
|
43
48
|
}
|
44
49
|
|
@@ -74,10 +79,16 @@
|
|
74
79
|
border-color: $border;
|
75
80
|
|
76
81
|
a {
|
82
|
+
color: $color;
|
83
|
+
|
77
84
|
&:hover, &:focus {
|
78
85
|
color: mix($color, $background, 80%);
|
79
86
|
}
|
80
87
|
}
|
88
|
+
|
89
|
+
code {
|
90
|
+
color: $color;
|
91
|
+
}
|
81
92
|
}
|
82
93
|
|
83
94
|
.alert-success {
|
@@ -88,6 +99,26 @@
|
|
88
99
|
@include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-color);
|
89
100
|
}
|
90
101
|
|
102
|
+
.alert-info {
|
103
|
+
@include alert-variant($alert-info-bg, $alert-info-border, $alert-info-color);
|
104
|
+
}
|
105
|
+
|
106
|
+
.alert-warning {
|
107
|
+
@include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-color);
|
108
|
+
}
|
109
|
+
|
110
|
+
.alert-light {
|
111
|
+
@include alert-variant($alert-light-bg, $alert-light-border, $alert-light-color);
|
112
|
+
}
|
113
|
+
|
114
|
+
.alert-dark {
|
115
|
+
@include alert-variant($alert-dark-bg, $alert-dark-border, $alert-dark-color);
|
116
|
+
}
|
117
|
+
|
118
|
+
.alert-primary {
|
119
|
+
@include alert-variant($alert-primary-bg, $alert-primary-border, $alert-primary-color);
|
120
|
+
}
|
121
|
+
|
91
122
|
|
92
123
|
// Debug errors
|
93
124
|
|
@@ -1,44 +1,89 @@
|
|
1
1
|
.scopes {
|
2
|
-
list-style: none;
|
3
|
-
|
4
|
-
margin-top: -0.25rem;
|
5
2
|
margin-bottom: 0;
|
6
3
|
|
7
|
-
|
4
|
+
dd {
|
5
|
+
margin-bottom: 0;
|
6
|
+
}
|
7
|
+
|
8
|
+
&.grouped {
|
9
|
+
@include media-breakpoint-up(md) {
|
10
|
+
display: grid;
|
11
|
+
grid-template-columns: auto 1fr;
|
12
|
+
}
|
13
|
+
|
14
|
+
|
15
|
+
@include media-breakpoint-down(sm) {
|
16
|
+
.scope-group-empty:first-child {
|
17
|
+
display: none;
|
18
|
+
}
|
19
|
+
}
|
20
|
+
|
21
|
+
background: #fafafa;
|
22
|
+
|
23
|
+
dd {
|
24
|
+
padding: 0.375rem 0.5rem 0.375rem;
|
25
|
+
}
|
26
|
+
}
|
27
|
+
|
28
|
+
&.columns {
|
29
|
+
grid-template-rows: auto 1fr;
|
30
|
+
grid-auto-flow: column;
|
31
|
+
|
32
|
+
overflow-x: auto;
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
.scope-group {
|
37
|
+
line-height: 2;
|
38
|
+
font-size: 0.85rem;
|
39
|
+
padding: 0.5rem 1rem 0.25rem 0.75rem;
|
40
|
+
|
41
|
+
background: #f7f7f7;
|
42
|
+
}
|
43
|
+
|
44
|
+
.scope-list {
|
45
|
+
list-style: none;
|
8
46
|
|
9
47
|
display: flex;
|
10
48
|
flex-wrap: wrap;
|
11
49
|
|
50
|
+
position: relative;
|
51
|
+
align-items: center;
|
52
|
+
|
53
|
+
margin-bottom: 0;
|
54
|
+
padding: 0;
|
55
|
+
|
12
56
|
li {
|
13
|
-
margin
|
14
|
-
margin-right: 0.35rem;
|
57
|
+
margin: 0.125rem 0.35rem 0.125rem 0;
|
15
58
|
|
16
59
|
&:last-child {
|
17
60
|
margin-right: 0;
|
18
61
|
}
|
19
62
|
}
|
63
|
+
}
|
20
64
|
|
21
|
-
|
22
|
-
|
65
|
+
.scope {
|
66
|
+
display: inline-block;
|
23
67
|
|
24
|
-
|
25
|
-
font-weight: normal;
|
26
|
-
white-space: nowrap;
|
68
|
+
background-color: $scope-bg;
|
27
69
|
|
28
|
-
|
29
|
-
|
70
|
+
font-size: 0.8rem;
|
71
|
+
font-weight: normal;
|
72
|
+
white-space: nowrap;
|
30
73
|
|
31
|
-
|
32
|
-
|
33
|
-
}
|
74
|
+
border-radius: 50rem;
|
75
|
+
padding: $scope-padding;
|
34
76
|
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
77
|
+
&, &:hover, &:focus {
|
78
|
+
color: $scope-color;
|
79
|
+
}
|
80
|
+
|
81
|
+
&:hover, &:focus {
|
82
|
+
background-color: $scope-hover-bg;
|
83
|
+
text-decoration: none;
|
39
84
|
}
|
40
85
|
|
41
|
-
|
86
|
+
&.active {
|
42
87
|
&, &:hover, &:focus, strong {
|
43
88
|
color: $scope-active-color;
|
44
89
|
}
|
@@ -105,8 +105,7 @@
|
|
105
105
|
|
106
106
|
.utilities {
|
107
107
|
display: flex;
|
108
|
-
justify-content:
|
109
|
-
|
108
|
+
justify-content: flex-start;
|
110
109
|
margin-bottom: 10px;
|
111
110
|
}
|
112
111
|
|
@@ -146,6 +145,10 @@
|
|
146
145
|
padding: 15px;
|
147
146
|
}
|
148
147
|
|
148
|
+
.utilities {
|
149
|
+
margin-bottom: 10px;
|
150
|
+
}
|
151
|
+
|
149
152
|
.main-content-header,
|
150
153
|
.main-content-footer {
|
151
154
|
flex-direction: column;
|
@@ -16,11 +16,13 @@
|
|
16
16
|
height: $header-height;
|
17
17
|
|
18
18
|
display: flex;
|
19
|
-
align-items:
|
19
|
+
align-items: stretch;
|
20
20
|
|
21
21
|
.navbar-toggler {
|
22
22
|
outline: none;
|
23
23
|
|
24
|
+
align-self: center;
|
25
|
+
|
24
26
|
margin-left: $grid-gutter-width / 2;
|
25
27
|
margin-right: $grid-gutter-width / 2;
|
26
28
|
|
@@ -44,7 +46,6 @@
|
|
44
46
|
display: flex;
|
45
47
|
align-items: center;
|
46
48
|
|
47
|
-
height: 100%;
|
48
49
|
padding: 10px 15px;
|
49
50
|
|
50
51
|
font-size: 1.4rem;
|
@@ -77,14 +77,14 @@ $tag-hover-border: darken(theme-color("primary"), 10%);
|
|
77
77
|
|
78
78
|
// Scopes
|
79
79
|
|
80
|
-
$scope-padding: 0.25rem 0.
|
80
|
+
$scope-padding: 0.25rem 0.675rem;
|
81
81
|
|
82
|
-
$scope-color: rgba(black, 0.
|
83
|
-
$scope-bg: rgba(black, 0.
|
82
|
+
$scope-color: rgba(black, 0.4);
|
83
|
+
$scope-bg: rgba(black, 0.035);
|
84
84
|
|
85
|
-
$scope-label-color: rgba(black, 0.
|
85
|
+
$scope-label-color: rgba(black, 0.5);
|
86
86
|
|
87
|
-
$scope-hover-color: rgba(black, 0.
|
87
|
+
$scope-hover-color: rgba(black, 0.5);
|
88
88
|
$scope-hover-bg: rgba(black, 0.05);
|
89
89
|
|
90
90
|
$scope-active-color: white;
|
@@ -101,6 +101,26 @@ $alert-danger-bg: #de7471;
|
|
101
101
|
$alert-danger-color: white;
|
102
102
|
$alert-danger-border: #d85956;
|
103
103
|
|
104
|
+
$alert-info-bg: darken(theme-color("info"), 10%);
|
105
|
+
$alert-info-color: white;
|
106
|
+
$alert-info-border: darken($alert-info-bg, 10%);
|
107
|
+
|
108
|
+
$alert-warning-bg: darken(theme-color("warning"), 5%);
|
109
|
+
$alert-warning-color: white;
|
110
|
+
$alert-warning-border: darken($alert-warning-bg, 5%);
|
111
|
+
|
112
|
+
$alert-light-bg: theme-color("light");
|
113
|
+
$alert-light-color: $body-color;
|
114
|
+
$alert-light-border: darken($alert-light-bg, 5%);
|
115
|
+
|
116
|
+
$alert-dark-bg: theme-color("dark");
|
117
|
+
$alert-dark-color: white;
|
118
|
+
$alert-dark-border: darken($alert-dark-bg, 10%);
|
119
|
+
|
120
|
+
$alert-primary-bg: darken(theme-color("primary"), 5%);
|
121
|
+
$alert-primary-color: white;
|
122
|
+
$alert-primary-border: darken($alert-primary-bg, 10%);
|
123
|
+
|
104
124
|
|
105
125
|
// Modals
|
106
126
|
|
@@ -20,14 +20,19 @@ function createElement () {
|
|
20
20
|
focus: false
|
21
21
|
})
|
22
22
|
|
23
|
-
// Remove dialog elements once hidden
|
24
23
|
$el.on('hidden.bs.modal', function () {
|
24
|
+
// Restore modal-open class on body if background modals still visible
|
25
|
+
if ($el.prevAll('.modal.show').length) {
|
26
|
+
$(document.body).addClass('modal-open')
|
27
|
+
}
|
28
|
+
|
29
|
+
// Remove dialog elements once hidden
|
25
30
|
$el.remove()
|
26
31
|
})
|
27
32
|
|
28
33
|
// Restore the next visible modal to the foreground
|
29
34
|
$el.on('hide.bs.modal', function () {
|
30
|
-
$el.prevAll('.modal.
|
35
|
+
$el.prevAll('.modal.show').last().removeClass('background')
|
31
36
|
})
|
32
37
|
|
33
38
|
// Set X-Trestle-Dialog header on AJAX requests initiated from the dialog
|
@@ -120,7 +125,7 @@ export default class Dialog {
|
|
120
125
|
this.$el.modal('show')
|
121
126
|
|
122
127
|
// Background any existing visible modals
|
123
|
-
this.$el.prevAll('.modal.
|
128
|
+
this.$el.prevAll('.modal.show').addClass('background')
|
124
129
|
}
|
125
130
|
|
126
131
|
hide () {
|
@@ -0,0 +1,63 @@
|
|
1
|
+
import cookie from '../core/cookie'
|
2
|
+
|
3
|
+
const PREFIX = 'trestle:navigation'
|
4
|
+
const SEPARATOR = ','
|
5
|
+
|
6
|
+
class NavigationCookieStore {
|
7
|
+
addGroup (id, state) {
|
8
|
+
this.updateState(state, (groups) => groups.add(id))
|
9
|
+
}
|
10
|
+
|
11
|
+
removeGroup (id, state) {
|
12
|
+
this.updateState(state, (groups) => groups.delete(id))
|
13
|
+
}
|
14
|
+
|
15
|
+
updateState (state, callback) {
|
16
|
+
const groups = this.getState(state)
|
17
|
+
callback(groups)
|
18
|
+
this.saveState(state, groups)
|
19
|
+
}
|
20
|
+
|
21
|
+
getState (state) {
|
22
|
+
const str = cookie.get(`${PREFIX}:${state}`)
|
23
|
+
return new Set(str.length ? str.split(SEPARATOR) : [])
|
24
|
+
}
|
25
|
+
|
26
|
+
saveState (state, groups) {
|
27
|
+
cookie.set(`${PREFIX}:${state}`, [...groups].join(SEPARATOR))
|
28
|
+
}
|
29
|
+
}
|
30
|
+
|
31
|
+
class Navigation {
|
32
|
+
constructor () {
|
33
|
+
this.store = new NavigationCookieStore()
|
34
|
+
}
|
35
|
+
|
36
|
+
toggle (list) {
|
37
|
+
if (list.hasClass('collapsed')) {
|
38
|
+
this.expand(list)
|
39
|
+
} else {
|
40
|
+
this.collapse(list)
|
41
|
+
}
|
42
|
+
}
|
43
|
+
|
44
|
+
expand (list) {
|
45
|
+
list.removeClass('collapsed')
|
46
|
+
|
47
|
+
const id = list.data('group')
|
48
|
+
|
49
|
+
this.store.addGroup(id, 'expanded')
|
50
|
+
this.store.removeGroup(id, 'collapsed')
|
51
|
+
}
|
52
|
+
|
53
|
+
collapse (list) {
|
54
|
+
list.addClass('collapsed')
|
55
|
+
|
56
|
+
const id = list.data('group')
|
57
|
+
|
58
|
+
this.store.addGroup(id, 'collapsed')
|
59
|
+
this.store.removeGroup(id, 'expanded')
|
60
|
+
}
|
61
|
+
}
|
62
|
+
|
63
|
+
export default new Navigation()
|
@@ -0,0 +1,51 @@
|
|
1
|
+
/* global history */
|
2
|
+
|
3
|
+
import $ from 'jquery'
|
4
|
+
|
5
|
+
import { triggerInit } from '../core/events'
|
6
|
+
|
7
|
+
const REMOTE_PAGINATION_SELECTOR = '.page-link[data-remote]'
|
8
|
+
|
9
|
+
$(document)
|
10
|
+
.on('ajax:send', function (e) {
|
11
|
+
const $context = $(e.target).closest('[data-context]')
|
12
|
+
const $table = $context.find('.table-container')
|
13
|
+
$table.addClass('loading')
|
14
|
+
})
|
15
|
+
|
16
|
+
.on('ajax:complete', function (e) {
|
17
|
+
const $context = $(e.target).closest('[data-context]')
|
18
|
+
const $table = $context.find('.table-container')
|
19
|
+
$table.removeClass('loading')
|
20
|
+
})
|
21
|
+
|
22
|
+
.on('ajax:success', REMOTE_PAGINATION_SELECTOR, function (e) {
|
23
|
+
const $link = $(e.target)
|
24
|
+
const $context = $link.closest('[data-context]')
|
25
|
+
|
26
|
+
// Update table and pagination
|
27
|
+
const $doc = $(e.detail[0])
|
28
|
+
|
29
|
+
const $table = $doc.find('.table-container')
|
30
|
+
$context.find('.table-container').replaceWith($table)
|
31
|
+
|
32
|
+
triggerInit($table)
|
33
|
+
|
34
|
+
const $pagination = $doc.find('.pagination-container')
|
35
|
+
$context.find('.pagination-container').replaceWith($pagination)
|
36
|
+
|
37
|
+
// Update the URL in the browser and context
|
38
|
+
const location = $link.attr('href')
|
39
|
+
|
40
|
+
if (location) {
|
41
|
+
// TODO: Implement URL updating with back button support
|
42
|
+
// if ($context.hasClass('app-main')) {
|
43
|
+
// history.pushState({}, '', location)
|
44
|
+
// }
|
45
|
+
|
46
|
+
$context.data('context', location)
|
47
|
+
}
|
48
|
+
|
49
|
+
// Scroll to top of table
|
50
|
+
$table[0].scrollIntoView(true)
|
51
|
+
})
|
@@ -3,6 +3,8 @@ import $ from 'jquery'
|
|
3
3
|
import { ready } from '../core/events'
|
4
4
|
import cookie from '../core/cookie'
|
5
5
|
|
6
|
+
import Navigation from './navigation'
|
7
|
+
|
6
8
|
ready(function () {
|
7
9
|
const $body = $('body')
|
8
10
|
const $wrapper = $('.app-wrapper')
|
@@ -60,13 +62,8 @@ ready(function () {
|
|
60
62
|
$sidebar.find('.nav-header a').on('click', function (e) {
|
61
63
|
e.preventDefault()
|
62
64
|
|
63
|
-
$(this).closest('ul')
|
64
|
-
|
65
|
-
const collapsed = $sidebar.find('.collapsed .nav-header a').map(function () {
|
66
|
-
return $(this).attr('href').replace(/^#/, '')
|
67
|
-
}).toArray()
|
68
|
-
|
69
|
-
cookie.set('trestle:navigation:collapsed', collapsed.join(','))
|
65
|
+
const list = $(this).closest('ul')
|
66
|
+
Navigation.toggle(list)
|
70
67
|
})
|
71
68
|
|
72
69
|
// Scroll sidebar to active item
|
data/frontend/js/index.js
CHANGED
@@ -29,6 +29,7 @@ import Dialog from './components/dialog'
|
|
29
29
|
import './components/file'
|
30
30
|
import './components/form'
|
31
31
|
import './components/gallery'
|
32
|
+
import './components/pagination'
|
32
33
|
import './components/select'
|
33
34
|
import './components/sidebar'
|
34
35
|
import './components/table'
|