';
// Welcome message
-$text = '
| '.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").' |
';
+$text = '
| '.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").' |
';
$text .= '
'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$project->label.'.
|
'."\n";
$text .= '
| '.$project->note_public.' |
'."\n";
print $text;
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index f119f08239d..e680df15a1c 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -101,20 +101,18 @@ if (empty($conf->eventorganization->enabled)) {
$tmpthirdparty = new Societe($db);
-$listOfConferences = $listOfBooths = '
| '.$langs->trans('Label').' |
- '.$langs->trans('Type').' |
- '.$langs->trans('DateStart').' |
- '.$langs->trans('DateEnd').' |
- '.$langs->trans('Thirdparty').' |
- '.$langs->trans('Note').' |
';
+$listOfConferences = '
| '.$langs->trans('Label').' | ';
+$listOfConferences .= ''.$langs->trans('Type').' | ';
+$listOfConferences .= ''.$langs->trans('ThirdParty').' | ';
+$listOfConferences .= ''.$langs->trans('Note').' |
';
-$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle
+$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle as label
FROM ".MAIN_DB_PREFIX."actioncomm as a
INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
WHERE a.status<2";
$sqlforconf = $sql." AND ca.module='conference@eventorganization'";
-$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
+//$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
// For conferences
$result = $db->query($sqlforconf);
@@ -132,12 +130,13 @@ while ($i < $db->num_rows($result)) {
$thirdpartyname = '';
}
- $listOfConferences .= '
| '.$obj->label.' | '.$obj->libelle.' | '.$obj->datep.' | '.$obj->datep2.' | '.$thirdpartyname.' | '.$obj->note.' | ';
+ $listOfConferences .= '
| '.$obj->label.' | '.$obj->label.' | '.$thirdpartyname.' | '.$obj->note.' | ';
$listOfConferences .= ' |
';
$i++;
}
// For booths
+/*
$result = $db->query($sqlforbooth);
$i = 0;
while ($i < $db->num_rows($result)) {
@@ -157,6 +156,7 @@ while ($i < $db->num_rows($result)) {
$listOfBooths .= '
| ';
$i++;
}
+*/
// Get vote result
$idvote = GETPOST("vote");
@@ -275,19 +275,20 @@ $text .= '
| '.$project->note_public.' |
'
print $text;
print ''."\n";
-print dol_get_fiche_head('');
-print '
'."\n";
+print ''."\n";
print '| '.$langs->trans("ListOfSuggestedConferences").' | ';
-print $listOfConferences.'';
+print $listOfConferences.'
';
print '
'."\n";
-print '';
+/*
+print '
';
print ''."\n";
print '| '.$langs->trans("ListOfSuggestedBooths").' | ';
-print $listOfBooths.'';
+print $listOfBooths.'
';
print '
'."\n";
+*/
$object = null;