From d9674b18283858e4aa8aa7edda3e9422b86a8cbb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Nov 2023 01:05:54 +0100 Subject: [PATCH 1/3] Clean code --- htdocs/theme/eldy/btn.inc.php | 7 +++++-- htdocs/theme/eldy/global.inc.php | 4 ---- htdocs/theme/md/btn.inc.php | 6 ++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index 28ae22e9696..92b8ecb23aa 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -251,12 +251,15 @@ a.btnTitle.btnTitleSelected { border-radius: 3px; position: relative; text-align: center; - /* color: #ffffff; - background-color: rgb(); */ font-size: 12px; text-decoration: none; box-shadow: none; } +/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */ +.btnTitlePlus:hover { + max-width: 24px; + max-height: 40px; +} .btnTitle.refused, a.btnTitle.refused, .btnTitle.refused:hover, a.btnTitle.refused:hover { color: #8a8a8a; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index d1248aebe35..905ae6e22b0 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4111,10 +4111,6 @@ div.pagination li.litext a:hover { background-color: transparent; background-image: none; } -div.pagination li.litext a:hover { - background-color: transparent; - background-image: none; -} div.pagination li.noborder a:hover { border: none; background-color: transparent; diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php index 3e8195e0372..f39f27b6784 100644 --- a/htdocs/theme/md/btn.inc.php +++ b/htdocs/theme/md/btn.inc.php @@ -379,6 +379,12 @@ div.pagination .btnTitle:hover .btnTitle-label{ border-color: #ddd; } +/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */ +.btnTitlePlus:hover { + max-width: 24px; + max-height: 40px; +} + /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */ @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 */ From de3fec95f55aa6ab58cc4fa1506924791ea3edf1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Nov 2023 02:27:47 +0100 Subject: [PATCH 2/3] Debug v19 --- htdocs/core/class/commonobject.class.php | 31 ++++++++++++++++--- .../class/conferenceorbooth.class.php | 14 +++++++-- .../conferenceorbooth_list.php | 8 ++--- htdocs/public/project/index.php | 24 +++++++------- 4 files changed, 56 insertions(+), 21 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 912c06d5033..327afd9e26a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -7033,6 +7033,7 @@ abstract class CommonObject $param['options'] = array(); $type = $this->fields[$key]['type']; } + //var_dump($type); var_dump($param['options']); // Special case that force options and type ($type can be integer, varchar, ...) if (!empty($this->fields[$key]['arrayofkeyval']) && is_array($this->fields[$key]['arrayofkeyval'])) { @@ -7194,7 +7195,27 @@ abstract class CommonObject $out .= ''; + print ''; print '

'; } if ($project->accept_conference_suggestions == 1 || $project->accept_conference_suggestions == 2) { // Can suggest conferences $foundaction++; - print ''; + print ''; print '

'; } if ($project->accept_conference_suggestions == 2 || $project->accept_conference_suggestions == 3) { // Can vote for conferences $foundaction++; - print ''; + print ''; } if (! $foundaction) {