diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 0cdecb3645f..10187492037 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -2046,14 +2046,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $MAX = 10; - $morehtmlright = ''; - $morehtmlright .= $langs->trans("SeeAll"); - $morehtmlright .= ''; + $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id); // List of actions on element include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions = new FormActions($db); - $somethingshown = $formactions->showactions($object, $object->element, $socid, 1, 'listactions', $MAX, '', $morehtmlright); + $somethingshown = $formactions->showactions($object, $object->element, $socid, 1, 'listactions', $MAX, '', $morehtmlcenter); print ''; } diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php index 5be2b3d6eea..4df27127608 100644 --- a/htdocs/admin/accountant.php +++ b/htdocs/admin/accountant.php @@ -94,7 +94,7 @@ $formcompany = new FormCompany($db); $countrynotdefined = ''.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; print ''.$langs->trans("AccountantDesc")."
\n"; -print "
\n"; +print "

\n"; /** * Edit parameters diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 5cffc0257e1..bdafaed48fa 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -378,7 +378,7 @@ $head = company_admin_prepare_head(); print dol_get_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company'); print ''.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."
\n"; -print "
\n"; +print "

\n"; /** @@ -457,7 +457,7 @@ print ''."\n"; // Email print ''; print img_picto('', 'object_email', '', false, 0, 0, '', 'pictofixedwidth'); -print ''; +print ''; print ''."\n"; // Web diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php index 57c75b352f8..1ea09182344 100644 --- a/htdocs/admin/company_socialnetworks.php +++ b/htdocs/admin/company_socialnetworks.php @@ -133,7 +133,6 @@ foreach ($listofnetworks as $key => $value) { print ""; print ''; -print '
'; print $form->buttonsSaveCancel("Save", ''); diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 3dcfb66031d..82eed8bee6d 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -451,11 +451,11 @@ if ($mode == 'other') { print '' . "\n"; print ''; - print '
'; print '
'; print ''; print '
'; + print '
'; print '
'; // Other @@ -577,9 +577,9 @@ if ($mode == 'login') { print '
'; print ''; - print ''; @@ -630,7 +630,6 @@ if ($mode == 'login') { print ''; } -print '
'; print '
'; print ''; print '
'; diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php index e6bc6ee8f1d..03f396c9198 100644 --- a/htdocs/admin/openinghours.php +++ b/htdocs/admin/openinghours.php @@ -81,7 +81,7 @@ $head = company_admin_prepare_head(); print dol_get_fiche_head($head, 'openinghours', $langs->trans("Company"), -1, 'company'); print ''.$langs->trans("OpeningHoursDesc")."
\n"; -print "
\n"; +print "

\n"; if (empty($action) || $action == 'edit' || $action == 'updateedit') { /** diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 763c57dc51e..5922de82d2c 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1376,14 +1376,12 @@ if ($action == 'create' && $user->rights->projet->creer) { $MAXEVENT = 10; - $morehtmlright = ''; - $morehtmlright .= $langs->trans("SeeAll"); - $morehtmlright .= ''; + $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/projet/info.php?id='.$object->id); // List of actions on element include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions = new FormActions($db); - $somethingshown = $formactions->showactions($object, 'project', 0, 1, '', $MAXEVENT, '', $morehtmlright); + $somethingshown = $formactions->showactions($object, 'project', 0, 1, '', $MAXEVENT, '', $morehtmlcenter); print ''; } diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php index 3926d443f93..5f450a6c557 100644 --- a/htdocs/public/project/index.php +++ b/htdocs/public/project/index.php @@ -64,7 +64,7 @@ $langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox // No check on module enabled. Done later according to $validpaymentmethod $action = GETPOST('action', 'aZ09'); -$id = GETPOST('id'); +$id = GETPOST('id', 'int'); $securekeyreceived = GETPOST("securekey", 'alpha'); $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 'md5'); @@ -183,11 +183,27 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) { print ''; } -print '
'; + print '
'; print $langs->trans("Parameter"); - print ''; + print ''; print $langs->trans("Value"); print '
'."\n"; +print '
'; -$text = ''."\n"; -$text .= ''."\n"; -$text .= ''."\n"; + +// 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 '

