Skip to content

Commit 6b0d857

Browse files
spektra2147spektra2147
authored
Merge pull request #4 from openclassify/mostafa
Mostafa
2 parents c57c923 + c7d072a commit 6b0d857

File tree

11 files changed

+241
-64
lines changed

11 files changed

+241
-64
lines changed

‎resources/config/preferences.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
'default_value' => 'default',
3030
'mode' => 'dropdown',
3131
],
32-
],
32+
]
3333
];

‎resources/config/settings/sections.php‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
3+
return [
4+
'monitoring' => [
5+
'stacked' => false,
6+
'tabs' => [
7+
'general_setting' => [
8+
'title' => 'visiosoft.theme.defaultadmin::section.general_setting.name',
9+
'fields' => [
10+
'title', 'sidebar_hover', 'login_icon', 'panel_icon', 'footer_copyright_org_name'
11+
],
12+
],
13+
'light_mode' => [
14+
'title' => 'visiosoft.theme.defaultadmin::section.light_mode.name',
15+
'fields' => [
16+
'active_sidebar_border_color', 'primary_color', 'secondary_color',
17+
'background_color', 'block_background_color', 'negative_color',
18+
'positive_color', 'warning_color', 'info_color', 'menu_link_color', 'links_color',
19+
'links_hover_active_color', 'text_color', 'input_background_color', 'input_placeholder_color',
20+
'input_focused_background_color', 'input_focused_border_color'
21+
]
22+
],
23+
'dark_mode' => [
24+
'title' => 'visiosoft.theme.defaultadmin::section.dark_mode.name',
25+
'fields' => [
26+
'dark_mode', 'dark_primary_color', 'dark_secondary_color', 'dark_background_color',
27+
'dark_negative_color', 'dark_positive_color', 'dark_warning_color', 'dark_info_color',
28+
'dark_active_sidebar_border_color', 'dark_menu_link_color', 'dark_links_color',
29+
'dark_links_hover_active_color', 'dark_text_color', 'dark_input_background_color',
30+
'dark_input_placeholder_color', 'dark_input_focused_background_color',
31+
'dark_input_focused_border_color'
32+
]
33+
],
34+
'help' => [
35+
'title' => 'visiosoft.theme.defaultadmin::section.help.name',
36+
'fields' => [
37+
'help_one_title', 'help_one_link', 'help_two_title', 'help_two_link'
38+
]
39+
]
40+
]
41+
]
42+
];

resources/config/settings.php renamed to resources/config/settings/settings.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,27 @@
246246
'default_value' => '#1e3060'
247247
]
248248
],
249+
'help_one_title' => [
250+
'type' => 'anomaly.field_type.text',
251+
'config' => [
252+
'default_value' => 'help'
253+
]
254+
],
255+
'help_one_link' => [
256+
'type' => 'anomaly.field_type.url',
257+
'config' => [
258+
'default_value' => '#'
259+
]
260+
],'help_two_title' => [
261+
'type' => 'anomaly.field_type.text',
262+
'config' => [
263+
'default_value' => 'help'
264+
]
265+
],
266+
'help_two_link' => [
267+
'type' => 'anomaly.field_type.url',
268+
'config' => [
269+
'default_value' => '#'
270+
]
271+
]
249272
];

‎resources/css/dark_mode.css‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
#sidebar {
1414
background: {{ setting_value('visiosoft.theme.defaultadmin::dark_primary_color') }} !important;
1515
}
16-
.breadcrumb {
17-
background: {{ setting_value('visiosoft.theme.defaultadmin::dark_secondary_color') }} !important;
18-
border-radius: 0 !important;
19-
}
2016
.nav.nav-sections.nav-stacked {
2117
background: {{ setting_value('visiosoft.theme.defaultadmin::dark_secondary_color') }} !important;
2218
}
@@ -377,4 +373,44 @@ border-color: {{ setting_value('visiosoft.theme.defaultadmin::dark_secondary_col
377373
.text-muted {
378374
color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;
379375
filter: brightness(80%);
376+
}
377+
#search {
378+
border-bottom: 1px solid {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color') }};
379+
padding-top: 8px;
380+
color: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color') }} !important;
381+
}
382+
.dropdown-item.active, .dropdown-item.active:focus, .dropdown-item.active:hover {
383+
background:{{ setting_value('visiosoft.theme.defaultadmin::dark_primary_color') }} !important;
384+
}
385+
.breadcrumb li.active {
386+
color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;
387+
filter: color brightness(50%);
388+
}
389+
#search .search-bar {
390+
color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;
391+
}
392+
#search .search-bar::placeholder {
393+
color: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color') }} !important;
394+
}
395+
.breadcrumb li.active {
396+
background-color: inherit !important;
397+
}
398+
.btn-search {
399+
display: inline-block;
400+
margin-left: auto;
401+
float: right;
402+
padding: 0 !important;
403+
margin-top: 5px;
404+
background-color: inherit;
405+
color: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color') }};
406+
}
407+
.breadcrumb {
408+
background: inherit !important;
409+
border-radius: 0 !important;
410+
}
411+
.nav.nav-sections {
412+
opacity: 0.95;
413+
}
414+
.help-icon svg #Path_20512, #Path_20511 {
415+
fill: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }};
380416
}

