From cbf44bf17502b179bd1835215b1750ca9049dd20 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Apr 2013 12:10:04 +0200 Subject: [PATCH 1/5] Change to be compatible with jmobile --- htdocs/theme/amarok/style.css.php | 2 +- htdocs/theme/auguria/style.css.php | 11 +++++++++ htdocs/theme/bureau2crea/style.css.php | 33 +++++++++++++++++++++++++- htdocs/theme/cameleo/style.css.php | 11 +++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 8f190c664e0..cf243f769e3 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -2047,7 +2047,6 @@ div.ui-controlgroup-controls div.tabsElem a box-shadow: 0 -3px 6px rgba(0,0,0,.2); border: none; } -div.ui-controlgroup-horizontal a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text { @@ -2072,6 +2071,7 @@ div.tabsElem a.ui-btn-corner-all { border-bottom-right-radius: 0px; } + close(); ?> diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 38129cbb0f8..bf9b9c7aeee 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -2202,6 +2202,17 @@ div.ecmjqft { box-shadow: 0px 0px 10px #AAA; } + +/* ============================================================================== */ +/* JMobile */ +/* ============================================================================== */ + +.ui-body-c { + border: none; + text-shadow: none; +} + + close(); ?> diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 0becc3f0234..5bf68effb41 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1107,7 +1107,6 @@ div.tabs a.tab { color: #FFFFFF; text-decoration: none; position: relative; - float: left; padding: 0px 10px 0px 10px; } @@ -2421,6 +2420,38 @@ div.ecmjqft { } +/* ============================================================================== */ +/* JMobile */ +/* ============================================================================== */ + +.ui-btn-inner { + padding-left: 10px; + padding-right: 10px; + white-space: normal; +} + +div.ui-controlgroup-controls div.tabsElem, div.ui-controlgroup-controls div.tabsElem a.tab +{ + height: 22px; +} + +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: 22px +} + +.ui-body-c { + border: none; + text-shadow: none; +} + + close(); ?> diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index fad419cf922..a1e3e7a44c9 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -2247,6 +2247,17 @@ div.ecmjqft { } + +/* ============================================================================== */ +/* JMobile */ +/* ============================================================================== */ + +.ui-body-c { + border: none; + text-shadow: none; +} + + close(); ?> From f7aa90b3b31721062d735293d62c4712186b0c10 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Apr 2013 12:43:23 +0200 Subject: [PATCH 2/5] Add user help --- htdocs/langs/en_US/users.lang | 3 ++- htdocs/langs/fr_FR/users.lang | 3 ++- htdocs/user/fiche.php | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index b922617ef31..35ef2cfb386 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -115,4 +115,5 @@ YourQuotaOfUsersIsReached=Your quota of active users is reached ! NbOfUsers=Nb of users DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin HierarchicalResponsible=Hierarchical responsible -HierarchicView=Hierarchical view \ No newline at end of file +HierarchicView=Hierarchical view +UseTypeFieldToChange=Use field Type to change \ No newline at end of file diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 2b6e398d035..bb5b7fb608b 100644 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -115,4 +115,5 @@ YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint ! NbOfUsers=Nb d'utilisateurs DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin HierarchicalResponsible=Responsable hierarchique -HierarchicView=Vue hiérarchique \ No newline at end of file +HierarchicView=Vue hiérarchique +UseTypeFieldToChange=Modifier le champ Type pour changer \ No newline at end of file diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 98d3e85d343..275fd83f1a5 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -1848,6 +1848,7 @@ else { print $langs->trans("ThisUserIsNot"); } + print ' ('.$langs->trans("UseTypeFieldToChange").')'; print ''; print "\n"; } From bca399623fbe9cb4ce03fbd2c853f762721f53bb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Apr 2013 12:44:36 +0200 Subject: [PATCH 3/5] Fix: finish merge --- htdocs/core/modules/syslog/mod_syslog_file.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php index a628ee02d3e..e7e2c01372d 100644 --- a/htdocs/core/modules/syslog/mod_syslog_file.php +++ b/htdocs/core/modules/syslog/mod_syslog_file.php @@ -96,17 +96,9 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface /** * Return the parsed logfile path * -<<<<<<< HEAD * @param string $suffixinfilename When output is a file, append this suffix into default log filename. * @return string -======= -<<<<<<< OURS * @return string -======= - * @param string $suffixinfilename When output is a file, append this suffix into default log filename. - * @return string ->>>>>>> THEIRS ->>>>>>> refs/remotes/origin/3.3 */ private function getFilename($suffixinfilename='') { From 95f6b576b2da6540318bf48f2f73a0a1151a6180 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Apr 2013 14:20:23 +0200 Subject: [PATCH 4/5] Look: Minor fix --- htdocs/theme/amarok/style.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index cf243f769e3..deb5485aa39 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -577,7 +577,7 @@ div.vmenu { .blockvmenupair .menu_titre, .blockvmenuimpair .menu_titre { height:22px; line-height:22px; - text-align:center; + /* text-align:center; */ background-color:rgba(0,0,0,.08); background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); @@ -591,7 +591,7 @@ div.vmenu { color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); - padding-left:3px; + padding-left:5px; border-top:solid 1px rgba(255,255,255,.5); border-bottom:solid 1px rgba(0,0,0,.5); } From 304cf641c0c2f3a0949abab8830a262a761a415f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 24 Apr 2013 14:39:34 +0200 Subject: [PATCH 5/5] Prepare 3.4 --- build/rpm/dolibarr_fedora.spec | 3 ++- build/rpm/dolibarr_generic.spec | 3 ++- build/rpm/dolibarr_mandriva.spec | 3 ++- build/rpm/dolibarr_opensuse.spec | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 95b3fc0f179..f805e7cf470 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -165,7 +165,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/commande -%_datadir/dolibarr/htdocs/commissions %_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/contact @@ -187,8 +186,10 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin +%_datadir/dolibarr/htdocs/opensurvey %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal +%_datadir/dolibarr/htdocs/printipp %_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/public diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index cee4ab9f6ec..1961ebbf161 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -241,7 +241,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/commande -%_datadir/dolibarr/htdocs/commissions %_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/contact @@ -263,8 +262,10 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin +%_datadir/dolibarr/htdocs/opensurvey %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal +%_datadir/dolibarr/htdocs/printipp %_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/public diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 62758af82b4..9c36baf79d9 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -162,7 +162,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/commande -%_datadir/dolibarr/htdocs/commissions %_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/contact @@ -184,8 +183,10 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin +%_datadir/dolibarr/htdocs/opensurvey %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal +%_datadir/dolibarr/htdocs/printipp %_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/public diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index eb2bbc859f4..99f7c94a986 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -173,7 +173,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/categories %_datadir/dolibarr/htdocs/comm %_datadir/dolibarr/htdocs/commande -%_datadir/dolibarr/htdocs/commissions %_datadir/dolibarr/htdocs/compta %_datadir/dolibarr/htdocs/conf %_datadir/dolibarr/htdocs/contact @@ -195,8 +194,10 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/livraison %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin +%_datadir/dolibarr/htdocs/opensurvey %_datadir/dolibarr/htdocs/paybox %_datadir/dolibarr/htdocs/paypal +%_datadir/dolibarr/htdocs/printipp %_datadir/dolibarr/htdocs/product %_datadir/dolibarr/htdocs/projet %_datadir/dolibarr/htdocs/public