From 43d2244e7baa2e8ecdd156e2132822c1e23e4c39 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:52:45 +0000 Subject: [PATCH 1/8] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 ++++++++++++--------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d47a4791ecd..52d6791b7e2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,7 +2,6 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin - * Copyright (C) 2011 Philippe Grand * * 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 @@ -21,7 +20,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ + * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -816,9 +815,10 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; + -moz-border-radius-bottomleft:6px; + -moz-border-radius-bottomright:6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,9 +856,8 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -872,9 +871,8 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -888,9 +886,8 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -904,9 +901,8 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -932,9 +928,8 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1216,7 +1211,6 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } - .box { padding-right: 0px; padding-left: 0px; @@ -1233,6 +1227,8 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; + -moz-border-radius-topleft:6px; + -moz-border-radius-topright:6px; } tr.box_impair { @@ -1273,8 +1269,6 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #efefd4; } @@ -1284,8 +1278,6 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius: 6px; background: #EFCFCF; } @@ -1296,8 +1288,6 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; - -webkit-border-radius: 6px; - border-radius:6px; background: #efefd4; } @@ -1391,8 +1381,6 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; --webkit-border-radius: 6px; -border-radius: 6px; } @@ -1414,9 +1402,7 @@ border-radius: 6px; } .bodyline { - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - border-radius: 8px; + -moz-border-radius:8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1512,7 +1498,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; } From f5b197d207d08b52788900e4096a2d02dec800e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 22:58:48 +0000 Subject: [PATCH 2/8] Restore stable version to allow 3.1 branch creation --- htdocs/theme/eldy/style.css.php | 52 +++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 52d6791b7e2..d47a4791ecd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2006 Rodolphe Quiedeville * Copyright (C) 2007-2011 Regis Houssin + * Copyright (C) 2011 Philippe Grand * * 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 @@ -20,7 +21,7 @@ /** * \file htdocs/theme/eldy/style.css.php * \brief Fichier de style CSS du theme Eldy - * \version $Id: style.css.php,v 1.93 2011/08/07 22:52:45 eldy Exp $ + * \version $Id: style.css.php,v 1.94 2011/08/07 22:58:48 eldy Exp $ */ //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language @@ -815,10 +816,9 @@ div.tabBar { padding-right: 8px; padding-bottom: 8px; margin: 0px 0px 10px 0px; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; - -moz-border-radius-bottomleft:6px; - -moz-border-radius-bottomright:6px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-right: 1px solid #555555; border-bottom: 1px solid #555555; border-left: 1px solid #D0D0D0; @@ -856,8 +856,9 @@ a.tab:link { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -871,8 +872,9 @@ a.tab:visited { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -886,8 +888,9 @@ a.tab#active { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -901,8 +904,9 @@ a.tab:hover { padding: 0px 6px; margin: 0em 0.2em; text-decoration: none; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -928,8 +932,9 @@ span.tabspan { margin: 0em 0.2em; text-decoration: none; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; border-: 1px solid #555555; border-: 1px solid #D8D8D8; @@ -1211,6 +1216,7 @@ border: 0px; box-shadow: 4px 4px 4px #CCC; } + .box { padding-right: 0px; padding-left: 0px; @@ -1227,8 +1233,6 @@ font-family: , sans-serif; font-weight: normal; border-bottom: 1px solid #FDFFFF; white-space: nowrap; - -moz-border-radius-topleft:6px; - -moz-border-radius-topright:6px; } tr.box_impair { @@ -1269,6 +1273,8 @@ div.warning { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #efefd4; } @@ -1278,6 +1284,8 @@ div.error { margin: 0.5em 0em 0.5em 0em; border: 1px solid #8C9CAB; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; background: #EFCFCF; } @@ -1288,6 +1296,8 @@ div.info { margin: 0.5em 0em 0.5em 0em; border: 1px solid #e0e0d0; -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; background: #efefd4; } @@ -1381,6 +1391,8 @@ z-index: 3000; background-color: #FFFFF0; opacity: 1; -moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; } @@ -1402,7 +1414,9 @@ opacity: 1; } .bodyline { - -moz-border-radius:8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; border: 1px #E4ECEC outset; padding: 0px; margin-bottom: 5px; @@ -1498,7 +1512,7 @@ td.hidden { .cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FFFFFF; border: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -table.cal_event { border-collapse: collapse; margin-bottom: 1px; } +table.cal_event { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; } table.cal_event td { border: 0px; padding-: 0px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } .cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; } From 9b24e466eb731ed90781e3c53b917b56effc02f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:44:55 +0000 Subject: [PATCH 3/8] Work on package From ec6e94556142d7072a3fadb2a077175bdb284d59 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH 4/8] Work on package From 1ff6bed07cb30028015c3e1d678f1bda4df0e00a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 00:44:51 +0000 Subject: [PATCH 5/8] Fix: Do not close automatically deposits From fa378def70b43ae2a041ea778af5c42645cf8f5e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:01:45 +0000 Subject: [PATCH 6/8] Fix: Do not close automatically deposits From 6cef802a6634f41a7c9335bd69018ca66de93706 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:10:07 +0000 Subject: [PATCH 7/8] Fix: Use short instead of long labels From e765eb77e543de0052fa211cf55a53d3147f92af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Aug 2011 01:53:25 +0000 Subject: [PATCH 8/8] Fix: When a line is defined as option, it was not possible to remove "options" then.