'."\n"; +print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; +print $project->note_public."\n"; +//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; +print '
'; + + +print '
'; + +print '

'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'
'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$project->title.'.

'.$project->note_public.'

'."\n"; print $text; diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php index 0b5e26702e8..c0bcdc751c6 100644 --- a/htdocs/public/project/suggestbooth.php +++ b/htdocs/public/project/suggestbooth.php @@ -517,6 +517,22 @@ $formcompany = new FormCompany($db); llxHeaderVierge($langs->trans("NewSuggestionOfBooth")); +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 '

'."\n"; +//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; +//print $project->note_public."\n"; +//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; +print '
'; + print load_fiche_titre($langs->trans("NewSuggestionOfBooth"), '', '', 0, 0, 'center'); @@ -525,13 +541,6 @@ print '
'; print '
'; print '
'; -// Welcome message -$text = '

'; -$text .= ''."\n"; -$text .= ''."\n"; -print $text; -print ''; - dol_htmloutput_errors($errmsg); // Print form diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php index 62b54758cc7..f2a919c0aa2 100644 --- a/htdocs/public/project/suggestconference.php +++ b/htdocs/public/project/suggestconference.php @@ -450,6 +450,22 @@ $formcompany = new FormCompany($db); llxHeaderVierge($langs->trans("NewSuggestionOfConference")); +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 '

'."\n"; +//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; +//print $project->note_public."\n"; +//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; +print '
'; + print load_fiche_titre($langs->trans("NewSuggestionOfConference"), '', '', 0, 0, 'center'); @@ -458,12 +474,6 @@ print '
'; print '
'; print '
'; -// Welcome message -$text = '

'; -$text .= ''."\n"; -$text .= ''."\n"; -print $text; -print ''; dol_htmloutput_errors($errmsg); diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 11cc7b55a4d..10bcd6d9411 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2984,12 +2984,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $MAXEVENT = 10; - $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id); + $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id); // List of actions on element include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions = new FormActions($db); - $somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty + $somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for thirdparty print ''; diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php index 443126290ab..2ce4884932e 100644 --- a/htdocs/societe/partnership.php +++ b/htdocs/societe/partnership.php @@ -65,7 +65,7 @@ if ($id > 0) { $object = new Partnership($db); $extrafields = new ExtraFields($db); $diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id; -$hookmanager->initHooks(array('partnershipthirdparty', 'globalcard')); // Note that conf->hooks_modules contains array +$hookmanager->initHooks(array('thirdpartypartnership', 'globalcard')); // Note that conf->hooks_modules contains array // Fetch optionals attributes and labels $extrafields->fetch_name_optionals_label($object->table_element); diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 0eb55107a0c..b54087c55a6 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1421,6 +1421,7 @@ table[summary="list_of_modules"] .fa-cog { .titlefieldcreate { width: 20%; } .titlefield { /* width: 25%; */ width: 250px; } .titlefieldmiddle { width: 50%; } +.titlefieldmax45 { max-width: 45%; } .imgmaxwidth180 { max-width: 180px; } .imgmaxheight50 { max-height: 50px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 691ffa8f658..dbbdb1d2679 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3431,7 +3431,7 @@ table.liste, table.noborder, table.formdoc, div.noborder { border-right: 1px solid #ccc; border-left: 1px solid #ccc; - margin: 0px 0px 8px 0px; + margin: 0px 0px 20px 0px; -webkit-border-radius: 0.1em; border-radius: 0.1em;
'.$langs->trans("EvntOrgRegistrationBoothWelcomeMessage").'
'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$project->label.'.

'.$project->note_public.'
'.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").'
'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$project->label.'.

'.$project->note_public.'