From b1951de6615fc16f8b2c2b33822622268fb98e00 Mon Sep 17 00:00:00 2001
From: imnavajas <imnavajas@coit.es>
Date: Sun, 28 May 2023 16:50:56 +0200
Subject: [PATCH] Settings and UI changes

---
 .idea/workspace.xml                           |  9 ++++
 ci4/app/Controllers/Settings.php              | 14 -------
 ci4/app/Filters/LoginAuthFilter.php           |  2 +-
 ci4/app/Helpers/general_helper.php            |  3 +-
 ci4/app/Language/es/App.php                   |  2 +-
 .../backend/vuexy/form/settings/index.php     | 18 ++++----
 .../tarifas/acabado/viewTarifaacabadoForm.php |  2 +-
 .../viewTarifapreimpresionForm.php            | 42 ++++++++++---------
 .../viewTarifapreimpresionList.php            |  4 +-
 .../Views/themes/backend/vuexy/main/menu.php  | 20 ++++++++-
 10 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0f5a3baa..21bbd9a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,15 @@
   <component name="ChangeListManager">
     <list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Settings.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Settings.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/Helpers/general_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Helpers/general_helper.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Language/es/App.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Language/es/App.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/settings/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/settings/index.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/menu.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/menu.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -89,6 +97,7 @@
       <workItem from="1685018778974" duration="1905000" />
       <workItem from="1685038598644" duration="6958000" />
       <workItem from="1685102978387" duration="3272000" />
+      <workItem from="1685266094611" duration="3469000" />
     </task>
     <task id="LOCAL-00001" summary="Starting Vuexy Theme creation">
       <created>1682339938559</created>
diff --git a/ci4/app/Controllers/Settings.php b/ci4/app/Controllers/Settings.php
index cf51db9a..25033d98 100644
--- a/ci4/app/Controllers/Settings.php
+++ b/ci4/app/Controllers/Settings.php
@@ -54,20 +54,6 @@ class Settings extends BaseController
             ['title' => lang("App.menu_settings"), 'route'  => "", 'active' => true]
         ];
 
-        $data['btn_return'] = [
-            'title' => lang("App.global_come_back"),
-            'route'   => '/home',
-            'class'   => 'btn btn-dark mr-1',
-            'icon'  => 'fas fa-angle-left'
-        ];
-
-        $data['btn_submit'] = [
-            'title' => lang("App.global_save"),
-            'route'   => '',
-            'class'   => 'btn btn-primary mr-1',
-            'icon'  => 'fas fa-save'
-        ];
-
         $data['obj'] = $this->settings_model->first();
         $data['countries'] = $this->countries_model->select('id_country,code,name')->where('data_lang',session()->get('lang')??'en')->findAll();
         $data['theme'] = $this->theme_model->select('id_theme,type,name')->findAll();
diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php
index 8343f613..91085c7b 100644
--- a/ci4/app/Filters/LoginAuthFilter.php
+++ b/ci4/app/Filters/LoginAuthFilter.php
@@ -141,7 +141,7 @@ class LoginAuthFilter implements FilterInterface
             'Test',
             'GoBaseController',
             'GoBaseResourceController',
-            'Settings', 'My', 'Activity', 'Notification'    // PARA LA DEMO
+            'My', 'Activity', 'Notification'    // PARA LA DEMO
 
         ];
     }
diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php
index 278c3457..495703c6 100644
--- a/ci4/app/Helpers/general_helper.php
+++ b/ci4/app/Helpers/general_helper.php
@@ -465,7 +465,8 @@ function escape_only($value='') {
 }
 
 function unescape($value='') {
-    return html_entity_decode($value,null,'UTF-8');;
+    //return html_entity_decode($value,null,'UTF-8');;
+    return html_entity_decode($value,ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401,'UTF-8');
 }
 
 function redirect_to( $location = NULL ) {
diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php
index a5259df0..c309f994 100644
--- a/ci4/app/Language/es/App.php
+++ b/ci4/app/Language/es/App.php
@@ -395,7 +395,7 @@ return [
     "settings_label_api" => "API",
     "settings_label_api_title" => "Configuración de API",
     "settings_label_api_subtitle_1" => "Establezca a continuación si desea habilitar el uso de API:",
-    "settings_label_logs" => "Registros",
+    "settings_label_logs" => "Logs",
     "settings_label_logs_title" => "Configuración de registros",
     "settings_label_logs_subtitle_1" => "Defina a continuación si desea borrar los registros de acceso con frecuencia:",
     "settings_field_title" => "Título de la página",
diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php
index eaff54ac..3818b102 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php
@@ -22,6 +22,7 @@
                         <span class="align-middle fw-semibold"><?=lang("App.settings_label_email")?></span>
                     </button>
                 </li>
+                <?php /* ?>
                 <li class="nav-item">
                     <button class="nav-link" data-bs-toggle="tab" data-bs-target="#robots">
                         <i class="ti ti-robot me-1 ti-sm"></i>
@@ -40,6 +41,7 @@
                         <span class="align-middle fw-semibold"><?=lang("App.settings_label_storage")?></span>
                     </button>
                 </li>
+                <?php */ ?>
                 <li class="nav-item">
                     <button class="nav-link" data-bs-toggle="tab" data-bs-target="#backup">
                         <i class="ti ti-server me-1 ti-sm"></i>
@@ -52,6 +54,7 @@
                         <span class="align-middle fw-semibold"><?=lang("App.settings_label_register")?></span>
                     </button>
                 </li>
+                <?php /* ?>
                 <li class="nav-item">
                     <button class="nav-link" data-bs-toggle="tab" data-bs-target="#notification">
                         <i class="ti ti-bell me-1 ti-sm"></i>
@@ -64,6 +67,7 @@
                         <span class="align-middle fw-semibold"><?=lang("App.settings_label_api")?></span>
                     </button>
                 </li>
+                <?php */ ?>
                 <li class="nav-item">
                     <button class="nav-link" data-bs-toggle="tab" data-bs-target="#logs">
                         <i class="ti ti-archive me-1 ti-sm"></i>
@@ -1282,15 +1286,13 @@
                 </div>
                 <!-- /Cron Settings -->
             </div>
-            <div class="row mt-4">
-                <div class="col-12">
-                    <a href="<?= site_url($btn_return['route']??'#') ?>" class="<?= $btn_return['class']??''?>">
-                        <i class="<?= $btn_return['icon']??'' ?>"></i> <?= $btn_return['title']??'' ?>
-                    </a>
-                    <button type="submit" class="<?= $btn_submit['class']??''?>">
-                        <i class="<?= $btn_submit['icon']??'' ?>"></i> <?= $btn_submit['title']??'' ?>
+            <div class="tab-content pt-4">
+                    <button type="submit" class="btn btn-primary float-start me-sm-3 me-1">
+                        <?= lang("App.global_save") ?>
                     </button>
-                </div>
+                    <a href="<?= site_url('/home') ?>" class="btn btn-secondary">
+                        <?= lang("App.global_come_back") ?>
+                    </a>
             </div>
         </form>
     </div>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php
index f52ac417..92ff8f02 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php
@@ -17,7 +17,7 @@
                            class="btn btn-primary float-start me-sm-3 me-1"
                            name="save"
                            value="<?= lang("Basic.global.Save") ?>"
-                    >
+                    />
                     <?= anchor(route_to("tarifaacabadoList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary"]) ?>
                 </div><!-- /.card-footer -->
             </form>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php
index 43edc2bc..266655af 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php
@@ -1,27 +1,29 @@
 <?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
-<?=$this->extend('themes/backend/vuexy/main/defaultlayout') ?>
+<?= $this->extend('themes/backend/vuexy/main/defaultlayout') ?>
 <?= $this->section("content") ?>
 <div class="row">
     <div class="col-12">
-		<div class="card card-info">
-			<div class="card-header">
-        		<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
-			</div><!--//.card-header -->
-			<form id="tarifapreimpresionForm" method="post" action="<?= $formAction ?>">
-				<?= csrf_field() ?>
-			<div class="card-body">
-				<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
-				<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
-				<?= view("themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems") ?>
-			</div><!-- /.card-body -->
-			<div class="card-footer">
-				<?= anchor(route_to("tarifapreimpresionList"), lang("Basic.global.Cancel"), [
-        "class" => "btn btn-secondary float-start",
-    ]) ?>
-				<input type="submit" class="btn btn-primary float-end" name="save" value="<?= lang("Basic.global.Save") ?>">
-			</div><!-- /.card-footer -->
-			</form>
-    </div><!-- //.card -->
+        <div class="card card-info">
+            <div class="card-header">
+                <h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
+            </div><!--//.card-header -->
+            <form id="tarifapreimpresionForm" method="post" class="card-body" action="<?= $formAction ?>">
+                <?= csrf_field() ?>
+                <?= view("themes/_commonPartialsBs/_alertBoxes") ?>
+                <?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
+                <?= view("themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems") ?>
+                <div class="pt-4">
+                    <input
+                            type="submit"
+                            class="btn btn-primary float-start me-sm-3 me-1"
+                            name="save"
+                            value="<?= lang("Basic.global.Save") ?>"
+                    />
+                    <?= anchor(route_to("tarifapreimpresionList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary"]) ?>
+
+                </div><!-- /.card-footer -->
+            </form>
+        </div><!-- //.card -->
     </div><!--//.col -->
 </div><!--//.row -->
 <?= $this->endSection() ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
index 90483867..8bacdd86 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
@@ -58,8 +58,8 @@
 								</td>
 								*/ ?>
 								<td class="align-middle text-center text-nowrap">
-									<?=anchor(route_to('editTarifapreimpresion', $item->id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1',  'data-id'=>$item->id,]); ?> 
-									<?=anchor('#confirm2delete', lang('Basic.global.Delete'), ['class'=>'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteTarifapreimpresion', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?>
+									<?=anchor(route_to('editTarifapreimpresion', $item->id), "<i class='ti ti-pencil ti-sm mx-2'></i>", ['class'=>'text-body',  'data-id'=>$item->id,]); ?>
+									<?=anchor('#confirm2delete', "<i class='ti ti-trash ti-sm mx-2'></i>", ['class'=>'text-body', 'data-href'=>route_to('deleteTarifapreimpresion', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?>
 								</td>
 							</tr>
 
diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu.php b/ci4/app/Views/themes/backend/vuexy/main/menu.php
index ee68f1c3..8ca0e685 100644
--- a/ci4/app/Views/themes/backend/vuexy/main/menu.php
+++ b/ci4/app/Views/themes/backend/vuexy/main/menu.php
@@ -505,7 +505,6 @@
                 </li>
             <?php endif; ?>
 
-
             <?php
             /**
              * MENU ACTIVIDAD
@@ -520,11 +519,28 @@
                 </li>
             <?php endif; ?>
 
+            <?php
+            /**
+             * MENU AJUSTES
+             */
+            if (count(getArrayItem($menus, 'name', 'Settings')) > 0): ?>
+                <!-- Settings -->
+                <li class="menu-header small text-uppercase">
+                    <span class="menu-header-text">Ajustes del Sistema</span>
+                </li>
+                <li class="menu-item">
+                    <a href="<?= site_url("settings")?>" class="menu-link">
+                        <i class="menu-icon tf-icons ti ti-settings""></i>
+                        <div data-i18n="<?= lang("App.menu_settings") ?>"><?= lang("App.menu_settings") ?></div>
+                    </a>
+                </li>
+            <?php endif; ?>
+
+
         </ul>
     </aside>
     <!-- / Menu -->
 
-
 <?php /*