diff --git a/html/index.php b/html/index.php index ed2a46648..b5ca40f9b 100644 --- a/html/index.php +++ b/html/index.php @@ -180,14 +180,14 @@ border:0px; text-decoration:none; font-family: helvetica,arial,sans-serif; background-image: url("image/bg-submit2.gif"); -background-repeat: repeat-x; +background-repeat: repeat-x repeat-y; background-position: left; text-decoration:none; font-family: helvetica,arial,sans-serif; border-width:0px; padding:2px 4px 2px 4px; cursor:pointer; -margin:1px 2px 1px 2px; +margin:31px 2px 1px 2px; -moz-border-radius:2px 2px; border-radius:2px 2px; font-size : 20px; @@ -198,10 +198,9 @@ cursor:pointer; background-color:white; border-style: solid; border-width: 0px; -font-color:blue; -margin:1px 2px 1px 2px; -margin-bottom: 9px; - +color:red; +background-image: url("image/bg-submit3.gif"); +background-repeat: repeat-x repeat-y; } @@ -221,7 +220,7 @@ if (defined("RECOVER") && isset ($_REQUEST['recover']) ) } echo ' -version 6.8.1.3 - '.$my_domain.' +version 6.8.1.4 - '.$my_domain.'

@@ -238,11 +237,11 @@ version 6.8.1.3 - '.$my_domain.'
- + - +'; @@ -273,7 +272,7 @@ if ( $g_captcha == true ) echo '
utilisateurUtilisateur
mot de passe Mot de passe
- +
@@ -292,11 +291,11 @@ echo '

- login + Login

-

or

+

OU

- email + Email

diff --git a/html/style-classic.css b/html/style-classic.css index 82cce2fa7..97610f10e 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -1645,7 +1645,6 @@ li.tabs_selected { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C2E3FC', endColorstr='#6393c1',GradientType=0 ); /* IE6-9 */ color:whitesmoke; margin-left: 2px; - padding: 12px 15px 15px 15px; border-top-left-radius: 10px; border-top-right-radius: 10px; border:1px #879ed4 solid; @@ -1656,7 +1655,7 @@ li.tabs { display:inline; background-color: inherit; color:inherit;margin-left: 0px; - padding: 15px 15px 0px 15px; + padding: 0px; border-top-left-radius: 10px; border-top-right-radius: 10px; border:1px #879ed4 solid; @@ -1666,13 +1665,37 @@ li.tabs:hover { display:inline; background-color: lightblue; color:wheat;margin-left: 2px; - padding: 15px 15px 0px 15px; + padding: 0px; border-top-left-radius: 10px; border-top-right-radius: 10px; border:1px #879ed4 solid; white-space: nowrap; } +@media only screen and (min-width: 1280px) { + li.tabs { + display:inline; + background-color: inherit; + color:inherit;margin-left: 0px; + padding: 15px 7px 0px 10px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; + border:1px #879ed4 solid; + +} + li.tabs:hover { + display:inline; + background-color: lightblue; + color:wheat;margin-left: 2px; + padding: 10px 10px 0px 10px; + border-top-left-radius: 5px; + border-top-right-radius: 5px; + border:1px #879ed4 solid; + } + li.tabs_selected { + padding: 12px 15px 15px 15px; + } +} ul.tabs a { text-decoration: none; color:inherit; @@ -1793,32 +1816,12 @@ tr.highlight a{ /******************************************************************************* * Inner_box on a smaller screen *******************************************************************************/ -@media only screen and (max-width: 1280px) { +@media only screen and (min-width: 1280px) { div.inner_box { width: 95%; left:2%; margin-bottom: 2%; } - li.tabs { - display:inline; - background-color: inherit; - color:inherit;margin-left: 0px; - padding: 10px 10px 0px 10px; - border-top-left-radius: 10px; - border-top-right-radius: 10px; - border:1px #879ed4 solid; - - } - li.tabs:hover { - display:inline; - background-color: lightblue; - color:wheat;margin-left: 2px; - padding: 10px 10px 0px 10px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; - border:1px #879ed4 solid; - - } } /***************************************************************************** * Table of one column to present menu diff --git a/html/style-mandarine.css b/html/style-mandarine.css index f8c3d31d1..f020a1aee 100644 --- a/html/style-mandarine.css +++ b/html/style-mandarine.css @@ -1827,11 +1827,16 @@ tr.highlight a{ background-color:grey !important; } -div.topmenu a.mtitle{ +//--- Top menu and menu2 +div.topmenu a.mtitle , div.menu2 a.mtitle{ font-size:13.6px; font-size:0.85rem; color:red; } +div.topmenu a.mtitle:hover,div.menu2 a.mtitle:hover{ + color:red; + background-color: transparent; +} div.topmenu td.selectedcell a.mtitle, div.menu2 a.mtitle{ font-size:13.6px; font-size:0.85rem; diff --git a/include/class_database.php b/include/class_database.php index 23344c506..cddbb001a 100644 --- a/include/class_database.php +++ b/include/class_database.php @@ -36,7 +36,7 @@ class Database private $db; /**< database connection */ private $ret; /**< return value */ - + private $is_open; /*!< true is connected */ /**\brief constructor * \param $p_database_id is the id of the dossier, or the modele following the * p_type if = 0 then connect to the repository @@ -108,8 +108,9 @@ class Database } } $this->db=$a; + $this->is_open=TRUE; if ($this->exist_schema('comptaproc')) - pg_exec($this->db, 'set search_path to public,comptaproc;'); + pg_exec($this->db, 'set search_path to public,comptaproc;'); pg_exec($this->db, 'set DateStyle to ISO, MDY;'); ob_end_clean(); } @@ -136,7 +137,7 @@ class Database { try { - + if ( ! $this->is_open ) throw new Exception(' Database is closed'); $this->sql=$p_string; $this->array=$p_array; @@ -176,6 +177,8 @@ class Database echo $a->getTraceAsString(); echo pg_last_error($this->db); } + $this->rollback(); + throw ($a); } @@ -228,6 +231,7 @@ class Database */ function commit() { + if ( ! $this->is_open) return; $Res=$this->exec_sql("commit"); } @@ -236,6 +240,7 @@ class Database */ function rollback() { + if ( ! $this->is_open) return; $Res=$this->exec_sql("rollback"); } @@ -973,7 +978,8 @@ class Database function close() { - pg_close($this->db); + if ( $this->is_open ) pg_close($this->db); + $this->is_open=FALSE; } /**\brief diff --git a/include/constant.php b/include/constant.php index 7b4649fea..a33d56cb6 100644 --- a/include/constant.php +++ b/include/constant.php @@ -73,7 +73,7 @@ define ('SMALLX','ⵝ'); -define ('SVNINFO',6813); +define ('SVNINFO',6814); define ("DEBUG",false); define ("LOGINPUT",false); @@ -108,12 +108,15 @@ if ( DEBUG ) { error_reporting(2147483647); ini_set("display_errors",1); ini_set("html_errors",1); + ini_set('log_errors',1); + ini_set('error_log','syslog'); } - else { - error_reporting(0); +else { + error_reporting(15); ini_set("display_errors",1); - ini_set("html_errors",1); - + ini_set("html_errors",0); + ini_set('log_errors',1); + ini_set('error_log','syslog'); } // Erreur define ("NOERROR",0);