lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	README.md
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur 2021-06-19 20:05:25 +02:00
commit edb4cf4130
16 changed files with 100 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -201,11 +201,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
### System Environment / Requirements
(See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
- PHP
- MariaDB, MySQL or PostgreSQL
- Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
### Extending

6
htdocs/core/lib/ticket.lib.php
View File

@ -248,6 +248,12 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
print '</div>';
}
if (!empty($conf->global->TICKET_IMAGE_PUBLIC_INTERFACE)) {
print '<div class="backimagepublicticket">';
print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION.'">';
print '</div>';
}
print '</div>';
print '<div class="ticketlargemargin">';

6
htdocs/opensurvey/fonctions.php
View File

@ -116,6 +116,12 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
print '</div>';
}
if (!empty($conf->global->OPENSURVEY_IMAGE_PUBLIC_INTERFACE)) {
print '<div class="backimagepublicopensurvey">';
print '<img id="idOPENSURVEY_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->OPENSURVEY_IMAGE_PUBLIC_INTERFACE.'">';
print '</div>';
}
print '<div style="margin-left: 50px; margin-right: 50px; text-align: start;"><br>';
}

7
htdocs/public/eventorganization/attendee_subscription.php
View File

@ -164,6 +164,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '</div>';
}
if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) {
print '<div class="backimagepubliceventorganizationsubscription">';
print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE.'">';
print '</div>';
}
print '</div>';
print '<div class="divmainbodylarge">';

5
htdocs/public/eventorganization/subscriptionok.php
View File

@ -153,6 +153,11 @@ if ($urllogo) {
print '</div>';
}
if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) {
print '<div class="backimagepubliceventorganizationsubscription">';
print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE.'">';
print '</div>';
}
print '<br><br><br>';

11
htdocs/public/members/new.php
View File

@ -130,18 +130,25 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '<div class="center">';
// Output html code for logo
if ($urllogo) {
print '<div class="backgreypublicpayment">';
print '<div class="logopublicpayment">';
print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
print '>';
print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
print '</div>';
if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
}
print '</div>';
}
if (!empty($conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION)) {
print '<div class="backimagepublicregistration">';
print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION.'">';
print '</div>';
}
print '</div>';
print '<div class="divmainbodylarge">';

5
htdocs/public/onlinesign/newonlinesign.php
View File

@ -195,6 +195,11 @@ if ($urllogo) {
}
print '</div>';
}
if (!empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN)) {
print '<div class="backimagepublicproposalsign">';
print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN.'">';
print '</div>';
}
// Output introduction text
$text = '';

5
htdocs/public/payment/newpayment.php
View File

@ -865,6 +865,11 @@ if ($urllogo) {
}
print '</div>';
}
if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
print '<div class="backimagepublicpayment">';
print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.$conf->global->MAIN_IMAGE_PUBLIC_PAYMENT.'">';
print '</div>';
}

5
htdocs/public/payment/paymentko.php
View File

@ -266,6 +266,11 @@ if ($urllogo) {
}
print '</div>';
}
if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
print '<div class="backimagepublicpayment">';
print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.$conf->global->MAIN_IMAGE_PUBLIC_PAYMENT.'">';
print '</div>';
}
print '<br><br>';

5
htdocs/public/payment/paymentok.php
View File

@ -226,6 +226,11 @@ if ($urllogo) {
}
print '</div>';
}
if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
print '<div class="backimagepublicpayment">';
print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.$conf->global->MAIN_IMAGE_PUBLIC_PAYMENT.'">';
print '</div>';
}
print '<br><br><br>';

6
htdocs/public/project/index.php
View File

@ -186,6 +186,12 @@ if ($urllogo) {
print '</div>';
}
if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
print '<div class="backimagepublicorganizedevent">';
print '<img id="idPROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT.'">';
print '</div>';
}
print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
$text = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";

8
htdocs/public/project/new.php
View File

@ -118,6 +118,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '<div class="center">';
// Output html code for logo
if ($urllogo) {
print '<div class="backgreypublicpayment">';
@ -130,6 +131,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '</div>';
}
if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
print '<div class="backimagepublicorganizedevent">';
print '<img id="idPROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT.'">';
print '</div>';
}
print '</div>';
print '<div class="divmainbodylarge">';

8
htdocs/public/project/suggestbooth.php
View File

@ -152,6 +152,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '<div class="center">';
// Output html code for logo
if ($urllogo) {
print '<div class="backgreypublicpayment">';
@ -164,6 +165,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '</div>';
}
if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) {
print '<div class="backimagepublicsuggestbooth">';
print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH.'">';
print '</div>';
}
print '</div>';
print '<div class="divmainbodylarge">';

8
htdocs/public/project/suggestconference.php
View File

@ -152,6 +152,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '<div class="center">';
// Output html code for logo
if ($urllogo) {
print '<div class="backgreypublicpayment">';
@ -164,6 +165,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
}
print '</div>';
}
if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE)) {
print '<div class="backimagepublicsuggestconference">';
print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE.'">';
print '</div>';
}
print '</div>';
print '<div class="divmainbodylarge">';

7
htdocs/public/project/viewandvote.php
View File

@ -261,6 +261,13 @@ if ($urllogo) {
}
print '</div>';
}
if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) {
print '<div class="backimagepublicsuggestbooth">';
print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH.'">';
print '</div>';
}
print '<table id="welcome" class="center">'."\n";
$text = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgVoteHelpMessage").' : "'.$project->title.'".<br><br></td></tr>'."\n";

8
htdocs/public/recruitment/view.php
View File

@ -190,7 +190,7 @@ print '<input type="hidden" name="suffix" value="'.GETPOST("suffix", 'alpha').'"
print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
print '<input type="hidden" name="entity" value="'.$entity.'" />';
print "\n";
print '<!-- Form to sign -->'."\n";
print '<!-- Form to view job -->'."\n";
print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
@ -228,6 +228,12 @@ if ($urllogo) {
print '</div>';
}
if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
print '<div class="backimagepublicrecruitment">';
print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="'.$conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE.'">';
print '</div>';
}
// Output introduction text
$text = '';
if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {