From 7cc7e8392d8bdf09025724bd7a1336836c6329c4 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Mon, 17 Jun 2013 11:58:59 +0200 Subject: [PATCH 01/14] Fix ODT to PDF exec scripts path --- htdocs/includes/odtphp/odf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index 5326af0e116..d4467d7aeb8 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -458,7 +458,7 @@ IMG; $execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2); // 1 or 2 $name=str_replace('.odt', '', $name); - $command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name; + $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; //$dirname=dirname($name); //$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname; From dc5db0c1379903054e1ebc8462568005acbb2fea Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Tue, 18 Jun 2013 09:07:53 +0200 Subject: [PATCH 02/14] fix ODT to PDF script path --- htdocs/includes/odtphp/odf.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index d4467d7aeb8..94c69705442 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -458,7 +458,12 @@ IMG; $execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2); // 1 or 2 $name=str_replace('.odt', '', $name); - $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; + if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) { + $command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.$name; + }else { + $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; + } + //$dirname=dirname($name); //$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname; From 835b8e9d7ed738dbcf1619be0a940c3a72bf46ef Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Wed, 19 Jun 2013 11:23:43 +0200 Subject: [PATCH 03/14] Fix trad holidays --- htdocs/langs/fr_FR/holiday.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 35a043504eb..876d26c31dc 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -85,8 +85,8 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=Premier jour de congès -LastDayOfHoliday=Dernier jour de congès +FirstDayOfHoliday=Premier jour de congés +LastDayOfHoliday=Dernier jour de congés HolidaysMonthlyUpdate=Mise à jour mensuelle ManualUpdate=Mise à jour manuelle From 035edc12ce48438b4ef5c1847e32ab0a572fc976 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Wed, 19 Jun 2013 14:41:18 +0200 Subject: [PATCH 04/14] Fix [ bug #945 ] error adding a service --- htdocs/product/class/product.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 7973ab0db57..e9fcde9d67c 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -315,7 +315,7 @@ class Product extends CommonObject $sql.= ", ".$this->status; $sql.= ", ".$this->status_buy; $sql.= ", '".$this->canvas."'"; - $sql.= ", ".((! isset($this->finished) || $this->finished < 0)?'null':$this->finished); + $sql.= ", ".((empty($this->finished) || $this->finished < 0)?'null':$this->finished); $sql.= ")"; dol_syslog(get_class($this)."::Create sql=".$sql); @@ -463,7 +463,7 @@ class Product extends CommonObject $sql.= ",tosell = " . $this->status; $sql.= ",tobuy = " . $this->status_buy; - $sql.= ",finished = " . ((! isset($this->finished) || $this->finished < 0) ? "null" : $this->finished); + $sql.= ",finished = " . ((empty($this->finished) || $this->finished < 0) ? "null" : $this->finished); $sql.= ",weight = " . ($this->weight!='' ? "'".$this->weight."'" : 'null'); $sql.= ",weight_units = " . ($this->weight_units!='' ? "'".$this->weight_units."'": 'null'); $sql.= ",length = " . ($this->length!='' ? "'".$this->length."'" : 'null'); From 9f396718869cc9ce99bfacd5696c50337be4cadb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 19:40:19 +0200 Subject: [PATCH 05/14] Fix: Bad translation --- htdocs/langs/fr_FR/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4bb7b833596..2d9c4a329b8 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -556,7 +556,7 @@ Permission113= Configurer les comptes financiers (créer, gérer les catégories Permission114= Rapprocher les écritures bancaires Permission115= Exporter transactions et relevés Permission116= Saisir virements entre comptes -Permission117= Gérer les envois de chèques +Permission117= Gérer les dépots en banque de chèques reçus Permission121= Consulter les tiers (sociétés) liés à l'utilisateur Permission122= Créer/modifier les tiers (sociétés) liés à l'utilisateur Permission125= Supprimer les tiers (sociétés) liés à l'utilisateur From aaad4d3474c75bcdf5ec8408e88f462ee6b4d380 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 19:52:20 +0200 Subject: [PATCH 06/14] Fix: Menu cheque depends on bank module and not invoice. --- htdocs/core/menus/init_menu_auguria.sql | 6 +++--- htdocs/core/menus/standard/eldy.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 8f49ca9eb7e..bdcfc30937f 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -199,9 +199,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -- Check deposit -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 9, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->facture->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); -- Withdrawal insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 9f3637477bc..9a85f6224f5 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -906,7 +906,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Gestion cheques - if (! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) + if ((! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) { $newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks'); $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); From ec2e4c8a8ba855132ebc9f90858500988332b77c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 22:58:35 +0200 Subject: [PATCH 07/14] Fix: parenthesis at wrong place --- htdocs/core/menus/init_menu_auguria.sql | 6 +++--- htdocs/core/menus/standard/eldy.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index bdcfc30937f..eeeb699a844 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -199,9 +199,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -- Check deposit -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); -- Withdrawal insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 9a85f6224f5..f8bb5d57f6e 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -906,7 +906,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Gestion cheques - if ((! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) + if (! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) { $newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks'); $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); From f987fd2245ca132505eb0cce686ffc496c1bb840 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 23:46:18 +0200 Subject: [PATCH 08/14] Fix: Inconsistency arrays into php function --- htdocs/core/class/translate.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index b5f2dfce9c3..ffa06230d20 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -759,6 +759,7 @@ class Translate { $this->load("dict"); $label=array(); + foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label']; $num = $db->num_rows($resql); $i = 0; @@ -772,9 +773,9 @@ class Translate $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label']; $i++; } - + //print count($label).' '.count($this->cache_currencies); array_multisort($label, SORT_ASC, $this->cache_currencies); - + //var_dump($this->cache_currencies); $this->cache_currencies is now sorted onto label return $num; } else From 66d02240f520b5281a06afaa7b012643097de0b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 09:36:36 +0200 Subject: [PATCH 09/14] Fix: Missing translation --- htdocs/langs/en_US/opensurvey.lang | 2 ++ htdocs/langs/fr_FR/opensurvey.lang | 2 ++ htdocs/opensurvey/public/index.php | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang index f81dd5bec94..63471882927 100644 --- a/htdocs/langs/en_US/opensurvey.lang +++ b/htdocs/langs/en_US/opensurvey.lang @@ -37,6 +37,8 @@ PollManagement=Polls management BackToHoursSetup=Back to hours setup UrlForSurvey=URL to communicate to get a direct access to survey PollOnChoice=Your are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date survey +CreateSurveyStandard=Create a standard survey CheckBox=Simple checkbox YesNoList=List (empty/yes/no) PourContreList=List (empty/for/against) diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang index 12fc74f258d..f4a4df67782 100644 --- a/htdocs/langs/fr_FR/opensurvey.lang +++ b/htdocs/langs/fr_FR/opensurvey.lang @@ -37,6 +37,8 @@ PollManagement=Gestion du sondage BackToHoursSetup=Retour configuration heures UrlForSurvey=URL à communiquer pour accès direct au sondage PollOnChoice=Vous êtes en train de créer un sondage à choix multiples. Renseigner les différents choix possible de votre sondage: +CreateSurveyDate=Créer un sondage de dates +CreateSurveyStandard=Créer un sondage standard CheckBox=Case à cochée YesNoList=Liste (vide/oui/non) PourContreList=Liste (vide/pour/contre) diff --git a/htdocs/opensurvey/public/index.php b/htdocs/opensurvey/public/index.php index 557142d691d..fcbef77a4e0 100755 --- a/htdocs/opensurvey/public/index.php +++ b/htdocs/opensurvey/public/index.php @@ -53,7 +53,8 @@ print '
print $langs->trans("OrganizeYourMeetingEasily").'

