diff --git a/html/image/bg-submit4.png b/html/image/bg-submit4.png new file mode 100644 index 000000000..34f6c5afb Binary files /dev/null and b/html/image/bg-submit4.png differ diff --git a/html/style-color.css b/html/style-color.css index 01386f9ce..fecefeced 100644 --- a/html/style-color.css +++ b/html/style-color.css @@ -1,24 +1,24 @@ /* */ div.add_todo_list { - border:1px solid blue; - display:none; - background-color:#BFD0FF; - padding:3; - position:absolute; - text-align:left; - line-height:3em; - z-index:1} + border:1px solid blue; + display:none; + background-color:#BFD0FF; + padding:3; + position:absolute; + text-align:left; + line-height:3em; + z-index:1} div.welcome { } @@ -856,57 +879,56 @@ div.gest_name { h2.gest_name { border-left: 5px solid #403a8d; border-bottom:1px solid #b4bbc2; - border-top:1px solid #b4bbc2; - border-right:1px solid #b4bbc2; + border-top:1px solid #b4bbc2; + border-right:1px solid #b4bbc2; padding: 5px; } div.op_detail_frame { - background-color:#e4e7ed; - height:100%; width:100%; + background-color:#e4e7ed; + height:100%; width:100%; } div.inner_box { - background-color:#dddddd; - font-size:12; + background-color:#e4e7ed; + font-size:10; + font-family:verdana,helvetica,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:3; - padding:0; - margin:0; - overflow:hidden; - z-index:3; - -position:absolute; -left:10%; + position:absolute; + left:10%; - -border:1px solid darkblue; + border:1px solid darkblue; } div.op_detail_title { background-color:grey; -/* width:500;*/ + /* width:500;*/ } div#div_jrn{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } - div#div_cat{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; +div#div_cat{ + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } @@ -915,14 +937,14 @@ div.divinfo div#search_form { - position:absolute; - border:1px solid black; - top:15%;left:100; - margin-left:25% - z-index:2; - width:50%; - display:none; - background-color:#e4e7ed; + position:absolute; + border:1px solid black; + top:15%;left:100; + margin-left:25% + z-index:2; + width:50%; + display:none; + background-color:#e4e7ed; } table.table_large td, table.result td @@ -934,12 +956,11 @@ table.info_op { font-size:18; width:100%; - } table.info_op tr { -font-size:14; -background:white; + font-size:14; + background:white; } h2#jrn_name { @@ -956,7 +977,7 @@ tr.footer{ span.remain { font-weight: bold; color:black; - } +} div#jrn_name_div { @@ -984,34 +1005,35 @@ div#jrn_name_div } div#wait_box { - background-color:#F1E6E6; - font-size:10; + background-color:#F1E6E6; + font-size:10; + font-family: verdana,helvetica,arial,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:10; - padding:0; - margin:0; - overflow:hidden; - z-index:10; - -position:absolute; -left:30%; -top:30%; + position:absolute; + left:30%; + top:30%; -border:1px solid darkblue; + border:1px solid darkblue; } #wait_box h2 { -color:black; -text-align:center; + color:black; + text-align:center; } div#div_jrnsearch_op{ - position:absolute; - z-index: 5; - border:1px solid black; - display:none; - width:50em; - background-color:#EDF3FF; + + border:1px solid black; + display:none; + width:50em; + background-color:#EDF3FF; + position:absolute; + z-index: 5; } ul { @@ -1019,29 +1041,30 @@ ul { } a.line,div.content a.line { -font-size:110%; - text-decoration:underline; - display:inline; - color: #0000ff; + font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; } a.line:hover,div_content a.line { -font-size:110%; - text-decoration:underline; - display:inline; - color: #0000ff; - background-color: rgb(93, 144, 205); + font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; + background-color: rgb(93, 144, 205); } #close_div { - background-color:white; - color:red; - text-decoration:none; - border:1px solid red; - margin-left: 2px; - margin-right:2px; - margin-top:0px; - font-size:10px; + background-color:white; + color:red; + font-family: arial; + text-decoration:none; + border:1px solid red; + margin-left: 2px; + margin-right:2px; + margin-top:0px; + font-size:10px; } table.table_large tr.odd ,table.table_large tr.even { @@ -1066,4 +1089,4 @@ span.invoice display:block; margin: 20px; font-weight: bold; -} \ No newline at end of file +} diff --git a/html/style-epad.css b/html/style-epad.css index a7ffced32..3dd704d12 100644 --- a/html/style-epad.css +++ b/html/style-epad.css @@ -1,95 +1,99 @@ /* */ div.add_todo_list { - border:1px solid blue; - display:none; - background-color:#BFD0FF; - padding:3; - position:absolute; - text-align:left; - line-height:3em; - z-index:1} + border:1px solid blue; + display:none; + background-color:#BFD0FF; + padding:3; + position:absolute; + text-align:left; + line-height:3em; + z-index:1} div.welcome { } @@ -878,56 +875,56 @@ div.gest_name { h2.gest_name { border-left: 5px solid #403a8d; border-bottom:1px solid #b4bbc2; - border-top:1px solid #b4bbc2; - border-right:1px solid #b4bbc2; + border-top:1px solid #b4bbc2; + border-right:1px solid #b4bbc2; padding: 5px; } div.op_detail_frame { - background-color:#e4e7ed; - height:100%; width:100%; + background-color:#e4e7ed; + height:100%; width:100%; } div.inner_box { - background-color:#e4e7ed; - font-size:10; - font-family:helvetica,sans-serif; - padding:0; - margin:0; - overflow:hidden; - z-index:3; + background-color:#e4e7ed; + font-size:10; + font-family:verdana,helvetica,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:3; -position:absolute; -left:10%; + position:absolute; + left:10%; -border:1px solid darkblue; + border:1px solid darkblue; } div.op_detail_title { background-color:grey; -/* width:500;*/ + /* width:500;*/ } div#div_jrn{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } - div#div_cat{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; +div#div_cat{ + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } @@ -936,17 +933,17 @@ div.divinfo div#search_form { - position:absolute; - border:1px solid black; - top:15%;left:100; - margin-left:25% - z-index:2; - width:50%; - display:none; - background-color:#e4e7ed; + position:absolute; + border:1px solid black; + top:15%;left:100; + margin-left:25% + z-index:2; + width:50%; + display:none; + background-color:#e4e7ed; } -table.result td +table.table_large td, table.result td { padding-left:5px; padding-right:5px; @@ -954,14 +951,12 @@ table.result td table.info_op { font-size:18; - margin-right:30%; - width:20%; - + width:100%; } table.info_op tr { -font-size:14; -background:white; + font-size:14; + background:white; } h2#jrn_name { @@ -978,7 +973,7 @@ tr.footer{ span.remain { font-weight: bold; color:black; - } +} div#jrn_name_div { @@ -995,46 +990,46 @@ div#jrn_name_div #direct { display:inline; - float:right; - + float:left; + width:400px; } -.direct +#calc { - font-size:10px; - border:groove 1px #000000; - margin:1px; + display:inline; + float:left; } div#wait_box { - background-color:#F1E6E6; - font-size:10; - font-family:helvetica,arial,sans-serif; - padding:0; - margin:0; - overflow:hidden; - z-index:10; + background-color:#F1E6E6; + font-size:10; + font-family: verdana,helvetica,arial,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:10; -position:absolute; -left:30%; -top:30%; + position:absolute; + left:30%; + top:30%; -border:1px solid darkblue; + border:1px solid darkblue; } #wait_box h2 { -color:black; -text-align:center; + color:black; + text-align:center; } div#div_jrnsearch_op{ - position:absolute; - z-index: 5; - border:1px solid black; - display:none; - width:50em; - background-color:#EDF3FF; + + border:1px solid black; + display:none; + width:50em; + background-color:#EDF3FF; + position:absolute; + z-index: 5; } ul { @@ -1042,29 +1037,30 @@ ul { } a.line,div.content a.line { -font-size:110%; - text-decoration:underline; - display:inline; - color: #0000ff; + font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; } a.line:hover,div_content a.line { -font-size:110%; - text-decoration:underline; - display:inline; - color: #0000ff; - background-color: rgb(93, 144, 205); + font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; + background-color: rgb(93, 144, 205); } #close_div { - background-color:white; - color:blue; - text-decoration:none; - border:1px solid blue; - margin-left: 2px; - margin-right:2px; - margin-top:0px; - font-size:10px; + background-color:white; + color:red; + font-family: arial; + text-decoration:none; + border:1px solid red; + margin-left: 2px; + margin-right:2px; + margin-top:0px; + font-size:12px; } table.table_large tr.odd ,table.table_large tr.even { @@ -1089,4 +1085,4 @@ span.invoice display:block; margin: 20px; font-weight: bold; -} \ No newline at end of file +} diff --git a/html/style-light.css b/html/style-light.css index 7e2cc13fe..fecefeced 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -1,24 +1,24 @@ /* */ div.add_todo_list { - border:1px solid blue; - display:none; - background-color:#BFD0FF; - padding:3; - position:absolute; - text-align:left; - line-height:3em; - z-index:1} + border:1px solid blue; + display:none; + background-color:#BFD0FF; + padding:3; + position:absolute; + text-align:left; + line-height:3em; + z-index:1} div.welcome { } @@ -864,56 +879,56 @@ div.gest_name { h2.gest_name { border-left: 5px solid #403a8d; border-bottom:1px solid #b4bbc2; - border-top:1px solid #b4bbc2; - border-right:1px solid #b4bbc2; + border-top:1px solid #b4bbc2; + border-right:1px solid #b4bbc2; padding: 5px; } div.op_detail_frame { - background-color:#e4e7ed; - height:100%; width:100%; + background-color:#e4e7ed; + height:100%; width:100%; } div.inner_box { - background-color:whitesmoke; - font-size:10; - font-family:helvetica,sans-serif; - padding:0; - margin:0; - overflow:hidden; - z-index:3; + background-color:#e4e7ed; + font-size:10; + font-family:verdana,helvetica,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:3; -position:absolute; -left:10%; + position:absolute; + left:10%; -border:1px solid darkblue; + border:1px solid darkblue; } div.op_detail_title { background-color:grey; -/* width:500;*/ + /* width:500;*/ } div#div_jrn{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } - div#div_cat{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; +div#div_cat{ + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } @@ -922,14 +937,14 @@ div.divinfo div#search_form { - position:absolute; - border:1px solid black; - top:15%;left:100; - margin-left:25% - z-index:2; - width:50%; - display:none; - background-color:#e4e7ed; + position:absolute; + border:1px solid black; + top:15%;left:100; + margin-left:25% + z-index:2; + width:50%; + display:none; + background-color:#e4e7ed; } table.table_large td, table.result td @@ -941,12 +956,11 @@ table.info_op { font-size:18; width:100%; - } table.info_op tr { -font-size:14; -background:white; + font-size:14; + background:white; } h2#jrn_name { @@ -963,7 +977,7 @@ tr.footer{ span.remain { font-weight: bold; color:black; - } +} div#jrn_name_div { @@ -991,34 +1005,35 @@ div#jrn_name_div } div#wait_box { - background-color:#F1E6E6; - font-size:10; - font-family:helvetica,arial,sans-serif; - padding:0; - margin:0; - overflow:hidden; - z-index:10; + background-color:#F1E6E6; + font-size:10; + font-family: verdana,helvetica,arial,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:10; -position:absolute; -left:30%; -top:30%; + position:absolute; + left:30%; + top:30%; -border:1px solid darkblue; + border:1px solid darkblue; } #wait_box h2 { -color:black; -text-align:center; + color:black; + text-align:center; } div#div_jrnsearch_op{ - position:absolute; - z-index: 5; - border:1px solid black; - display:none; - width:50em; - background-color:#EDF3FF; + + border:1px solid black; + display:none; + width:50em; + background-color:#EDF3FF; + position:absolute; + z-index: 5; } ul { @@ -1026,29 +1041,30 @@ ul { } a.line,div.content a.line { -font-size:110%; - text-decoration:underline; - display:inline; - color: #0000ff; + font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; } a.line:hover,div_content a.line { -font-size:110%; - text-decoration:underline; - display:inline; - color: #0000ff; - background-color: rgb(93, 144, 205); + font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; + background-color: rgb(93, 144, 205); } #close_div { - background-color:white; - color:blue; - text-decoration:none; - border:1px solid blue; - margin-left: 2px; - margin-right:2px; - margin-top:0px; - font-size:10px; + background-color:white; + color:red; + font-family: arial; + text-decoration:none; + border:1px solid red; + margin-left: 2px; + margin-right:2px; + margin-top:0px; + font-size:10px; } table.table_large tr.odd ,table.table_large tr.even { @@ -1073,4 +1089,4 @@ span.invoice display:block; margin: 20px; font-weight: bold; -} \ No newline at end of file +} diff --git a/html/style.css b/html/style.css index 054e32808..8113cf83b 100644 --- a/html/style.css +++ b/html/style.css @@ -130,13 +130,20 @@ div.u_tool div.name { float:left; margin-left:10px; } -div.u_tool div.acces_direct{ +div.u_tool { float:right; margin-right:10px; text-align:right; } - +div.module { + position:absolute; + top:0px; + right:5px; + text-align:right; + padding:0px; + margin: 0px; +} div.u_subt2menu { background-color:lightgrey; left:1%; @@ -744,7 +751,7 @@ ul.select_table li span { } div.pc_calendar{ - + float:left; } diff --git a/html/user_login.php b/html/user_login.php index 03f2830c0..10b06dd18 100644 --- a/html/user_login.php +++ b/html/user_login.php @@ -121,7 +121,7 @@ $result.=""; echo '

'._('Bienvenue ').$User->first_name.' '.$User->name.' '._("dans PhpCompta")."

"; echo '
'._('Choississez votre dossier'); -echo ''.$result.''; +echo '
'.$result.'
'; echo ''; ?>
diff --git a/include/class_html_input.php b/include/class_html_input.php index 7fe9c970a..a94607265 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -208,7 +208,7 @@ class HtmlInput */ static function button_anchor($p_label,$p_value,$p_name="",$p_javascript="") { - $r=sprintf(' %s', + $r=sprintf(' %s', $p_name, $p_value, $p_javascript, diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index 150eafbe3..00a40695b 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -169,7 +169,7 @@ if ( isset( $_REQUEST['bt_html'] ) ) } echo ' - +

'. $poste_id['pcm_val'].' '.h($Poste->label).'

'; diff --git a/include/template/module.php b/include/template/module.php index d5e3877e3..73b604e7b 100644 --- a/include/template/module.php +++ b/include/template/module.php @@ -46,7 +46,7 @@ if ( $cn->get_value("select count(*) from profile join profile_user using (p_id) endif; ?> -
+