diff --git a/html/popup.php b/html/popup.php index fd54c87ea..727efb778 100644 --- a/html/popup.php +++ b/html/popup.php @@ -26,9 +26,9 @@ require_once NOALYSS_INCLUDE.'/class_database.php'; require_once NOALYSS_INCLUDE.'/class_user.php'; require_once NOALYSS_INCLUDE.'/class_periode.php'; -echo '
'.HtmlInput::print_window(); html_page_start($_SESSION['g_theme']); +echo '
'; global $g_user; if ( basename($_GET['ajax']) == 'ajax_history.php' ) { @@ -69,10 +69,13 @@ if ( basename($_GET['ajax']) == 'ajax_history.php' ) $href_csv="export.php?".$href.'&f_id='.$_GET['f_id'].'&ople=0&type=poste&'.$from_periode.'&'.$to_periode."&act=CSV:fichedetail"; $href_pdf="export.php?".$href.'&f_id='.$_GET['f_id'].'&ople=0&type=poste&'.$from_periode.'&'.$to_periode."&act=PDF:fichedetail"; } - + echo HtmlInput::print_window(); echo ''._("Export CSV").''; echo ''._("Export PDF").''; } + else { + echo HtmlInput::print_window(); + } echo '
'; echo HtmlInput::hidden('inpopup',1); load_all_script(); diff --git a/html/style-light.css b/html/style-light.css index 646eacf74..fda541d9d 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -13,7 +13,7 @@ } BODY { - background-color: #FDFDFD; + background-color: #F8F8FF; font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; font-family: 'openSansRegular'; padding: 0px 0px 0px 0px ; @@ -414,19 +414,20 @@ tr.even:hover td background-color: #a9d6e4; color:#FFFFFF; } -td.mtitle:hover +td.mtitle:hover , td.selectedcell:hover,div.menu2 td.mtitle:hover { - color:#FFFFFF; - border-radius: 0px; - border-bottom-color: red; - border-bottom-style: solid; - border-bottom-width: 4px; + color:#FFFFFF; + border-radius: 0px; + background: #5D90CD; + border-top: 4px solid #5D90CD; + border-bottom: 4px solid #5D90CD; } div.menu2 td.mtitle:hover { color:#FFFFFF; border-radius: 10px 10px 0px 0px; + background-color: #5D90CD; border-bottom-color: red; border-bottom-style: solid; border-bottom-width: 4px; @@ -933,20 +934,20 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton { border-style: solid ; border-color: #605D5D; border-width:1px; - padding-bottom: 3px; - padding-top: 3px; - padding-right: 3px; - padding-left: 3px; - margin-top:3px; + padding-bottom: 2px; + padding-top: 2px; + padding-right: 2px; + padding-left: 2px; + margin-top:2px; cursor:pointer; margin:1px 2px 1px 2px; - border-radius: 4px; - moz-border-radius:4px; + border-radius: 2px; + moz-border-radius:2px; } a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.smallbutton:hover { cursor:pointer; - color: white; - background-color : black; + background-color: #515E7B; + color: red; /* border-style: inset ; */ margin:1px 2px 1px 2px; @@ -1291,7 +1292,7 @@ a.line:hover,div_content a.line { color:white; text-decoration:none; - border:1px solid #605D5D; + border:0px; margin-left: 2px; margin-right:2px; margin-top:2px; @@ -2016,3 +2017,5 @@ ul.aligned-block li { #menu_manager{} #menu_manager> img {vertical-align:top;height:20px;width:20px;background-image:url('image/empty.gif')} #menu_cfgdefmenu{} #menu_cfgdefmenu> img {vertical-align:top;height:20px;width:20px;background-image:url('image/empty.gif')} #menu_agenda{} #menu_agenda> img {vertical-align:top;height:20px;width:20px;background-image:url('image/empty.gif')} + +td.toolselected {background-color: #909BA7; } \ No newline at end of file diff --git a/html/style-mandarine.css b/html/style-mandarine.css index f020a1aee..a097758cf 100644 --- a/html/style-mandarine.css +++ b/html/style-mandarine.css @@ -1173,11 +1173,13 @@ a.line:hover,div_content a.line text-decoration:none; margin-left: 2px; margin-right:2px; - margin-top:0px; + margin-top:3px; font-size:12px; font-size:0.90rem; cursor: pointer; - + cursor: pointer; + border:0px; + font-size:20px; } #close_div:hover { @@ -1457,8 +1459,8 @@ div.bxbutton float:right; height:10px; display:block; - margin-top:0.48%; margin-right:0.48%; + margin-top:3px; } div.inner_box tr.odd { } diff --git a/html/style-mobile.css b/html/style-mobile.css index cb3ae7a3c..89f8f0092 100644 --- a/html/style-mobile.css +++ b/html/style-mobile.css @@ -18,8 +18,7 @@ BODY { padding : 0px; margin:0px; color:#0000FF; - font-size:1.2em; - font-size:1.2rem; + font-size:100%; } .notice { color:#FF0000; @@ -169,8 +168,7 @@ td.tool a.mtitle:hover { text-align:right; padding:0px; margin: 0px; - font-size:13px; - font-size:0.86rem; + font-size:70%: } div.u_subt2menu { background-color:#EDF3FF; @@ -220,10 +218,7 @@ div.content{ width:100%; font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; font-family: 'openSansRegular'; - font-size:14px; - font-size:1.1rem; - -} + } div.content30{ float:left; @@ -952,8 +947,7 @@ td.toolselected a.mtitle { background-color:#FF0000; } div.topmenu { - font-size:14.6px; - font-size:1.1rem; + font-size:85%; } diff --git a/include/template/history_top.php b/include/template/history_top.php index 804e475d8..917d20bba 100644 --- a/include/template/history_top.php +++ b/include/template/history_top.php @@ -7,7 +7,7 @@ { $callback=$_SERVER['PHP_SELF']; $str=$_SERVER['QUERY_STRING']."&act=de&ajax=$callback"; - echo '⬜ + echo ''; echo ''; } diff --git a/include/template/ledger_detail_top.php b/include/template/ledger_detail_top.php index 4118d811f..3b07b4d58 100644 --- a/include/template/ledger_detail_top.php +++ b/include/template/ledger_detail_top.php @@ -1,7 +1,7 @@
+?>
⬜ + echo ''; echo ''; }