Selector de bandera automatico y quitado estilo node-waves

This commit is contained in:
imnavajas
2023-05-16 14:53:22 +02:00
parent dd9686d966
commit 790e9c3111
7 changed files with 87 additions and 73 deletions

15
.idea/workspace.xml generated
View File

@ -5,15 +5,13 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files"> <list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files">
<change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Config/Basics.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Config/Basics.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Helpers/general_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Helpers/general_helper.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Integration.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Integration.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/login/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/login/header.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Pedidos/Pedido.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Pedidos/Pedido.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/all.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/all.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Filters/LoginAuthFilter.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Filters/LoginAuthFilter.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/_commonPartialsBs/datatables.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/_commonPartialsBs/datatables.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/header.php" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -84,6 +82,7 @@
<workItem from="1684221025785" duration="2261000" /> <workItem from="1684221025785" duration="2261000" />
<workItem from="1684226343116" duration="4598000" /> <workItem from="1684226343116" duration="4598000" />
<workItem from="1684236911941" duration="2213000" /> <workItem from="1684236911941" duration="2213000" />
<workItem from="1684239429024" duration="2049000" />
</task> </task>
<task id="LOCAL-00001" summary="Starting Vuexy Theme creation"> <task id="LOCAL-00001" summary="Starting Vuexy Theme creation">
<created>1682339938559</created> <created>1682339938559</created>

View File

