diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 987a08cf..0bdb7590 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,7 @@ - + + \ No newline at end of file diff --git a/ci4/.env b/ci4/.env index f5a58fed..d00689e2 100644 --- a/ci4/.env +++ b/ci4/.env @@ -23,7 +23,7 @@ CI_ENVIRONMENT = development #-------------------------------------------------------------------- # app.baseURL = 'https://sk-imn.imnavajas.es' -app.baseURL = 'https://sk-jjo.imnavajas.es' +app.baseURL = 'https://sk-imn.imnavajas.es' # app.forceGlobalSecureRequests = false # app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler' @@ -41,9 +41,9 @@ app.baseURL = 'https://sk-jjo.imnavajas.es' #-------------------------------------------------------------------- database.default.hostname = localhost -database.default.database = sk_jjo -database.default.username = sk_jjo -database.default.password = 61tv&G1Zf^XY +database.default.database = sk_imn +database.default.username = sk_imn +database.default.password = Uyia19_87 database.default.DBDriver = MySQLi database.default.DBPrefix = database.default.dump = diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php index 16980da4..093d13a3 100644 --- a/ci4/app/Controllers/Home.php +++ b/ci4/app/Controllers/Home.php @@ -32,7 +32,7 @@ class Home extends BaseController else $salutation = lang("App.dashboard_good_night"); - echo view(getenv('theme.path').'main/all'); + echo view(getenv('theme.path').'main/all_selects'); /* //echo view(getenv('theme.path').'main/header'); diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php index 47ddf7c7..278c3457 100644 --- a/ci4/app/Helpers/general_helper.php +++ b/ci4/app/Helpers/general_helper.php @@ -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){ diff --git a/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php b/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php index b88bd0bc..00be171b 100644 --- a/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php +++ b/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php @@ -1,35 +1,27 @@ section('css') ?> - - - */ ?> endSection() ?> section('additionalExternalJs') ?> - ?> - - endSection() ?> section('additionalInlineJs') ?> - 'use strict'; - const select2 = $('.select2'); + const select2 = $('.select2'); - // Select2 - // -------------------------------------------------------------------- - if (select2.length) { - select2.each(function () { - var $this = $(this); - $this.wrap('
').select2({ - placeholder: 'Select value', - dropdownParent: $this.parent() - }); + // Select2 + // -------------------------------------------------------------------- + if (select2.length) { + select2.each(function () { + var $this = $(this); + $this.wrap('
').select2({ + placeholder: 'Select value', + dropdownParent: $this.parent() }); - } + }); + } endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/form.php b/ci4/app/Views/themes/backend/vuexy/form/group/form.php deleted file mode 100644 index dd972e4e..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/group/form.php +++ /dev/null @@ -1,166 +0,0 @@ - -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
-
-
-
-
-
-

-
-
- -
" method="post"> - - - -
-
-
-
- - -
-
-
-
- - - -
-
-
-
-
-
- - -
-
-
-
-
-
-
-

-
-
-
- - -
-

- - -
- - -
- - -
- - -
-
-
- -
-
-

-
-
-
- - -
-

- - -
- - -
- - -
- - -
-
-
- -
-
-
-
- - - - -
-
-
-
-
-
-
-
- - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/index.php b/ci4/app/Views/themes/backend/vuexy/form/group/index.php deleted file mode 100644 index 4d233d31..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/group/index.php +++ /dev/null @@ -1,118 +0,0 @@ - -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
-
- -
-
-
-
-
-

-
-
- - - -
-
-
- - - -
- - - - - - - - - - -
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php index a66b6690..c664c8dd 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php @@ -6,107 +6,65 @@
-
-

-
+