-
+
+
'; From 4268ca0de21fa368b423f74fa5812a059d13528a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 09:40:02 +0200 Subject: [PATCH 10/14] Missing space --- htdocs/opensurvey/public/create_survey.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php index 2010a6fdd03..d5e6a930357 100755 --- a/htdocs/opensurvey/public/create_survey.php +++ b/htdocs/opensurvey/public/create_survey.php @@ -164,11 +164,11 @@ print '
'."\n"; $cocheplus=''; if ($_SESSION["canedit"]) $cocheplus="checked"; -print ''. $langs->trans("VotersCanModify") .'
'."\n"; +print ' '. $langs->trans("VotersCanModify") .'
'."\n"; if ($_SESSION["mailsonde"]) $cochemail="checked"; -print ''. $langs->trans("ToReceiveEMailForEachVote") .'
'."\n"; +print ' '. $langs->trans("ToReceiveEMailForEachVote") .'
'."\n"; if (GETPOST('choix_sondage')) { From a749e2bfaadfbfdb48d6086761aa9c5455314740 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 16:20:31 +0200 Subject: [PATCH 11/14] Fix: Still working on css debug. bureau2crea and cameleo are too bugged. I disable them with jmobile to have things working correctly. Conflicts: htdocs/theme/bureau2crea/style.css.php --- htdocs/main.inc.php | 8 +++ htdocs/theme/amarok/style.css.php | 25 ++++++++- htdocs/theme/auguria/style.css.php | 12 ++++ htdocs/theme/bureau2crea/style.css.php | 76 ++++++++++++++++++++++---- htdocs/theme/cameleo/style.css.php | 12 ++++ htdocs/theme/eldy/style.css.php | 19 +++++-- 6 files changed, 134 insertions(+), 18 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 310a9a5e2f2..b4691761100 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -679,6 +679,7 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme','alpha',1); $conf->css = "/theme/".$conf->theme."/style.css.php"; } + // Set javascript option if (! GETPOST('nojs')) // If javascript was not disabled on URL @@ -702,6 +703,13 @@ if (! empty($conf->browser->phone)) $conf->dol_no_mouse_hover=1; } +// Disabled bugged themes +if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) +{ + $conf->theme='eldy'; + $conf->css = "/theme/".$conf->theme."/style.css.php"; +} + if (! defined('NOREQUIRETRAN')) { if (! GETPOST('lang')) // If language was not forced on URL diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index dce3f0bfbed..5e57bcc1bc2 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -2065,6 +2065,9 @@ div.jnotify-background { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} .ui-btn-inner { min-width: .4em; padding-left: 10px; @@ -2074,9 +2077,19 @@ li.ui-li-divider .ui-link { font-size: px; } +.ui-btn-icon-right .ui-btn-inner { + padding-right: 34px; +} +.ui-btn-icon-left .ui-btn-inner { + padding-left: 34px; +} .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2091,7 +2104,11 @@ div.ui-controlgroup-controls div.tabsElem a -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2); -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2); box-shadow: 0 -3px 6px rgba(0,0,0,.2); - border: none; +} +div.ui-controlgroup-controls div.tabsElem a#active { + -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + box-shadow: 0 -3px 6px rgba(0,0,0,.3); } a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text @@ -2139,6 +2156,12 @@ div.ui-radio padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + + close(); ?> diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 4238327a35b..14685d261b3 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -2254,6 +2254,9 @@ div.ecmjqft { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; } @@ -2270,6 +2273,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2332,6 +2339,11 @@ div.ui-radio } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + close(); ?> diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index cc31da801d0..0ac7c62c074 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -57,6 +57,12 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); $fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12'; $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11'; + +$path=''; // This value may be used in future for external module to overwrite theme +$theme='bureau2crea'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } + +// Define image path files $fontlist='arial, sans-serif, verdana, helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; @@ -66,9 +72,6 @@ $dol_optimize_smallscreen=$conf->dol_optimize_smallscreen; $dol_no_mouse_hover=$conf->dol_no_mouse_hover; $dol_use_jmobile=$conf->dol_use_jmobile; -$path=''; // This value may be used in future for external module to overwrite theme -$theme='bureau2crea'; // Value of theme -if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } ?> @@ -301,7 +304,7 @@ div.fichethirdleft { dol_optimize_smallscreen)) { print "width: 35%;\n"; } ?> } div.fichetwothirdright { - dol_optimize_smallscreen)) { print "float: ".$left.";\n"; } ?> + dol_optimize_smallscreen)) { print "float: ".$right.";\n"; } ?> dol_optimize_smallscreen)) { print "width: 65%;\n"; } ?> } div.fichehalfleft { @@ -309,7 +312,7 @@ div.fichehalfleft { dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.fichehalfright { - dol_optimize_smallscreen)) { print "float: ".$left.";\n"; } ?> + dol_optimize_smallscreen)) { print "float: ".$right.";\n"; } ?> dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { @@ -957,7 +960,7 @@ img.toolbarbutton { * RESIZER-BARS */ .ui-layout-resizer { /* all 'resizer-bars' */ - width: 8px !important; + width: dol_optimize_smallscreen)?'8':'24'); ?>px !important; } .ui-layout-resizer-hover { /* affects both open and closed states */ } @@ -966,7 +969,7 @@ img.toolbarbutton { /*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */ .ui-layout-resizer-dragging { /* resizer beging 'dragging' */ background: #DDD; - width: 8px; + width: dol_optimize_smallscreen)?'8':'24'); ?>px; } .ui-layout-resizer-dragging { /* CLONED resizer being dragged */ border-left: 1px solid #BBB; @@ -1079,6 +1082,8 @@ img.toolbarbutton { border: 1px solid #BBB; border-width: 0; } +.ecm-layout-resizer-closed { +} .ecm-in-layout-center { border-left: 1px !important; @@ -1731,7 +1736,7 @@ border: 0px; } div.titre { - font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; + font-family: ; font-weight: normal; color: #842F00; font-size: 16px; @@ -1929,9 +1934,30 @@ li.cal_event { border: none; list-style-type: none; } /* Ajax - Liste deroulante de l'autocompletion */ /* ============================================================================== */ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 0.9em; } .ui-autocomplete-loading { background: white url() right center no-repeat; } - +.ui-autocomplete { + position:absolute; + width:auto; + font-size: 1.0em; + background-color:white; + border:1px solid #888; + margin:0px; + padding:0px; + } +.ui-autocomplete ul { + list-style-type:none; + margin:0px; + padding:0px; + } +.ui-autocomplete ul li.selected { background-color: #D3E5EC;} +.ui-autocomplete ul li { + list-style-type:none; + display:block; + margin:0; + padding:2px; + height:18px; + cursor:pointer; + } /* ============================================================================== */ /* jQuery - jeditable */ @@ -2106,9 +2132,22 @@ A.none, A.none:active, A.none:visited, A.none:hover { line-height:1.5; zoom:1; font-weight: normal; - font-family:Verdana,Arial,sans-serif; + font-family:; font-size:1em; } +.ui-widget { + font-family:; + font-size:px; +} +.ui-button { margin-left: -1px; } +.ui-button-icon-only .ui-button-text { height: 8px; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; } +.ui-button-text +{ + line-height: 1em !important; +} +.ui-autocomplete-input { margin: 0; padding: 1px; } + table.noborder { margin-bottom: 10px; @@ -2406,7 +2445,7 @@ div.ecmjqft { /* Core Styles */ .ecmjqft LI.directory { font-weight:normal; background: url() left top no-repeat; } .ecmjqft LI.expanded { font-weight:normal; background: url() left top no-repeat; } -.ecmjqft LI.wait { font-weight:normal; background: url() left top no-repeat; } +.ecmjqft LI.wait { font-weight:normal; background: url() left top no-repeat; } /* ============================================================================== */ @@ -2434,6 +2473,9 @@ div.ecmjqft { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; } @@ -2446,6 +2488,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2507,6 +2553,12 @@ div.ui-radio padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + + close(); ?> diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 7b1c9762db0..c2c020bb035 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -2299,6 +2299,9 @@ div.ecmjqft { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; } @@ -2315,6 +2318,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2376,6 +2383,11 @@ div.ui-radio padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + close(); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 27c1a2cce90..bb5025b72f4 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1107,9 +1107,6 @@ td.photo { padding: 0 4px 0 4px !important; } -.toolbar { - height: 34px !important; -} a.toolbarbutton { margin-top: 0px; @@ -2623,7 +2620,7 @@ li.ui-li-divider .ui-link { color: #FFF !important; } .ui-btn { - margin: 0.2em 4px + margin: 0.1em 2px } a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; @@ -2641,9 +2638,15 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-btn-icon-right .ui-btn-inner { padding-right: 34px; } +.ui-btn-icon-left .ui-btn-inner { + padding-left: 34px; +} .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 38px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 38px; +} .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2657,8 +2660,13 @@ div.ui-controlgroup-controls div.tabsElem a -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2); -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2); box-shadow: 0 -3px 6px rgba(0,0,0,.2); - border: none; } +div.ui-controlgroup-controls div.tabsElem a#active { + -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + box-shadow: 0 -3px 6px rgba(0,0,0,.3); +} + a.tab span.ui-btn-inner { border: none; @@ -2710,6 +2718,7 @@ ul.ulmenu { -webkit-border-radius: 0; } + close(); ?> From a1f9b22210d3be81e392557be6f7cff23c9e0809 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 16:21:54 +0200 Subject: [PATCH 12/14] Fix: Missing icon --- htdocs/theme/cameleo/img/menus/holiday.png | Bin 0 -> 1816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/theme/cameleo/img/menus/holiday.png diff --git a/htdocs/theme/cameleo/img/menus/holiday.png b/htdocs/theme/cameleo/img/menus/holiday.png new file mode 100644 index 0000000000000000000000000000000000000000..27b653d93ba448745bf4a7fa9597899efaee5698 GIT binary patch literal 1816 zcmV+z2j}>SP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyr0 z4G9*@T5-Ps00x*zL_t(Y$F)~$a8=b6{?^{-ocq3DxDt|-q>=}LLg7cT1&VDMessne zW&}nVJCy-x?Q5+4)z0V$RB1bHe-x)`wT@zxDILYf=!~OM1@cfT7_k}>asv_|Z<2d+ zZ|*(!oW1wzk4w@}ffAFhU;FG?d+l$1=ljmA1AKw-Jny=53%{(NQf-<_vg^7C27}{k zNkmJSxdK215k&xy);frXmKTDO-VzUYd@|K$X{ra9Ip}%b0|2%Fm<7NBU;_{!0StDL z^`~`)omkFjbJiHz5&V7oO8_wT^IAmqbY8Q*b-h4_?yiv->D``s|Mfj$>DmCa0#UIa zAw;n|I|$i%6iP`6GEp{I!psM9zo`4bDE^tz)C#~K{$Vvrp6t5fJ>vSQMy#i zF5r`3-wwd{JoY^guIs|hyU2}=B75KwWHT0WDNSxxvzIgM7kGu%II1=8PyMJmUh-rY zhPKyCk0CFO3o5S<;8$BW@>rIHWvhWd{LKp34hN*9fMtWyDGp{w2tvSUW>z2&KmZrz z!5aXo1F$slRPu`h>f2OI+c zyuFs94#~hJl?o8ZFv_ZlM*3qjChG2W)u=pp`MYoKXulEQc|wTNzU1j`iKWXPsJinT z-($c(_@>BVb(|q(_tv%&)N)utnc`1=dY@D{s{yQdv0f0k?k3_Xr>A}GPRK1;K0J_NP z0uX@aKxoHjqa#!mpZ&s&*#3X&tgk;}S@!6$W5;>&e&xZ_Xz6Ijs=E5e#`n(lUO-h@ z#q?}{t@!A~$52X<5W>9j@`2B@x$tr}uLkC-4ApFVl$4>R%rx86#@7Z~X{drS+KN^5 zr}u8?o1DLV*;n!ATW?n;lU+m8ZSIPIlJB13TQ)4Z`%5K}p8`+>p$xOKCFq^g>Wwt8 zIl6g2vimnroXO|&UvFzW`RsH7UHO%r`6C{_ZP9BNhSIvbKjoYq7>=A9OwCI6q~q%r z#y0^#cK>EHH#bil$z-xMkN$a2`u_t6z?#)7-zkj;v*%MT^^CYUH<&|rf0q4RM&fHv zRJXOfHh;M9?8@NRyQV%5Wtw&(_RXCW z&ut%n_+sPH=8dO%b4XJsP zL@R)f_$?28Hu;{hmR}>X>cMLR8hdXyA}jAN&OQh4zb~B{-g>e8j(XYoyyI&Fr5T0+ z)*4pDYN-BJI3^3*aWEhjpxQaZwjChb76>>tY|DZ%rXU?>kcb8ai9>AktMTvr_V9!= zJBy|a)o%F@pwSbLA-?P<$agl_=Hj{atkquM^P}B;!%#Qf!RZekC!ZxeUqdMc-dMp62!;#%!zLlI{aguTZ6bTW+TBCH%Vpd8+`I@xW00Dv|F#l#q+W~0>X$ja; zKu8HGEsS2wLZu4`&I!X9Q|wv_Vyyv)=b5>TfINWnY)q>FS^%UbzSPXT6KwiP%Ef?~ z&Bg>lWP?Q578G@)V{yP(LP*;v-x9WC6GdrUg3KBqacK=i6EVc*&H{6B!!UzLfRzGC z5ryXU!MeM0mkGUNZ&5?plTRVKX!|v-nD1(cnu1qu1w&=Z%~e>TNI96xKr|OX0ze6C z6(=DhM){7gY`Qdl_-ss`!5JbNX6Ex?ZYRPk!I~|dQy$Rroec=p-gWi=wB&OZh-?5h z5iBMW#1PEm69^kH875ZHS{bk4MwZ-T03e@iK&a;Pwf_y%ofD5X-OD2Y0000 Date: Thu, 20 Jun 2013 16:39:17 +0200 Subject: [PATCH 13/14] Fix: all forms must react same way with option optimize_small_screen --- htdocs/core/lib/company.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 170d2cb9da2..28bbe1c5767 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -408,7 +408,9 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') if (! empty($conf->projet->enabled) && $user->rights->projet->creer) { //$buttoncreate=''.$langs->trans("AddProject").''; - $buttoncreate=''.$langs->trans("AddProject").' '.img_picto($langs->trans("AddProject"),'filenew').''."\n"; + $buttoncreate=''.$langs->trans("AddProject"); + if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($langs->trans("AddProject"),'filenew'); + $buttoncreate.=''."\n"; } print "\n"; From 253ce19bc1165aa586e9e4de7201ee9fe198371c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Jun 2013 15:26:46 +0200 Subject: [PATCH 14/14] Fix: Bad position of field --- htdocs/core/tpl/login.tpl.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 58710d9f0e4..be66c742cb9 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -72,14 +72,14 @@ $(document).ready(function () { - - + - - +
+
+