Add class style "photo" to all photos.
This commit is contained in:
parent
1fce3e6cf1
commit
c5e01667ee
@ -890,7 +890,7 @@ class MenuLeft {
|
|||||||
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,0,'eldy');
|
$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,0,'eldy');
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Menu AUTRES (Pour les menus du haut qui ne serait pas g<EFBFBD>r<EFBFBD>s)
|
* Menu AUTRES (Pour les menus du haut qui ne serait pas geres)
|
||||||
*/
|
*/
|
||||||
if ($mainmenu && ! in_array($mainmenu,$this->overwritemenufor)) { $mainmenu=""; }
|
if ($mainmenu && ! in_array($mainmenu,$this->overwritemenufor)) { $mainmenu=""; }
|
||||||
|
|
||||||
|
|||||||
@ -440,6 +440,7 @@ class MenuTop {
|
|||||||
else $class='class="tmenu"';
|
else $class='class="tmenu"';
|
||||||
|
|
||||||
print '<td class="tmenu" id="td_'.$idsel.'">';
|
print '<td class="tmenu" id="td_'.$idsel.'">';
|
||||||
|
print '<span id="mainmenu_'.$idsel.'">';
|
||||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||||
print $tabMenu[$i]['titre'];
|
print $tabMenu[$i]['titre'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
@ -458,6 +459,7 @@ class MenuTop {
|
|||||||
}
|
}
|
||||||
|
|
||||||
print '</tr></table>';
|
print '</tr></table>';
|
||||||
|
print "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2459,10 +2459,10 @@ class Product extends CommonObject
|
|||||||
|
|
||||||
// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
|
// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
|
||||||
if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) {
|
if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) {
|
||||||
print '<img border="0" height="120" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdirthumb.$photo_vignette).'">';
|
print '<img class="photo" border="0" height="120" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdirthumb.$photo_vignette).'">';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
print '<img border="0" height="120" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdir.$photo).'">';
|
print '<img class="photo" border="0" height="120" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdir.$photo).'">';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '</a>';
|
print '</a>';
|
||||||
@ -2472,8 +2472,9 @@ class Product extends CommonObject
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($size == 0) // Format origine
|
if ($size == 0) { // Format origine
|
||||||
print '<img border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdir.$photo).'">';
|
print '<img class="photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdir.$photo).'">';
|
||||||
|
}
|
||||||
|
|
||||||
// On continue ou on arrete de boucler ?
|
// On continue ou on arrete de boucler ?
|
||||||
if ($nbmax && $nbphoto >= $nbmax) break;
|
if ($nbmax && $nbphoto >= $nbmax) break;
|
||||||
|
|||||||
@ -148,7 +148,7 @@ if ($product->id)
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="28%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -845,17 +845,18 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print '<table class="border" width="100%"><tr>';
|
print '<table class="border" width="100%"><tr>';
|
||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td width="85%">';
|
print '<td width="15%">'.$langs->trans("Ref").'</td><td>';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
$nblignes=6;
|
$nblignes=4;
|
||||||
if ($product->isproduct() && $conf->stock->enabled) $nblignes++;
|
if (! empty($conf->global->PRODUIT_MULTIPRICES_LIMIT) && empty($socid)) $nblignes+=$conf->global->PRODUIT_MULTIPRICES_LIMIT;
|
||||||
if ($product->isservice()) $nblignes++;
|
else $nblignes+=3;
|
||||||
|
|
||||||
if ($product->is_photo_available($conf->produit->dir_output))
|
if ($product->is_photo_available($conf->produit->dir_output))
|
||||||
{
|
{
|
||||||
// Photo
|
// Photo
|
||||||
print '<td valign="middle" align="center" rowspan="'.$nblignes.'">';
|
print '<td valign="middle" align="center" width="30%" rowspan="'.$nblignes.'">';
|
||||||
$nbphoto=$product->show_photos($conf->produit->dir_output,1,1,0);
|
$nbphoto=$product->show_photos($conf->produit->dir_output,1,1,0);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
@ -992,7 +993,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
// Nature
|
// Nature
|
||||||
if($product->type!=1)
|
if($product->type!=1)
|
||||||
{
|
{
|
||||||
print '<tr><td>'.$langs->trans("Nature").'</td><td>';
|
print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
|
||||||
print $product->getLibFinished();
|
print $product->getLibFinished();
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
@ -1000,7 +1001,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
if ($product->isservice())
|
if ($product->isservice())
|
||||||
{
|
{
|
||||||
// Duration
|
// Duration
|
||||||
print '<tr><td>'.$langs->trans("Duration").'</td><td>'.$product->duration_value.' ';
|
print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="2">'.$product->duration_value.' ';
|
||||||
if ($product->duration_value > 1)
|
if ($product->duration_value > 1)
|
||||||
{
|
{
|
||||||
$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
|
$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
|
||||||
@ -1016,7 +1017,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Weight / Volume
|
// Weight / Volume
|
||||||
print '<tr><td>'.$langs->trans("Weight").'</td><td>';
|
print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="2">';
|
||||||
if ($product->weight != '')
|
if ($product->weight != '')
|
||||||
{
|
{
|
||||||
print $product->weight." ".measuring_units_string($product->weight_units,"weight");
|
print $product->weight." ".measuring_units_string($product->weight_units,"weight");
|
||||||
@ -1027,7 +1028,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
print "</td></tr>\n";
|
print "</td></tr>\n";
|
||||||
|
|
||||||
print '<tr><td>'.$langs->trans("Volume").'</td><td>';
|
print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
|
||||||
if ($product->volume != '')
|
if ($product->volume != '')
|
||||||
{
|
{
|
||||||
print $product->volume." ".measuring_units_string($product->volume_units,"volume");
|
print $product->volume." ".measuring_units_string($product->volume_units,"volume");
|
||||||
@ -1040,7 +1041,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Note
|
// Note
|
||||||
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td>'.nl2br($product->note).'</td></tr>';
|
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="2">'.nl2br($product->note).'</td></tr>';
|
||||||
|
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
print "</div>\n<!-- CUT HERE -->\n";
|
print "</div>\n<!-- CUT HERE -->\n";
|
||||||
|
|||||||
@ -201,6 +201,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// if ($nbbyrow && $nbphoto == 1) print '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
|
// if ($nbbyrow && $nbphoto == 1) print '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
|
||||||
|
|
||||||
|
// Do not use show_photo because there is more information to show
|
||||||
if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
|
if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
|
||||||
if ($nbbyrow) print '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
|
if ($nbbyrow) print '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
|
||||||
|
|
||||||
@ -224,7 +225,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
$imgWidth = ($product->imgWidth < $maxWidth) ? $product->imgWidth : $maxWidth;
|
$imgWidth = ($product->imgWidth < $maxWidth) ? $product->imgWidth : $maxWidth;
|
||||||
$imgHeight = ($product->imgHeight < $maxHeight) ? $product->imgHeight : $maxHeight;
|
$imgHeight = ($product->imgHeight < $maxHeight) ? $product->imgHeight : $maxHeight;
|
||||||
|
|
||||||
print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdir.$filename).'">';
|
print '<img class="photo" border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&file='.urlencode($pdir.$filename).'">';
|
||||||
|
|
||||||
print '</a>';
|
print '</a>';
|
||||||
print '<br>'.$viewfilename;
|
print '<br>'.$viewfilename;
|
||||||
|
|||||||
@ -89,7 +89,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -86,7 +86,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
|
|||||||
@ -89,7 +89,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -91,7 +91,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -92,7 +92,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -75,7 +75,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -86,7 +86,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Reference
|
// Reference
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -142,7 +142,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
// Ref
|
// Ref
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
|
print '<td width="30%">'.$langs->trans("Ref").'</td><td>';
|
||||||
print $html->showrefnav($product,'ref','',1,'ref');
|
print $html->showrefnav($product,'ref','',1,'ref');
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|||||||
@ -919,6 +919,12 @@ a.impayee:hover { font-weight: bold; color: #550000; }
|
|||||||
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo {
|
||||||
|
border: 0px;
|
||||||
|
/* filter:alpha(opacity=55); */
|
||||||
|
/* opacity:.55; */
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
color: #57A2CA;
|
color: #57A2CA;
|
||||||
|
|||||||
@ -634,6 +634,12 @@ a.impayee:hover { font-weight: bold; color: #550000; }
|
|||||||
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo {
|
||||||
|
border: 0px;
|
||||||
|
/* filter:alpha(opacity=55); */
|
||||||
|
/* opacity:.55; */
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
font-family: Helvetica, Verdana;
|
font-family: Helvetica, Verdana;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|||||||
@ -1017,6 +1017,12 @@ a.impayee:hover { font-weight: bold; color: #550000; }
|
|||||||
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo {
|
||||||
|
border: 0px;
|
||||||
|
/* filter:alpha(opacity=55); */
|
||||||
|
/* opacity:.55; */
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
font-family: helvetica, verdana, arial, sans-serif;
|
font-family: helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|||||||
@ -733,6 +733,12 @@ a.impayee:hover { font-weight: bold; color: #550000; }
|
|||||||
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo {
|
||||||
|
border: 0px;
|
||||||
|
/* filter:alpha(opacity=55); */
|
||||||
|
/* opacity:.55; */
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
font-family: helvetica, verdana, arial, sans-serif;
|
font-family: helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|||||||
@ -649,10 +649,18 @@ a.impayee:hover { font-weight: bold; color: #550000; }
|
|||||||
* Other
|
* Other
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
.fieldrequired { font-weight: bold; color: #000055; }
|
||||||
|
|
||||||
#pictotitle {
|
#pictotitle {
|
||||||
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo {
|
||||||
|
border: 0px;
|
||||||
|
/* filter:alpha(opacity=55); */
|
||||||
|
/* opacity:.55; */
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
font-family: helvetica, verdana, arial, sans-serif;
|
font-family: helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|||||||
@ -723,6 +723,12 @@ a.impayee:hover { font-weight: bold; color: #550000; }
|
|||||||
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
<?php print !empty($conf->browser->phone)?'display: none;':''; ?>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.photo {
|
||||||
|
border: 0px;
|
||||||
|
/* filter:alpha(opacity=55); */
|
||||||
|
/* opacity:.55; */
|
||||||
|
}
|
||||||
|
|
||||||
div.titre {
|
div.titre {
|
||||||
font-family: helvetica, verdana, arial, sans-serif;
|
font-family: helvetica, verdana, arial, sans-serif;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user