Look and feel v11

Dolibarr · Jan 27, 2020 · 90d255d · 90d255d
1 parent c103ff5
commit 90d255d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 11 deletions.
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
@@ -48,11 +48,11 @@
 if (is_numeric($entity)) define("DOLENTITY", $entity);
 
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Init vars
 $errmsg = '';
@@ -96,27 +96,45 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     global $user, $conf, $langs, $mysoc;
 
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
-    print '<body id="mainbody" class="publicnewmemberform" style="margin-top: 10px;">';
 
-    // Print logo
+    print '<body id="mainbody" class="publicnewmemberform">';
+
+    // Define urllogo
+    $width = 0;
     $urllogo = DOL_URL_ROOT.'/theme/login_logo.png';
 
     if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
     {
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+        $width = 150;
     }
     elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
     {
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
-        $width = 128;
+        $width = 150;
     }
     elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
     {
         $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+        $width = 150;
     }
-    print '<div class="center">';
-    print '<img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" />';
-    print '</div><br>';
+
+	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.'"';
+    	if ($width) print ' width="'.$width.'"';
+    	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="80px"></a></div>';
+    	}
+    	print '</div>';
+    }
+    print '</div>';
 
     print '<div class="divmainbodylarge">';
 }

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
@@ -34,8 +34,9 @@
  *		\brief      File to offer a way to make a payment for a particular Dolibarr object
  */
 
-define("NOLOGIN", 1); // This means this output page does not require to be logged.
-define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
@@ -49,11 +50,12 @@
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 
+// Load translation files
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
+
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
 
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
-
 $action = GETPOST('action', 'aZ09');
 
 // Input are: