[Noalyss-commit] [noalyss] 19/21: Integrate stash

[dwm]

sparkyx pushed a commit to branch unstable
in repository noalyss.

commit f239ef40e3c49b2a50a59e9171d4b3957acd02c1
Merge: 5e18408d9 b282f2846
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sat Dec 14 18:09:48 2024 +0100

    Integrate stash

 html/css/style-classic7.css       | 89 +++++++++++++++++++++++++++++++++++++++
 html/test.php                     |  2 +-
 include/class/todo_list.class.php | 20 +++++++--
 include/sql/mod1/data.sql         | 23 +---------
 include/sql/mod1/make-sql         |  2 +-
 include/sql/mod1/schema.sql       |  7 +++
 include/sql/mod2/make-sql         |  4 +-
 sql/upgrade.sql                   |  4 +-
 8 files changed, 119 insertions(+), 32 deletions(-)

diff --cc html/css/style-classic7.css
index 082e05c8e,bab8568b8..6aeefd5a5
--- a/html/css/style-classic7.css
+++ b/html/css/style-classic7.css
@@@ -264,6 -262,6 +264,45 @@@ td.tool a.mtitle:hover 
   }
  
  
++ }
++ #module .nav-pills a.nav-link:hover {
++         color:white !important;
++        border:1px solid transparent;
++ }
++ #module .nav-item-active , #module .nav-item-active > a.nav-link{
++     background-color: #5d90cd ;
++     color:white !important;
++     border: 0px solid black;
++ }
++ /* animate module : sliding */
++ #module .nav-item-module {
++     position:relative;
++     background-color: white;
++     color:navy;
++ }
++ #module .nav-item-module.nav-item-slide::before {
++     content:'';
++     top:0;
++     left:0;
++     bottom:0;
++     right:0;
++     position:absolute;
++     background-color:#5d90cd;
++     z-index:-1;
++     transform:scaleX(0);
++     transition:transform 300ms ease-in-out;
++     mix-blend-mode: darken;
++ }
++ #module  .nav-item-module.nav-item-slide:hover::before,
++ #module  .nav-item-module.nav-item-slide:focus::before {
++     transform:scaleX(1);
++ }
++ #module .nav-item-slide {
++     z-index:0;
++     transition:color 300ms ease-in-out;
++ }
++
++
  
  
   #module .nav-fill  #module .nav-item {
@@@ -3759,43 -3713,43 +3798,93 @@@ h2.h-section 
  
  }
  
 +.nav-item.nav-item-underline::before {
 +     content:'';
 +    left:0;
 +    bottom:0;
 +    right:0;
 +    position:absolute;
 +    height:var(--border-size);
 +    background-color:lightblue;
 +    transform:scaleX(0);
 +    transition:transform 150ms ease-in-out;
 +}
 +
 +.nav-item.nav-item-underline:hover::before,
 +.nav-item.nav-item-underline:focus::before
 +{
 +    transform:scaleX(1);
 +}
 +
 + .nav-item.li-active.nav-item-underline::before {
 +    transform: scale(1);
 +     background-color: #d03100;
 + }
 +
 + /**
 +  * For level 2 and 3 no animation but border difference if active
 +  */
 +
 + .nav-level2 .nav-link.active::after, .nav-level3 .nav-link.active::after {
 +     content: '';
 +     position: absolute;
 +     bottom: 0;
 +     left: 0;
 +     right: 0;
 +     background-color:darkorange;
 +     height: var(--border-size);
 + }
 +
 + .nav-level3 .nav-link.active::after {
 +     background-color:yellow;
 + }
