lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Avoid wrap with chrome.

Browse Source 
Fix: Disable lightbox. Does not works with showphoto.
This commit is contained in:
Laurent Destailleur 2011-06-12 22:13:05 +00:00
parent 0da7c26b1e
commit 7f852d293c
7 changed files with 72 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/propal/index.php
View File

@ -239,7 +239,7 @@ if ($resql)
$propal_static->ref=$obj->ref; $propal_static->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $propal_static->getNomUrl(1); print $propal_static->getNomUrl(1);
print '</td>'; print '</td>';
@ -309,7 +309,7 @@ if ($conf->propal->enabled)
$propal_static->ref=$obj->ref; $propal_static->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $propal_static->getNomUrl(1); print $propal_static->getNomUrl(1);
print '</td>'; print '</td>';
@ -381,7 +381,7 @@ if ($conf->propal->enabled)
$propal_static->ref=$obj->ref; $propal_static->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $propal_static->getNomUrl(1); print $propal_static->getNomUrl(1);
print '</td>'; print '</td>';

8
htdocs/commande/index.php
View File

@ -21,7 +21,7 @@
/** /**
* \file htdocs/commande/index.php * \file htdocs/commande/index.php
* \ingroup commande * \ingroup commande
* \brief Page acceuil espace commandes * \brief Home page of customer order module
* \version $Id$ * \version $Id$
*/ */
@ -252,7 +252,7 @@ if ($resql)
$commandestatic->ref=$obj->ref; $commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1); print $commandestatic->getNomUrl(1);
print '</td>'; print '</td>';
@ -321,7 +321,7 @@ if ($conf->commande->enabled)
$commandestatic->ref=$obj->ref; $commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1); print $commandestatic->getNomUrl(1);
print '</td>'; print '</td>';
@ -392,7 +392,7 @@ if ($conf->commande->enabled)
$commandestatic->ref=$obj->ref; $commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1); print $commandestatic->getNomUrl(1);
print '</td>'; print '</td>';

42
htdocs/compta/dons/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -20,7 +20,7 @@
/** /**
* \file htdocs/compta/dons/index.php * \file htdocs/compta/dons/index.php
* \ingroup don * \ingroup don
* \brief Page accueil espace don * \brief Home page of donation module
* \version $Id$ * \version $Id$
*/ */
@ -56,17 +56,17 @@ $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$somme[$objp->fk_statut] = $objp->somme; $somme[$objp->fk_statut] = $objp->somme;
$nb[$objp->fk_statut] = $objp->nb; $nb[$objp->fk_statut] = $objp->nb;
$i++; $i++;
} }
$db->free($result); $db->free($result);
} else { } else {
dol_print_error($db); dol_print_error($db);
} }
@ -109,15 +109,15 @@ print '</tr>';
$var=true; $var=true;
foreach ($listofstatus as $status) foreach ($listofstatus as $status)
{ {
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td><a href="liste.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>'; print '<td><a href="liste.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>';
print '<td align="right">'.$nb[$status].'</td>'; print '<td align="right">'.$nb[$status].'</td>';
print '<td align="right">'.($nb[$status]?price($somme[$status],'MT'):'&nbsp;').'</td>'; print '<td align="right">'.($nb[$status]?price($somme[$status],'MT'):'&nbsp;').'</td>';
print '<td align="right">'.($nb[$status]?price(price2num($somme[$status]/$nb[$status],'MT')):'&nbsp;').'</td>'; print '<td align="right">'.($nb[$status]?price(price2num($somme[$status]/$nb[$status],'MT')):'&nbsp;').'</td>';
$totalnb += $nb[$status]; $totalnb += $nb[$status];
$total += $somme[$status]; $total += $somme[$status];
print "</tr>"; print "</tr>";
} }
print '<tr class="liste_total">'; print '<tr class="liste_total">';
@ -170,7 +170,7 @@ if ($resql)
$donation_static->id=$obj->rowid; $donation_static->id=$obj->rowid;
$donation_static->ref=$obj->ref?$obj->ref:$obj->rowid; $donation_static->ref=$obj->ref?$obj->ref:$obj->rowid;
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $donation_static->getNomUrl(1); print $donation_static->getNomUrl(1);
print '</td>'; print '</td>';
@ -185,7 +185,7 @@ if ($resql)
print '</td>'; print '</td>';
// Date // Date
print '<td>'.dol_print_date($db->jdate($obj->datec),'day').'</td>'; print '<td align="center">'.dol_print_date($db->jdate($obj->datem),'day').'</td>';
print '<td align="right">'.$donation_static->LibStatut($obj->fk_statut,5).'</td>'; print '<td align="right">'.$donation_static->LibStatut($obj->fk_statut,5).'</td>';

38
htdocs/core/class/html.form.class.php
View File

