diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php index 9d6f30850e6..cc8e9ada81b 100644 --- a/htdocs/public/eventorganization/attendee_new.php +++ b/htdocs/public/eventorganization/attendee_new.php @@ -1,5 +1,6 @@ + * Copyright (C) 2023 Laurent Destailleur * * 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 @@ -678,22 +679,25 @@ $formcompany = new FormCompany($db); llxHeaderVierge($langs->trans("NewRegistration")); -print '
'; -print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center'); - print '
'; print '
'; -print '
'; +// Sub banner +print '
'; +print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center'); // Welcome message print ''.$langs->trans("EvntOrgWelcomeMessage").''; print '
'; - // Title -print ''.dol_escape_htmltag($project->title . ' '. $conference->label).'
'; +print ''.dol_escape_htmltag($project->title . ' '. $conference->label).'
'; +print '
'; + +// Help text +print '
'; + if ($project->date_start_event || $project->date_end_event) { - print '
'; + print '
'; } if ($project->date_start_event) { $format = 'day'; @@ -718,29 +722,31 @@ if ($project->date_start_event || $project->date_end_event) { print '
'; } if ($project->location) { - print ''.dol_escape_htmltag($project->location).'
'; + print ''.dol_escape_htmltag($project->location).'
'; } +print '
'; + + $maxattendees = 0; if ($conference->id > 0) { /* date of project is not date of event so commented - print $langs->trans("Date").': '; - print dol_print_date($conference->datep); - if ($conference->date_end) { - print ' - '; - print dol_print_date($conference->datef); - }*/ + print $langs->trans("Date").': '; + print dol_print_date($conference->datep); + if ($conference->date_end) { + print ' - '; + print dol_print_date($conference->datef); + }*/ } else { /* date of project is not date of event so commented - print $langs->trans("Date").': '; - print dol_print_date($project->date_start); - if ($project->date_end) { - print ' - '; - print dol_print_date($project->date_end); - }*/ + print $langs->trans("Date").': '; + print dol_print_date($project->date_start); + if ($project->date_end) { + print ' - '; + print dol_print_date($project->date_end); + }*/ $maxattendees = $project->max_attendees; // Max attendeed for the project/event } -print '
'; if ($maxattendees && $currentnbofattendees >= $maxattendees) { print '
'; @@ -882,12 +888,13 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS print "\n"; print "
"; - print '
'; } } else { print $langs->trans("ConferenceIsNotConfirmed"); } +print ''; + llxFooterVierge(); $db->close(); diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php index 8cefe20909b..3edc7f97a75 100644 --- a/htdocs/public/project/index.php +++ b/htdocs/public/project/index.php @@ -125,10 +125,13 @@ $conf->dol_hide_topmenu = 1; $conf->dol_hide_leftmenu = 1; $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '
' : '').'
'; + llxHeader($head, $langs->trans("SuggestForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea); + print ''."\n"; print '
'."\n"; + print '
'."\n"; print ''."\n"; print ''."\n"; @@ -185,21 +188,55 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) { print '
'; +print '
'; +print '
'; + + // Event summary print '
'; -print ''.$project->title.'
'; -print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': '; -print dol_print_date($project->date_start, 'daytext'); -if ($project->date_end && $project->date_start != $project->date_end) { - print ' - '.dol_print_date($project->date_end, 'daytext'); -} +print ''.dol_escape_htmltag($project->title . ' '. $project->label).'
'; print '

'."\n"; -print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; +print ''.$langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; print $project->note_public."\n"; //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; print '
'; +// Help text +print '
'; + +if ($project->date_start_event || $project->date_end_event) { + print '
'; +} +if ($project->date_start_event) { + $format = 'day'; + $tmparray = dol_getdate($project->date_start_event, false, ''); + if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) { + $format = 'dayhour'; + } + print dol_print_date($project->date_start_event, $format); +} +if ($project->date_start_event && $project->date_end_event) { + print ' - '; +} +if ($project->date_end_event) { + $format = 'day'; + $tmparray = dol_getdate($project->date_end_event, false, ''); + if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) { + $format = 'dayhour'; + } + print dol_print_date($project->date_end_event, $format); +} +if ($project->date_start_event || $project->date_end_event) { + print '
'; +} +if ($project->location) { + print ''.dol_escape_htmltag($project->location).'
'; +} + +print '
'; + + print '
'; print ''."\n"; @@ -246,11 +283,16 @@ print ''."\n"; print '
'."\n"; + +print '
'; + + print '
'."\n"; print '
'."\n"; print '
'; + htmlPrintOnlineFooter($mysoc, $langs, 1, $suffix, $object); llxFooter('', 'public'); diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php index cc7b6bb8e01..503fa69a730 100644 --- a/htdocs/public/project/suggestbooth.php +++ b/htdocs/public/project/suggestbooth.php @@ -475,6 +475,7 @@ if (empty($reshook) && $action == 'add') { } } } + if (!$error) { $db->commit(); @@ -540,30 +541,61 @@ $formcompany = new FormCompany($db); llxHeaderVierge($langs->trans("NewSuggestionOfBooth")); + +print '
'; +print '
'; + print '
'; // Event summary print '
'; -print ''.$project->title.'
'; -print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': '; -print dol_print_date($project->date_start, 'daytext'); -if ($project->date_end && $project->date_start != $project->date_end) { - print ' - '.dol_print_date($project->date_end, 'daytext'); -} +print ''.dol_escape_htmltag($project->title . ' '. $project->label).'
'; print '

