Merge branch '2022.5.3_rc' into 2022.5.3

aspangaro · Nov 3, 2023 · c558433 · c558433
2 parents 940b98f + b023c09
commit c558433
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 41 deletions.
diff --git a/htdocs/custom/oblyon/CHANGELOG.md b/htdocs/custom/oblyon/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog ##
 
+### Version 2.2.11 - Compatibility 14.0.x - 19-alpha (2023/09/12)
+- Upgrade CSS Compatibility with v18/v19
+- Fix token problem (CSRF) on icon page for Easya version
+- Fix leftmenu min width with reduce menu (hover)
+
 ### Version 2.2.10 - Compatibility 14.0.x - 19-alpha (2023/09/12)
 - NEW Add option to access directly in project list when you click in menu (PROJECT_FORCE_LIST_ACCESS)
 - NEW Add option to show reconciliation link in menu bank (OBLYON_ENABLE_MENU_BANK_RECONCILIATE)

diff --git a/htdocs/custom/oblyon/VERSION b/htdocs/custom/oblyon/VERSION
@@ -1 +1 @@
-2.2.10
+2.2.11
diff --git a/htdocs/custom/oblyon/admin/icons.php b/htdocs/custom/oblyon/admin/icons.php
@@ -1,6 +1,6 @@
 <?php
 	/************************************************
-	* Copyright (C) 2015-2022  Alexandre Spangaro   <[email protected]>
+	* Copyright (C) 2015-2023  Alexandre Spangaro   <[email protected]>
 	* Copyright (C) 2022       Sylvain Legrand      <[email protected]>
 	*
 	* This program is free software: you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 	* GNU General Public License for more details.
 	*
 	* You should have received a copy of the GNU General Public License
-	* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	* along with this program.  If not, see <https://www.gnu.org/licenses/>.
 	************************************************/
 
 	/************************************************
@@ -84,7 +84,7 @@
 	print '				<tr>';
 	foreach ($list as $name => $weight)
 		print '				<td class = "center">
-								<a title = "'.$langs->trans('Icon'.$name).'" href = "'.$_SERVER['PHP_SELF'].'?action=set_'.$name.'">'.img_picto($langs->trans('Icon'.$name), 'icon'.$name.'.png@oblyon', 'width = "50%"').'
+								<a title = "'.$langs->trans('Icon'.$name).'" href = "'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=set_'.$name.'">'.img_picto($langs->trans('Icon'.$name), 'icon'.$name.'.png@oblyon', 'width = "50%"').'
 									<br/>'.$langs->trans('Icon'.$name).'
 								</a>
 							</td>';

diff --git a/htdocs/custom/oblyon/core/menus/standard/oblyon.lib.php b/htdocs/custom/oblyon/core/menus/standard/oblyon.lib.php
@@ -1226,7 +1226,7 @@ function print_left_oblyon_menu($db, $menu_array_before, $menu_array_after, &$ta
 					// VAT
 					if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
 					{
-						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing",$langs->transcountry("VAT", $mysoc->country_code),1,$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
+						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing",$langs->transcountry("MenuVAT", $mysoc->country_code),1,$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
 
                         if (! empty($menu_invert)) $leftmenu= 'tax_vat';
 

diff --git a/htdocs/custom/oblyon/langs/en_US/oblyon.lang b/htdocs/custom/oblyon/langs/en_US/oblyon.lang
@@ -19,6 +19,7 @@ BankColorizeMovementDesc = If this function is activated, you can define a speci
 BankColorizeMovementName1 = Background color for a debit movement
 BankColorizeMovementName2 = Background color for a credit movement
 MenuCatalog = Catalog
+MenuVAT=VAT
 
 CustomCSS=Style CSS
 

diff --git a/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang b/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang
@@ -19,6 +19,7 @@ BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez définir un
 BankColorizeMovementName1=Couleur de fond pour un mouvement débiteur
 BankColorizeMovementName2=Couleur de fond pour un mouvement créditeur
 MenuCatalog=Catalogue
+MenuVAT=TVA
 
 CustomCSS=Style CSS
 

diff --git a/htdocs/theme/oblyon/dropdown.inc.php b/htdocs/theme/oblyon/dropdown.inc.php
@@ -12,7 +12,7 @@
 
 .dropdown-menu {
     position: absolute;
-    top: 100%;
+    /*top: 100%;*/
     left: 0;
     z-index: 1000;
     display: none;