@ -80,7 +80,20 @@ function getAllClass($controller = null){
} }
// IMN
function getCurrentLanguageFlag(){
try {
$session = session();
if($session->get('lang') == 'en'){
return "fi-gb";
}else{
return "fi-es";
}
} catch (Exception $e) {
return "fi-es";
}
}
function getAllClassFolder($folder = null){ function getAllClassFolder($folder = null){

View File

@ -10,7 +10,7 @@ if (!empty($token) && $tfa == false) {
<!DOCTYPE html> <!DOCTYPE html>
<html <html
lang="<?= $settings['default_language'] ?? 'es' == 'pt' ? 'pt-br' : $settings['default_language'] ?? 'es' ?>" lang="<?= $settings['default_language'] ?? 'es' ?>"
class="h-100" class="h-100"
class="dark-style customizer-hide" class="dark-style customizer-hide"
dir="ltr" dir="ltr"

View File

@ -15,7 +15,7 @@ if (!empty($token) && $tfa == false) {
<!DOCTYPE html> <!DOCTYPE html>
<html <html
lang="<?= $settings['default_language'] ?? 'es' == 'pt' ? 'pt-br' : $settings['default_language'] ?? 'es' ?>" lang="<?= $session->get('lang') ?>"
class="h-100" class="h-100"
class="semi-dark-style customizer-hide" class="semi-dark-style customizer-hide"
dir="ltr" dir="ltr"
@ -371,7 +371,7 @@ if (!empty($token) && $tfa == false) {
<!-- Language --> <!-- Language -->
<li class="nav-item dropdown-language dropdown me-2 me-xl-0"> <li class="nav-item dropdown-language dropdown me-2 me-xl-0">
<a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown"> <a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown">
<i class="fi fi-es fis rounded-circle me-1 fs-3"></i> <i class="fi <?= getCurrentLanguageFlag(); ?> fis rounded-circle me-1 fs-3"></i>
</a> </a>
<ul class="dropdown-menu dropdown-menu-end"> <ul class="dropdown-menu dropdown-menu-end">
<li> <li>
@ -423,12 +423,12 @@ if (!empty($token) && $tfa == false) {
<span class="align-middle"><?= lang("App.menu_profile") ?></span> <span class="align-middle"><?= lang("App.menu_profile") ?></span>
</a> </a>
</li> </li>
<li> <!-- <li>-->
<a class="dropdown-item" href="#"> <!-- <a class="dropdown-item" href="#">-->
<i class="ti ti-settings me-2 ti-sm"></i> <!-- <i class="ti ti-settings me-2 ti-sm"></i>-->
<span class="align-middle">Settings</span> <!-- <span class="align-middle">Settings</span>-->
</a> <!-- </a>-->
</li> <!-- </li>-->
<li> <li>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>

View File

@ -15,7 +15,7 @@ if (!empty($token) && $tfa == false) {
<!DOCTYPE html> <!DOCTYPE html>
<html <html
lang="<?= $settings['default_language'] ?? 'es' == 'pt' ? 'pt-br' : $settings['default_language'] ?? 'es' ?>" lang="<?= $session->get('lang') ?>"
class="h-100" class="h-100"
class="semi-dark-style customizer-hide" class="semi-dark-style customizer-hide"
dir="ltr" dir="ltr"

View File

@ -15,7 +15,7 @@ if (!empty($token) && $tfa == false) {
<!DOCTYPE html> <!DOCTYPE html>
<html <html
lang="<?= $settings['default_language'] ?? 'es' == 'pt' ? 'pt-br' : $settings['default_language'] ?? 'es' ?>" lang="<?= $session->get('lang') ?>"
class="h-100" class="h-100"
class="semi-dark-style customizer-hide" class="semi-dark-style customizer-hide"
dir="ltr" dir="ltr"
@ -79,11 +79,10 @@ if (!empty($token) && $tfa == false) {
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/css/rtl/core.css') ?>"/> <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/css/rtl/core.css') ?>"/>
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/css/rtl/theme-semi-dark.css') ?>"/> <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/css/rtl/theme-semi-dark.css') ?>"/>
<link rel="stylesheet" href="<?= site_url('themes/vuexy/css/demo.css') ?>"/> <link rel="stylesheet" href="<?= site_url('themes/vuexy/css/demo.css') ?>"/>
<!-- Vendors CSS --> <!-- Vendors CSS -->
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/perfect-scrollbar/perfect-scrollbar.css') ?>"/> <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/perfect-scrollbar/perfect-scrollbar.css') ?>"/>
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/node-waves/node-waves.css') ?>"/>
<!-- Page CSS --> <!-- Page CSS -->
<?= $this->renderSection('css') ?> <?= $this->renderSection('css') ?>
@ -92,7 +91,7 @@ if (!empty($token) && $tfa == false) {
<script src="<?= site_url('themes/vuexy/vendor/js/helpers.js') ?>"></script> <script src="<?= site_url('themes/vuexy/vendor/js/helpers.js') ?>"></script>
<script src="<?= site_url('themes/vuexy/js/config.js') ?>"></script> <script src="<?= site_url('themes/vuexy/js/config.js') ?>"></script>
</head> </head>
<body> <body>
@ -143,8 +142,9 @@ if (!empty($token) && $tfa == false) {
<!-- Language --> <!-- Language -->
<li class="nav-item dropdown-language dropdown me-2 me-xl-0"> <li class="nav-item dropdown-language dropdown me-2 me-xl-0">
<a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown"> <a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);"
<i class="fi fi-es fis rounded-circle me-1 fs-3"></i> data-bs-toggle="dropdown">
<i class="fi <?= getCurrentLanguageFlag(); ?> fis rounded-circle me-1 fs-3"></i>
</a> </a>
<ul class="dropdown-menu dropdown-menu-end"> <ul class="dropdown-menu dropdown-menu-end">
<li> <li>
@ -176,7 +176,7 @@ if (!empty($token) && $tfa == false) {
<a class="dropdown-item" href="#"> <a class="dropdown-item" href="#">
<div class="d-flex"> <div class="d-flex">
<div class="flex-shrink-0 me-3"> <div class="flex-shrink-0 me-3">
<div class="avatar avatar-online"> <div class="avatar avatar">
<img src="<?= $picture ?? '' ?>" alt class="h-auto rounded-circle"/> <img src="<?= $picture ?? '' ?>" alt class="h-auto rounded-circle"/>
</div> </div>
</div> </div>
@ -196,12 +196,12 @@ if (!empty($token) && $tfa == false) {
<span class="align-middle"><?= lang("App.menu_profile") ?></span> <span class="align-middle"><?= lang("App.menu_profile") ?></span>
</a> </a>
</li> </li>
<li> <!-- <li>-->
<a class="dropdown-item" href="#"> <!-- <a class="dropdown-item" href="#">-->
<i class="ti ti-settings me-2 ti-sm"></i> <!-- <i class="ti ti-settings me-2 ti-sm"></i>-->
<span class="align-middle">Settings</span> <!-- <span class="align-middle">Settings</span>-->
</a> <!-- </a>-->
</li> <!-- </li>-->
<li> <li>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@ -267,7 +267,6 @@ if (!empty($token) && $tfa == false) {
<script src="<?= site_url('themes/vuexy/vendor/libs/popper/popper.js') ?>"></script> <script src="<?= site_url('themes/vuexy/vendor/libs/popper/popper.js') ?>"></script>
<script src="<?= site_url('themes/vuexy/vendor/js/bootstrap.js') ?>"></script> <script src="<?= site_url('themes/vuexy/vendor/js/bootstrap.js') ?>"></script>
<script src="<?= site_url('themes/vuexy/vendor/libs/perfect-scrollbar/perfect-scrollbar.js') ?>"></script> <script src="<?= site_url('themes/vuexy/vendor/libs/perfect-scrollbar/perfect-scrollbar.js') ?>"></script>
<script src="<?= site_url('themes/vuexy/vendor/libs/node-waves/node-waves.js') ?>"></script>
<script src="<?= site_url('themes/vuexy/vendor/libs/hammer/hammer.js') ?>"></script> <script src="<?= site_url('themes/vuexy/vendor/libs/hammer/hammer.js') ?>"></script>
@ -285,59 +284,62 @@ if (!empty($token) && $tfa == false) {
<script type="text/javascript"> <script type="text/javascript">
var theTable; var theTable;
var <?=csrf_token() ?? 'token'?>v = '<?= csrf_hash() ?>'; var <?=csrf_token() ?? 'token'?>v = '<?= csrf_hash() ?>';
function yeniden(andac = null) { function yeniden(andac = null) {
if (andac == null) { if (andac == null) {
andac = <?= csrf_token() ?>v; andac = <?= csrf_token() ?>v;
} else { } else {
<?= csrf_token() ?>v = andac; <?= csrf_token() ?>v = andac;
}
$('input[name="<?= csrf_token() ?>"]').val(andac);
$('meta[name="<?= config('Security')->tokenName ?>"]').attr('content', andac)
$.ajaxSetup({ headers: {'<?= config('Security')->headerName ?>': andac, 'X-Requested-With': 'XMLHttpRequest' }, <?=csrf_token()?>: andac });
} }
$('input[name="<?= csrf_token() ?>"]').val(andac);
document.addEventListener('DOMContentLoaded', function() { $('meta[name="<?= config('Security')->tokenName ?>"]').attr('content', andac)
$.ajaxSetup({
headers: {'<?= config('Security')->headerName ?>': andac, 'X-Requested-With': 'XMLHttpRequest'},
<?=csrf_token()?>: andac
});
}
function adjustSidebar4ContentWrapper() { document.addEventListener('DOMContentLoaded', function () {
if ($('#sidebar').hasClass('d-none') && $(window).width() <= 768) {
$('#contentWrapper').addClass('full-width'); function adjustSidebar4ContentWrapper() {
} else { if ($('#sidebar').hasClass('d-none') && $(window).width() <= 768) {
if (!$('#sidebar').hasClass('inactive')) { $('#contentWrapper').addClass('full-width');
$('#contentWrapper').removeClass('full-width'); } else {
} if (!$('#sidebar').hasClass('inactive')) {
$('#contentWrapper').removeClass('full-width');
} }
} }
}
adjustSidebar4ContentWrapper(); adjustSidebar4ContentWrapper();
$('#sidebarCollapse').on('click', function () { $('#sidebarCollapse').on('click', function () {
if ($('#sidebar').hasClass('d-none') && $(window).width() <= 768 ) { if ($('#sidebar').hasClass('d-none') && $(window).width() <= 768) {
$('#sidebar').removeClass('d-none d-sm-none d-md-block'); $('#sidebar').removeClass('d-none d-sm-none d-md-block');
$('#contentWrapper').removeClass('full-width'); $('#contentWrapper').removeClass('full-width');
} else { } else {
$('#sidebar').toggleClass('inactive'); $('#sidebar').toggleClass('inactive');
$('#contentWrapper').toggleClass('full-width'); $('#contentWrapper').toggleClass('full-width');
$('.collapse.in').toggleClass('in'); $('.collapse.in').toggleClass('in');
$('a[aria-expanded=true]').attr('aria-expanded', 'false'); $('a[aria-expanded=true]').attr('aria-expanded', 'false');
} }
});
$(window).resize(function() {
adjustSidebar4ContentWrapper();
});
<?= $this->renderSection('additionalInlineJs') ?>
}); });
$(window).resize(function () {
adjustSidebar4ContentWrapper();
});
<?= $this->renderSection('additionalInlineJs') ?>
});
</script> </script>

View File

@ -17,7 +17,7 @@ if (!empty($token) && $tfa == false) {
<!DOCTYPE html> <!DOCTYPE html>
<html <html
lang="<?= $settings['default_language'] ?? 'es' == 'pt' ? 'pt-br' : $settings['default_language'] ?? 'es' ?>" lang="<?= $session->get('lang') ?>"
class="h-100" class="h-100"
class="dark-style customizer-hide" class="dark-style customizer-hide"
dir="ltr" dir="ltr"