diff --git a/build/rpm/README b/build/rpm/README
index 6f2e6634f4b..ffdb6d24a53 100644
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -26,8 +26,9 @@ with format RPM (for Redhat, OpenSuse, Mandriva, ...).
# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage)
#
# On OpenSuse
-# yast --install dolibarr-...rpm To install package and dependencies
-# yast --remove dolibarr To remove package
+# zypper install dolibarr-...rpm To install package and dependencies
+# zypper remove dolibarr To remove package
+# zypper search xxx To search a package
#
# On Mageia (after su - root)
# urpmi dolibarr-...rpm To install package and dependencies
diff --git a/build/rpm/install.forced.php.generic b/build/rpm/install.forced.php.generic
index 0d8b1214ad1..718eade3696 100755
--- a/build/rpm/install.forced.php.generic
+++ b/build/rpm/install.forced.php.generic
@@ -18,4 +18,6 @@ $force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='444';
+// Value to overwrite path to use shared libraries/fonts instead of embedded one
+// We don't force any external lib with generic package
?>
\ No newline at end of file
diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse
index 90c4d6ab182..06a0074b04d 100755
--- a/build/rpm/install.forced.php.opensuse
+++ b/build/rpm/install.forced.php.opensuse
@@ -19,10 +19,10 @@ $force_install_nophpinfo='1';
$force_install_lockinstall='444';
// Value to overwrite path to use shared libraries/fonts instead of embedded one
-$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
+//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
//$force_dolibarr_lib_GEOIP_PATH='';
-$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
+//$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
//$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
$force_dolibarr_lib_PHPEXCEL_PATH='';
$force_dolibarr_lib_TCPDF_PATH='';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 97658572831..49f7268b875 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3775,14 +3775,16 @@ class Form
*/
function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='')
{
+ global $langs,$conf;
+
$ret='';
if (empty($fieldid)) $fieldid='rowid';
if (empty($fieldref)) $fieldref='ref';
//print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
$object->load_previous_next_ref((isset($object->next_prev_filter)?$object->next_prev_filter:''),$fieldid);
- $previous_ref = $object->ref_previous?''.img_previous().'':'';
- $next_ref = $object->ref_next?''.img_next().'':'';
+ $previous_ref = $object->ref_previous?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Previous"),'previous.png'):' ').'':'';
+ $next_ref = $object->ref_next?''.(empty($conf->dol_use_jmobile)?img_picto($langs->trans("Next"),'next.png'):' ').'':'';
//print "xx".$previous_ref."x".$next_ref;
if ($previous_ref || $next_ref || $morehtml) {
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 53f1aba9e19..486748f92a7 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -196,7 +196,8 @@ if (! $error)
elseif ($db->error && ! (! empty($_POST["db_create_database"]) && $db->connected))
{
// Note: you may experience error here with message "No such file or directory" when mysql was installed for the first time but not yet launched.
- print ''.$db->error.'
';
+ if ($db->error == "No such file or directory") print ''.$langs->trans("ErrorToConnectToMysqlCheckInstance").'
';
+ else print ''.$db->error.'
';
if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'
';
//print '';
print $langs->trans("ErrorGoBackAndCorrectParameters");
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 3cfee357c81..a9de1c511a8 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -121,6 +121,7 @@ ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP
ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
ErrorNewValueCantMatchOldValue=New value can't be equal to old one
ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
+ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 5081f66d5f7..08c14dc5c35 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -122,6 +122,7 @@ ErrorFailedToAddToMailmanList=Echec de l'ajout de %s à la liste Mailman %s ou b
ErrorFailedToRemoveToMailmanList=Echec de la suppression de %s de la liste Mailman %s ou base SPIP
ErrorNewValueCantMatchOldValue=La nouvelle valeur ne peut être égale à l'ancienne
ErrorFailedToValidatePasswordReset=Echec de la réinitialisation du mot de passe. Il est possible que ce lien ait déjà été utilisé (l'utilisation de ce lien ne fonctionne qu'une fois). Si ce n'est pas le cas, essayer de recommencer le processus de réinit de mot de passe depuis le début.
+ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de donnée. Vérifier que Mysql est bien lancé (dans la plupart des cas, vous pouvez le lancer depuis la ligne de commande par la commande 'sudo /etc/init.d/mysql start').
# Warnings
WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index deb5485aa39..b54ed11fc69 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -2071,6 +2071,12 @@ div.tabsElem a.ui-btn-corner-all {
border-bottom-right-radius: 0px;
}
+.ui-btn-icon-left .ui-icon {
+ left: 8px;
+}
+.ui-btn-icon-right .ui-icon {
+ right: 8px;
+}
close();
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index bf9b9c7aeee..f6c6e177696 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -2212,6 +2212,21 @@ div.ecmjqft {
text-shadow: none;
}
+div.tabsElem a.ui-btn-corner-all {
+ -webkit-border-bottom-left-radius: 0px;
+ -moz-border-radius-bottomleft: 0px;
+ border-bottom-left-radius: 0px;
+ -webkit-border-bottom-right-radius: 0px;
+ -moz-border-radius-bottomright: 0px;
+ border-bottom-right-radius: 0px;
+}
+
+.ui-btn-icon-left .ui-icon {
+ left: 8px;
+}
+.ui-btn-icon-right .ui-icon {
+ right: 8px;
+}
close();
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 5bf68effb41..15ad13654e3 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -2430,9 +2430,15 @@ div.ecmjqft {
white-space: normal;
}
+div.ui-controlgroup
+{
+ height: auto;
+ background-image: none;
+}
+
div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab
{
- height: 22px;
+ height: auto;
}
a.tab span.ui-btn-inner
@@ -2443,7 +2449,7 @@ a.tab span.ui-btn-inner
div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text {
background-image: none;
color: #D45416;
- height: 22px
+ height: auto;
}
.ui-body-c {
@@ -2451,6 +2457,12 @@ div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text,
text-shadow: none;
}
+.ui-btn-icon-left .ui-icon {
+ left: 8px;
+}
+.ui-btn-icon-right .ui-icon {
+ right: 8px;
+}
close();
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index a1e3e7a44c9..74f5bc86278 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -2257,6 +2257,34 @@ div.ecmjqft {
text-shadow: none;
}
+div.ui-controlgroup
+{
+ height: auto;
+ background-image: none;
+}
+
+div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab
+{
+ height: auto;
+}
+
+a.tab span.ui-btn-inner
+{
+ border: none;
+ padding: 0;
+}
+div.tabs a.tab#active span.ui-btn-inner, div.tabs a.tab#active span.ui-btn-text, div.tabs a.tab span.ui-btn-inner, div.tabs a.tab span.ui-btn-text {
+ background-image: none;
+ color: #D45416;
+ height: auto;
+}
+
+.ui-btn-icon-left .ui-icon {
+ left: 8px;
+}
+.ui-btn-icon-right .ui-icon {
+ right: 8px;
+}
close();