update style and fix some bug

This commit is contained in:
Dany De Bontridder 2015-08-07 01:26:31 +02:00
parent 6633c7d0df
commit 6b3eebb9ea
5 changed files with 63 additions and 47 deletions

View file

@ -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;
}
</style>
<script src="js/scripts.js" type="text/javascript"></script>
@ -221,7 +220,7 @@ if (defined("RECOVER") && isset ($_REQUEST['recover']) )
}
echo '
<span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
version 6.8.1.3 - '.$my_domain.'
version 6.8.1.4 - '.$my_domain.'
</span>
<BR>
<BR>
@ -238,11 +237,11 @@ version 6.8.1.3 - '.$my_domain.'
<TABLE><TR><TD>
<TABLE BORDER=0 CELLSPACING=0>
<TR>
<TD class="cell">utilisateur</TD>
<TD class="cell">Utilisateur</TD>
<TD><input type="text" class="input_text" value="" id="p_user" name="p_user" tabindex="1"></TD>
</TR>
<TR>
<TD class="cell"> mot de passe </TD>
<TD class="cell"> Mot de passe </TD>
<TD><INPUT TYPE="PASSWORD" class="input_text" value="" NAME="p_pass" tabindex="2"></TD>
</TR>';
@ -273,7 +272,7 @@ if ( $g_captcha == true )
echo '
<TR style="height:50px;vertical-align:bottom">
<TD style="width:auto;text-align:center" colspan="2">
<INPUT TYPE="SUBMIT" style="width:60%;height:32px;-moz-border-radius:10px;border-radius:10px" class="button" NAME="login" value="Se connecter">
<INPUT TYPE="SUBMIT" style="width:250px;height:48px;-moz-border-radius:10px;border-radius:10px" class="button" NAME="login" value="Se connecter">
</TD>
</TR>
</table>
@ -292,11 +291,11 @@ echo '
<input type="hidden" value="send_email" name="id">
<input type="hidden" value="recover" name="recover" >
<p>
login <input type="text" class="input_text" name="login" nohistory>
Login <input type="text" class="input_text" name="login" nohistory>
</p>
<p>or</p>
<p>OU</p>
<p>
email <input type="text" class="input_text" name="email" nohistory>
Email <input type="text" class="input_text" name="email" nohistory>
</p>
<input type="submit" class="button" name="send_email" value="Envoi email">

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -73,7 +73,7 @@ define ('SMALLX','&#x2D5D;');
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);