Skip to content

Commit a166bd3

Browse files
author
Muammer Top
authored
Merge pull request #16 from openclassify/vedatakd
created interactive sidebar
2 parents 7e2a923 + e4443d8 commit a166bd3

File tree

9 files changed

+183
-40
lines changed

9 files changed

+183
-40
lines changed

‎resources/config/settings/sections.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'general_setting' => [
88
'title' => 'visiosoft.theme.defaultadmin::section.general_setting.name',
99
'fields' => [
10-
'title', 'sidebar_hover', 'login_icon', 'panel_icon', 'footer_copyright_org_name'
10+
'title', 'interactive_side_menu','sidebar_hover', 'login_icon', 'panel_icon', 'footer_copyright_org_name'
1111
],
1212
],
1313
'light_mode' => [

‎resources/config/settings/settings.php‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
return [
44
'sidebar_hover' => 'anomaly.field_type.boolean',
5-
'navigation' => [
6-
'type' => 'anomaly.field_type.textarea',
5+
'navigation' => [
6+
'type' => 'anomaly.field_type.textarea',
77
'input_view' => 'visiosoft.theme.defaultadmin::admin/navigation/settings',
88
],
99
"dark_mode" => [
@@ -13,25 +13,25 @@
1313
]
1414
],
1515
"login_icon" => [
16-
"type" => "anomaly.field_type.file",
16+
"type" => "anomaly.field_type.file",
1717
"config" => [
18-
"folders" => ['images'],
18+
"folders" => ['images'],
1919
]
2020
],
2121
"panel_icon" => [
22-
"type" => "anomaly.field_type.file",
22+
"type" => "anomaly.field_type.file",
2323
"config" => [
24-
"folders" => ['images'],
24+
"folders" => ['images'],
2525
]
2626
],
2727
"title" => [
28-
"type" => "anomaly.field_type.text",
28+
"type" => "anomaly.field_type.text",
2929
"config" => [
3030
"default_value" => 'OpenClassify',
3131
]
3232
],
3333
"footer_copyright_org_name" => [
34-
"type" => "anomaly.field_type.text",
34+
"type" => "anomaly.field_type.text",
3535
"config" => [
3636
"default_value" => 'OpenClassify, Inc',
3737
]
@@ -49,55 +49,55 @@
4949
// ]
5050
// ],
5151
"active_sidebar_border_color" => [
52-
"type" => "anomaly.field_type.colorpicker",
52+
"type" => "anomaly.field_type.colorpicker",
5353
"config" => [
5454
"default_value" => '#4eb6a2',
5555
]
5656
],
5757
"primary_color" => [
58-
"type" => "anomaly.field_type.colorpicker",
58+
"type" => "anomaly.field_type.colorpicker",
5959
"config" => [
6060
"default_value" => '#1d3557',
6161
]
6262
],
6363
"secondary_color" => [
64-
"type" => "anomaly.field_type.colorpicker",
64+
"type" => "anomaly.field_type.colorpicker",
6565
"config" => [
6666
"default_value" => '#213c62',
6767
]
6868
],
6969
"background_color" => [
70-
"type" => "anomaly.field_type.colorpicker",
70+
"type" => "anomaly.field_type.colorpicker",
7171
"config" => [
7272
"default_value" => '#f1f1f1',
7373
]
7474
],
7575
"block_background_color" => [
76-
"type" => "anomaly.field_type.colorpicker",
76+
"type" => "anomaly.field_type.colorpicker",
7777
"config" => [
7878
"default_value" => '#FFF',
7979
]
8080
],
8181
"negative_color" => [
82-
"type" => "anomaly.field_type.colorpicker",
82+
"type" => "anomaly.field_type.colorpicker",
8383
"config" => [
8484
"default_value" => '#f06461',
8585
]
8686
],
8787
"positive_color" => [
88-
"type" => "anomaly.field_type.colorpicker",
88+
"type" => "anomaly.field_type.colorpicker",
8989
"config" => [
9090
"default_value" => '#4eb6a2',
9191
]
9292
],
9393
"warning_color" => [
94-
"type" => "anomaly.field_type.colorpicker",
94+
"type" => "anomaly.field_type.colorpicker",
9595
"config" => [
9696
"default_value" => '#fee28b',
9797
]
9898
],
9999
"info_color" => [
100-
"type" => "anomaly.field_type.colorpicker",
100+
"type" => "anomaly.field_type.colorpicker",
101101
"config" => [
102102
"default_value" => '#54acdb',
103103
]
@@ -151,49 +151,49 @@
151151
]
152152
],
153153
"dark_primary_color" => [
154-
"type" => "anomaly.field_type.colorpicker",
154+
"type" => "anomaly.field_type.colorpicker",
155155
"config" => [
156156
"default_value" => '#1d3557',
157157
]
158158
],
159159
"dark_secondary_color" => [
160-
"type" => "anomaly.field_type.colorpicker",
160+
"type" => "anomaly.field_type.colorpicker",
161161
"config" => [
162162
"default_value" => '#213c62',
163163
]
164164
],
165165
"dark_background_color" => [
166-
"type" => "anomaly.field_type.colorpicker",
166+
"type" => "anomaly.field_type.colorpicker",
167167
"config" => [
168168
"default_value" => '#384774',
169169
]
170170
],
171171
"dark_negative_color" => [
172-
"type" => "anomaly.field_type.colorpicker",
172+
"type" => "anomaly.field_type.colorpicker",
173173
"config" => [
174174
"default_value" => '#993434',
175175
]
176176
],
177177
"dark_positive_color" => [
178-
"type" => "anomaly.field_type.colorpicker",
178+
"type" => "anomaly.field_type.colorpicker",
179179
"config" => [
180180
"default_value" => '#5ba587',
181181
]
182182
],
183183
"dark_warning_color" => [
184-
"type" => "anomaly.field_type.colorpicker",
184+
"type" => "anomaly.field_type.colorpicker",
185185
"config" => [
186186
"default_value" => '#c89332',
187187
]
188188
],
189189
"dark_info_color" => [
190-
"type" => "anomaly.field_type.colorpicker",
190+
"type" => "anomaly.field_type.colorpicker",
191191
"config" => [
192192
"default_value" => '#4679bd',
193193
]
194194
],
195195
"dark_active_sidebar_border_color" => [
196-
"type" => "anomaly.field_type.colorpicker",
196+
"type" => "anomaly.field_type.colorpicker",
197197
"config" => [
198198
"default_value" => '#5ba587',
199199
]
@@ -257,7 +257,7 @@
257257
'config' => [
258258
'default_value' => '#'
259259
]
260-
],'help_two_title' => [
260+
], 'help_two_title' => [
261261
'type' => 'anomaly.field_type.text',
262262
'config' => [
263263
'default_value' => 'help'
@@ -268,5 +268,12 @@
268268
'config' => [
269269
'default_value' => '#'
270270
]
271-
]
271+
],
272+
'interactive_side_menu' => [
273+
'type' => 'anomaly.field_type.boolean',
274+
'bind' => 'admin_theme::interactive_side_menu',
275+
'config' => [
276+
'default_value' => false,
277+
],
278+
],
272279
];

‎resources/css/interactive_sidebar.css‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#sidebar > ul > li > a {
2+
text-align: left;
3+
}
4+
5+
#sidebar a {
6+
color: #f1f1f1 !important;
7+
opacity: 0.7;
8+
justify-content: space-between;
9+
display: flex !important;
10+
align-items: center;
11+
font-weight:300;
12+
font-size: 16px;
13+
}
14+
15+
#sidebar .title-box {
16+
justify-content: space-between;
17+
display: flex;
18+
max-width: 190px;
19+
}
20+
21+
#sidebar a:hover, #sidebar a:active, #sidebar a:focus {
22+
color: #f1f1f1 !important;
23+
opacity: 1;
24+
}
25+
26+
#sidebar > ul > li > a .title {
27+
display: inline;
28+
}
29+
30+
#sidebar .list-arrow {
31+
font-size: 11px;
32+
display: block;
33+
width: 20px;
34+
float: right;
35+
}

