jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/presupuesto_cliente_2'

Browse Source 
Main

See merge request jjimenez/safekat!231
This commit is contained in:
Jaime Jimenez Ortega
2024-05-07 09:01:10 +00:00
parent 282f2274ca e92e7b93f5
commit 5ef1360565
266 changed files with 6544 additions and 10103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci4/app/Views/themes/backend/vuexy/main/activities_layout.php
View File

@ -4,7 +4,7 @@ $token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
$picture = session()->get('picture');
$picture = "/assets/img/default-user.png";
$pulse = session()->get('pulse');
$notification = session()->get('notification');
@ -31,7 +31,7 @@ if (!empty($token) && $tfa == false) {
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<title><?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?></title>
<title><?= config('Safekat')->appName ?></title>
<meta name="description" content=""/>
@ -269,7 +269,7 @@ if (!empty($token) && $tfa == false) {
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item" href="<?= site_url("login/logout") ?>">
<a class="dropdown-item" href="<?= site_url("logout") ?>">
<i class="ti ti-logout me-2 ti-sm"></i>
<span class="align-middle"><?= lang("App.menu_logout") ?></span>
</a>

15
ci4/app/Views/themes/backend/vuexy/main/all.php
View File

@ -1,16 +1,7 @@
<?php
$session = session();
$token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
$picture = session()->get('picture');
$pulse = session()->get('pulse');
$notification = session()->get('notification');
if (!empty($token) && $tfa == false) {
//echo "<script>window.location.href = '/'; </script>";
}
$picture = "/assets/img/default-user.png";
?>
<!DOCTYPE html>
@ -31,7 +22,7 @@ if (!empty($token) && $tfa == false) {
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<title><?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?></title>
<title><?= config('Safekat')->appName ?></title>
<meta name="description" content=""/>
@ -502,7 +493,7 @@ if (!empty($token) && $tfa == false) {
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item" href="<?= site_url("login/logout") ?>">
<a class="dropdown-item" href="<?= site_url("logout") ?>">
<i class="ti ti-logout me-2 ti-sm"></i>
<span class="align-middle"><?= lang("App.menu_logout") ?></span>
</a>

15
ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php
View File

@ -1,16 +1,7 @@
<?php
$session = session();
$token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
$picture = session()->get('picture');
$pulse = session()->get('pulse');
$notification = session()->get('notification');
if (!empty($token) && $tfa == false) {
//echo "<script>window.location.href = '/'; </script>";
}
$picture = "/assets/img/default-user.png";
?>
<!DOCTYPE html>
@ -31,7 +22,7 @@ if (!empty($token) && $tfa == false) {
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<title><?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?></title>
<title><?= config('Safekat')->appName ?></title>
<meta name="description" content=""/>
@ -267,7 +258,7 @@ if (!empty($token) && $tfa == false) {
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item" href="<?= site_url("login/logout") ?>">
<a class="dropdown-item" href="<?= site_url("logout") ?>">
<i class="ti ti-logout me-2 ti-sm"></i>
<span class="align-middle"><?= lang("App.menu_logout") ?></span>
</a>

6
ci4/app/Views/themes/backend/vuexy/main/demo_view.php
View File

@ -4,7 +4,7 @@ $token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
$picture = session()->get('picture');
$picture = "/assets/img/default-user.png";
$pulse = session()->get('pulse');
$notification = session()->get('notification');
@ -30,7 +30,7 @@ if (!empty($token) && $tfa == false) {
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<title><?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?></title>
<title><?= config('Safekat')->appName ?></title>
<meta name="description" content=""/>
@ -204,7 +204,7 @@ if (!empty($token) && $tfa == false) {
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item" href="<?= site_url("login/logout") ?>">
<a class="dropdown-item" href="<?= site_url("logout") ?>">
<i class="ti ti-logout me-2 ti-sm"></i>
<span class="align-middle"><?= lang("App.menu_logout") ?></span>
</a>

6
ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php
View File

@ -4,7 +4,7 @@ $token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
$picture = session()->get('picture');
$picture = "/assets/img/default-user.png";
$pulse = session()->get('pulse');
$notification = session()->get('notification');
@ -31,7 +31,7 @@ if (!empty($token) && $tfa == false) {
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<title><?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?></title>
<title><?= config('Safekat')->appName ?></title>
<meta name="description" content=""/>
@ -272,7 +272,7 @@ if (!empty($token) && $tfa == false) {
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item" href="<?= site_url("login/logout") ?>">
<a class="dropdown-item" href="<?= site_url("logout") ?>">
<i class="ti ti-logout me-2 ti-sm"></i>
<span class="align-middle"><?= lang("App.menu_logout") ?></span>
</a>

4
ci4/app/Views/themes/backend/vuexy/main/header.php
View File

@ -5,7 +5,7 @@ $tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
// Legacy TODO: check?
$picture = session()->get('picture');
$picture = "/assets/img/default-user.png";
$pulse = session()->get('pulse');
$notification = session()->get('notification');
@ -174,7 +174,7 @@ if (!empty($token) && $tfa == false) {
<span class="ml-2"><?= lang("App.menu_activity") ?></span>
</a>
--->
<a href="<?= site_url('login/logout'); ?>" class="dropdown-item">
<a href="<?= site_url('logout'); ?>" class="dropdown-item">
<i class="fas fa-sign-out-alt"></i>
<span class="ml-2"><?= lang("App.menu_logout") ?></span>
</a>

1139
ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php
View File

File diff suppressed because it is too large Load Diff

6
ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php
View File

@ -4,7 +4,7 @@ $token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings');
$picture = session()->get('picture');
$picture = "/assets/img/default-user.png";
$pulse = session()->get('pulse');
$notification = session()->get('notification');
@ -31,7 +31,7 @@ if (!empty($token) && $tfa == false) {
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"
/>
<title><?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?></title>
<title><?= config('Safekat')->appName ?></title>
<meta name="description" content=""/>
@ -273,7 +273,7 @@ if (!empty($token) && $tfa == false) {
<div class="dropdown-divider"></div>
</li>
<li>
<a class="dropdown-item" href="<?= site_url("login/logout") ?>">
<a class="dropdown-item" href="<?= site_url("logout") ?>">
<i class="ti ti-logout me-2 ti-sm"></i>
<span class="align-middle"><?= lang("App.menu_logout") ?></span>
</a>

24
ci4/app/Views/themes/backend/vuexy/main/selector_menu.php
View File

@ -1,22 +1,16 @@
<?php
$session = session();
$viewMode = $session->get('view_mode');
if ($viewMode == config("Basics")->vista_maquetacion) {
include "menu_maquetacion.php";
}
else if ($viewMode == config("Basics")->vista_digitalizacion) {
include "menu_digitalizacion.php";
}
else {
include "menu_impresion.php";
switch ($viewMode) {
case config("Safekat")->vista_maquetacion:
include "menu_maquetacion.php";
break;
case config("Safekat")->vista_digitalizacion:
include "menu_digitalizacion.php";
break;
default:
include "menu_impresion.php";
}