From 6dbaba697355c90fd1f1bcb4abc441a1b5a6959b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Feb 2016 17:45:26 +0100
Subject: [PATCH] Fix: previous and next arrow
---
htdocs/comm/action/index.php | 12 ++++++------
htdocs/core/lib/functions.lib.php | 12 +++++++-----
htdocs/theme/eldy/img/next.png | Bin 157 -> 106 bytes
htdocs/theme/eldy/img/previous.png | Bin 151 -> 106 bytes
htdocs/theme/eldy/style.css.php | 3 +++
htdocs/theme/md/img/next.png | Bin 157 -> 106 bytes
htdocs/theme/md/img/previous.png | Bin 151 -> 106 bytes
htdocs/theme/md/style.css.php | 3 +++
8 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 913b46a852b..fe7b15c66fe 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 73e42b22b33..1ef841a975a 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
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3Sg7<#%mhEy;nOE4X1+#pon
z_MeBhMa0nPjGEs~nMYI3s;=qjOqBBwJUdmPsi7c&PmqD(imAZ4=&L$Y85kHCJYD@<
J);T3K0RW2L9?Ad!
literal 157
zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4i*Lm2Co_CW-~A_FeQ1ryD<E3??1C2Bvs%M
zS<Jw|Eeyhp4727)FfcH%mw5WRvOi#C=aLcVDabg&z`&sA>Eal|aXmRffpv?~iG|#S
z#(PpGIErsc+tIGI;P8i@M%F_qO<XgLH4OeJ9xY;+ugYqn-*&o;fq{X+)78&qol`;+
E02RP0^Z)<=
diff --git a/htdocs/theme/eldy/img/previous.png b/htdocs/theme/eldy/img/previous.png
index 90b9e8f7bad1f31e92eb47c627138c40735aa649..95934a2b16ee026803e6501c9659085f4b953fea 100644
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3Sg7<#%mhEy;nOBfw!+%So)
z?LW`GmZ?7J2`Woc*b-HZ9lba-XR!vk<fq<iaXwY|;kY@&vM_;FJMW5cGB7YOc)I$z
JtaD0e0sx<bA9er$
literal 151
zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4i*Lm2Co_CW-~A_FeQ1ryD<E3??1C2Bvs%M
zS<Jw|Eeyhp4727)FfcH%mw5WRvOi#C=aMl!Ub3f|fq_B8)5S4_<9c#}0`CjsFN?We
y7~XLYFK#`^8T{Cnjh&;JQ*X(+1HN5X8Or~#=oeim&|zR;VDNPHb6Mw<&;$T5_bDR)
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b2ca926fd71..14154d01f51 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
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3Sg7<#%mhEy;nOE4X1+#pon
z_MeBhMa0nPjGEs~nMYI3s;=qjOqBBwJUdmPsi7c&PmqD(imAZ4=&L$Y85kHCJYD@<
J);T3K0RW2L9?Ad!
literal 157
zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4i*Lm2Co_CW-~A_FeQ1ryD<E3??1C2Bvs%M
zS<Jw|Eeyhp4727)FfcH%mw5WRvOi#C=aLcVDabg&z`&sA>Eal|aXmRffpv?~iG|#S
z#(PpGIErsc+tIGI;P8i@M%F_qO<XgLH4OeJ9xY;+ugYqn-*&o;fq{X+)78&qol`;+
E02RP0^Z)<=
diff --git a/htdocs/theme/md/img/previous.png b/htdocs/theme/md/img/previous.png
index 90b9e8f7bad1f31e92eb47c627138c40735aa649..95934a2b16ee026803e6501c9659085f4b953fea 100644
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3Sg7<#%mhEy;nOBfw!+%So)
z?LW`GmZ?7J2`Woc*b-HZ9lba-XR!vk<fq<iaXwY|;kY@&vM_;FJMW5cGB7YOc)I$z
JtaD0e0sx<bA9er$
literal 151
zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4i*Lm2Co_CW-~A_FeQ1ryD<E3??1C2Bvs%M
zS<Jw|Eeyhp4727)FfcH%mw5WRvOi#C=aMl!Ub3f|fq_B8)5S4_<9c#}0`CjsFN?We
y7~XLYFK#`^8T{Cnjh&;JQ*X(+1HN5X8Or~#=oeim&|zR;VDNPHb6Mw<&;$T5_bDR)
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9ae58bbb261..fe1e161dfc8 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%;
}
--
GitLab