From de4183ea6552e917ac33f8416f784340966f2a8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Jan 2020 17:30:46 +0100
Subject: [PATCH] Update logos

---
 htdocs/core/lib/security2.lib.php             |   2 +-
 htdocs/langs/en_US/other.lang                 |   2 +-
 htdocs/main.inc.php                           |   2 +-
 htdocs/public/payment/newpayment.php          |  61 +++++++++++-------
 htdocs/theme/common/dolibarr_logo_bw.png      | Bin 791 -> 0 bytes
 .../{common => }/dolibarr_logo_256x256.png    | Bin
 htdocs/theme/dolibarr_logo_bw.png             | Bin 0 -> 646 bytes
 htdocs/theme/eldy/global.inc.php              |  11 ++++
 htdocs/theme/eldy/manifest.json.php           |   2 +-
 9 files changed, 51 insertions(+), 29 deletions(-)
 delete mode 100644 htdocs/theme/common/dolibarr_logo_bw.png
 rename htdocs/theme/{common => }/dolibarr_logo_256x256.png (100%)
 create mode 100644 htdocs/theme/dolibarr_logo_bw.png

diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index c81ea9d98d7..26e97499482 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -283,7 +283,7 @@ if (! function_exists('dol_loginfunction'))
 		// Set jquery theme
 		$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
 
-		$favicon = DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png';
+		$favicon = DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png';
 		if (! empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 640199588ab..46424590f31 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -24,7 +24,7 @@ MessageOK=Message on the return page for a validated payment
 MessageKO=Message on the return page for a canceled payment
 ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
 DeleteAlsoContentRecursively=Check to delete all content recursively
-
+PoweredBy=Powered by
 YearOfInvoice=Year of invoice date
 PreviousYearOfInvoice=Previous year of invoice date
 NextYearOfInvoice=Following year of invoice date
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c9def11e910..a6de7819237 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1224,7 +1224,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
 		// Favicon
-		$favicon = DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png';
+		$favicon = DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png';
 		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
 		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index c580fa2a6d3..80ed910ac70 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -717,7 +717,8 @@ if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) $head = '<link rel="styleshee
 $conf->dol_hide_topmenu = 1;
 $conf->dol_hide_leftmenu = 1;
 
-llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody');
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
 // Check link validity
 if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
@@ -753,27 +754,7 @@ print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECURE
 print '<input type="hidden" name="e" value="'.$entity.'" />';
 print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
 print "\n";
-print '<!-- Form to send a payment -->'."\n";
-print '<!-- creditor = '.$creditor.' -->'."\n";
-// Additionnal information for each payment system
-if (!empty($conf->paypal->enabled))
-{
-	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
-	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
-}
-if (!empty($conf->paybox->enabled))
-{
-	print '<!-- PAYBOX_CGI_URL = '.$conf->global->PAYBOX_CGI_URL_V2.' -->'."\n";
-}
-if (!empty($conf->stripe->enabled))
-{
-	print '<!-- STRIPE_LIVE = '.$conf->global->STRIPE_LIVE.' -->'."\n";
-}
-print '<!-- urlok = '.$urlok.' -->'."\n";
-print '<!-- urlko = '.$urlko.' -->'."\n";
-print "\n";
 
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
 // Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
 $width = 0;
@@ -803,13 +784,43 @@ elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$log
 // Output html code for logo
 if ($urllogo)
 {
-	print '<tr>';
-	print '<td align="center"><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	if ($width) print ' width="'.$width.'"';
-	print '></td>';
-	print '</tr>'."\n";
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a href="https://www.dolibarr.org" target="dolibarr">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" width="100px"></a></div>';
+	}
+	print '</div>';
 }
 
+
+
+
+print '<!-- Form to send a payment -->'."\n";
+print '<!-- creditor = '.$creditor.' -->'."\n";
+// Additionnal information for each payment system
+if (!empty($conf->paypal->enabled))
+{
+	print '<!-- PAYPAL_API_SANDBOX = '.$conf->global->PAYPAL_API_SANDBOX.' -->'."\n";
+	print '<!-- PAYPAL_API_INTEGRAL_OR_PAYPALONLY = '.$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY.' -->'."\n";
+}
+if (!empty($conf->paybox->enabled))
+{
+	print '<!-- PAYBOX_CGI_URL = '.$conf->global->PAYBOX_CGI_URL_V2.' -->'."\n";
+}
+if (!empty($conf->stripe->enabled))
+{
+	print '<!-- STRIPE_LIVE = '.$conf->global->STRIPE_LIVE.' -->'."\n";
+}
+print '<!-- urlok = '.$urlok.' -->'."\n";
+print '<!-- urlko = '.$urlko.' -->'."\n";
+print "\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
 // Output introduction text
 $text = '';
 if (!empty($conf->global->PAYMENT_NEWFORM_TEXT))
