From 6f2a77b63d579f9e666f5372c4ced1e44e28e4b1 Mon Sep 17 00:00:00 2001 From: Sylvain Legrand Date: Thu, 10 Aug 2023 13:29:07 +0200 Subject: [PATCH 1/8] Improve the use of variable (#131) * Improve the use of variable * Update global.inc.php * Update global.inc.php * Improve work in progress * Update global.inc.php * Infos * notifications * fixes * Update global.inc.php * Calendar + Tab * Update global.inc.php --- htdocs/custom/oblyon/admin/colors.php | 296 +- htdocs/custom/oblyon/langs/fr_FR/oblyon.lang | 19 + htdocs/theme/oblyon/badges.inc.php | 162 +- htdocs/theme/oblyon/btn.inc.php | 257 +- htdocs/theme/oblyon/custom.css.php | 6 +- htdocs/theme/oblyon/dropdown.inc.php | 605 +- htdocs/theme/oblyon/global.inc.php | 8490 ++++++++--------- htdocs/theme/oblyon/graph-color.php | 12 +- htdocs/theme/oblyon/info-box.inc.php | 354 +- htdocs/theme/oblyon/login.inc.php | 343 +- .../theme/oblyon/main_menu_fa_icons.inc.php | 318 +- htdocs/theme/oblyon/manifest.json.php | 34 +- htdocs/theme/oblyon/progress.inc.php | 138 +- htdocs/theme/oblyon/style.css.php | 99 +- htdocs/theme/oblyon/theme_vars.inc.php | 20 +- htdocs/theme/oblyon/timeline.inc.php | 204 +- 16 files changed, 5673 insertions(+), 5684 deletions(-) diff --git a/htdocs/custom/oblyon/admin/colors.php b/htdocs/custom/oblyon/admin/colors.php index cc84569..e320ec7 100644 --- a/htdocs/custom/oblyon/admin/colors.php +++ b/htdocs/custom/oblyon/admin/colors.php @@ -1,7 +1,7 @@ - * Copyright (C) 2022 Sylvain Legrand + * Copyright (C) 2022 Sylvain Legrand * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,6 +58,22 @@ 'OBLYON_COLOR_BUTTON_DELETE1', 'OBLYON_COLOR_BUTTON_DELETE2' ), + 'message' => array('OBLYON_COLOR_INFO_BORDER', + 'OBLYON_COLOR_INFO_BCKGRD', + 'OBLYON_COLOR_INFO_TEXT', + 'OBLYON_COLOR_WARNING_BORDER', + 'OBLYON_COLOR_WARNING_BCKGRD', + 'OBLYON_COLOR_WARNING_TEXT', + 'OBLYON_COLOR_ERROR_BORDER', + 'OBLYON_COLOR_ERROR_BCKGRD', + 'OBLYON_COLOR_ERROR_TEXT', + 'OBLYON_COLOR_NOTIF_INFO_BCKGRD', + 'OBLYON_COLOR_NOTIF_INFO_TEXT', + 'OBLYON_COLOR_NOTIF_WARNING_BCKGRD', + 'OBLYON_COLOR_NOTIF_WARNING_TEXT', + 'OBLYON_COLOR_NOTIF_ERROR_BCKGRD', + 'OBLYON_COLOR_NOTIF_ERROR_TEXT' + ), 'options' => array('OBLYON_COLOR_MAIN', 'OBLYON_COLOR_BCKGRD', 'OBLYON_COLOR_LOGO_BCKGRD', @@ -68,22 +84,26 @@ 'OBLYON_COLOR_BLINE_HOVER', 'OBLYON_COLOR_FLINE', 'OBLYON_COLOR_FLINE_HOVER', - 'OBLYON_COLOR_FDATE_DEFAULT' + 'OBLYON_COLOR_FDATE_DEFAULT', + 'OBLYON_COLOR_TEXTTABACTIVE' ), 'eldy' => array('THEME_ELDY_TOPBORDER_TITLE1', + 'THEME_ELDY_BACKTITLE1', + 'THEME_ELDY_BACKTABACTIVE', 'THEME_ELDY_LINEIMPAIR1', 'THEME_ELDY_LINEIMPAIR2', 'THEME_ELDY_LINEPAIR1', 'THEME_ELDY_LINEPAIR2', 'THEME_ELDY_LINEBREAK', 'THEME_ELDY_TEXTTITLENOTAB', + 'THEME_ELDY_TEXTTITLE', 'THEME_ELDY_TEXT', 'THEME_ELDY_TEXTLINK' ) ); $listtheme = array('green' => array( - 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', - 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#34495E', + 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', + 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#34495E', 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#2C3E50', 'OBLYON_COLOR_TOPMENU_TXT' => '#FFFFFF', 'OBLYON_COLOR_TOPMENU_TXT_ACTIVE' => '#', @@ -97,6 +117,21 @@ 'OBLYON_COLOR_BUTTON_ACTION2' => '#0044CC', 'OBLYON_COLOR_BUTTON_DELETE1' => '#CC8800', 'OBLYON_COLOR_BUTTON_DELETE2' => '#CC4400', + 'OBLYON_COLOR_INFO_BORDER' => '#87cfd2', + 'OBLYON_COLOR_INFO_BCKGRD' => '#eff8fc', + 'OBLYON_COLOR_INFO_TEXT' => '#', + 'OBLYON_COLOR_WARNING_BORDER' => '#f2cf87', + 'OBLYON_COLOR_WARNING_BCKGRD' => '#fcf8e3', + 'OBLYON_COLOR_WARNING_TEXT' => '#', + 'OBLYON_COLOR_ERROR_BORDER' => '#e0796e', + 'OBLYON_COLOR_ERROR_BCKGRD' => '#f07b6e', + 'OBLYON_COLOR_ERROR_TEXT' => '#', + 'OBLYON_COLOR_NOTIF_INFO_BCKGRD' => '#d9e5d1', + 'OBLYON_COLOR_NOTIF_INFO_TEXT' => '#446548', + 'OBLYON_COLOR_NOTIF_WARNING_BCKGRD' => '#fff7d1', + 'OBLYON_COLOR_NOTIF_WARNING_TEXT' => '#a28918', + 'OBLYON_COLOR_NOTIF_ERROR_BCKGRD' => '#d79eac', + 'OBLYON_COLOR_NOTIF_ERROR_TEXT' => '#a72947', 'OBLYON_COLOR_MAIN' => '#0083A2', 'OBLYON_COLOR_BCKGRD' => '#F5F5F5', 'OBLYON_COLOR_LOGO_BCKGRD' => '#FFFFFF', @@ -108,20 +143,24 @@ 'OBLYON_COLOR_FLINE' => '#444444', 'OBLYON_COLOR_FLINE_HOVER' => '#222222', 'OBLYON_COLOR_FDATE_DEFAULT' => '#FF0000', - 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', - 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', - 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', - 'THEME_ELDY_LINEBREAK' => '#FFFFFF', - 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', - 'THEME_ELDY_TEXT' => '#000000', - 'THEME_ELDY_TEXTLINK' => '#1C1C1C' + 'OBLYON_COLOR_TEXTTABACTIVE' => '#222222', + 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', + 'THEME_ELDY_BACKTITLE1' => '#E9EAED', + 'THEME_ELDY_BACKTABACTIVE' => '#EAEAEA', + 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', + 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', + 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', + 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', + 'THEME_ELDY_LINEBREAK' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLE' => '#28283C', + 'THEME_ELDY_TEXT' => '#000000', + 'THEME_ELDY_TEXTLINK' => '#1C1C1C' ), 'dark' => array( - 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', - 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#333333', - 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#0083A2', + 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', + 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#333333', + 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#0083A2', 'OBLYON_COLOR_TOPMENU_TXT' => '#F4F4F4', 'OBLYON_COLOR_TOPMENU_TXT_ACTIVE' => '#', 'OBLYON_COLOR_TOPMENU_TXT_HOVER' => '#', @@ -134,6 +173,21 @@ 'OBLYON_COLOR_BUTTON_ACTION2' => '#0063A2', 'OBLYON_COLOR_BUTTON_DELETE1' => '#CC8800', 'OBLYON_COLOR_BUTTON_DELETE2' => '#CC4400', + 'OBLYON_COLOR_INFO_BORDER' => '#87cfd2', + 'OBLYON_COLOR_INFO_BCKGRD' => '#eff8fc', + 'OBLYON_COLOR_INFO_TEXT' => '#', + 'OBLYON_COLOR_WARNING_BORDER' => '#f2cf87', + 'OBLYON_COLOR_WARNING_BCKGRD' => '#fcf8e3', + 'OBLYON_COLOR_WARNING_TEXT' => '#', + 'OBLYON_COLOR_ERROR_BORDER' => '#e0796e', + 'OBLYON_COLOR_ERROR_BCKGRD' => '#f07b6e', + 'OBLYON_COLOR_ERROR_TEXT' => '#', + 'OBLYON_COLOR_NOTIF_INFO_BCKGRD' => '#d9e5d1', + 'OBLYON_COLOR_NOTIF_INFO_TEXT' => '#446548', + 'OBLYON_COLOR_NOTIF_WARNING_BCKGRD' => '#fff7d1', + 'OBLYON_COLOR_NOTIF_WARNING_TEXT' => '#a28918', + 'OBLYON_COLOR_NOTIF_ERROR_BCKGRD' => '#d79eac', + 'OBLYON_COLOR_NOTIF_ERROR_TEXT' => '#a72947', 'OBLYON_COLOR_MAIN' => '#0083A2', 'OBLYON_COLOR_BCKGRD' => '#F4F4F4', 'OBLYON_COLOR_LOGO_BCKGRD' => '#FFFFFF', @@ -145,19 +199,23 @@ 'OBLYON_COLOR_FLINE' => '#444444', 'OBLYON_COLOR_FLINE_HOVER' => '#222222', 'OBLYON_COLOR_FDATE_DEFAULT' => '#FF0000', + 'OBLYON_COLOR_TEXTTABACTIVE' => '#222222', 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', + 'THEME_ELDY_BACKTITLE1' => '#E9EAED', + 'THEME_ELDY_BACKTABACTIVE' => '#EAEAEA', 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', 'THEME_ELDY_LINEBREAK' => '#FFFFFF', 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLE' => '#28283C', 'THEME_ELDY_TEXT' => '#000000', 'THEME_ELDY_TEXTLINK' => '#1C1C1C' ), 'blue' => array( - 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', - 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#092D5C', + 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', + 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#092D5C', 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#0D4185', 'OBLYON_COLOR_TOPMENU_TXT' => '#F4F4F4', 'OBLYON_COLOR_TOPMENU_TXT_ACTIVE' => '#', @@ -166,11 +224,26 @@ 'OBLYON_COLOR_LEFTMENU_BCKGRD_HOVER' => '#0D4185', 'OBLYON_COLOR_LEFTMENU_TXT' => '#F4F4F4', 'OBLYON_COLOR_LEFTMENU_TXT_ACTIVE' => '#F4F4F4', - 'OBLYON_COLOR_LEFTMENU_TXT_HOVER' => '#FFFFFF', + 'OBLYON_COLOR_LEFTMENU_TXT_HOVER' => '#FFFFFF', 'OBLYON_COLOR_BUTTON_ACTION1' => '#0088CC', 'OBLYON_COLOR_BUTTON_ACTION2' => '#0044CC', 'OBLYON_COLOR_BUTTON_DELETE1' => '#CC8800', 'OBLYON_COLOR_BUTTON_DELETE2' => '#CC4400', + 'OBLYON_COLOR_INFO_BORDER' => '#87cfd2', + 'OBLYON_COLOR_INFO_BCKGRD' => '#eff8fc', + 'OBLYON_COLOR_INFO_TEXT' => '#', + 'OBLYON_COLOR_WARNING_BORDER' => '#f2cf87', + 'OBLYON_COLOR_WARNING_BCKGRD' => '#fcf8e3', + 'OBLYON_COLOR_WARNING_TEXT' => '#', + 'OBLYON_COLOR_ERROR_BORDER' => '#e0796e', + 'OBLYON_COLOR_ERROR_BCKGRD' => '#f07b6e', + 'OBLYON_COLOR_ERROR_TEXT' => '#', + 'OBLYON_COLOR_NOTIF_INFO_BCKGRD' => '#d9e5d1', + 'OBLYON_COLOR_NOTIF_INFO_TEXT' => '#446548', + 'OBLYON_COLOR_NOTIF_WARNING_BCKGRD' => '#fff7d1', + 'OBLYON_COLOR_NOTIF_WARNING_TEXT' => '#a28918', + 'OBLYON_COLOR_NOTIF_ERROR_BCKGRD' => '#d79eac', + 'OBLYON_COLOR_NOTIF_ERROR_TEXT' => '#a72947', 'OBLYON_COLOR_MAIN' => '#E09430', 'OBLYON_COLOR_BCKGRD' => '#F4F4F4', 'OBLYON_COLOR_LOGO_BCKGRD' => '#ffffff', @@ -182,19 +255,23 @@ 'OBLYON_COLOR_FLINE' => '#444444', 'OBLYON_COLOR_FLINE_HOVER' => '#222222', 'OBLYON_COLOR_FDATE_DEFAULT' => '#FF0000', - 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', - 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', - 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', - 'THEME_ELDY_LINEBREAK' => '#FFFFFF', - 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', - 'THEME_ELDY_TEXT' => '#000000', - 'THEME_ELDY_TEXTLINK' => '#1C1C1C' + 'OBLYON_COLOR_TEXTTABACTIVE' => '#222222', + 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', + 'THEME_ELDY_BACKTITLE1' => '#E9EAED', + 'THEME_ELDY_BACKTABACTIVE' => '#EAEAEA', + 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', + 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', + 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', + 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', + 'THEME_ELDY_LINEBREAK' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLE' => '#28283C', + 'THEME_ELDY_TEXT' => '#000000', + 'THEME_ELDY_TEXTLINK' => '#1C1C1C' ), 'night' => array( - 'OBLYON_INFOXBOX_BACKGROUND' => '#444444', - 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#222222', + 'OBLYON_INFOXBOX_BACKGROUND' => '#444444', + 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#222222', 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#333333', 'OBLYON_COLOR_TOPMENU_TXT' => '#F4F4F4', 'OBLYON_COLOR_TOPMENU_TXT_ACTIVE' => '#', @@ -208,6 +285,21 @@ 'OBLYON_COLOR_BUTTON_ACTION2' => '#0044CC', 'OBLYON_COLOR_BUTTON_DELETE1' => '#CC8800', 'OBLYON_COLOR_BUTTON_DELETE2' => '#CC4400', + 'OBLYON_COLOR_INFO_BORDER' => '#87cfd2', + 'OBLYON_COLOR_INFO_BCKGRD' => '#eff8fc', + 'OBLYON_COLOR_INFO_TEXT' => '#', + 'OBLYON_COLOR_WARNING_BORDER' => '#f2cf87', + 'OBLYON_COLOR_WARNING_BCKGRD' => '#fcf8e3', + 'OBLYON_COLOR_WARNING_TEXT' => '#', + 'OBLYON_COLOR_ERROR_BORDER' => '#e0796e', + 'OBLYON_COLOR_ERROR_BCKGRD' => '#f07b6e', + 'OBLYON_COLOR_ERROR_TEXT' => '#', + 'OBLYON_COLOR_NOTIF_INFO_BCKGRD' => '#d9e5d1', + 'OBLYON_COLOR_NOTIF_INFO_TEXT' => '#446548', + 'OBLYON_COLOR_NOTIF_WARNING_BCKGRD' => '#fff7d1', + 'OBLYON_COLOR_NOTIF_WARNING_TEXT' => '#a28918', + 'OBLYON_COLOR_NOTIF_ERROR_BCKGRD' => '#d79eac', + 'OBLYON_COLOR_NOTIF_ERROR_TEXT' => '#a72947', 'OBLYON_COLOR_MAIN' => '#E09430', 'OBLYON_COLOR_BCKGRD' => '#444444', 'OBLYON_COLOR_LOGO_BCKGRD' => '#FFFFFF', @@ -219,53 +311,76 @@ 'OBLYON_COLOR_FLINE' => '#ECECEC', 'OBLYON_COLOR_FLINE_HOVER' => '#FCFCFC', 'OBLYON_COLOR_FDATE_DEFAULT' => '#FF0000', + 'OBLYON_COLOR_TEXTTABACTIVE' => '#222222', 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR1' => '#3C3C3C', - 'THEME_ELDY_LINEIMPAIR2' => '#4C4C4C', - 'THEME_ELDY_LINEPAIR1' => '#444444', - 'THEME_ELDY_LINEPAIR2' => '#444444', - 'THEME_ELDY_LINEBREAK' => '#', - 'THEME_ELDY_TEXTTITLENOTAB' => '#FEFEFE', - 'THEME_ELDY_TEXT' => '#FFFFFF', - 'THEME_ELDY_TEXTLINK' => '#e09430' + 'THEME_ELDY_BACKTITLE1' => '#E9EAED', + 'THEME_ELDY_BACKTABACTIVE' => '#EAEAEA', + 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', + 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', + 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', + 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', + 'THEME_ELDY_LINEBREAK' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLE' => '#28283C', + 'THEME_ELDY_TEXT' => '#000000', + 'THEME_ELDY_TEXTLINK' => '#1C1C1C' ), - 'light' => array( - 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', - 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#FFFFFF', - 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#D51123', - 'OBLYON_COLOR_TOPMENU_TXT' => '#444444', - 'OBLYON_COLOR_TOPMENU_TXT_ACTIVE' => '#FFFFFF', - 'OBLYON_COLOR_TOPMENU_TXT_HOVER' => '#FFFFFF', - 'OBLYON_COLOR_LEFTMENU_BCKGRD' => '#FFFFFF', - 'OBLYON_COLOR_LEFTMENU_BCKGRD_HOVER' => '#D51123', - 'OBLYON_COLOR_LEFTMENU_TXT' => '#444444', - 'OBLYON_COLOR_LEFTMENU_TXT_ACTIVE' => '#FFFFFF', - 'OBLYON_COLOR_LEFTMENU_TXT_HOVER' => '#FFFFFF', - 'OBLYON_COLOR_BUTTON_ACTION1' => '#0083A2', - 'OBLYON_COLOR_BUTTON_ACTION2' => '#0063A2', - 'OBLYON_COLOR_BUTTON_DELETE1' => '#CC8800', - 'OBLYON_COLOR_BUTTON_DELETE2' => '#CC4400', - 'OBLYON_COLOR_MAIN' => '#D51123', - 'OBLYON_COLOR_BCKGRD' => '#FFFFFF', - 'OBLYON_COLOR_LOGO_BCKGRD' => '#FFFFFF', - 'OBLYON_COLOR_LOGIN_BCKGRD' => '#FFFFFF', - 'OBLYON_COLOR_BTITLE' => '#D51123', - 'OBLYON_COLOR_FTITLE' => '#FFFFFF', - 'OBLYON_COLOR_BLINE' => '#FFFFFF', - 'OBLYON_COLOR_BLINE_HOVER' => '#F1F1F1', - 'OBLYON_COLOR_FLINE' => '#444444', - 'OBLYON_COLOR_FLINE_HOVER' => '#D51123', + 'light' => array( + 'OBLYON_INFOXBOX_BACKGROUND' => '#FFFFFF', + 'OBLYON_COLOR_TOPMENU_BCKGRD' => '#FFFFFF', + 'OBLYON_COLOR_TOPMENU_BCKGRD_HOVER' => '#D51123', + 'OBLYON_COLOR_TOPMENU_TXT' => '#444444', + 'OBLYON_COLOR_TOPMENU_TXT_ACTIVE' => '#FFFFFF', + 'OBLYON_COLOR_TOPMENU_TXT_HOVER' => '#FFFFFF', + 'OBLYON_COLOR_LEFTMENU_BCKGRD' => '#FFFFFF', + 'OBLYON_COLOR_LEFTMENU_BCKGRD_HOVER' => '#D51123', + 'OBLYON_COLOR_LEFTMENU_TXT' => '#444444', + 'OBLYON_COLOR_LEFTMENU_TXT_ACTIVE' => '#FFFFFF', + 'OBLYON_COLOR_LEFTMENU_TXT_HOVER' => '#FFFFFF', + 'OBLYON_COLOR_BUTTON_ACTION1' => '#0083A2', + 'OBLYON_COLOR_BUTTON_ACTION2' => '#0063A2', + 'OBLYON_COLOR_BUTTON_DELETE1' => '#CC8800', + 'OBLYON_COLOR_BUTTON_DELETE2' => '#CC4400', + 'OBLYON_COLOR_INFO_BORDER' => '#87cfd2', + 'OBLYON_COLOR_INFO_BCKGRD' => '#eff8fc', + 'OBLYON_COLOR_INFO_TEXT' => '#', + 'OBLYON_COLOR_WARNING_BORDER' => '#f2cf87', + 'OBLYON_COLOR_WARNING_BCKGRD' => '#fcf8e3', + 'OBLYON_COLOR_WARNING_TEXT' => '#', + 'OBLYON_COLOR_ERROR_BORDER' => '#e0796e', + 'OBLYON_COLOR_ERROR_BCKGRD' => '#f07b6e', + 'OBLYON_COLOR_ERROR_TEXT' => '#', + 'OBLYON_COLOR_NOTIF_INFO_BCKGRD' => '#d9e5d1', + 'OBLYON_COLOR_NOTIF_INFO_TEXT' => '#446548', + 'OBLYON_COLOR_NOTIF_WARNING_BCKGRD' => '#fff7d1', + 'OBLYON_COLOR_NOTIF_WARNING_TEXT' => '#a28918', + 'OBLYON_COLOR_NOTIF_ERROR_BCKGRD' => '#d79eac', + 'OBLYON_COLOR_NOTIF_ERROR_TEXT' => '#a72947', + 'OBLYON_COLOR_MAIN' => '#D51123', + 'OBLYON_COLOR_BCKGRD' => '#FFFFFF', + 'OBLYON_COLOR_LOGO_BCKGRD' => '#FFFFFF', + 'OBLYON_COLOR_LOGIN_BCKGRD' => '#FFFFFF', + 'OBLYON_COLOR_BTITLE' => '#D51123', + 'OBLYON_COLOR_FTITLE' => '#FFFFFF', + 'OBLYON_COLOR_BLINE' => '#FFFFFF', + 'OBLYON_COLOR_BLINE_HOVER' => '#F1F1F1', + 'OBLYON_COLOR_FLINE' => '#444444', + 'OBLYON_COLOR_FLINE_HOVER' => '#D51123', 'OBLYON_COLOR_FDATE_DEFAULT' => '#FF0000', - 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', - 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', - 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', - 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', - 'THEME_ELDY_LINEBREAK' => '#FFFFFF', - 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', - 'THEME_ELDY_TEXT' => '#000000', - 'THEME_ELDY_TEXTLINK' => '#1C1C1C' - ) + 'OBLYON_COLOR_TEXTTABACTIVE' => '#222222', + 'THEME_ELDY_TOPBORDER_TITLE1' => '#FFFFFF', + 'THEME_ELDY_BACKTITLE1' => '#E9EAED', + 'THEME_ELDY_BACKTABACTIVE' => '#EAEAEA', + 'THEME_ELDY_LINEIMPAIR1' => '#FFFFFF', + 'THEME_ELDY_LINEIMPAIR2' => '#FFFFFF', + 'THEME_ELDY_LINEPAIR1' => '#FBFBFB', + 'THEME_ELDY_LINEPAIR2' => '#FBFBFB', + 'THEME_ELDY_LINEBREAK' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLENOTAB' => '#FFFFFF', + 'THEME_ELDY_TEXTTITLE' => '#28283C', + 'THEME_ELDY_TEXT' => '#000000', + 'THEME_ELDY_TEXTLINK' => '#1C1C1C' + ) ); // Actions ************************************** @@ -319,9 +434,9 @@
- - - '; + + + '; // Sauvegarde / Restauration oblyon_print_backup_restore(); clearstatcache(); @@ -361,15 +476,24 @@ oblyon_print_input($key, 'input', $langs->trans($key), '', $metas, 4, 1); } } - // button - $metas = array(array(5), 'Buttons'); - oblyon_print_liste_titre($metas); - if (count($listcolor['button'])) { - foreach ($listcolor['button'] as $key) { - $metas = array('type' => 'text', 'class' => 'flat quatrevingtpercent color action'); - oblyon_print_input($key, 'input', $langs->trans($key), '', $metas, 4, 1); - } - } + // button + $metas = array(array(5), 'Buttons'); + oblyon_print_liste_titre($metas); + if (count($listcolor['button'])) { + foreach ($listcolor['button'] as $key) { + $metas = array('type' => 'text', 'class' => 'flat quatrevingtpercent color action'); + oblyon_print_input($key, 'input', $langs->trans($key), '', $metas, 4, 1); + } + } + // message + $metas = array(array(5), 'Messages'); + oblyon_print_liste_titre($metas); + if (count($listcolor['message'])) { + foreach ($listcolor['message'] as $key) { + $metas = array('type' => 'text', 'class' => 'flat quatrevingtpercent color action'); + oblyon_print_input($key, 'input', $langs->trans($key), '', $metas, 4, 1); + } + } // Others $metas = array(array(5), 'Others'); oblyon_print_liste_titre($metas); diff --git a/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang b/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang index 9878cb9..1256597 100644 --- a/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang +++ b/htdocs/custom/oblyon/langs/fr_FR/oblyon.lang @@ -98,14 +98,33 @@ OBLYON_COLOR_BUTTON_ACTION1=Couleur 1 de fond des boutons OBLYON_COLOR_BUTTON_ACTION2=Couleur 2 de fond des boutons OBLYON_COLOR_BUTTON_DELETE1=Couleur 1 de fond des boutons dangereux OBLYON_COLOR_BUTTON_DELETE2=Couleur 2 de fond des boutons dangereux +OBLYON_COLOR_INFO_BORDER = Couleur des bordures des messages d'information +OBLYON_COLOR_INFO_BCKGRD = Couleur de fond des messages d'information +OBLYON_COLOR_INFO_TEXT = Couleur de texte des messages d'information +OBLYON_COLOR_WARNING_BORDER = Couleur des bordures des messages d'avertissement +OBLYON_COLOR_WARNING_BCKGRD = Couleur de fond des messages d'avertissement +OBLYON_COLOR_WARNING_TEXT = Couleur de texte des messages d'avertissement +OBLYON_COLOR_ERROR_BORDER = Couleur des bordures des messages d'erreur +OBLYON_COLOR_ERROR_BCKGRD = Couleur de fond des messages d'erreur +OBLYON_COLOR_ERROR_TEXT = Couleur de texte des messages d'erreur +OBLYON_COLOR_NOTIF_INFO_BCKGRD = Couleur de fond des notifications d'information +OBLYON_COLOR_NOTIF_INFO_TEXT = Couleur de texte des notifications d'information +OBLYON_COLOR_NOTIF_WARNING_BCKGRD = Couleur de fond des notifications d'avertissement +OBLYON_COLOR_NOTIF_WARNING_TEXT = Couleur de texte des notifications d'avertissement +OBLYON_COLOR_NOTIF_ERROR_BCKGRD = Couleur de fond des notifications d'erreur +OBLYON_COLOR_NOTIF_ERROR_TEXT = Couleur de texte des notifications d'erreur +OBLYON_COLOR_TEXTTABACTIVE=Couleur de texte des onglets actifs Eldys = Couleurs de base THEME_ELDY_TOPBORDER_TITLE1 = Couleur des bordures de titre +THEME_ELDY_BACKTITLE1 = Couleur de fond des filtres (Oblyon => uniquement sur les filtres inactifs des statistiques) +THEME_ELDY_BACKTABACTIVE = Couleur des onglets actifs THEME_ELDY_LINEIMPAIR1 = Couleur de fond 1 des lignes impaires des tables THEME_ELDY_LINEIMPAIR2 = Couleur de fond 2 des lignes impaires des tables THEME_ELDY_LINEPAIR1 = Couleur de fond 1 des lignes paires des tables THEME_ELDY_LINEPAIR2 = Couleur de fond 2 des lignes paires des tables THEME_ELDY_LINEBREAK = Couleur des retours à la ligne THEME_ELDY_TEXTTITLENOTAB = Couleur du texte des titres (hors tables) +THEME_ELDY_TEXTTITLE = Couleur du texte des titres THEME_ELDY_TEXT = Couleur du texte de base THEME_ELDY_TEXTLINK = Couleur des textes de liens diff --git a/htdocs/theme/oblyon/badges.inc.php b/htdocs/theme/oblyon/badges.inc.php index f246315..ed8b62f 100644 --- a/htdocs/theme/oblyon/badges.inc.php +++ b/htdocs/theme/oblyon/badges.inc.php @@ -6,24 +6,24 @@ */ .badge { - display: inline-block; - font-size: 80%; - font-weight: 700 !important; - line-height: 1; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: .25rem; - transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; - border-width: 2px; - border-style: solid; - border-color: rgba(255,255,255,0); - box-sizing: border-box; + display: inline-block; + font-size: 80%; + font-weight: 700 !important; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25rem; + transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; + border-width: 2px; + border-style: solid; + border-color: rgba(255,255,255,0); + box-sizing: border-box; } .badge-status { - font-size: 1em; - padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */ + font-size: 1em; + padding: .19em .35em; /* more than 0.19 generate a change into heigth of lines */ } .tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status { font-size: 1.1em; @@ -39,95 +39,95 @@ } .badge-pill, .tabs .badge { - padding-right: .5em; - padding-left: .5em; - border-radius: 0.25rem; + padding-right: .5em; + padding-left: .5em; + border-radius: 0.25rem; } .badge-dot { - border-radius: 50%; - padding: 0.45em; - vertical-align: text-top; + border-radius: 50%; + padding: 0.45em; + vertical-align: text-top; } a.badge:focus, a.badge:hover { - text-decoration: none; + text-decoration: none; } .liste_titre .badge:not(.nochangebackground) { - background-color: ; - color: #fff; + background-color: ; + color: #fff; } /* PRIMARY */ .badge-primary{ - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } a.badge-primary.focus, a.badge-primary:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-primary:focus, a.badge-primary:hover { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } /* SECONDARY */ .badge-secondary, .tabs .badge { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } a.badge-secondary.focus, a.badge-secondary:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-secondary:focus, a.badge-secondary:hover { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } /* SUCCESS */ .badge-success { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } a.badge-success.focus, a.badge-success:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-success:focus, a.badge-success:hover { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } /* DANGER */ .badge-danger { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } a.badge-danger.focus, a.badge-danger:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-danger:focus, a.badge-danger:hover { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } /* WARNING */ .badge-warning { - color: #212529 !important; - background-color: ; + color: #212529 !important; + background-color: ; } a.badge-warning.focus, a.badge-warning:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-warning:focus, a.badge-warning:hover { - color: #212529 !important; - background-color: ; + color: #212529 !important; + background-color: ; } /* WARNING colorblind */ @@ -143,44 +143,44 @@ /* INFO */ .badge-info { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } a.badge-info.focus, a.badge-info:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-info:focus, a.badge-info:hover { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } /* LIGHT */ .badge-light { - color: #212529 !important; - background-color: ; + color: #212529 !important; + background-color: ; } a.badge-light.focus, a.badge-light:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-light:focus, a.badge-light:hover { - color: #212529 !important; - background-color: ; + color: #212529 !important; + background-color: ; } /* DARK */ .badge-dark { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } a.badge-dark.focus, a.badge-dark:focus { - outline: 0; - box-shadow: 0 0 0 0.2rem ; + outline: 0; + box-shadow: 0 0 0 0.2rem ; } a.badge-dark:focus, a.badge-dark:hover { - color: #fff !important; - background-color: ; + color: #fff !important; + background-color: ; } @media only screen and (max-width: 570px) @@ -245,27 +245,27 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL } print $cssPrefix.".badge-status".$statusName." {\n"; - print " color: ".$thisBadgeTextColor." !important;\n"; + print " color: ".$thisBadgeTextColor." !important;\n"; if (in_array((string) $statusName, $TBadgeBorderOnly)) { - print " border-color: ".$thisBadgeBorderColor." !important;\n"; + print " border-color: ".$thisBadgeBorderColor." !important;\n"; } - print " background-color: ".$thisBadgeBackgroundColor." !important;\n"; + print " background-color: ".$thisBadgeBackgroundColor." !important;\n"; print "}\n"; print $cssPrefix.".font-status".$statusName." {\n"; - print " color: ".$thisBadgeBackgroundColor." !important;\n"; + print " color: ".$thisBadgeBackgroundColor." !important;\n"; print "}\n"; print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n"; - print " outline: 0;\n"; - print " box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n"; + print " outline: 0;\n"; + print " box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5)." !important;\n"; print "}\n"; print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n"; - print " color: ".$thisBadgeTextColor." !important;\n"; - //print " background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n"; + print " color: ".$thisBadgeTextColor." !important;\n"; + //print " background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n"; if (in_array((string) $statusName, $TBadgeBorderOnly)) { - print " border-color: ".colorDarker($thisBadgeBorderColor, 10)." !important;\n"; + print " border-color: ".colorDarker($thisBadgeBorderColor, 10)." !important;\n"; } print "}\n"; } diff --git a/htdocs/theme/oblyon/btn.inc.php b/htdocs/theme/oblyon/btn.inc.php index f778796..c362816 100644 --- a/htdocs/theme/oblyon/btn.inc.php +++ b/htdocs/theme/oblyon/btn.inc.php @@ -5,60 +5,60 @@ /* ============================================================================== */ -/* Buttons for actions */ +/* Buttons for actions */ /* ============================================================================== */ div.divButAction { - margin-bottom: 1.4em; + margin-bottom: 1.4em; } div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete, div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete { - margin-bottom: 1.4em !important; + margin-bottom: 1.4em !important; } div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused { - margin-bottom: 0 !important; + margin-bottom: 0 !important; } span.butAction, span.butActionDelete { - cursor: pointer; + cursor: pointer; } .butAction { - background: ; + background: ; } .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { - text-decoration: none; - /* text-transform: capitalize; */ - font-weight: bold; - - margin: 0em em !important; - padding: 0.6em em; - font-family: ; - display: inline-block; - text-align: center; - cursor: pointer; - color: #fff; - background: ; - border: 0px; - - border-top-right-radius: 0.30em !important; - border-bottom-right-radius: 0.30em !important; - border-top-left-radius: 0.30em !important; - border-bottom-left-radius: 0.30em !important; + text-decoration: none; + /* text-transform: capitalize; */ + font-weight: bold; + + margin: 0em em !important; + padding: 0.6em em; + font-family: ; + display: inline-block; + text-align: center; + cursor: pointer; + color: #fff; + background: ; + border: 0px; + + border-top-right-radius: 0.30em !important; + border-bottom-right-radius: 0.30em !important; + border-top-left-radius: 0.30em !important; + border-bottom-left-radius: 0.30em !important; } .butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active { - text-decoration: none; - /* text-transform: capitalize; */ - font-weight: normal; - - margin: 0em 0.3em 0 0.3em !important; - padding: 0.2em em 0.3em; - font-family: ; - display: inline-block; - /* text-align: center; New button are on right of screen */ - background: ; - cursor: pointer; + text-decoration: none; + /* text-transform: capitalize; */ + font-weight: normal; + + margin: 0em 0.3em 0 0.3em !important; + padding: 0.2em em 0.3em; + font-family: ; + display: inline-block; + /* text-align: center; New button are on right of screen */ + background: ; + cursor: pointer; } .tableforfieldcreate a.butActionNew>span.fa-plus-circle, .tableforfieldcreate a.butActionNew>span.fa-plus-circle:hover, @@ -99,71 +99,71 @@ } .butAction:hover { - background: ; - -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); - box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); + background: ; + -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); } .butActionNew:hover { - text-decoration: underline; - box-shadow: unset !important; + text-decoration: underline; + box-shadow: unset !important; } .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete { - background: ; - color: #ffffff; + background: ; + color: #ffffff; } .butActionDelete:hover { - background: ; - -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); - box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); + background: ; + -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); } .butActionRefused { - text-decoration: none !important; - /* text-transform: capitalize; */ - font-weight: bold !important; - - white-space: nowrap !important; - cursor: not-allowed !important; - margin: 0em em; - padding: 0.6em em; - font-family: !important; - display: inline-block; - text-align: center; - cursor: pointer; - color: #999 !important; - background: unset; - border: 0px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); - box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); + text-decoration: none !important; + /* text-transform: capitalize; */ + font-weight: bold !important; + + white-space: nowrap !important; + cursor: not-allowed !important; + margin: 0em em; + padding: 0.6em em; + font-family: !important; + display: inline-block; + text-align: center; + cursor: pointer; + color: #999 !important; + background: unset; + border: 0px; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -webkit-box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 1px 4px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); } .butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active { - text-decoration: none !important; - /* text-transform: capitalize; */ - font-weight: normal !important; - - white-space: nowrap !important; - cursor: not-allowed !important; - margin: 0em em; - padding: 0.2em em; - font-family: !important; - display: inline-block; - /* text-align: center; New button are on right of screen */ - cursor: pointer; - color: #999 !important; - padding-top: 0.2em; - box-shadow: none !important; - -webkit-box-shadow: none !important; + text-decoration: none !important; + /* text-transform: capitalize; */ + font-weight: normal !important; + + white-space: nowrap !important; + cursor: not-allowed !important; + margin: 0em em; + padding: 0.2em em; + font-family: !important; + display: inline-block; + /* text-align: center; New button are on right of screen */ + cursor: pointer; + color: #999 !important; + padding-top: 0.2em; + box-shadow: none !important; + -webkit-box-shadow: none !important; } .butActionTransparent { - color: #222 ! important; - background-color: transparent ! important; + color: #222 ! important; + background-color: transparent ! important; } @@ -172,32 +172,29 @@ */ .btnTitle, a.btnTitle { - display: inline-block; - padding: 4px 12px 4px 12px; - font-weight: 400; - /* line-height: 1; */ - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - box-shadow: none; - text-decoration: none; - position: relative; - margin: 0 0 0 10px; - min-width: 80px; - text-align: center; - // color: rgb(); - border: none; - font-size: 12px; - font-weight: 300; - background-color: #fbfbfb; - border: 1px solid #fff; + display: inline-block; + padding: 4px 12px 4px 12px; + font-weight: 400; + /* line-height: 1; */ + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + box-shadow: none; + text-decoration: none; + position: relative; + margin: 0 0 0 10px; + min-width: 80px; + text-align: center; + border: none; + font-size: 12px; + font-weight: 300; } .btnTitle > .btnTitle-icon{ @@ -205,45 +202,45 @@ } .btnTitle > .btnTitle-label{ - color: #666666; + color: #666666; } .btnTitle:hover, a.btnTitle:hover { border: 0px; - border-radius: 3px; - position: relative; - margin: 0 0 0 10px; - text-align: center; - color: #ffffff; - background-color: ; - font-size: 12px; - text-decoration: none; - box-shadow: none; + border-radius: 3px; + position: relative; + margin: 0 0 0 10px; + text-align: center; + color: #ffffff; + background-color: ; + font-size: 12px; + text-decoration: none; + box-shadow: none; } .btnTitle.refused, a.btnTitle.refused, .btnTitle.refused:hover, a.btnTitle.refused:hover { - color: #ffffff; - cursor: not-allowed; - background-color: ; + color: #ffffff; + cursor: not-allowed; + background-color: ; } .btnTitle:hover .btnTitle-label{ - color: #ffffff; + color: #ffffff; } .btnTitle.refused .btnTitle-label, .btnTitle.refused:hover .btnTitle-label{ - color: #8a8a8a; + color: #8a8a8a; } .btnTitle>.fa, .btnTitle>.fal, .btnTitle>.far { - font-size: 20px; - display: block; + font-size: 20px; + display: block; } div.pagination li:first-child a.btnTitle{ - margin-left: 10px; + margin-left: 10px; } @@ -255,15 +252,15 @@ @media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */ { .btnTitle, a.btnTitle { - display: inline-block; - padding: 4px 4px 4px 4px; + display: inline-block; + padding: 4px 4px 4px 4px; min-width: unset; } } global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?> .butActionRefused, .butActionNewRefused, .btnTitle.refused { - display: none !important; + display: none !important; } diff --git a/htdocs/theme/oblyon/custom.css.php b/htdocs/theme/oblyon/custom.css.php index fc0eacf..39579d9 100644 --- a/htdocs/theme/oblyon/custom.css.php +++ b/htdocs/theme/oblyon/custom.css.php @@ -1,7 +1,7 @@ - * Copyright (c) 2023 Alexandre Spangaro + * Copyright (c) 2023 Eric Seigne + * Copyright (c) 2023 Alexandre Spangaro * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -$res = 0; +$res = 0; if (! $res && file_exists("../main.inc.php")) $res = @include "../main.inc.php"; if (! $res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php"; if (! $res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php"; diff --git a/htdocs/theme/oblyon/dropdown.inc.php b/htdocs/theme/oblyon/dropdown.inc.php index e824163..81f5d92 100644 --- a/htdocs/theme/oblyon/dropdown.inc.php +++ b/htdocs/theme/oblyon/dropdown.inc.php @@ -7,64 +7,64 @@ */ .open>.dropdown-menu, .dropdown dd ul.open { - display: block; + display: block; } .dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - margin: 2px 0 0; - font-size: 14px; - text-align: left; - list-style: none; - background-color: ; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid rgba(0,0,0,.15); - border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); - box-shadow: 0 6px 12px rgba(0,0,0,.175); + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: ; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid var(--colorboxstatsborder); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); + box-shadow: 0 6px 12px rgba(0,0,0,.175); } .dropdown-toggle{ - text-decoration: none !important; + text-decoration: none !important; } .dropdown-toggle::after { - /* font part */ - font-family: "global->MAIN_FONTAWESOME_FAMILY)) { - echo 'Font Awesome 5 Free'; - } else { - echo $conf->global->MAIN_FONTAWESOME_FAMILY; - } - ?>"; - font-weight: 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; + /* font part */ + font-family: "global->MAIN_FONTAWESOME_FAMILY)) { + echo 'Font Awesome 5 Free'; + } else { + echo $conf->global->MAIN_FONTAWESOME_FAMILY; + } + ?>"; + font-weight: 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); + transform: rotate(180deg); } @@ -72,326 +72,345 @@ * MENU Dropdown */ .login_block.usedropdown .logout-btn{ - display: none; + display: none; } .tmenu .open.dropdown, .login_block .open.dropdown, .tmenu .open.dropdown, .login_block .dropdown:hover{ - background: rgba(0, 0, 0, 0.1); + background: rgba(0, 0, 0, 0.1); } .tmenu .dropdown-menu, .login_block .dropdown-menu { - position: absolute; - right: 0; - left: auto; - line-height:1.3em; + position: absolute; + right: 0; + left: auto; + line-height:1.3em; } .tmenu .dropdown-menu, .login_block .dropdown-menu .user-body { - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } .user-body { - color: #333; + color: var(--colortextlink); } .side-nav-vert .user-menu .dropdown-menu { - border-top-right-radius: 0; - border-top-left-radius: 0; - padding: 1px 0 0 0; - border-top-width: 0; - width: 300px; + border-top-right-radius: 0; + border-top-left-radius: 0; + padding: 1px 0 0 0; + border-top-width: 0; + width: 300px; } .side-nav-vert .user-menu .dropdown-menu { - margin-top: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; + margin-top: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; } .side-nav-vert .user-menu .dropdown-menu > .user-header { - min-height: 175px; - padding: 10px; - text-align: center; - white-space: normal; + min-height: 175px; + padding: 10px; + text-align: center; + white-space: normal; } #topmenu-global-search-dropdown .dropdown-menu{ - width: 300px; - max-width: 100%; + width: 300px; + max-width: 100%; } .dropdown-user-image { - border-radius: 50%; - vertical-align: middle; - z-index: 5; - height: 90px; - width: 90px; - border: 3px solid; - border-color: transparent; - border-color: rgba(255, 255, 255, 0.2); - max-width: 100%; - max-height :100%; + border-radius: 50%; + vertical-align: middle; + z-index: 5; + height: 90px; + width: 90px; + border: 3px solid; + border-color: transparent; + border-color: var(--colorboxstatsborder); + max-width: 100%; + max-height :100%; } .dropdown-menu > .user-header{ global->MAIN_MENU_INVERT ) { ?> - background-color: ; + background-color: ; - background-color: ; + background-color: ; } .dropdown-menu .dropdown-header{ - padding: 5px 10px 10px 10px; + padding: 5px 10px 10px 10px; } .dropdown-menu > .user-footer { - background-color: #f9f9f9; - padding: 10px; +global->MAIN_MENU_INVERT ) { ?> + background-color: ; + + background-color: ; + + padding: 10px; } .user-footer:after { - clear: both; + clear: both; } .dropdown-menu > .bookmark-footer{ - padding: 10px; + padding: 10px; } .dropdown-menu > .user-body, .dropdown-body{ - padding: 15px; - border-bottom: 1px solid #f4f4f4; - border-top: 1px solid #dddddd; - white-space: normal; + padding: 15px; + border-bottom: 1px solid var(--colorboxstatsborder); + border-top: 1px solid var(--colorboxstatsborder); + white-space: normal; } .dropdown-menu > .bookmark-body, .dropdown-body{ - padding: 10px 0; - overflow-y: auto; - max-height: 60vh ; /* fallback for browsers without support for calc() */ - max-height: calc(90vh - 110px) ; - white-space: normal; + padding: 10px 0; + overflow-y: auto; + max-height: 60vh ; /* fallback for browsers without support for calc() */ + max-height: calc(90vh - 110px) ; + white-space: normal; } #topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body{ - max-height: 60vh ; /* fallback for browsers without support for calc() */ - max-height: calc(90vh - 200px) ; + max-height: 60vh ; /* fallback for browsers without support for calc() */ + max-height: calc(90vh - 200px) ; } .dropdown-body::-webkit-scrollbar { - width: 8px; + width: 8px; } .dropdown-body::-webkit-scrollbar-thumb { - -webkit-border-radius: 0; - border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; global->MAIN_MENU_INVERT ) { ?> - background-color: ; + background-color: ; - background-color: ; + background-color: ; } .dropdown-body::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - -webkit-border-radius: 0; - border-radius: 0; - background: #aaa; + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-border-radius: 0; + border-radius: 0; + background: #aaa; } #topmenu-login-dropdown, #topmenu-bookmark-dropdown, #topmenu-quickadd-dropdown, #topmenu-global-search-dropdown, #topmenu-tool-dropdown { - padding: 0 5px 0 5px; + padding: 0 5px 0 5px; } #topmenu-login-dropdown a:hover{ - text-decoration: none; + text-decoration: none; } #topmenuloginmoreinfo-btn, #topmenulogincompanyinfo-btn { - display: block; - text-align: right; - color:#666; - cursor: pointer; + display: block; + text-align: right; + color:#666; + cursor: pointer; } #topmenuloginmoreinfo, #topmenulogincompanyinfo { - display: none; - clear: both; - font-size: 0.95em; + display: none; + clear: both; + font-size: 0.95em; } .button-top-menu-dropdown { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; - font-size: 14px; - font-weight: 400; - line-height: 1.42857143; - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background-image: none; - border: 1px solid transparent; - border-radius: 4px; -} - -.user-footer .button-top-menu-dropdown { - color: #666666; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - border-width: 1px; - background-color: #f4f4f4; - border-color: #ddd; -} - - .dropdown-menu a.top-menu-dropdown-link { - color: !important; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - display: block; - margin: 5px 0px; - } - .dropdown-item { - display: block !important; - box-sizing: border-box; - width: 100%; - padding: .25rem 1.5rem .25rem 1rem; - clear: both; - font-weight: 400; - color: !important; - text-align: inherit; - background-color: transparent; - border: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .dropdown-item::before { - /* font part */ - font-family: "global->MAIN_FONTAWESOME_FAMILY)) { - echo 'Font Awesome 5 Free'; - } else { - echo $conf->global->MAIN_FONTAWESOME_FAMILY; - } - ?>"; - font-weight: global->MAIN_FONTAWESOME_WEIGHT)) { - echo 900; - } else { - echo $conf->global->MAIN_FONTAWESOME_WEIGHT; - } - ?>; - font-style: normal; - font-variant: normal; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - text-align:center; - text-decoration:none; - margin-right: 5px; - display: inline-block; - content: "\f0da"; - color: rgba(0,0,0,0.3); - } - .dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus, .dropdown-menu a.top-menu-dropdown-link:hover { - text-decoration: none; + display: inline-block; + padding: 6px 12px; + margin-bottom: 0; + font-size: 14px; + font-weight: 400; + line-height: 1.42857143; + text-align: center; + white-space: nowrap; + vertical-align: middle; + -ms-touch-action: manipulation; + touch-action: manipulation; + cursor: pointer; + -moz-transition: all .3s ease-in-out; + -webkit-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; + user-select: none; + background-image: none; + border: none; + border-radius: 0.30em; + } + + .user-footer .pull-left .button-top-menu-dropdown { + background-color: ; + color: #fff; + } + + .user-footer .pull-left .button-top-menu-dropdown:hover, .user-footer .pull-left .button-top-menu-dropdown:focus { + background-color: ; + border-color: ; + box-shadow: inset 0 1px 0 rgba(235,235,235, .6); + -webkit-box-shadow: inset 0 1px 0 rgba(235,235,235, .6); + color: #fff; + } + + .user-footer .pull-right .button-top-menu-dropdown { + background-color: ; + color: #fff; + } + + .user-footer .pull-right .button-top-menu-dropdown:hover, .user-footer .pull-left .button-top-menu-dropdown:focus { + background-color: ; + border-color: ; + box-shadow: inset 0 1px 0 rgba(235,235,235, .6); + -webkit-box-shadow: inset 0 1px 0 rgba(235,235,235, .6); + color: #fff; + } + + .dropdown-menu a.top-menu-dropdown-link { + color: !important; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + display: block; + margin: 5px 0px; + } + .dropdown-item { + display: block !important; + box-sizing: border-box; + width: 100%; + padding: .25rem 1.5rem .25rem 1rem; + clear: both; + font-weight: 400; + color: !important; + text-align: inherit; + background-color: transparent; + border: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .dropdown-item::before { + /* font part */ + font-family: "global->MAIN_FONTAWESOME_FAMILY)) { + echo 'Font Awesome 5 Free'; + } else { + echo $conf->global->MAIN_FONTAWESOME_FAMILY; + } + ?>"; + font-weight: global->MAIN_FONTAWESOME_WEIGHT)) { + echo 900; + } else { + echo $conf->global->MAIN_FONTAWESOME_WEIGHT; + } + ?>; + font-style: normal; + font-variant: normal; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + text-align:center; + text-decoration:none; + margin-right: 5px; + display: inline-block; + content: "\f0da"; + color: rgba(0,0,0,0.3); + } + .dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus, .dropdown-menu a.top-menu-dropdown-link:hover { + text-decoration: none; global->MAIN_MENU_INVERT ) { ?> - background-color: ; - color: !important; + background-color: ; + color: !important; - background-color: ; - color: !important; + background-color: ; + color: !important; - } - /* - * SEARCH - */ - .dropdown-search-input { - width: 100%; - padding: 10px 35px 10px 20px; - background-color: transparent; - font-size: 14px; - line-height: 16px; - box-sizing: border-box; - color: ; - background-color: transparent; - background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-size: 16px 16px; - background-position: 95% center; - border-radius: 50px; - border: 1px solid #c4c4c2 !important; - transition: all 250ms ease-in-out; - backface-visibility: hidden; - transform-style: preserve-3d; - } - .dropdown-search-input::placeholder { - color: color( a(0.8)); - letter-spacing: 1.5px; - } - .hidden-search-result{ - display: none !important; - } - - /* - * QUICK ADD - */ - #topmenu-quickadd-dropdown .dropdown-menu { - width: 335px !important; - color: #444; - } - - .quickadd-header { - color: #444 !important; - } - - div.quickadd { - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; - flex-direction: row; - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; - flex-wrap: wrap; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-align-content: center; - -ms-flex-line-pack: center; - align-content: center; - -webkit-align-items: flex-start; - -ms-flex-align: start; - align-items: flex-start; - } - - div.quickadd a { - color: #444; + } + /* + * SEARCH + */ + .dropdown-search-input { + width: 100%; + padding: 10px 35px 10px 20px; + background-color: transparent; + font-size: 14px; + line-height: 16px; + box-sizing: border-box; + color: ; + background-color: transparent; + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-size: 16px 16px; + background-position: 95% center; + border-radius: 50px; + border: 1px solid #c4c4c2 !important; + transition: all 250ms ease-in-out; + backface-visibility: hidden; + transform-style: preserve-3d; + } + .dropdown-search-input::placeholder { + color: color( a(0.8)); + letter-spacing: 1.5px; + } + .hidden-search-result{ + display: none !important; + } + + /* + * QUICK ADD + */ + #topmenu-quickadd-dropdown .dropdown-menu { + width: 335px !important; + color: #444; + } + + .quickadd-header { + color: #444 !important; + } + + div.quickadd { + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + -webkit-flex-direction: row; + -ms-flex-direction: row; + flex-direction: row; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-align-content: center; + -ms-flex-line-pack: center; + align-content: center; + -webkit-align-items: flex-start; + -ms-flex-align: start; + align-items: flex-start; + } + + div.quickadd a { + color: #444; height: 60px; width: 110px; - } - - div.quickadd a:hover, div.quickadd a:active { - color: ; - } - - div.quickaddblock { - width: 110px; - display: block ruby; - } - - div.quickaddblock:hover, - div.quickaddblock:active, - div.quickaddblock:focus { - background: ; - } - - /* - * Responsive - */ - @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; - } - } + } + + div.quickadd a:hover, div.quickadd a:active { + color: ; + } + + div.quickaddblock { + width: 110px; + display: block ruby; + } + + div.quickaddblock:hover, + div.quickaddblock:active, + div.quickaddblock:focus { + background: ; + } + + /* + * Responsive + */ + @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 index 20f8414..fb965bc 100644 --- a/htdocs/theme/oblyon/global.inc.php +++ b/htdocs/theme/oblyon/global.inc.php @@ -2,7 +2,7 @@ /*