From 550d80f0210bb35e9879bff46516baa301b064b4 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 17 Sep 2024 18:07:54 +0200 Subject: [PATCH 01/64] add detail --- include/template/tax_summary_display.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/template/tax_summary_display.php b/include/template/tax_summary_display.php index 60e2feb55..c40e6983a 100644 --- a/include/template/tax_summary_display.php +++ b/include/template/tax_summary_display.php @@ -76,7 +76,7 @@ for ($i=0;$i < $nb_array;$i++): // add a link to see the detail in ajax : ajax_ledger.php $js_detail = $this->build_link_detail($dossier_id, $this->date_start, $this->date_end,$array[$i]['jrn_def_id'], $array[$i]['qs_vat_code']); ?> - Détails + Détails % @@ -235,7 +235,7 @@ for ($i=0;$i < $nb_array;$i++): // add a link to see the detail in ajax : ajax_ledger.php $js_detail = $this->build_link_detail($dossier_id, $this->date_start, $this->date_end,$array[$i]['jrn_def_id'], $array[$i]['qp_vat_code']); ?> - Détails + Détails % From d07f24810bd2046783dbcc58531c0bf742968fd0 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 17 Sep 2024 18:18:58 +0200 Subject: [PATCH 02/64] css : Cosmetic add CSS h-section --- include/adm.inc.php | 2 +- include/bank.inc.php | 2 +- include/customer.inc.php | 2 +- include/manager.inc.php | 2 +- include/supplier.inc.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/adm.inc.php b/include/adm.inc.php index face146b7..491e22dcd 100644 --- a/include/adm.inc.php +++ b/include/adm.inc.php @@ -65,7 +65,7 @@ if ( $low_action == "list" )
' . "Exercice " . $g_user->get_exercice() . ''; + echo '

' . "Exercice " . $g_user->get_exercice() . '

'; echo dossier::hidden(); $a=$http->get("query","string",""); echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a); diff --git a/include/bank.inc.php b/include/bank.inc.php index aded35f39..61017cc98 100644 --- a/include/bank.inc.php +++ b/include/bank.inc.php @@ -65,7 +65,7 @@ if ( $low_action == "list" ) ' ._( "Exercice")." " . $g_user->get_exercice() . ''; + echo '

' ._( "Exercice")." " . $g_user->get_exercice() . '

'; $a=$http->get("query","string",""); echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a); diff --git a/include/customer.inc.php b/include/customer.inc.php index 77501a14c..a80fea4ac 100644 --- a/include/customer.inc.php +++ b/include/customer.inc.php @@ -68,7 +68,7 @@ if ($low_action == "list")
' . "Exercice " . $g_user->get_exercice() . ''; + echo '

' . "Exercice " . $g_user->get_exercice() . '

'; $a=$http->get("query","string",""); echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a); diff --git a/include/manager.inc.php b/include/manager.inc.php index 712650abf..8143f2c15 100644 --- a/include/manager.inc.php +++ b/include/manager.inc.php @@ -67,7 +67,7 @@ if ($low_action == "list")
' . "Exercice " . $g_user->get_exercice() . ''; + echo '

' . "Exercice " . $g_user->get_exercice() . '

'; echo dossier::hidden(); $a=$http->get("query","string",""); echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a); diff --git a/include/supplier.inc.php b/include/supplier.inc.php index 15bf2aff0..b6751e466 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -67,7 +67,7 @@ if ( $low_action == "list" )
' . "Exercice " . $g_user->get_exercice() . ''; + echo '

' . "Exercice " . $g_user->get_exercice() . '

