diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index bef93bc317a..c7f9e2efa2c 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2012 Laurent Destailleur * * 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) - accessforbidden(); +if (!$user->admin) accessforbidden(); $mesg=''; @@ -65,7 +64,7 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription4")."
"; print "
"; print '
'; //print '
'; -print img_picto('','puce').' '.$langs->trans("SetupDescription5")."
"; +print $langs->trans("SetupDescription5")."
"; //print '
'; print "
"; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 2bb3584bbcc..40b736596a5 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -457,7 +457,7 @@ else $var=!$var; print "\n"; $url='http://www.dolistore.com'; - print ''; + print ''; print ''.$langs->trans("DoliStoreDesc").''; print ''.$url.''; print ''; diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index 2bd7cfe0a90..131b8134d16 100644 --- a/htdocs/admin/system/about.php +++ b/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 ''; +print '
'.img_picto_common('', 'dolibarr_box.png','height="120"').'
'; -print "
\n"; - -print $langs->trans("DolibarrLicense").':'; +print $langs->trans("Version").' / '.$langs->trans("DolibarrLicense").':'; print ''; print "
\n"; @@ -56,6 +52,7 @@ print "
\n"; print $langs->trans("Developpers").':'; print ''; print "
\n"; @@ -76,28 +73,20 @@ if (preg_match('/^fr_/i',$langs->getDefaultLang())) print '
  • '; print ''.$langs->trans("OfficialWiki").''; print '
  • '; +print ''; + +print $langs->trans("Demo").':'; +print ''; + +print $langs->trans("ModulesMarketPlaces").':'; +print ''; @@ -109,19 +98,18 @@ print ''.$langs->tr print ''; print ''; - -print '
    '.$langs->trans("MakeADonation").':
    '; +print $langs->trans("Foundation").':
    '; print '
    '; llxFooter(); + +$db->close(); ?> diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 67680c6cbe6..5c41d857bc7 100644 --- a/htdocs/public/members/new.php +++ b/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 '
    '; - print 'Logo'; + print 'Logo'; print '

    '; print '
    '; @@ -362,7 +362,8 @@ print '
    '. print ''; print ''; -print ''."\n"; +print '
    '; +print '
    '."\n"; // Type if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) @@ -548,6 +549,7 @@ if (! empty($backtopage)) print ''; print "
    \n"; +print ''; llxFooterVierge(); diff --git a/htdocs/theme/common/dolibarr_box.png b/htdocs/theme/common/dolibarr_box.png new file mode 100644 index 00000000000..31592d08f1c Binary files /dev/null and b/htdocs/theme/common/dolibarr_box.png differ diff --git a/htdocs/theme/dolibarr.png b/htdocs/theme/dolibarr.png new file mode 100755 index 00000000000..dbac590012f Binary files /dev/null and b/htdocs/theme/dolibarr.png differ diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png old mode 100644 new mode 100755 index 7f29b619432..da9baa40406 Binary files a/htdocs/theme/dolibarr_logo.png and b/htdocs/theme/dolibarr_logo.png differ diff --git a/htdocs/theme/doliforge_logo.png b/htdocs/theme/doliforge_logo.png new file mode 100755 index 00000000000..c9de1b5012c Binary files /dev/null and b/htdocs/theme/doliforge_logo.png differ diff --git a/htdocs/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png new file mode 100755 index 00000000000..76ff5ac1535 Binary files /dev/null and b/htdocs/theme/dolistore_logo.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e6158dfb294..8b63587f697 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/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) */