From a8913704e930dbf54cdd2a22067f3f87ba805848 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 16 May 2012 12:33:10 +0200 Subject: [PATCH 1/3] Fix: W3C --- htdocs/public/members/new.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 9a82627c3bb..a20fb716f6e 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -90,7 +90,7 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo { global $user, $conf, $langs, $mysoc; top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers - print ''; + print ''; // Print logo $urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; @@ -337,6 +337,7 @@ $extrafields->fetch_name_optionals_label('member'); // fetch optionals attrib llxHeaderVierge($langs->trans("NewSubscription")); + print_titre($langs->trans("NewSubscription")); if (! empty($conf->global->MEMBER_NEWFORM_TEXT)) print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."
\n"; @@ -344,6 +345,8 @@ else print $langs->trans("NewSubscriptionDesc",$conf->global->MAIN_INFO_SOCIETE_ dol_htmloutput_errors($errmsg); +print '
'; + print '
'.$langs->trans("FieldsWithAreMandatory",'*').'
'; //print $langs->trans("FieldsWithIsForPublic",'**').'
'; @@ -563,10 +566,10 @@ if (! empty($backtopage)) } print ''; -print "
\n"; +print "
\n"; print ''; - +print llxFooterVierge(); $db->close(); From 7a49d5658961d08f9267648720c4ca2bbbf88242 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 16 May 2012 17:04:00 +0200 Subject: [PATCH 2/3] Fix: Missing name --- htdocs/adherents/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index c6f3d6dc46d..9b0d1895e1b 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -266,7 +266,7 @@ else */ $max=5; -$sql = "SELECT a.rowid, a.statut, a.nom, a.prenom,"; +$sql = "SELECT a.rowid, a.statut, a.nom as lastname, a.prenom as firstname,"; $sql.= " datefin as date_end_subscription,"; $sql.= " c.rowid as cid, c.tms as datem, c.datec as datec, c.dateadh as date_start, c.datef as date_end, c.cotisation"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."cotisation as c"; From 1725e5b591979fedcd6266fc400b2f722eb80bd7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 May 2012 00:08:36 +0200 Subject: [PATCH 3/3] Fix: [ bug #405 ] Late icon always displayed on comm/propal.php --- htdocs/comm/propal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 3fdf2e22d12..31af8ad691c 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2003,7 +2003,7 @@ else print ''; print ''; - if ($objp->fk_statut == 1 && $objp->dfv < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); + if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print ''; print '';