@ -3350,13 +3350,19 @@ class Form
if ($dir) if ($dir)
{ {
$cache='0';
if ($file && file_exists($dir."/".$file)) if ($file && file_exists($dir."/".$file))
{ {
$ret.='<img alt="Photo" class="photologo" width="'.$width.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($file).'">'; // TODO Link to large image
$ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($file).'&cache='.$cache.'">';
$ret.='<img alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="photologo" border="0" width="'.$width.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($file).'&cache='.$cache.'">';
$ret.='</a>';
} }
else if ($altfile && file_exists($dir."/".$altfile)) else if ($altfile && file_exists($dir."/".$altfile))
{ {
$ret.='<img alt="Photo alt" class="photologo" width="'.$width.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($altfile).'">'; $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($file).'&cache='.$cache.'">';
$ret.='<img alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i','_',$file)).'" class="photologo" border="0" width="'.$width.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&file='.urlencode($altfile).'&cache='.$cache.'">';
$ret.='</a>';
} }
else else
{ {
@ -3364,16 +3370,40 @@ class Form
{ {
global $dolibarr_main_url_root; global $dolibarr_main_url_root;
$ret.='<!-- Put link to gravatar -->'; $ret.='<!-- Put link to gravatar -->';
$ret.='<img alt="Photo found on Gravatar" class="photologo" title="Photo Gravatar.com - email '.$email.'" width="'.$width.'" src="http://www.gravatar.com/avatar/'.md5($email).'?s='.$width.'&d='.urlencode( dol_buildpath('/theme/common/nophoto.jpg',2) ).'">'; $ret.='<img alt="Photo found on Gravatar" title="Photo Gravatar.com - email '.$email.'" border="0" width="'.$width.'" src="http://www.gravatar.com/avatar/'.md5($email).'?s='.$width.'&d='.urlencode( dol_buildpath('/theme/common/nophoto.jpg',2) ).'">';
} }
else else
{ {
$ret.='<img alt="No photo" class="photologo" width="'.$width.'" src="'.DOL_URL_ROOT.'/theme/common/nophoto.jpg">'; $ret.='<img alt="No photo" border="0" width="'.$width.'" src="'.DOL_URL_ROOT.'/theme/common/nophoto.jpg">';
} }
} }
} }
else dol_print_error('','Call of showphoto with wrong parameters'); else dol_print_error('','Call of showphoto with wrong parameters');
/* Disabled. lightbox seems to not work. I don't know why.
$ret.="\n<script type=\"text/javascript\">
jQuery(function() {
jQuery('.photologo').lightBox();
});
</script>\n";
$ret.="\n<script type=\"text/javascript\">
jQuery(function() {
jQuery('.photologo').lightBox({
overlayBgColor: '#FFF',
overlayOpacity: 0.6,
imageLoading: '".DOL_URL_ROOT."/includes/jquery/plugins/lightbox/images/lightbox-ico-loading.gif',
imageBtnClose: '".DOL_URL_ROOT."/includes/jquery/plugins/lightbox/images/lightbox-btn-close.gif',
imageBtnPrev: '".DOL_URL_ROOT."/includes/jquery/plugins/lightbox/images/lightbox-btn-prev.gif',
imageBtnNext: '".DOL_URL_ROOT."/includes/jquery/plugins/lightbox/images/lightbox-btn-next.gif',
containerResizeSpeed: 350,
txtImage: 'Imagem',
txtOf: 'de'
});
});
</script>\n";
*/
return $ret; return $ret;
} }

4
htdocs/fourn/commande/index.php
View File

@ -286,7 +286,7 @@ if ($resql)
$commandestatic->ref=$obj->ref; $commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1); print $commandestatic->getNomUrl(1);
print '</td>'; print '</td>';
@ -354,7 +354,7 @@ else dol_print_error($db);
$commandestatic->ref=$obj->ref; $commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="94" class="nobordernopadding" nowrap="nowrap">'; print '<td width="96" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1); print $commandestatic->getNomUrl(1);
print '</td>'; print '</td>';

10
htdocs/main.inc.php
View File

@ -906,7 +906,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" type="text/css" />'."\n"; // JQuery print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" type="text/css" />'."\n"; // JQuery
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.css" type="text/css" />'."\n"; // Tooltip print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.css" type="text/css" />'."\n"; // Tooltip
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.css" type="text/css" />'."\n"; // JNotify print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.css" type="text/css" />'."\n"; // JNotify
//print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/lightbox/css/jquery.lightbox-0.5.css" media="screen" />'."\n"; // Lightbox
} }
print '<!-- Includes for Dolibarr, modules or specific pages-->'."\n"; print '<!-- Includes for Dolibarr, modules or specific pages-->'."\n";
@ -950,13 +951,14 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
$ext='.js'; $ext='.js';
if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $ext='.jgz'; } // mini='_mini', ext='.gz' if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $ext='.jgz'; } // mini='_mini', ext='.gz'
// JQuery. Must be before other includes (prototype/scriptaculous/...) // JQuery. Must be before other includes
print '<!-- Includes JS for JQuery -->'."\n"; print '<!-- Includes JS for JQuery -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-latest.custom.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui-latest.custom.min'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd_0_5'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd_0_5'.$ext.'"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.min'.$ext.'"></script>'."\n";
// jQuery Layout //print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/lightbox/js/jquery.lightbox-0.5.min'.$ext.'"></script>'."\n";
// jQuery Layout
if (!empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) || defined('REQUIRE_JQUERY_LAYOUT')) if (!empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) || defined('REQUIRE_JQUERY_LAYOUT'))
{ {
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest.min'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest.min'.$ext.'"></script>'."\n";

4
htdocs/viewimage.php
View File

@ -21,8 +21,8 @@
/** /**
* \file htdocs/viewimage.php * \file htdocs/viewimage.php
* \brief Wrapper permettant l'affichage de fichiers images Dolibarr * \brief Wrapper to show images into Dolibarr screens
* \remarks Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?file=pathrelatifdufichier&modulepart=repfichierconcerne">' * \remarks Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0">'
* \version $Id$ * \version $Id$
*/ */