‎resources/css/theme.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ transition: width 200ms cubic-bezier(0.075, 0.82, 0.165, 1);
531531
margin: 8px 0;
532532
display: block;
533533
padding: 0 10px;
534-
font-size: 18px;
534+
font-size: 16px;
535535
line-height: 39px;
536536
position: relative;
537537
text-align: center;
@@ -614,7 +614,7 @@ select + .select2 {
614614
margin-bottom: 15px;
615615
}
616616
.collapse {
617-
display: block;
617+
display: none;
618618
}
619619
@media (max-width: 768px) {
620620
.collapse {

‎resources/lang/en/setting.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,7 @@
143143
'help_two_link' => [
144144
'name' => 'Help 2 link'
145145
],
146+
'interactive_side_menu' => [
147+
'name' => 'interactive side menu',
148+
],
146149
];

‎resources/lang/tr/setting.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
return [
44
'sidebar_hover' => [
5-
'name' => 'Kenar Çubuğu Üzerine Gelme',
5+
'name' => 'Kenar Çubuğu Üzerine Gelme',
66
'instructions' => 'Fareyle üzerine gelindiğinde kenar çubuğu genişletilsin mi?',
77
],
8-
'navigation' => [
9-
'name' => 'Navigasyon',
8+
'navigation' => [
9+
'name' => 'Navigasyon',
1010
'instructions' => '<em>varsayılan</em> gezinme sırasını belirtin.',
11-
'warning' => 'İlk erişilebilir gezinme öğesi <strong>ana</strong> alanı olarak kullanılır.',
12-
'reorder' => 'Birincil gezinme öğelerini yeniden sıralamak için <strong>kenar çubuğu</strong> sürükleyip bırakın.',
11+
'warning' => 'İlk erişilebilir gezinme öğesi <strong>ana</strong> alanı olarak kullanılır.',
12+
'reorder' => 'Birincil gezinme öğelerini yeniden sıralamak için <strong>kenar çubuğu</strong> sürükleyip bırakın.',
1313
],
1414
"login_icon" => [
1515
'name' => 'Oturum Açma Simgesi',
@@ -31,5 +31,8 @@
3131
],
3232
"active_sidebar_border_color" => [
3333
'name' => 'Etkin Kenar Çubuğu Kenarlık Rengi',
34-
]
34+
],
35+
'interactive_side_menu' => [
36+
'name' => 'Etkileşimli yan menü',
37+
],
3538
];

‎resources/views/layouts/default.twig‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
{# {% include "theme::partials/navbar" %} #}
1616
{# {% include "theme::partials/header" %} #}
1717
<section id="app">
18-
{% include "visiosoft.theme.defaultadmin::partials/logo" %}
19-
{% include "visiosoft.theme.defaultadmin::partials/sidebar" %}
20-
{% include "visiosoft.theme.defaultadmin::partials/menu" %}
18+
{% if config('admin_theme::interactive_side_menu',false) %}
19+
{% include "visiosoft.theme.defaultadmin::partials/interactiveMenu" %}
20+
{% else %}
21+
{% include "visiosoft.theme.defaultadmin::partials/logo" %}
22+
{% include "visiosoft.theme.defaultadmin::partials/sidebar" %}
23+
{% include "visiosoft.theme.defaultadmin::partials/menu" %}
24+
{% endif %}
2125
<main id="main" style="min-height: 1500px; padding-top: 70px;">
2226
{% include "visiosoft.theme.defaultadmin::partials/topbar" %}
2327
<div class="topbar-breadcrumb">{{ breadcrumb() }}</div>

0 commit comments

Comments
 (0)