Better responsive design
This commit is contained in:
parent
9fd5ddf807
commit
cc64994f30
@ -211,9 +211,10 @@ class Form
|
|||||||
if (empty($notabletag)) $ret.='</td>';
|
if (empty($notabletag)) $ret.='</td>';
|
||||||
|
|
||||||
if (empty($notabletag)) $ret.='<td align="left">';
|
if (empty($notabletag)) $ret.='<td align="left">';
|
||||||
$ret.='<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'">';
|
else $ret.='<div class="clearboth"></div>';
|
||||||
if (preg_match('/ckeditor|textarea/',$typeofdata)) $ret.='<br>'."\n";
|
$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' marginrightonly').'" name="modify" value="'.$langs->trans("Modify").'">';
|
||||||
$ret.='<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
|
if (preg_match('/ckeditor|textarea/',$typeofdata) && empty($notabletag)) $ret.='<br>'."\n";
|
||||||
|
$ret.='<input type="submit" class="button'.(empty($notabletag)?'':' marginrightonly').'" name="cancel" value="'.$langs->trans("Cancel").'">';
|
||||||
if (empty($notabletag)) $ret.='</td>';
|
if (empty($notabletag)) $ret.='</td>';
|
||||||
|
|
||||||
if (empty($notabletag)) $ret.='</tr></table>'."\n";
|
if (empty($notabletag)) $ret.='</tr></table>'."\n";
|
||||||
@ -4485,7 +4486,7 @@ class Form
|
|||||||
if ($usecalendar == "eldy")
|
if ($usecalendar == "eldy")
|
||||||
{
|
{
|
||||||
// Zone de saisie manuelle de la date
|
// Zone de saisie manuelle de la date
|
||||||
$retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" size="9" maxlength="11" value="'.$formated_date.'"';
|
$retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class"minwidth100" maxlength="11" value="'.$formated_date.'"';
|
||||||
$retstring.=($disabled?' disabled':'');
|
$retstring.=($disabled?' disabled':'');
|
||||||
$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
|
$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
|
||||||
$retstring.='>';
|
$retstring.='>';
|
||||||
@ -4513,7 +4514,7 @@ class Form
|
|||||||
{
|
{
|
||||||
//$retstring.='<div class="inline-block">';
|
//$retstring.='<div class="inline-block">';
|
||||||
// Day
|
// Day
|
||||||
$retstring.='<select'.($disabled?' disabled':'').' class="flat" id="'.$prefix.'day" name="'.$prefix.'day">';
|
$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50" id="'.$prefix.'day" name="'.$prefix.'day">';
|
||||||
|
|
||||||
if ($emptydate || $set_time == -1)
|
if ($emptydate || $set_time == -1)
|
||||||
{
|
{
|
||||||
@ -4527,7 +4528,7 @@ class Form
|
|||||||
|
|
||||||
$retstring.="</select>";
|
$retstring.="</select>";
|
||||||
|
|
||||||
$retstring.='<select'.($disabled?' disabled':'').' class="flat" id="'.$prefix.'month" name="'.$prefix.'month">';
|
$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50onsmartphone" id="'.$prefix.'month" name="'.$prefix.'month">';
|
||||||
if ($emptydate || $set_time == -1)
|
if ($emptydate || $set_time == -1)
|
||||||
{
|
{
|
||||||
$retstring.='<option value="0" selected> </option>';
|
$retstring.='<option value="0" selected> </option>';
|
||||||
@ -4545,11 +4546,11 @@ class Form
|
|||||||
// Year
|
// Year
|
||||||
if ($emptydate || $set_time == -1)
|
if ($emptydate || $set_time == -1)
|
||||||
{
|
{
|
||||||
$retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat" type="text" size="3" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
|
$retstring.='<input'.($disabled?' disabled':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50" type="text" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$retstring.='<select'.($disabled?' disabled':'').' class="flat" id="'.$prefix.'year" name="'.$prefix.'year">';
|
$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth75" id="'.$prefix.'year" name="'.$prefix.'year">';
|
||||||
|
|
||||||
for ($year = $syear - 5; $year < $syear + 10 ; $year++)
|
for ($year = $syear - 5; $year < $syear + 10 ; $year++)
|
||||||
{
|
{
|
||||||
@ -4566,7 +4567,7 @@ class Form
|
|||||||
if ($h)
|
if ($h)
|
||||||
{
|
{
|
||||||
// Show hour
|
// Show hour
|
||||||
$retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'hour':'').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
|
$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'hour':'').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';
|
||||||
if ($emptyhours) $retstring.='<option value="-1"> </option>';
|
if ($emptyhours) $retstring.='<option value="-1"> </option>';
|
||||||
for ($hour = 0; $hour < 24; $hour++)
|
for ($hour = 0; $hour < 24; $hour++)
|
||||||
{
|
{
|
||||||
@ -4580,7 +4581,7 @@ class Form
|
|||||||
if ($m)
|
if ($m)
|
||||||
{
|
{
|
||||||
// Show minutes
|
// Show minutes
|
||||||
$retstring.='<select'.($disabled?' disabled':'').' class="flat '.($fullday?$fullday.'min':'').'" id="'.$prefix.'min" name="'.$prefix.'min">';
|
$retstring.='<select'.($disabled?' disabled':'').' class="flat valignmiddle maxwidth50 '.($fullday?$fullday.'min':'').'" id="'.$prefix.'min" name="'.$prefix.'min">';
|
||||||
if ($emptyhours) $retstring.='<option value="-1"> </option>';
|
if ($emptyhours) $retstring.='<option value="-1"> </option>';
|
||||||
for ($min = 0; $min < 60 ; $min++)
|
for ($min = 0; $min < 60 ; $min++)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2241,14 +2241,14 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
|
|||||||
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
|
* Example: picto.png if picto.png is stored into htdocs/theme/mytheme/img
|
||||||
* Example: picto.png@mymodule if picto.png is stored into htdocs/mymodule/img
|
* Example: picto.png@mymodule if picto.png is stored into htdocs/mymodule/img
|
||||||
* Example: /mydir/mysubdir/picto.png if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
|
* Example: /mydir/mysubdir/picto.png if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
|
||||||
* @param string $options Add more attribute on img tag (For example 'style="float: right"')
|
* @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
|
||||||
* @param int $pictoisfullpath If 1, image path is a full path
|
* @param int $pictoisfullpath If 1, image path is a full path
|
||||||
* @param int $srconly Return only content of the src attribute of img.
|
* @param int $srconly Return only content of the src attribute of img.
|
||||||
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
|
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
* @see #img_object, #img_picto_common
|
* @see #img_object, #img_picto_common
|
||||||
*/
|
*/
|
||||||
function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
|
function img_picto($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
@ -2300,7 +2300,7 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $
|
|||||||
if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB
|
if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB
|
||||||
$title=$tmparray[0];
|
$title=$tmparray[0];
|
||||||
$alt=empty($tmparray[1])?'':$tmparray[1];
|
$alt=empty($tmparray[1])?'':$tmparray[1];
|
||||||
return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($options?' '.$options:'').'>'; // Alt is used for accessibility, title for popup
|
return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($morealt?' '.$morealt:'').'>'; // Alt is used for accessibility, title for popup
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2310,16 +2310,16 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $
|
|||||||
* @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 $picto Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
|
* @param string $picto Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
|
||||||
* For external modules use imagename@mymodule to search into directory "img" of module.
|
* For external modules use imagename@mymodule to search into directory "img" of module.
|
||||||
* @param string $options Add more attribute on img tag (ie: class="datecallink")
|
* @param string $morealt Add more attribute on img tag (ie: class="datecallink")
|
||||||
* @param int $pictoisfullpath If 1, image path is a full path
|
* @param int $pictoisfullpath If 1, image path is a full path
|
||||||
* @param int $srconly Return only content of the src attribute of img.
|
* @param int $srconly Return only content of the src attribute of img.
|
||||||
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
|
* @param int $notitle 1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
* @see #img_picto, #img_picto_common
|
* @see #img_picto, #img_picto_common
|
||||||
*/
|
*/
|
||||||
function img_object($titlealt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
|
function img_object($titlealt, $picto, $morealt = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
|
||||||
{
|
{
|
||||||
return img_picto($titlealt, 'object_'.$picto, $options, $pictoisfullpath, $srconly, $notitle);
|
return img_picto($titlealt, 'object_'.$picto, $morealt, $pictoisfullpath, $srconly, $notitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2327,12 +2327,12 @@ function img_object($titlealt, $picto, $options = '', $pictoisfullpath = false,
|
|||||||
*
|
*
|
||||||
* @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 $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
|
* @param string $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
|
||||||
* @param string $options Add more attribute on img tag
|
* @param string $morealt Add more attribute on img tag
|
||||||
* @param int $pictoisfullpath If 1, image path is a full path
|
* @param int $pictoisfullpath If 1, image path is a full path
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
* @see #img_object, #img_picto
|
* @see #img_object, #img_picto
|
||||||
*/
|
*/
|
||||||
function img_weather($titlealt, $picto, $options = '', $pictoisfullpath = 0)
|
function img_weather($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
@ -2340,7 +2340,7 @@ function img_weather($titlealt, $picto, $options = '', $pictoisfullpath = 0)
|
|||||||
|
|
||||||
$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
|
$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
|
||||||
|
|
||||||
return img_picto($titlealt, $path, $options, 1);
|
return img_picto($titlealt, $path, $morealt, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2348,12 +2348,12 @@ function img_weather($titlealt, $picto, $options = '', $pictoisfullpath = 0)
|
|||||||
*
|
*
|
||||||
* @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 $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
|
* @param string $picto Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
|
||||||
* @param string $options Add more attribute on img tag
|
* @param string $morealt Add more attribute on img tag
|
||||||
* @param int $pictoisfullpath If 1, image path is a full path
|
* @param int $pictoisfullpath If 1, image path is a full path
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
* @see #img_object, #img_picto
|
* @see #img_object, #img_picto
|
||||||
*/
|
*/
|
||||||
function img_picto_common($titlealt, $picto, $options = '', $pictoisfullpath = 0)
|
function img_picto_common($titlealt, $picto, $morealt = '', $pictoisfullpath = 0)
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
@ -2372,7 +2372,7 @@ function img_picto_common($titlealt, $picto, $options = '', $pictoisfullpath = 0
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return img_picto($titlealt, $path, $options, 1);
|
return img_picto($titlealt, $path, $morealt, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2478,9 +2478,9 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
|
|||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('View');
|
if ($titlealt == 'default') $titlealt = $langs->trans('View');
|
||||||
|
|
||||||
$options = ($float ? 'style="float: right" ' : '').$other;
|
$morealt = ($float ? 'style="float: right" ' : '').$other;
|
||||||
|
|
||||||
return img_picto($titlealt, 'view.png', $options);
|
return img_picto($titlealt, 'view.png', $morealt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2552,16 +2552,16 @@ function img_info($titlealt = 'default')
|
|||||||
* Show warning logo
|
* Show warning 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"'). If 1
|
* @param string $morealt Add more attribute on img tag (For example 'style="float: right"'). If 1
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
*/
|
*/
|
||||||
function img_warning($titlealt = 'default', $options = '')
|
function img_warning($titlealt = 'default', $morealt = '')
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
|
||||||
|
|
||||||
return img_picto($titlealt, 'warning.png', 'class="pictowarning"'.($options ? ($options == '1' ? ' style="float: right"' : ' '.$options): ''));
|
return img_picto($titlealt, 'warning.png', 'class="pictowarning"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2583,32 +2583,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"')
|
* @param string $morealt 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', $options='')
|
function img_next($titlealt = 'default', $morealt='')
|
||||||
{
|
{
|
||||||
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', $options);
|
return img_picto($titlealt, 'next.png', $morealt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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"')
|
* @param string $morealt 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', $options='')
|
function img_previous($titlealt = 'default', $morealt='')
|
||||||
{
|
{
|
||||||
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', $options);
|
return img_picto($titlealt, 'previous.png', $morealt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2650,16 +2650,16 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass='')
|
|||||||
*
|
*
|
||||||
* @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 int $selected Selected
|
* @param int $selected Selected
|
||||||
* @param string $options Add more attribute on img tag (For example 'style="float: right"')
|
* @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
*/
|
*/
|
||||||
function img_left($titlealt = 'default', $selected = 0, $options='')
|
function img_left($titlealt = 'default', $selected = 0, $morealt='')
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Left');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Left');
|
||||||
|
|
||||||
return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $options);
|
return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $morealt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2667,16 +2667,16 @@ function img_left($titlealt = 'default', $selected = 0, $options='')
|
|||||||
*
|
*
|
||||||
* @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 int $selected Selected
|
* @param int $selected Selected
|
||||||
* @param string $options Add more attribute on img tag (For example 'style="float: right"')
|
* @param string $morealt Add more attribute on img tag (For example 'style="float: right"')
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
*/
|
*/
|
||||||
function img_right($titlealt = 'default', $selected = 0, $options='')
|
function img_right($titlealt = 'default', $selected = 0, $morealt='')
|
||||||
{
|
{
|
||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Right');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Right');
|
||||||
|
|
||||||
return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $options);
|
return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $morealt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -110,11 +110,10 @@ if ($permission) {
|
|||||||
<div class="tagtd nowrap maxwidthonsmartphone">
|
<div class="tagtd nowrap maxwidthonsmartphone">
|
||||||
<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
|
<?php $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$object->socid; ?>
|
||||||
<?php
|
<?php
|
||||||
// add company icon for direct link
|
// add company icon before select list
|
||||||
if ($selectedCompany && empty($conf->dol_use_jmobile))
|
if ($selectedCompany)
|
||||||
{
|
{
|
||||||
$companystatic->fetch($selectedCompany);
|
echo img_object('', 'company', 'class="hideonsmartphone"');
|
||||||
echo $companystatic->getNomUrl(2, '', 0, 1);
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
|
<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
|
||||||
|
|||||||
@ -72,14 +72,14 @@ else $typeofdata='textarea:12:100';
|
|||||||
<div class="tagtable border table-border centpercent">
|
<div class="tagtable border table-border centpercent">
|
||||||
<?php if ($module != 'product') { // No public note yet on products ?>
|
<?php if ($module != 'product') { // No public note yet on products ?>
|
||||||
<div class="tagtr table-border-row">
|
<div class="tagtr table-border-row">
|
||||||
<div class="tagtd table-key-border-col<?php echo (empty($cssclass)?'':' '.$cssclass); ?>"<?php echo ($colwidth ? ' style="width: '.$colwidth.'%"' : ''); ?>><?php echo $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam); ?></div>
|
<div class="tagtd table-key-border-col<?php echo (empty($cssclass)?'':' '.$cssclass); ?>"<?php echo ($colwidth ? ' style="width: '.$colwidth.'%"' : ''); ?>><?php echo $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0); ?></div>
|
||||||
<div class="tagtd table-val-border-col"><?php echo $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam); ?></div>
|
<div class="tagtd table-val-border-col"><?php echo $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1); ?></div>
|
||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<?php if (empty($user->societe_id)) { ?>
|
<?php if (empty($user->societe_id)) { ?>
|
||||||
<div class="tagtr table-border-row">
|
<div class="tagtr table-border-row">
|
||||||
<div class="tagtd table-key-border-col<?php echo (empty($cssclass)?'':' '.$cssclass); ?>"<?php echo ($colwidth ? ' style="width: '.$colwidth.'%"' : ''); ?>><?php echo $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam); ?></div>
|
<div class="tagtd table-key-border-col<?php echo (empty($cssclass)?'':' '.$cssclass); ?>"<?php echo ($colwidth ? ' style="width: '.$colwidth.'%"' : ''); ?>><?php echo $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0); ?></div>
|
||||||
<div class="tagtd table-val-border-col"><?php echo $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam); ?></div>
|
<div class="tagtd table-val-border-col"><?php echo $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1); ?></div>
|
||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -698,7 +698,7 @@ else
|
|||||||
|
|
||||||
// Label
|
// Label
|
||||||
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
|
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
|
||||||
print '<td><input size="80" name="title" value="'.$object->title.'"></td></tr>';
|
print '<td><input class="quatrevingtpercent" name="title" value="'.$object->title.'"></td></tr>';
|
||||||
|
|
||||||
// Thirdparty
|
// Thirdparty
|
||||||
if ($conf->societe->enabled)
|
if ($conf->societe->enabled)
|
||||||
@ -752,7 +752,7 @@ else
|
|||||||
// Date start
|
// Date start
|
||||||
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
|
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
|
||||||
print $form->select_date($object->date_start?$object->date_start:-1,'projectstart',0,0,0,'',1,0,1);
|
print $form->select_date($object->date_start?$object->date_start:-1,'projectstart',0,0,0,'',1,0,1);
|
||||||
print ' <input type="checkbox" name="reportdate" value="yes" ';
|
print ' <input type="checkbox" class="valignmiddle" name="reportdate" value="yes" ';
|
||||||
if ($comefromclone){print ' checked ';}
|
if ($comefromclone){print ' checked ';}
|
||||||
print '/> '. $langs->trans("ProjectReportDate");
|
print '/> '. $langs->trans("ProjectReportDate");
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|||||||
@ -542,7 +542,7 @@ div.myavailability {
|
|||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
.selectlimit {
|
.selectlimit, .marginrightonly {
|
||||||
margin-right: 10px !important;
|
margin-right: 10px !important;
|
||||||
}
|
}
|
||||||
.strikefordisabled {
|
.strikefordisabled {
|
||||||
@ -622,6 +622,7 @@ div.myavailability {
|
|||||||
.minwidth500imp { min-width: 500px !important; }
|
.minwidth500imp { min-width: 500px !important; }
|
||||||
}
|
}
|
||||||
.maxwidth50 { max-width: 50px; }
|
.maxwidth50 { max-width: 50px; }
|
||||||
|
.maxwidth75 { max-width: 75px; }
|
||||||
.maxwidth100 { max-width: 100px; }
|
.maxwidth100 { max-width: 100px; }
|
||||||
.maxwidth150 { max-width: 150px; }
|
.maxwidth150 { max-width: 150px; }
|
||||||
.maxwidth200 { max-width: 200px; }
|
.maxwidth200 { max-width: 200px; }
|
||||||
@ -665,12 +666,18 @@ div.myavailability {
|
|||||||
div.titre {
|
div.titre {
|
||||||
line-height: 2em;
|
line-height: 2em;
|
||||||
}
|
}
|
||||||
|
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
|
||||||
|
height: 40px !important;
|
||||||
|
}
|
||||||
|
|
||||||
input[type=text], select, textarea {
|
.quatrevingtpercent, .inputsearch {
|
||||||
|
width: 95%;
|
||||||
|
}
|
||||||
|
|
||||||
|
input, input[type=text], input[type=password], select, textarea {
|
||||||
min-width: 20px;
|
min-width: 20px;
|
||||||
min-height: 1.4em;
|
min-height: 1.4em;
|
||||||
line-height: 1.4em;
|
line-height: 1.4em;
|
||||||
margin: .5em 0;
|
|
||||||
padding: .4em .1em;
|
padding: .4em .1em;
|
||||||
border: 1px solid #BBB;
|
border: 1px solid #BBB;
|
||||||
}
|
}
|
||||||
@ -679,6 +686,7 @@ div.myavailability {
|
|||||||
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
|
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
|
||||||
.maxwidthonsmartphone { max-width: 100px; }
|
.maxwidthonsmartphone { max-width: 100px; }
|
||||||
.maxwidth50onsmartphone { max-width: 50px; }
|
.maxwidth50onsmartphone { max-width: 50px; }
|
||||||
|
.maxwidth75onsmartphone { max-width: 75px; }
|
||||||
.maxwidth100onsmartphone { max-width: 100px; }
|
.maxwidth100onsmartphone { max-width: 100px; }
|
||||||
.maxwidth150onsmartphone { max-width: 150px; }
|
.maxwidth150onsmartphone { max-width: 150px; }
|
||||||
.maxwidth200onsmartphone { max-width: 200px; }
|
.maxwidth200onsmartphone { max-width: 200px; }
|
||||||
@ -699,7 +707,6 @@ div.myavailability {
|
|||||||
}
|
}
|
||||||
select {
|
select {
|
||||||
width: 98%;
|
width: 98%;
|
||||||
<?php if (empty($conf->dol_use_jmobile)) { ?>max-width: 100px;<?php } ?>
|
|
||||||
min-width: 40px;
|
min-width: 40px;
|
||||||
}
|
}
|
||||||
div.divphotoref {
|
div.divphotoref {
|
||||||
@ -2357,10 +2364,7 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord
|
|||||||
table.borderplus {
|
table.borderplus {
|
||||||
border: 1px solid #BBB;
|
border: 1px solid #BBB;
|
||||||
}
|
}
|
||||||
.border tbody tr, .border tbody tr td {
|
.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
|
||||||
height: 20px;
|
|
||||||
}
|
|
||||||
div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
|
|
||||||
height: 20px;
|
height: 20px;
|
||||||
}
|
}
|
||||||
div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
|
div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
|
||||||
|
|||||||
@ -549,7 +549,7 @@ div.myavailability {
|
|||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
.selectlimit {
|
.selectlimit, .marginrightonly {
|
||||||
margin-right: 10px !important;
|
margin-right: 10px !important;
|
||||||
}
|
}
|
||||||
.strikefordisabled {
|
.strikefordisabled {
|
||||||
@ -627,6 +627,7 @@ div.myavailability {
|
|||||||
.minwidth500imp { min-width: 500px !important; }
|
.minwidth500imp { min-width: 500px !important; }
|
||||||
}
|
}
|
||||||
.maxwidth50 { max-width: 50px; }
|
.maxwidth50 { max-width: 50px; }
|
||||||
|
.maxwidth75 { max-width: 75px; }
|
||||||
.maxwidth100 { max-width: 100px; }
|
.maxwidth100 { max-width: 100px; }
|
||||||
.maxwidth150 { max-width: 150px; }
|
.maxwidth150 { max-width: 150px; }
|
||||||
.maxwidth200 { max-width: 200px; }
|
.maxwidth200 { max-width: 200px; }
|
||||||
@ -670,12 +671,18 @@ div.myavailability {
|
|||||||
div.titre {
|
div.titre {
|
||||||
line-height: 2em;
|
line-height: 2em;
|
||||||
}
|
}
|
||||||
|
.border tbody tr, .border tbody tr td, div.tabBar table.border tr {
|
||||||
|
height: 40px !important;
|
||||||
|
}
|
||||||
|
|
||||||
input[type=text], select, textarea {
|
.quatrevingtpercent, .inputsearch {
|
||||||
|
width: 95%;
|
||||||
|
}
|
||||||
|
|
||||||
|
input, input[type=text], input[type=password], select, textarea {
|
||||||
min-width: 20px;
|
min-width: 20px;
|
||||||
min-height: 1.4em;
|
min-height: 1.4em;
|
||||||
line-height: 1.4em;
|
line-height: 1.4em;
|
||||||
margin: .5em 0;
|
|
||||||
padding: .4em .1em;
|
padding: .4em .1em;
|
||||||
border: 1px solid #BBB;
|
border: 1px solid #BBB;
|
||||||
}
|
}
|
||||||
@ -684,6 +691,7 @@ div.myavailability {
|
|||||||
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
|
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
|
||||||
.maxwidthonsmartphone { max-width: 100px; }
|
.maxwidthonsmartphone { max-width: 100px; }
|
||||||
.maxwidth50onsmartphone { max-width: 50px; }
|
.maxwidth50onsmartphone { max-width: 50px; }
|
||||||
|
.maxwidth75onsmartphone { max-width: 75px; }
|
||||||
.maxwidth100onsmartphone { max-width: 100px; }
|
.maxwidth100onsmartphone { max-width: 100px; }
|
||||||
.maxwidth150onsmartphone { max-width: 150px; }
|
.maxwidth150onsmartphone { max-width: 150px; }
|
||||||
.maxwidth200onsmartphone { max-width: 200px; }
|
.maxwidth200onsmartphone { max-width: 200px; }
|
||||||
@ -697,6 +705,28 @@ div.myavailability {
|
|||||||
.minwidth500imp { min-width: 50px !important; }
|
.minwidth500imp { min-width: 50px !important; }
|
||||||
.titlefield { width: auto; }
|
.titlefield { width: auto; }
|
||||||
.titlefieldcreate { width: auto; }
|
.titlefieldcreate { width: auto; }
|
||||||
|
|
||||||
|
#tooltip {
|
||||||
|
position: absolute;
|
||||||
|
width: <?php print dol_size(300,'width'); ?>px;
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
width: 98%;
|
||||||
|
min-width: 40px;
|
||||||
|
}
|
||||||
|
div.divphotoref {
|
||||||
|
padding-right: 5px;
|
||||||
|
}
|
||||||
|
img.photoref, div.photoref {
|
||||||
|
border: none;
|
||||||
|
-moz-box-shadow: none;
|
||||||
|
-webkit-box-shadow: none;
|
||||||
|
box-shadow: none;
|
||||||
|
padding: 4px;
|
||||||
|
height: 20px;
|
||||||
|
width: 20px;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.linkobject { cursor: pointer; }
|
.linkobject { cursor: pointer; }
|
||||||
<?php if (GETPOST("optioncss") == 'print') { ?>
|
<?php if (GETPOST("optioncss") == 'print') { ?>
|
||||||
@ -2245,10 +2275,7 @@ table.borderplus {
|
|||||||
border: 1px solid #BBB;
|
border: 1px solid #BBB;
|
||||||
}
|
}
|
||||||
|
|
||||||
.border tbody tr, .border tbody tr td {
|
.border tbody tr, .border tbody tr td, div.tabBar table.border tr {
|
||||||
height: 20px;
|
|
||||||
}
|
|
||||||
div.tabBar table.border tr {
|
|
||||||
height: 20px;
|
height: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user