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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2013-11-13 18:46:25 +01:00
commit 7a714906a0
5 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/help.lang
View File

@ -24,4 +24,5 @@ BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center ho
LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
PossibleLanguages=Supported languages
MakeADonation=Help Dolibarr project, make a donation
SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>

2
htdocs/langs/es_ES/help.lang
View File

@ -14,6 +14,7 @@ TypeSupportCommercial=Comercial
TypeOfHelp=Tipo
NeedHelpCenter=¿Necesita soporte o ayuda?
Efficiency=Eficacia
OfficialSupport=Soporte oficial
TypeHelpOnly=Sólamente ayuda
TypeHelpDev=Ayuda+Desarrollo
TypeHelpDevForm=Ayuda+Desarrollo+Formación
@ -25,3 +26,4 @@ LinkToGoldMember=En caso contrario, puede llamar inmediatamente a uno de los asi
PossibleLanguages=Idiomas disponibles
MakeADonation=Ayude al proyecto Dolibarr, haga una donación
SubscribeToFoundation=Ayude al proyecto Dolibarr, adhiérase a la asociación Dolibarr
SeeOfficalSupport=Para obtener soporte oficial Dolibarr en su idioma: <br><b><a href="%s" target="_blank">%s</a></b>

2
htdocs/langs/fr_FR/help.lang
View File

@ -14,6 +14,7 @@ TypeSupportCommercial=Commercial
TypeOfHelp=Type
NeedHelpCenter=Besoin d'assistance ou aide ?
Efficiency=Efficacité
OfficialSupport=Assistance officiel
TypeHelpOnly=Aide uniquement
TypeHelpDev=Aide+Développement
TypeHelpDevForm=Aide+Développement+Formation
@ -25,3 +26,4 @@ LinkToGoldMember=Vous pouvez appeler immédiatement un des quelques accompagnate
PossibleLanguages=Langues disponibles
MakeADonation=Aidez le projet Dolibarr, faites un don
SubscribeToFoundation=Aidez le projet Dolibarr, adhérez à l'association Dolibarr
SeeOfficalSupport=Pour un accompagnement officielle Dolibarr dans votre langue : <br><b><a href="%s" target="_blank">%s</a></b>

7
htdocs/main.inc.php
View File

@ -1611,8 +1611,13 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
print "<!-- End Bookmarks -->\n";
}
//Dolibarr version
//Dolibarr version
$doliurl='http://www.dolibarr.org';
//local communities
if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es';
$appli='Dolibarr';
if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';

35
htdocs/support/index.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2008-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -100,7 +101,41 @@ print '</tr>';
print '</table>'."\n";
print "\n";
print '</div><div class="inline-block">';
// Official support
print '<table class="login" width="100%">';
print '<tr class="title">';
print '<td width="100%" align="left" valign="top">';
print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
print '<font style="'.$style1.'">'.$langs->trans("OfficialSupport").'</font>';
print '<br>'.$langs->trans("TypeOfSupport").': <font style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</font>';
print '<br>'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': ';
print $langs->trans("TypeHelpOnly").'/'.img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).'/'.img_picto_common('','star','',1).img_picto_common('','star','',1);
print '</td></tr></table>';
print '</td>';
print '</tr><tr>';
print '<td align="center" valign="top">';
print '<table class="nocellnopadd">';
print '<tr><td align="center">';
//TODO Create commercial dedicated page into dolibarr.org?
$urlofficialsupport='http://wiki.dolibarr.org/index.php/Dolibarr_help_and_support';
//TODO Create commercial dedicated page into dolibarr.fr?
if (preg_match('/fr/i',$langs->defaultlang)) $urlofficialsupport='http://wiki.dolibarr.org/index.php/Assistance_Dolibarr';
if (preg_match('/es/i',$langs->defaultlang)) $urlofficialsupport='http://www.dolibarr.es/soporte/';
print '<br>'.$langs->trans("SeeOfficalSupport",$urlofficialsupport,$langs->transnoentities("ClickHere")).'<br>';
print '</td></tr></table>';
print '</td>';
print '</tr>';
print '</table>'."\n";
print "\n";
print '</div><div class="inline-block">';
/*