'; echo dossier::hidden(); echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$search); From 0e51eab54bb9d85ac228b3e86fbf5b107e371cff Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 17 Sep 2024 23:08:50 +0200 Subject: [PATCH 03/64] Cosmetic : animate bar menu --- html/css/style-classic7.css | 32 +++++++++++++++++++++++++ html/lang/en_US/LC_MESSAGES/messages.po | 10 ++++---- include/template/menu.php | 2 +- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 28d47fe58..5e9436d34 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -25,6 +25,8 @@ BODY { color:darkblue !important; background-color:#FCFDFD; --hover : rgba(108, 130, 208, 0.9); + --border-size:4px; + --accent-color:lightblue; } input{ font-family: 'OpenSansRegular'; @@ -3280,6 +3282,8 @@ li.li-active { background-color: navy !important; color:white !important; border-radius: 0px; + transition: all 300ms ease-in-out; + } #module .nav-item-active , #module .nav-item-active > a.nav-link{ background-color: #5d90cd !important; @@ -3653,3 +3657,31 @@ h2.h-section { font-size: 80%; font-variant-caps: normal; } +/*** + * 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:orangered; + 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); +} + diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index 63afdab2b..1c3cdee69 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: NOALYSS 672\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-07 17:50+0200\n" -"PO-Revision-Date: 2024-09-07 18:03+0200\n" +"PO-Revision-Date: 2024-09-10 10:26+0200\n" "Last-Translator: dany \n" "Language-Team: French \n" "Language: en_US\n" @@ -14534,7 +14534,7 @@ msgstr "General Ledger" #: include/ext/tva/form_parameter.php:68 include/ext/tva/form_parameter.php:71 #: include/ext/tva/form_parameter.php:72 msgid "Grille 00 : opérations soumises à un régime particulier" -msgstr "Grid 00: transactions subject to special rules" +msgstr "Grid 00: transactions subject to special rules " #: include/ext/tva/form_parameter.php:69 include/ext/tva/form_parameter.php:72 #: include/ext/tva/form_parameter.php:73 @@ -15112,7 +15112,7 @@ msgstr "Call History" #: include/ext/skel/index.php:46 include/ext/tva/index.php:35 #: include/ext/tva/index.php:38 include/ext/tva/index.php:39 msgid "Historique des déclarations TVA" -msgstr "History of VAT returns" +msgstr "History" #: include/ext/rapport_avance/index.php:62 #: include/ext/rapport_avance/index.php:61 @@ -17194,7 +17194,7 @@ msgstr "Style of row must be a number" #: include/ext/invoicing/include/invoice_send_mail.inc.php:65 #: include/ext/invoicing/include/invoice_send_mail.inc.php:69 msgid "Le sujet est obligatoire" -msgstr "The subject is compulsory" +msgstr "The subject is mandatory" #: include/class_anc_key.php:150 include/class/class_anc_key.php:150 #: include/class/anc_key.class.php:150 include/class/anc_key.class.php:158 @@ -18112,7 +18112,7 @@ msgstr "Listing" #: include/ext/skel/index.php:45 include/ext/tva/index.php:34 #: include/ext/tva/index.php:37 include/ext/tva/index.php:38 msgid "Listing Assujetti" -msgstr "Subject Listing" +msgstr "Customer Listing" #: include/ext/skel/index.php:45 include/ext/tva/index.php:34 #: include/ext/tva/index.php:37 include/ext/tva/index.php:38 diff --git a/include/template/menu.php b/include/template/menu.php index 55567578e..de87e4c19 100644 --- a/include/template/menu.php +++ b/include/template/menu.php @@ -33,7 +33,7 @@ } else { $js=""; - $class_list_element="nav-item"; + $class_list_element="nav-item nav-item-underline"; $class_link="nav-link"; if ( $amenu[$i]['me_url']!='') From d7b13de885c57a2abe4a9664ad5b73b352e7fd46 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Wed, 18 Sep 2024 13:54:59 +0200 Subject: [PATCH 04/64] Cosmetic : menu and module , animate --- html/css/style-classic7.css | 110 +++++++++++++++++++++++++----------- include/template/module.php | 4 +- 2 files changed, 78 insertions(+), 36 deletions(-) diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 5e9436d34..f983e7418 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -190,6 +190,9 @@ td.tool a.mtitle:hover { width: 100%; } +/*** + * Style for module + */ #module { /* position:absolute;*/ top:0px; @@ -210,7 +213,72 @@ td.tool a.mtitle:hover { background-color: darkgray; display:block; } +#module .nav-pills #module.nav-link { + color: navy !important; + } + #module .nav-pills a.nav-link { + border:1px solid blue; + margin:1px; + border-radius: 0px; + font-size: 75%; + color:navy !important; + } + #module .nav-pills a.nav-link:hover { + color:white !important; + } + #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); + /* transform-origin:left; */ + transition:transform 300ms ease-in-out; + } + #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 { + background: white !important; + color: blue !important; + } + + #module .nav-link:hover { + /*background-color:white;*/ + color:white; + } + #module .nav-link:hover { + background-color: transparent; + color:white; + } +/** + menu left (not used) + */ div.lmenu { float:left; clear:left; @@ -1308,7 +1376,7 @@ div#wait_box left:30%; top:30%; border:1px solid #00008B; - width:18%; + width: 260px; opacity: 0.8; border-radius: 20px; min-width:281px; @@ -3225,7 +3293,7 @@ margin:1px; border-radius: 0px; } .nav-pills .nav-link { - color:white !important; + color:white ; } li.li-active { @@ -3264,32 +3332,7 @@ li.li-active { .nav-level2 .active { border-radius:0px !important; } -/** - * Module - */ -.nav-item-module { -} -#module .nav-pills a.nav-link { - background-color:white !important; - color:navy !important; - border:1px solid blue; - margin:1px; - border-radius: 0px; - font-size: 75%; -} -#module .nav-pills a.nav-link:hover { - background-color: navy !important; - color:white !important; - border-radius: 0px; - transition: all 300ms ease-in-out; - -} -#module .nav-item-active , #module .nav-item-active > a.nav-link{ - background-color: #5d90cd !important; - color:white !important; - border: 0px solid black; -} /** * Module for smartphone menu */ @@ -3507,7 +3550,6 @@ li.li-active { padding: 0.5rem; color:navy !important; text-decoration: underline; - border-radius: 7px; } .hoverclass-drag { @@ -3519,14 +3561,14 @@ li.li-active { * User's widget list * *********************************************************************************************************************/ - #widget_box_id { - width: 100%; - margin-left: 0px; - margin-right: 0px; + #widget_box_id { + width: 100%; + margin-left: 0px; + margin-right: 0px; + } } - #contain_widget li { padding : 0.75rem; margin:2px; @@ -3674,7 +3716,7 @@ h2.h-section { right:0; position:absolute; height:var(--border-size); - background-color:orangered; + background-color:crimson; transform:scaleX(0); transition:transform 300ms ease-in-out; } diff --git a/include/template/module.php b/include/template/module.php index ef825db22..6095c1778 100644 --- a/include/template/module.php +++ b/include/template/module.php @@ -104,7 +104,7 @@ endif;?> echo '