diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 913b46a852b31d8a7cbc1d2ab867082fa066792c..fe7b15c66feb22dde354a98335771fe9d10dc475 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 ="<a href=\"?year=".$prev_year."&month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"))."</a>\n"; + $nav ="<a href=\"?year=".$prev_year."&month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n"; $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y"); $nav.=" </span>\n"; - $nav.="<a href=\"?year=".$next_year."&month=".$next_month.$param."\">".img_next($langs->trans("Next"))."</a>\n"; + $nav.="<a href=\"?year=".$next_year."&month=".$next_month.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n"; $nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)"; $picto='calendar'; } if ($action=='show_week') { - $nav ="<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n"; + $nav ="<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n"; $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week; $nav.=" </span>\n"; - $nav.="<a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n"; + $nav.="<a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n"; $nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)"; $picto='calendarweek'; } if ($action=='show_day') { - $nav ="<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n"; + $nav ="<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a>\n"; $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort"); $nav.=" </span>\n"; - $nav.="<a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n"; + $nav.="<a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\">".img_next($langs->trans("Next"), 'class="valignbottom"')."</a>\n"; $nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)"; $picto='calendarday'; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 73e42b22b3380d3691cfb4ae25f2cf5126129c16..1ef841a975a91d69ad591634a43061aeb083ccad 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/theme/eldy/img/next.png b/htdocs/theme/eldy/img/next.png index a6152079d98ec6f0084658118994377ba5b3f003..f85bb9154bcc470d14f629ddeb7aa803e9ce93c9 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 90b9e8f7bad1f31e92eb47c627138c40735aa649..95934a2b16ee026803e6501c9659085f4b953fea 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 b2ca926fd7180119eb08f9ec3bd18678d365c95c..14154d01f516ced95dd1aaae6fcf38e41fc52592 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -418,6 +418,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 a6152079d98ec6f0084658118994377ba5b3f003..f85bb9154bcc470d14f629ddeb7aa803e9ce93c9 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 90b9e8f7bad1f31e92eb47c627138c40735aa649..95934a2b16ee026803e6501c9659085f4b953fea 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 9ae58bbb26117aabdac145ff2e85a248bf04c190..fe1e161dfc804e9178a636829d2a5f31f7d063cc 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%; }