diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 7b42637ed7b..c894647bb29 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -305,28 +305,28 @@ $param.="&maxprint=".$maxprint; // Show navigation bar if (empty($action) || $action=='show_month') { - $nav ="".img_previous($langs->trans("Previous"))."\n"; + $nav ="".img_previous($langs->trans("Previous"), 'class="valignbottom"')."\n"; $nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y"); $nav.=" \n"; - $nav.="".img_next($langs->trans("Next"))."\n"; + $nav.="".img_next($langs->trans("Next"), 'class="valignbottom"')."\n"; $nav.="   (".$langs->trans("Today").")"; $picto='calendar'; } if ($action=='show_week') { - $nav ="".img_previous($langs->trans("Previous"))."\n"; + $nav ="".img_previous($langs->trans("Previous"), 'class="valignbottom"')."\n"; $nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week; $nav.=" \n"; - $nav.="".img_next($langs->trans("Next"))."\n"; + $nav.="".img_next($langs->trans("Next"), 'class="valignbottom"')."\n"; $nav.="   (".$langs->trans("Today").")"; $picto='calendarweek'; } if ($action=='show_day') { - $nav ="".img_previous($langs->trans("Previous"))."\n"; + $nav ="".img_previous($langs->trans("Previous"), 'class="valignbottom"')."\n"; $nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort"); $nav.=" \n"; - $nav.="".img_next($langs->trans("Next"))."\n"; + $nav.="".img_next($langs->trans("Next"), 'class="valignbottom"')."\n"; $nav.="   (".$langs->trans("Today").")"; $picto='calendarday'; } diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index d3aa3557c89..af6d8b94c28 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -95,6 +95,7 @@ if ($action == 'add') // Add targets into database $obj = new $classname($db); + dol_syslog("Call add_to_target on class ".$classname); $result=$obj->add_to_target($id,$filtersarray); } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d5f7345d7a7..d4d74ec3fe6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2410,30 +2410,32 @@ function img_error($titlealt = 'default') * Show next logo * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. - * @return string Return img tag +* @param string $options Add more attribute on img tag (For example 'style="float: right"') + * @return string Return img tag */ -function img_next($titlealt = 'default') +function img_next($titlealt = 'default', $options='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Next'); - return img_picto($titlealt, 'next.png'); + return img_picto($titlealt, 'next.png', $options); } /** * Show previous logo * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. + * @param string $options Add more attribute on img tag (For example 'style="float: right"') * @return string Return img tag */ -function img_previous($titlealt = 'default') +function img_previous($titlealt = 'default', $options='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Previous'); - return img_picto($titlealt, 'previous.png'); + return img_picto($titlealt, 'previous.png', $options); } /** diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index ca9f2b11f0d..42f59e7c2fb 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -123,7 +123,7 @@ class mailing_fraise extends MailingTargets $s.=''; $s.=' '; $s.=$langs->trans("Type").': '; - $s.=''; $sql = "SELECT rowid, libelle, statut"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type"; $sql.= " WHERE entity = ".$conf->entity; @@ -212,7 +212,7 @@ class mailing_fraise extends MailingTargets if ($dateendsubscriptionafter > 0) $sql.=" AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'"; if ($dateendsubscriptionbefore > 0) $sql.=" AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'"; $sql.= " AND a.fk_adherent_type = ta.rowid"; - if ($_POST['filter']) $sql.= " AND ta.rowid='".$_POST['filter']."'"; + if ($_POST['filtertype']) $sql.= " AND ta.rowid='".$_POST['filtertype']."'"; $sql.= " ORDER BY a.email"; //print $sql; diff --git a/htdocs/theme/eldy/img/next.png b/htdocs/theme/eldy/img/next.png index a6152079d98..f85bb9154bc 100644 Binary files a/htdocs/theme/eldy/img/next.png and b/htdocs/theme/eldy/img/next.png differ diff --git a/htdocs/theme/eldy/img/previous.png b/htdocs/theme/eldy/img/previous.png index 90b9e8f7bad..95934a2b16e 100644 Binary files a/htdocs/theme/eldy/img/previous.png and b/htdocs/theme/eldy/img/previous.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 3d11bbf0508..9f3ffa7e3a3 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -427,6 +427,9 @@ th .button { .valignmiddle { vertical-align: middle; } +.valignbottom { + vertical-align: bottom; +} .centpercent { width: 100%; } diff --git a/htdocs/theme/md/img/next.png b/htdocs/theme/md/img/next.png index a6152079d98..f85bb9154bc 100644 Binary files a/htdocs/theme/md/img/next.png and b/htdocs/theme/md/img/next.png differ diff --git a/htdocs/theme/md/img/previous.png b/htdocs/theme/md/img/previous.png index 90b9e8f7bad..95934a2b16e 100644 Binary files a/htdocs/theme/md/img/previous.png and b/htdocs/theme/md/img/previous.png differ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index f2ab4e27c43..4ea0bcfc0fa 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -414,6 +414,9 @@ th .button { .valignmiddle { vertical-align: middle; } +.valignbottom { + vertical-align: bottom; +} .centpercent { width: 100%; }