Fix: previous and next arrow
@@ -305,28 +305,28 @@ $param.="&maxprint=".$maxprint;
|
|||||||
// Show navigation bar
|
// Show navigation bar
|
||||||
if (empty($action) || $action=='show_month')
|
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 id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y");
|
||||||
$nav.=" </span>\n";
|
$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>)";
|
$nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";
|
||||||
$picto='calendar';
|
$picto='calendar';
|
||||||
}
|
}
|
||||||
if ($action=='show_week')
|
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 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.=" </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>)";
|
$nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
|
||||||
$picto='calendarweek';
|
$picto='calendarweek';
|
||||||
}
|
}
|
||||||
if ($action=='show_day')
|
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 id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort");
|
||||||
$nav.=" </span>\n";
|
$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>)";
|
$nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
|
||||||
$picto='calendarday';
|
$picto='calendarday';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2410,30 +2410,32 @@ function img_error($titlealt = 'default')
|
|||||||
* Show next logo
|
* 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.
|
* @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
|
* @return string Return img tag
|
||||||
*/
|
*/
|
||||||
function img_next($titlealt = 'default')
|
function img_next($titlealt = 'default', $options='')
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Next');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Next');
|
||||||
|
|
||||||
return img_picto($titlealt, 'next.png');
|
return img_picto($titlealt, 'next.png', $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show previous logo
|
* 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 $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
|
* @return string Return img tag
|
||||||
*/
|
*/
|
||||||
function img_previous($titlealt = 'default')
|
function img_previous($titlealt = 'default', $options='')
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
|
||||||
|
|
||||||
return img_picto($titlealt, 'previous.png');
|
return img_picto($titlealt, 'previous.png', $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 106 B |
@@ -418,6 +418,9 @@ th .button {
|
|||||||
.valignmiddle {
|
.valignmiddle {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
.valignbottom {
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
.centpercent {
|
.centpercent {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 106 B |
|
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 106 B |
@@ -414,6 +414,9 @@ th .button {
|
|||||||
.valignmiddle {
|
.valignmiddle {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
.valignbottom {
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
.centpercent {
|
.centpercent {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||