@@ -34,39 +34,44 @@
 .dropdown-toggle{
     text-decoration: none !important;
 }
-.dropdown-toggle::after {
-    /* font part */
-    font-family: "<?php if(empty($conf->global->MAIN_FONTAWESOME_FAMILY)) {
-                            echo 'Font Awesome 5 Free';
-                        } else {
-                            echo $conf->global->MAIN_FONTAWESOME_FAMILY;
-                        }
-                 ?>";
-    font-weight: <?php if(empty($conf->global->MAIN_FONTAWESOME_WEIGHT)) {
-                            echo 900;
-                        } else {
-                            echo $conf->global->MAIN_FONTAWESOME_WEIGHT;
-                        }
-                  ?>;
-    font-size: 0.7em;
-    font-style: normal;
-    font-variant: normal;
-    text-rendering: auto;
-    -webkit-font-smoothing: antialiased;
-    text-align:center;
-    text-decoration:none;
-    margin:  auto 3px;
-    display: inline-block;
-    /*content: "\f078";*/
-    -webkit-transition: -webkit-transform .2s ease-in-out;
-    -ms-transition: -ms-transform .2s ease-in-out;
-     transition: transform .2s ease-in-out;
-}
 
-.open>.dropdown-toggle::after {
-    transform: rotate(180deg);
-}
+    /* CSS to hide the arrow to show open/close */
+    .dropdown-toggle::after {
+        /* font part */
+        font-family: "<?php if(empty($conf->global->MAIN_FONTAWESOME_FAMILY)) {
+                                echo 'Font Awesome 5 Free';
+                            } else {
+                                echo $conf->global->MAIN_FONTAWESOME_FAMILY;
+                            }
+                     ?>";
+        font-weight: <?php if(empty($conf->global->MAIN_FONTAWESOME_WEIGHT)) {
+                                echo 900;
+                            } else {
+                                echo $conf->global->MAIN_FONTAWESOME_WEIGHT;
+                            }
+                      ?>;
+        font-size: 0.7em;
+        font-style: normal;
+        font-variant: normal;
+        text-rendering: auto;
+        -webkit-font-smoothing: antialiased;
+        text-align:center;
+        text-decoration:none;
+        margin:  auto 3px;
+        display: inline-block;
+        content: "\f078";
+        -webkit-transition: -webkit-transform .2s ease-in-out;
+        -ms-transition: -ms-transform .2s ease-in-out;
+         transition: transform .2s ease-in-out;
+    }
 
+    div#topmenu-global-search-dropdown .dropdown-toggle::after, div#topmenu-quickadd-dropdown .dropdown-toggle::after, div#topmenu-bookmark-dropdown .dropdown-toggle::after {
+        content: unset !important;
+    }
+
+    .open>.dropdown-toggle::after {
+        transform: rotate(180deg);
+    }
 
 /*
 * MENU Dropdown
@@ -387,9 +392,82 @@
         background: <?php print $maincolor; ?>;
     }
 
+    /* for the dropdown on action buttons */
+    dropdown-holder {
+        position: relative;
+        display: inline-block;
+    }
+
+    .dropdown-content {
+        display: none;
+        position: absolute;
+        z-index: 1;
+        width: 300px;
+        right:10px;	/* will be set with js */
+        background: #fff;
+        border: 1px solid #bbb;
+        text-align: <?php echo $left; ?>
+    }
+
+    .dropdown-content a {
+        margin-right: auto !important;
+        margin-left: auto !important;
+    }
+    .dropdown-content .butAction {
+        background: none;
+        color: #000 !important;
+    }
+    .dropdown-content a.butAction {
+        display: flex;
+    }
+    .dropdown-content .butAction:hover {
+        box-shadow: none;
+        text-decoration: underline;
+    }
+    .dropdown-content .butActionRefused {
+        margin-left: 0;
+        margin-right: 0;
+        border: none;
+    }
+
+    .dropdown-holder.open .dropdown-content {
+        display: block;
+    }
+
     /*
      * Responsive
      */