-
+ - - -
-
-
-
- - -
-
-
-
- - dashboard : set_value('dashboard'); ?> - -
-
+ + +
+
+ +
-
-
-
- - -
-
+
+ + dashboard : set_value('dashboard'); ?> +
-
-
-
Role Permissions
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+ +
+
+
Role Permissions
+ +
+
>> -
- rules, $item['name'], $subitem)?'checked':''?> - > - -
-
+ + - + - + + - -
+ + >> + @@ -115,7 +73,7 @@ id="" name="" class="form-check-input" - rules, $item['name'], $subitem)?'checked':''?> + rules, $item['name'], $subitem) ? 'checked' : '' ?> > @@ -126,17 +84,41 @@
-
+ + + + + + + +
+ rules, $item['name'], $subitem) ? 'checked' : '' ?> + > + +
+ + + + + + + +
-
- "btn btn-secondary float-start"]) ?> - + "> + "btn btn-secondary"]) ?>
@@ -150,14 +132,14 @@ section('additionalInlineJs') ?> $('#select_all').on('click', function () { - $(':checkbox').each(function() { - this.checked = true; - }); + $(':checkbox').each(function() { + this.checked = true; + }); }); $('#remove_all').on('click', function () { - $(':checkbox').each(function() { - this.checked = false; - }); + $(':checkbox').each(function() { + this.checked = false; + }); }); endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php index 0f58c828..af23de5e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php @@ -26,7 +26,7 @@ - +
- +
- +
- +
- +
- - + +
status);?> - - +
- -
+ +
\ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php index fe4d02ae..417ed876 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php @@ -1,25 +1,26 @@ include("themes/_commonPartialsBs/select2bs5") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
-
-
-

-
-
- -
- - getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - -
-
- "btn btn-secondary float-start"]) ?> - "> -
-
-
+
+
+

+
+
+
+ + + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+ "> + "btn btn-secondary"]) ?> +
+
+
+
endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/login/header.php b/ci4/app/Views/themes/backend/vuexy/login/header.php index d8fea562..fec3e52d 100644 --- a/ci4/app/Views/themes/backend/vuexy/login/header.php +++ b/ci4/app/Views/themes/backend/vuexy/login/header.php @@ -10,7 +10,7 @@ if (!empty($token) && $tfa == false) { - - + + - @@ -371,7 +370,7 @@ if (!empty($token) && $tfa == false) {
  • - +
    • @@ -423,12 +422,12 @@ if (!empty($token) && $tfa == false) {
      • -
    • - - - Settings - -
      • + + + + + +
    • @@ -492,7 +491,6 @@ if (!empty($token) && $tfa == false) { - diff --git a/ci4/app/Views/themes/backend/vuexy/main/all_selects.php b/ci4/app/Views/themes/backend/vuexy/main/all_selects.php index 5a130e55..9c4a779c 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all_selects.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all_selects.php @@ -80,7 +80,7 @@ if (!empty($token) && $tfa == false) { - + @@ -398,7 +398,6 @@ if (!empty($token) && $tfa == false) { - @@ -414,19 +413,10 @@ if (!empty($token) && $tfa == false) { 'use strict'; $(function () { - const selectPicker = $('.selectpicker'), - select2 = $('.select2'); - - // Bootstrap Select - // -------------------------------------------------------------------- - if (selectPicker.length) { - selectPicker.selectpicker(); - } + const select2 = $('.select2'); // Select2 // -------------------------------------------------------------------- - - // Default if (select2.length) { select2.each(function () { var $this = $(this); diff --git a/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php b/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php index 34b1c2f4..f090ea69 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php @@ -15,7 +15,7 @@ if (!empty($token) && $tfa == false) { - - + + - + - renderSection('css') ?> @@ -92,7 +90,7 @@ if (!empty($token) && $tfa == false) { - + @@ -143,8 +141,9 @@ if (!empty($token) && $tfa == false) {
    • - - + +
      • @@ -176,7 +175,7 @@ if (!empty($token) && $tfa == false) {
        -
        +
        @@ -196,12 +195,12 @@ if (!empty($token) && $tfa == false) {
        • -
      • - - - Settings - -
        • + + + + + +
      • @@ -267,10 +266,7 @@ if (!empty($token) && $tfa == false) { - - - @@ -285,59 +281,62 @@ if (!empty($token) && $tfa == false) { diff --git a/ci4/app/Views/themes/backend/vuexy/main/header.php b/ci4/app/Views/themes/backend/vuexy/main/header.php index 1944335d..e1129698 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/header.php +++ b/ci4/app/Views/themes/backend/vuexy/main/header.php @@ -17,7 +17,7 @@ if (!empty($token) && $tfa == false) {