Update the about page.

htdocs/admin/index.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,7 @@ require("../main.inc.php");
 $langs->load("admin");
 $langs->load("companies");
 
-if (!$user->admin)
+if (!$user->admin) accessforbidden();
-  accessforbidden();
 
 $mesg='';
 
@@ -65,7 +64,7 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription4")."<br>";
 print "<br>";
 print '<br>';
 //print '<hr style="color: #DDDDDD;">';
-print img_picto('','puce').' '.$langs->trans("SetupDescription5")."<br>";
+print $langs->trans("SetupDescription5")."<br>";
 //print '<hr style="color: #DDDDDD;">';
 print "<br>";
 

htdocs/admin/modules.php

@@ -457,7 +457,7 @@ else
     $var=!$var;
     print "<tr ".$bc[$var].">\n";
     $url='http://www.dolistore.com';
-    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" src="'.DOL_URL_ROOT.'/theme/common/dolistore.jpg"></a></td>';
+    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
     print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
     print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
     print '</tr>';

htdocs/admin/system/about.php

@@ -28,6 +28,7 @@ require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("help");
+$langs->load("members");
 
 
 /*
@@ -39,16 +40,11 @@ llxHeader();
 
 print_fiche_titre("Dolibarr",'','setup');
 
-print $langs->trans("Version").':';
+print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png','height="120"').'</div>';
-print '<ul>';
-print '<li>'.DOL_VERSION.'</li>';
-print '</ul>';
 
-print "<br>\n";
+print $langs->trans("Version").' / '.$langs->trans("DolibarrLicense").':';
-
-print $langs->trans("DolibarrLicense").':';
 print '<ul>';
-print '<li>GNU/GPL</li>';
+print '<li>'.DOL_VERSION.' / <a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL</a></li>';
 print '</ul>';
 
 print "<br>\n";
@@ -56,6 +52,7 @@ print "<br>\n";
 print $langs->trans("Developpers").':';
 print '<ul>';
 print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="http://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank">http://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
+print '<li>'.$langs->trans("DoliForge").': <a href="http://www.doliforge.org" target="_blank">http://wwww.doliforge.org</a></li>';
 print '</ul>';
 
 print "<br>\n";
@@ -76,28 +73,20 @@ if (preg_match('/^fr_/i',$langs->getDefaultLang()))
 print '<li>';
 print '<a target="blank" href="http://wiki.dolibarr.org/">'.$langs->trans("OfficialWiki").'</a>';
 print '</li>';
+print '</ul>';
+
+print $langs->trans("Demo").':';
+print '<ul>';
 print '<li>';
-print '<a target="blank" href="http://demo.dolibarr.org/public/demo">'.$langs->trans("OfficialDemo").'</a>';
+print '<a target="blank" href="http://www.dolibarr.org/onlinedemo/">'.$langs->trans("OfficialDemo").'</a>';
 print '</li>';
+print '</ul>';
+
+print $langs->trans("ModulesMarketPlaces").':';
+print '<ul>';
 print '<li>';
 print '<a target="blank" href="http://www.dolistore.com">'.$langs->trans("OfficialMarketPlace").'</a>';
 print '</li>';
-
-if (preg_match('/^fr_/i',$langs->getDefaultLang()))
-{
-	print '<li>';
-	print 'Les t&acirc;ches en cours de r&eacute;alisation sur Dolibarr sont consultables dans le <a target="blank" href="http://savannah.nongnu.org/task/?group=dolibarr">gestionnaire de projets</a> sur Savannah.';
-	print '</li>';
-
-	print '<li>';
-	print 'Si vous trouvez un bogue dans Dolibarr, vous pouvez en informer les d&eacute;veloppeurs sur le <a target="blank" href="http://savannah.nongnu.org/bugs/?group=dolibarr">syst&egrave;me de gestion des bogues</a> de Savannah.';
-	print '</li>';
-
-	print '<li>';
-	print 'Le code source de Dolibarr est consultable par l\'<a target="_blank" href="http://savannah.nongnu.org/cgi-bin/viewcvs/dolibarr/dolibarr/">interface web du cvs</a>.';
-	print '</li>';
-}
-
 print '</ul>';
 
 
@@ -109,19 +98,18 @@ print '<a target="_blank" href="'.DOL_URL_ROOT.'/support/index.php">'.$langs->tr
 print '</li>';
 print '</ul>';
 
-
+print $langs->trans("Foundation").':<br>';
-print '<br>'.$langs->trans("MakeADonation").':<br>';
 
 print '<ul>';
-print '<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
+$url='http://wiki.dolibarr.org/index.php/Subscribe';
-<input type="hidden" name="cmd" value="_s-xclick">
+if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Adh%C3%A9rer';
-<input type="hidden" name="hosted_button_id" value="6573525">';
+print '<li><a href="'.$url.'">'.$langs->trans("SubscribeToFoundation").'</a></li>';
-print '<input class="none" type="image" src="'.DOL_URL_ROOT.'/theme/common/paypal.png" border="0" name="submit" alt="Help Dolibarr making a donation">';
-print '</form>';
 print '</ul>';
 
 
 llxFooter();
+
+$db->close();
 ?>
 
 

htdocs/public/members/new.php

@@ -101,7 +101,7 @@ function llxHeaderVierge($title, $head="", $disablejs=0, $disablehead=0, $arrayo
         $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
     }
     print '<center>';
-    print '<img alt="Logo" title="" src="'.$urllogo.'" />';
+    print '<img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'" />';
     print '</center><br>';
 
     print '<div style="margin-left: 50px; margin-right: 50px;">';
@@ -362,7 +362,8 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'.
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="add">';
 
-print '<table class="border">'."\n";
+print '<div id="divsubscribe">';
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Type
 if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
@@ -548,6 +549,7 @@ if (! empty($backtopage))
 print '</center>';
 
 print "<br></form>\n";
+print '</div>';
 
 
 llxFooterVierge();

htdocs/theme/eldy/style.css.php

@@ -1726,6 +1726,9 @@ div.titre {
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
 
+#divsubscribe { width: 700px; }
+#tablesubscribe { width: 100%; }
+
 
 /* ============================================================================== */
 /* Formulaire confirmation (When Ajax JQuery is used)                             */