++/***
++ * Animate menu
++ *
++ */
++
++.nav-item {
++    position:relative;
++
++}
++
+ .nav-item.nav-item-underline::before {
+      content:'';
+     left:0;
+     bottom:0;
+     right:0;
+     position:absolute;
+     height:var(--border-size);
+     background-color:lightblue;
+     transform:scaleX(0);
+     transition:transform 300ms ease-in-out;
+ }
+ 
+ .nav-item.nav-item-underline:hover::before,
+ .nav-item.nav-item-underline:focus::before
+ {
+     transform:scaleX(1);
+ }
+ 
+  .nav-item.li-active.nav-item-underline::before {
+     transform: scale(1);
+      background-color: darkred;
+  }
+ 
+  /**
+   * For level 2 and 3 no animation but border difference if active
+   */
+ 
+  .nav-level2 .nav-link.active::after, .nav-level3 .nav-link.active::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      background-color:darkorange;
+      height: 3px;
+  }
+ 
+  .nav-level3 .nav-link.active::after {
+      background-color:yellow;
+  }
diff --cc html/test.php
index 8bae03bfa,6637b69f9..7afef0b02
--- a/html/test.php
+++ b/html/test.php
@@@ -66,27 -64,20 +66,27 @@@ if (!file_exists('authorized_debug')
      exit();
  }
  define('ALLOWED', 1);
 -load_all_script();
 -// To enable assert , set "zend.assertions" in the php.ini file
 -ini_set("assert.active",1);
 -// assert_options(ASSERT_ACTIVE, 1);
 -//assert_options(ASSERT_WARNING, 1);
 -//removed in PHP8 assert_options(ASSERT_QUIET_EVAL, 1);
 -function my_assert_handler($file, $line, $code)
 +
 +global $aAvaible_module;
 +
 +/*
-  * Find all the folder
++ * Find all the folders
 + */
 +$directory=NOALYSS_BASE."/scenario";
 +$folder=scandir($directory);
 +$nb_folder=count($folder);
 +
 +for ($i=0; $i<$nb_folder;$i++)
  {
 -    echo "<hr>Assert Failed :
 -        File '$file'<br />
 -        Line '$line'<br />
 -        Code '$code'<br /><hr />";
 +    if (is_dir("{$directory}/".$folder[$i]) && $folder[$i] != '.' && 
$folder[$i] !='..')
 +    {
 +        $aAvaible_module[]=$folder[$i];
 +
 +    }
  }
 -//assert_options(ASSERT_CALLBACK, 'my_assert_handler');
 +
 +load_all_script();
 +// To enable assert , set "zend.assertions" in the php.ini file
  
/******************************************************************************************************************/
  /*  Utilities 
  
/******************************************************************************************************************/
diff --cc include/sql/mod1/data.sql
index f15f5c971,8c0ae4780..62e870ec7
--- a/include/sql/mod1/data.sql
+++ b/include/sql/mod1/data.sql
@@@ -37,13 -23,9 +23,6 @@@ SELECT pg_catalog.lo_create('2346181')
  SELECT pg_catalog.lo_create('2346476');
  
  
- 
--
--
--
  INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES 
(800, 'Ajout de fiche', 'fiche', 'FICADD');
  INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES 
(805, 'Création, modification et effacement de fiche', 'fiche', 'FIC');
  INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES 
(910, 'création, modification et effacement de catégorie de fiche', 'fiche', 
'FICCAT');
diff --cc include/sql/mod1/schema.sql
index fdabc9401,7e74cc61e..afc0887fe
--- a/include/sql/mod1/schema.sql
+++ b/include/sql/mod1/schema.sql
@@@ -16,6 -17,9 +17,12 @@@ CREATE SCHEMA comptaproc
  
  
  
++<<<<<<< HEAD
++=======
+ 
+ 
+ 
++>>>>>>> review-stash
  CREATE SCHEMA tva_belge;
  
  
diff --cc sql/upgrade.sql
index bfacd4c4d,0b72f6745..fe37f2c7e
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@@ -1,3 -1,1 +1,3 @@@
- 
 -ALTER TABLE public.todo_list ALTER COLUMN tl_date drop NOT NULL;
 +-- change color selected menu
- update parm_appearance set a_value='#000074' where a_code='MENU1-SELECTED' 
and a_value='#7191ea';
++update parm_appearance set a_value='#000074' where a_code='MENU1-SELECTED' 
and a_value='#7191ea';
++ALTER TABLE public.todo_list ALTER COLUMN tl_date drop NOT NULL;