'."\n"; -//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; -//print $project->note_public."\n"; +print ''.$langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; +print $project->note_public."\n"; //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; print '
'; +// Help text +print '
'; + +if ($project->date_start_event || $project->date_end_event) { + print '
'; +} +if ($project->date_start_event) { + $format = 'day'; + $tmparray = dol_getdate($project->date_start_event, false, ''); + if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) { + $format = 'dayhour'; + } + print dol_print_date($project->date_start_event, $format); +} +if ($project->date_start_event && $project->date_end_event) { + print ' - '; +} +if ($project->date_end_event) { + $format = 'day'; + $tmparray = dol_getdate($project->date_end_event, false, ''); + if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) { + $format = 'dayhour'; + } + print dol_print_date($project->date_end_event, $format); +} +if ($project->date_start_event || $project->date_end_event) { + print '
'; +} +if ($project->location) { + print ''.dol_escape_htmltag($project->location).'
'; +} + +print '
'; + +print '
'; + print load_fiche_titre($langs->trans("NewSuggestionOfBooth"), '', '', 0, 0, 'center'); -print '
'; -print '
'; -print '
'; - dol_htmloutput_errors($errmsg); // Print form @@ -574,7 +606,6 @@ print ''; print ''; print ''; -print '
'; print '
'.$langs->trans("FieldsWithAreMandatory", '*').'
'; //print $langs->trans("FieldsWithIsForPublic",'**').'
'; @@ -614,8 +645,7 @@ print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'se print ''; // Country print ''.$langs->trans('Country'); -print '*'; - +print '*'; print ''; $country_id = GETPOST('country_id'); if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) { @@ -668,7 +698,6 @@ print '
'; print '

'; - print "\n"; print "
"; print '
'; diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php index 5078164f6ce..9418e7640eb 100644 --- a/htdocs/public/project/suggestconference.php +++ b/htdocs/public/project/suggestconference.php @@ -70,8 +70,8 @@ $email = GETPOST("email"); $societe = GETPOST("societe"); $label = GETPOST("label"); $note = GETPOST("note"); -$datestart = GETPOST("datestart"); -$dateend = GETPOST("dateend"); +$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int')); +$dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int')); $id = GETPOST('id'); @@ -452,6 +452,7 @@ if (empty($reshook) && $action == 'add') { } } } + if (!$error) { $db->commit(); $securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2); @@ -473,29 +474,60 @@ $formcompany = new FormCompany($db); llxHeaderVierge($langs->trans("NewSuggestionOfConference")); + +print '
'; +print '
'; + print '
'; // Event summary print '
'; -print ''.$project->title.'
'; -print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': '; -print dol_print_date($project->date_start, 'daytext'); -if ($project->date_end && $project->date_start != $project->date_end) { - print ' - '.dol_print_date($project->date_end, 'daytext'); -} +print ''.dol_escape_htmltag($project->title . ' '. $project->label).'
'; print '

'."\n"; -//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; -//print $project->note_public."\n"; +print ''.$langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; +print $project->note_public."\n"; //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; print '
'; +// Help text +print '
'; + +if ($project->date_start_event || $project->date_end_event) { + print '
'; +} +if ($project->date_start_event) { + $format = 'day'; + $tmparray = dol_getdate($project->date_start_event, false, ''); + if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) { + $format = 'dayhour'; + } + print dol_print_date($project->date_start_event, $format); +} +if ($project->date_start_event && $project->date_end_event) { + print ' - '; +} +if ($project->date_end_event) { + $format = 'day'; + $tmparray = dol_getdate($project->date_end_event, false, ''); + if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) { + $format = 'dayhour'; + } + print dol_print_date($project->date_end_event, $format); +} +if ($project->date_start_event || $project->date_end_event) { + print '
'; +} +if ($project->location) { + print ''.dol_escape_htmltag($project->location).'
'; +} + +print '
'; + +print '
'; print load_fiche_titre($langs->trans("NewSuggestionOfConference"), '', '', 0, 0, 'center'); -print '
'; -print '
'; -print '
'; dol_htmloutput_errors($errmsg, $errors); @@ -507,8 +539,6 @@ print ''; print ''; print ''; -print '
'; - print '
'.$langs->trans("FieldsWithAreMandatory", '*').'
'; //print $langs->trans("FieldsWithIsForPublic",'**').'
'; @@ -584,10 +614,10 @@ print ''.$langs->trans("Format").'*'."\n" print ''.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).''; // Label print ''.$langs->trans("LabelOfconference").'*'."\n"; -print ''."\n"; +print ''."\n"; // Note print ''.$langs->trans("Description").'*'."\n"; -print ''."\n"; +print ''."\n"; print "\n";