diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index d95df9c5465..17c1414106e 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -761,7 +761,7 @@ else // On propose la generation de la vignette si elle n'existe pas if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo)) { - print 'logo).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'  '; + print 'logo).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'  '; } else if ($mysoc->logo_mini && is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 37186686938..d6c0fbd2070 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -208,7 +208,7 @@ print ''; if (count($object->lines) > 0) { // Loop on each active job - $style='impair'; + $style='pair'; foreach($object->lines as $line) { // title profil diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index 35837c0331d..d93c37cbfb9 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -311,12 +311,15 @@ if ($action != 'edit') { print ''; print ' '.$langs->trans("Link").''; } + +print ''; + print ''; dol_fiche_end(); diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index d9ef51b6a4a..e710bca2adf 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -1,6 +1,6 @@ - * Copyright (C) 2014 Marcos García +/* Copyright (C) 2013-2015 Laurent Destailleur + * Copyright (C) 2014 Marcos García * * 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 @@ -125,7 +125,6 @@ for ($i=0; $i<$nblignes; $i++) } if ($testmodifier) { - // Security check if (!$user->rights->opensurvey->write) accessforbidden(); @@ -473,17 +472,28 @@ if ($object->fk_user_creat) { print ''; // Link -print ''.img_picto('','object_globe.png').' '.$langs->trans("UrlForSurvey",'').''; +print ''.img_picto('','object_globe.png').' '.$langs->trans("UrlForSurvey",'').''; // Define $urlwithroot $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current -$url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$numsondage; -$urlvcal=''.$url.''; -print $urlvcal; +$url=$urlwithouturlroot.dol_buildpath('/public/opensurvey/studs.php',1).'?sondage='.$object->id_sondage; +$urllink=''; +print $urllink; +if ($action != 'edit') +{ + print ''; + print ' '.$langs->trans("Link").''; +} + +print ''; print ''; diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index 42f81685f8a..20855975880 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -100,6 +100,8 @@ print '
'; print ''; print ''; +dol_fiche_head(null, 'payboxaccount', ''); + $var=true; print ''; @@ -195,7 +197,13 @@ print ''; -print '

'; +print ''; + +dol_fiche_end(); + +print '
'; + +print ''; print '

'; @@ -227,6 +235,6 @@ if (! empty($conf->adherent->enabled)) print "
"; print info_admin($langs->trans("YouCanAddTagOnUrl")); -$db->close(); -dol_fiche_end(); llxFooter(); + +$db->close(); diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php index eec35e38430..a0127cd85d9 100644 --- a/htdocs/paypal/admin/paypal.php +++ b/htdocs/paypal/admin/paypal.php @@ -98,6 +98,11 @@ print '
'; $head=paypaladmin_prepare_head(); +print '
'; +print ''; +print ''; + + dol_fiche_head($head, 'paypalaccount', ''); print $langs->trans("PaypalDesc")."
\n"; @@ -111,10 +116,6 @@ if (! function_exists('curl_version')) print '
'; -print ''; -print ''; -print ''; - print ''; @@ -232,12 +233,12 @@ print ''; print '
'; -print '
'; +dol_fiche_end(); + +print '
'; print '
'; -dol_fiche_end(); - print '

'; // Help doc @@ -365,10 +366,10 @@ if (! empty($conf->use_javascript_ajax)) { print "\n".'