diff --git a/htdocs/theme/common/dolibarr_logo_bw.png b/htdocs/theme/common/dolibarr_logo_bw.png
deleted file mode 100644
index 238a1899c00d9e74878a57a3efa53a1209315a24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq008g+002G$0{{R3XxV<n00009P)t-sxp7(m
z00960|A0lF;{X5v0d!JMQvg8b*k%9#00Cl4M??UK1szBL000SaNLh0L01FcU01FcV
z0GgZ_00007bV*G`2j2?<7Y__&A{fyC00M_eL_t(Y$L-fKvfCgK0MOlxagmBb6!8&q
z3N(`g;2HMM<o9WGisS|^k{f&%U#H9hiv&iJ<?kX*C@jY2t$<x@8DM`yvSf`z@JOJ+
z!Xr&lPtJH$gycGKk6}RQw88`S&~><pm0iFGjo1NWzm3T+-Wd-%T(>b2wb(kXB6erg
z0EW2v#`*AKfyxMB!>sWElRY2!&P1(_ShX0i=TrrZB__8IgVVfcykYkIZN{{O-6Gau
zw;i_`+kLoW9P+Fy>~>6>`Y>nB6$V{}{eH}~%~uUGru(T{sH25NM-0L3#qJgx{{)s#
zcVYhwPNS&7Do+Wg@RVO_oGw+Wj4Y^(Xv2X@d3Nb&#Z1PvR~2StP9|q0Mnw{A)BWY*
zTkO(}<<=$)RRvZg;o=N#v6o3rOS51Kj3nW5kP4H`x)@3gHj?lL+q|)PD3%y<IFhnn
z!A@4#V7HE)Y)7oxAXI}fC%nO4w&OWWf=z|P*5?7X!6bY6G^Q3)f!zkSYdF?YgF7YI
zt2;QJks7C}$f>ktbv9Tv7zEo1%i*ZXb2=_-*n9w+gkcS<XRz6U*QSkm|J?`HOt}yi
zQf0SsFO{bjizJ?xDewxOPfmfSl8$F<54MkEcNfzZUidPYzChF>{=xXlZ@kzK;9(s5
zk=uLfb9(~}FFgE`<8kK?U%nLhrNnRCKb816j+f92jRy`h{$Ao=;q%LcFA0B+?+p{?
z$(=%P2$PJx8HfH+Mi%&#mvpM|*9u?bPq2*qG~;7l(lOzmOZXChgNHP-z%ianf!FXg
z{pKIj$O6M_nsu0Wi#cQcI6Z{Dj=!tN3hoc1JXQ?vO`dNb)7!rq`GH1x_}~6v`wK+|
Vh4s`po4Wu2002ovPDHLkV1gedW?BFM

diff --git a/htdocs/theme/common/dolibarr_logo_256x256.png b/htdocs/theme/dolibarr_logo_256x256.png
similarity index 100%
rename from htdocs/theme/common/dolibarr_logo_256x256.png
rename to htdocs/theme/dolibarr_logo_256x256.png
diff --git a/htdocs/theme/dolibarr_logo_bw.png b/htdocs/theme/dolibarr_logo_bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..50b1608847c3d5d0001b4e9334610b49ef41cf16
GIT binary patch
literal 646
zcmV;10(t$3P)<h;3K|Lk000e1NJLTq008g+002G#0{{R3FL?wN00006P)t-s1!+|P
z005m^!q5N!00DGTPE!Ct=GbNc0004EOGiWihy@);00009a7bBm000fw000fw0YWI7
zcmMzZ2XskIMF->o7!U;rhDLhx0005`Nkl<ZILpn{J&x5d5CGtbQUoeT%NBIL0tZ0y
zBJBb82rtV8H~@OK-qO%LL_@)0Qmj_m3XTwNU^*9(hZ+CnIeCi^4W!DO?|C#C+XL|5
zJzC2T@Ab=9Pw>@nynh(h+!fv(uMfkQcQwoLgw5{jP0earlD{#-<qb&0w4}vRTj|65
zUiXhiNA_F3+RKk-e|cm^v*p|Vxw*ZFJQa4ChyK~&ZDPA!JskVP@FKE1%MZinKJdI@
zz5Cw3-hGPfGpi}_(kNogEXT8K5({&d$HesWFL;8^W@Z=MC=IR6tbFbo|4DmJ2GS9O
zBBt^(PtfqUbO<`IKudu!v!jKSf&c?|Xelsdo+&^nBsP&-v=p$JJ*A^vQrJdr&{Du<
zMlRQZUf5A!URXu$3RA!rHkvmPpW-pG_*13;R_vR?ux6}yy?WX(dbRM6#ByOL@GkNl
zF_lWal5~nT+z?xC_{3$!rgGN{|72nIkhWya;)J`3A@i76oL`+;(wF{*xe=vu43(d-
zVxDE@mcP4Z+60}thTJv(ZOy6Y0z=PhHWiN>F2^CTUNIEzFyyM(LpiB|Rn0RW{Kzea
zTopSg*Py|Wt6~e~5&?!>6;DvEAYBf=f)yJm7Z^BKTQQFdjd42g_R+~MEHKP?ImfBU
gGlRx{;eYu20<NPy6F=A@_W%F@07*qoM6N<$f}tcGsQ>@~

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4b731808d2e..fb63a6d5a3b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3663,6 +3663,17 @@ table.table-fiche-title {
 	margin-bottom: 5px;
 }
 
+
+div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bottom: 1px solid #ddd; }
+.backgreypublicpayment a { color: #222 !important; }
+.poweredbypublicpayment {
+	float: right;
+	top: 20px;
+    right: 20px;
+    position: absolute;
+    font-size: 0.8em;
+    color: #222;
+}
 #dolpaymenttable { min-width: 320px; font-size: 16px; }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
 #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index 889b406ab3f..545f39b7896 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_AP
     "name": "<?php echo $appli; ?>",
     "icons": [
         {
-            "src": "<?php echo DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png'; ?>",
+            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_logo_256x256.png'; ?>",
             "sizes": "256x256",
             "type": "image/png"
         }