‎resources/css/theme.css‎

Lines changed: 64 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,30 @@ body.expand #topbar .topbar-left .logo span {
417417
width: 50% !important;
418418
}
419419
}
420+
#search {
421+
border-bottom: 1px solid {{ setting_value('visiosoft.theme.defaultadmin::background_color') }};
422+
padding-top: 8px;
423+
}
424+
.btn-search {
425+
display: inline-block;
426+
margin-left: auto;
427+
float: right;
428+
padding: 0 !important;
429+
margin-top: 5px;
430+
background-color: inherit;
431+
color: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }};
432+
}
433+
.dropdown-menu {
434+
z-index: 9999;
435+
}
420436
#search .search-bar {
421-
height: 70px;
422-
color: #212121;
437+
width: 70%;
438+
color: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }};
423439
font-size: 14px;
440+
display: inline-block;
424441
border: none !important;
442+
border-left: none !important;
443+
border-right: none !important;
425444
box-shadow: none !important;
426445
background-color: transparent !important;
427446
}
@@ -455,16 +474,20 @@ body.expand #topbar .topbar-left .logo span {
455474
margin-top: 0;
456475
position: fixed;
457476
overflow-x: scroll;
458-
background: {{ setting_value('visiosoft.theme.defaultadmin::sidebar_secondary_color') }};
459-
padding-bottom: 70px;
460-
box-shadow: 2px 0 0 rgba(66, 66, 66, 0.1);
477+
background: {{ setting_value('visiosoft.theme.defaultadmin::sidebar_secondary_color') }};
478+
padding-bottom: 70px;
479+
box-shadow: 2px 0 0 rgba(66, 66, 66, 0.1);
461480
}
462481

463482
.top-bar {
464-
background-color: {{ setting_value('visiosoft.theme.defaultadmin::block_background_color') }};
465-
width: 100%;
466-
height:70px;
467-
display: table;
483+
background-color: {{ setting_value('visiosoft.theme.defaultadmin::block_background_color') }};
484+
height:70px;
485+
display: table;
486+
width: calc(100% - 240px);
487+
position: fixed;
488+
right:0;
489+
top:0;
490+
z-index: 9999;
468491
}
469492
.topbar-breadcrumb {
470493
display: table-cell;
@@ -610,9 +633,6 @@ select + .select2 {
610633
width: 0;
611634
transition: none;
612635
}
613-
.top-bar {
614-
padding-top: 50px;
615-
}
616636
.logo-bar {
617637
width: 100%;
618638
height: 50px;
@@ -2693,9 +2713,7 @@ background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_col
26932713
opacity: 1;
26942714
line-height: 18px;
26952715
}
2696-
.breadcrumb li.active {
2697-
background-color: {{ setting_value('visiosoft.theme.defaultadmin::block_background_color') }} !important;
2698-
}
2716+
26992717
.text-center {
27002718
text-align: center;
27012719
}
@@ -2709,16 +2727,6 @@ background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_col
27092727
margin-bottom: 0;
27102728
line-height: 1.25;
27112729
}
2712-
2713-
.breadcrumb {
2714-
border-radius: 0 !important;
2715-
background: #fff;
2716-
font-size: 0.8rem;
2717-
}
2718-
.breadcrumb a {
2719-
color: #888888;
2720-
}
2721-
27222730
html,
27232731
body {
27242732
height: 100%;
@@ -2989,12 +2997,7 @@ color: {{ setting_value('visiosoft.theme.defaultadmin::secondary_color') }} !imp
29892997
margin-bottom: 1em;
29902998
background-color: #BFD3E9;
29912999
}
2992-
.breadcrumb {
2993-
margin-top: 0 !important;
2994-
margin-bottom: 0 !important;
2995-
padding-top: 0 !important;
2996-
padding-bottom: 0 !important;
2997-
}
3000+
29983001
.card {
29993002
margin-bottom: 0.5rem !important;
30003003
}
@@ -3226,7 +3229,7 @@ color: {{ setting_value('visiosoft.theme.defaultadmin::input_placeholder_color')
32263229
body {
32273230
background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }} !important;
32283231
}
3229-
.card-block, .card-body, #footer, .modal-dialog, .breadcrumb, .user-action-dropdown,
3232+
.card-block, .card-body, #footer, .modal-dialog, .user-action-dropdown,
32303233
.card.card-flex .card-block, .nav.nav-sections li.active,
32313234
.modal-content, .modal-header, .modal-body, .nav-pills, .dropdown-menu {
32323235
background-color: {{ setting_value('visiosoft.theme.defaultadmin::block_background_color') }} !important;
@@ -3316,3 +3319,32 @@ border-color: {{setting_value('visiosoft.theme.defaultadmin::input_focused_borde
33163319
.CodeMirror div {
33173320
color: white !important;
33183321
}
3322+
.breadcrumb {
3323+
border-radius: 0 !important;
3324+
background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }} !important;
3325+
font-size: 0.8rem;
3326+
margin-top: 15px !important;
3327+
margin-bottom: 0 !important;
3328+
padding-top: 0 !important;
3329+
padding-bottom: 0 !important;
3330+
}
3331+
.breadcrumb li.active {
3332+
background-color: inherit !important;
3333+
}
3334+
.breadcrumb a {
3335+
opacity: 0.5;
3336+
}
3337+
#search .search-bar::placeholder {
3338+
color: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }} !important;
3339+
}
3340+
3341+
.login-page {
3342+
width: 100%;
3343+
height: 100%;
3344+
background: linear-gradient(170deg, rgba(186, 39, 55, 1) 0%, rgba(186, 39, 55, 1) 60%, rgba(239, 197, 202, 1) 60%, rgba(239, 197, 202, 1) 0%);
3345+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ba2737', endColorstr='#efc5ca', GradientType=1);
3346+
}
3347+
3348+
.help-icon svg #Path_20512, #Path_20511 {
3349+
fill: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }};
3350+
}

‎resources/img/guide.svg‎

Lines changed: 5 additions & 6 deletions
Loading

‎resources/lang/en/section.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,16 @@
44
'theme_settings' => [
55
'name' => 'Theme Settings'
66
],
7+
'general_setting' => [
8+
'name' => 'Theme Settings'
9+
],
10+
'help' => [
11+
'name' => 'Help'
12+
],
13+
'dark_mode' => [
14+
'name' => 'Dark Mode'
15+
],
16+
'light_mode' => [
17+
'name' => 'Light Mode'
18+
]
719
];

‎resources/lang/en/setting.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,17 @@
130130
],
131131
'block_background_color' => [
132132
'name' => 'Block background color'
133-
]
133+
],
134+
'help_one_title' => [
135+
'name' => 'Help 1 title'
136+
],
137+
'help_one_link' => [
138+
'name' => 'Help 1 link'
139+
],
140+
'help_two_title' => [
141+
'name' => 'Help 2 title'
142+
],
143+
'help_two_link' => [
144+
'name' => 'Help 2 link'
145+
],
134146
];

‎resources/views/layouts/default.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
{% include "visiosoft.theme.defaultadmin::partials/logo" %}
1919
{% include "visiosoft.theme.defaultadmin::partials/sidebar" %}
2020
{% include "visiosoft.theme.defaultadmin::partials/menu" %}
21-
<main id="main" style="min-height: 1500px;">
21+
<main id="main" style="min-height: 1500px; padding-top: 70px;">
2222
{% include "visiosoft.theme.defaultadmin::partials/topbar" %}
23+
<div class="topbar-breadcrumb">{{ breadcrumb() }}</div>
2324
{% if trans('module::addon.info') != 'module::addon.info' %}
2425
<div class="page-info m-2 small text-white alert rounded">{{ trans('module::addon.info') }}</div>
2526
{% endif %}
26-
2727
<div class="container-fluid pt-1">
2828
{% include "theme::partials/messages" %}
2929
{% include "theme::partials/buttons" %}

‎resources/views/partials/search-box.twig‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<form class="navbar-form dropdown" id="search">
2+
<input type="text" class="form-control search-bar" placeholder="{{ trans('visiosoft.theme.defaultadmin::control_panel.search_placeholder') }}...">
3+
<button type="submit" class="btn btn-search"><i class="fa fa-search"></i></button>
4+
<div class="dropdown-menu results">
5+
<h6 class="dropdown-header">Navigation</h6>
6+
{% for key, navigation in template.cp.navigation %}
7+
<a class="dropdown-item" {{ html_attributes(navigation.attributes) }} {{ navigation.class }}>
8+
<span class="title">{{ trans(navigation.title) }}</span>
9+
</a>
10+
{% endfor %}
11+
</div>
12+
</form>

0 commit comments

Comments
 (0)