+    @media only screen and (max-width: 767px)
+    {
+        .dropdown-search-input {
+            width: 100%;
+        }
+
+        .tmenu .dropdown-menu, .login_block .dropdown-menu, .topnav .dropdown-menu {
+            margin-left: 5px;
+            right: 0;
+        }
+
+        #topmenu-quickadd-dropdown .dropdown-menu {
+            min-width: 220px;
+            max-width: 235px;
+        }
+        #topmenu-bookmark-dropdown .dropdown-menu {
+            min-width: 220px;
+            max-width: 360px;
+        }
+
+        .side-nav-vert .user-menu .dropdown-menu, .topnav .user-menu .dropdown-menu {
+            width: 300px;
+        }
+        .dropdown-menu {
+            border: none;
+            -webkit-box-shadow: none;
+            box-shadow: none;
+        }
+
+    }
+
     @media only screen and (max-width: 570px) {
         #topmenu-login-dropdown, #topmenu-bookmark-dropdown, #topmenu-quickadd-dropdown, #topmenu-global-search-dropdown, #topmenu-tool-dropdown {
             padding: 0 2px 0 2px;

diff --git a/htdocs/theme/oblyon/global.inc.php b/htdocs/theme/oblyon/global.inc.php
@@ -1096,18 +1096,43 @@
     background-repeat: no-repeat;
     background-position: 8px 7px;
 }
+.logopublicpayment #dolpaymentlogo {
+    max-height: 80px;
+    max-width: 300px;
+    image-rendering: -webkit-optimize-contrast;		/* better rendering on public page header */
+}
+
+a.butStatus {
+    padding-left: 5px;
+    padding-right: 5px;
+    background-color: transparent;
+    color: var(--colortext) !important;
+    border: 2px solid var( --butactionbg) !important;
+    margin: 0 0.45em !important;
+}
+
+span.userimg.notfirst, div.userimg.notfirst {
+    margin-left: -5px;
+}
+div.userimg.notfirst {
+    display: block-inline;
+}
 /* Used for timesheets */
 span.timesheetalreadyrecorded input {
     border: none;
     border-bottom: solid 1px rgba(0,0,0,0.4);
     margin-right: 1px !important;
+    min-width: 40px;
 }
 td.onholidaymorning, td.onholidayafternoon {
     background-color: #fdf6f2;
 }
 td.onholidayallday {
     background-color: #f4eede;
 }
+td.onholidayallday:not(.weekend) input {
+    background-color: #f8f7f0;
+}
 td.weekend {	/* must be after td.onholidayallday */
     background-color: #eee;
 }
@@ -1977,7 +2002,7 @@
     min-height: 0.01%;
 }
 .div-table-responsive {
-    line-height: 120%;
+    line-height: 155%;
 }
 /* Style used for full page tables with field selector and no content after table (priority before previous for such tables) */
 div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive-no-min {
@@ -4515,6 +4540,9 @@
         <?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
             min-width: 230px;
         <?php } ?>
+        <?php if (!empty($conf->global->OBLYON_REDUCE_LEFTMENU) && $conf->global->OBLYON_EFFECT_REDUCE_LEFTMENU == "hover") { ?>
+            min-width: 230px;
+        <?php } ?>
         -webkit-transition-property: max-width;
         -webkit-transition-duration: 0.2s;
         -webkit-transition-timing-function: linear;
@@ -4524,6 +4552,12 @@
     }
 <?php } ?>
 
+<?php if (!empty($conf->global->OBLYON_REDUCE_LEFTMENU) && $conf->global->OBLYON_EFFECT_REDUCE_LEFTMENU == "hover") { ?>
+    .vmenu.sec-nav__link:hover {
+        min-width: unset !important;
+    }
+<?php } ?>
+
 .vmenu {
     <?php if (GETPOST("optioncss") == 'print') { ?>
         display: none;
@@ -5645,7 +5679,9 @@
  */
 
 .box {
-    overflow-x: auto;
+    <?php if (empty($conf->global->FIX_STICKY_HEADER_CARD)) { ?>
+        overflow-x: auto;
+    <?php } ?>
     min-height: 40px;
     padding-right: 0px;
     padding-left: 0px;
@@ -10004,7 +10040,9 @@
             margin-<?php print $left; ?>: 5px;
         <?php } ?>
     }
-
+    .div-table-responsive {
+        line-height: 120%;
+    }
     .imgopensurveywizard, .imgautosize { width:95%; height: auto; }
 
     #tooltip {
@@ -10156,7 +10194,9 @@
     div.mainmenu {
         min-width: 20px;
     }
-
+    .div-table-responsive {
+        line-height: 120%;
+    }
     #tooltip {
         position: absolute;
         width: <?php print dol_size(300,'width'); ?>px;