From 33732a5df07cf4faaa7777189321f5fbdd26fbb3 Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Fri, 8 Feb 2013 14:27:28 +0000 Subject: [PATCH] Ajout d'une fleche sur les menu --- awstats/bureau/admin/menu_aws.php | 5 ++- bureau/admin/dom_edit.php | 4 +- bureau/admin/images/menu_right.png | Bin 455 -> 417 bytes bureau/admin/menu_aide.php | 5 ++- bureau/admin/menu_brouteur.php | 5 ++- bureau/admin/menu_cron.php | 3 +- bureau/admin/menu_ip.php | 1 + bureau/admin/menu_logs.php | 5 ++- bureau/admin/menu_mail.php | 4 +- bureau/admin/menu_mem.php | 5 ++- bureau/admin/menu_piwik.php | 3 +- bureau/admin/menu_quota.php | 3 +- bureau/admin/styles/style.css | 57 ++++++++++++++++++++--------- bureau/class/functions.php | 10 +++-- 14 files changed, 78 insertions(+), 32 deletions(-) diff --git a/awstats/bureau/admin/menu_aws.php b/awstats/bureau/admin/menu_aws.php index 5e596db0..329d3dd0 100644 --- a/awstats/bureau/admin/menu_aws.php +++ b/awstats/bureau/admin/menu_aws.php @@ -35,7 +35,10 @@ if (isset($q["t"]) && isset($r["u"]) && $q["t"] > 0 && $r["u"] > 0) { ?>
-
<?php __(" />  (/)
+
+ <?php __(" />  (/) + +
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php index bb03ef37..e109da84 100644 --- a/bureau/admin/dom_edit.php +++ b/bureau/admin/dom_edit.php @@ -138,11 +138,11 @@ for($i=0;$i<$r["nsub"];$i++) {
'.htmlspecialchars($iidir).''; - if ( ! file_exists($bro->convertabsolute($iidir,0))) { echo " "._("Directory not found").""; } + if ( ! file_exists($bro->convertabsolute($iidir,0))) { echo " "._("Directory not found").""; } } else { if ($r["sub"][$i]['type']) echo "
".htmlspecialchars($r["sub"][$i]["dest"]); } diff --git a/bureau/admin/images/menu_right.png b/bureau/admin/images/menu_right.png index bc10919983113191681d4b0407e209adcf94d892..90794d9ffbb3adcd1db75dfe6515b08e1893a36e 100644 GIT binary patch delta 360 zcmV-u0hj*A1EB+uBo78+OGiWi000000Qp0^e~~~Ue-|L>b61K000AyZL_t(I%dL|^ zii1E9MPG)tH*N!pUdC*5122%^iGp6hbvD_?tGG}Cx)WTO5@$2rq(>Pt%oG%KQ@?)y z`c%UoV`mO|p5K*HiPjpEN+|$DglU>=ib!=npAVMca=F~&I8LG{dh6A;ZE2dO%ChXB zzFtUze;{CkzOfV!>|00l75Ga}-Ej>jVax7%%1Gd%zw0MF-hmDlUl z64iCRiLnGC;uL(}$M=0plBOwb+d3Gd$|`tu*`()rlx1m2x~{V|qd>im@J<-qieQ?i z6<9<_(-eTREKy2XoI_wdu-moUS=pv}Sr!LlPCVEgL2Ke(>eBT4DwKZ=X$4xKH z9+(lTrfHHe3;`I1;YTAMj|U=BIiKltI{oT16-9C2KjIU3QVWwt?2EAg00001p=5JjKEdK*;+gN)s|$_+v~xeL01E@0ym8T$gN(-?Oa=~Sl= zsE{y7kiy_X9^n+pF5XB4hh$)2m-+Me&u13?7(H`Xuh)B}RG_uSq*4k15uvVYnWdVQ! zXqpBQaX|NvA=3eDx7$|D^Z?ueoX_W0zP>#3_6}hfl4V&Z#uA8#Q}8?w&+{xv6h#z8 z;b4p^tKiyYll^|5bQfEavMg=QC{WiU+!6-YBB<-S1r`w=o+73Lh-c#%rIf`v1jYlq zUA@o!x^BK)E)K?c&^dzE+G*}m=P3BT2U=^=T}%p`PNz;U%pRB#l046Y(P#v~@p$~v s$iv})h$PNun$PFI`b?Y6X2yTS2hWBQk5;fZ{Qv*}07*qoM6N<$f{D$x@c;k- diff --git a/bureau/admin/menu_aide.php b/bureau/admin/menu_aide.php index 188999aa..4f72c01b 100644 --- a/bureau/admin/menu_aide.php +++ b/bureau/admin/menu_aide.php @@ -23,6 +23,9 @@ ?>
-
<?php __(" /> 
+
+ <?php __(" />  + +
diff --git a/bureau/admin/menu_brouteur.php b/bureau/admin/menu_brouteur.php index a1ca5aca..2904636d 100644 --- a/bureau/admin/menu_brouteur.php +++ b/bureau/admin/menu_brouteur.php @@ -24,6 +24,9 @@ ?>
-
<?php __(" /> 
+
+ <?php __(" />  + +
diff --git a/bureau/admin/menu_cron.php b/bureau/admin/menu_cron.php index fba58c46..c9933b30 100644 --- a/bureau/admin/menu_cron.php +++ b/bureau/admin/menu_cron.php @@ -30,7 +30,8 @@ if ($q['t'] > 0 || $q['u'] > 0) {
-<?php __(" width=16px height=16px/>  () + <?php __(" width=16px height=16px/>  () +
diff --git a/bureau/admin/menu_ip.php b/bureau/admin/menu_ip.php index 35e6104a..673cedef 100644 --- a/bureau/admin/menu_ip.php +++ b/bureau/admin/menu_ip.php @@ -28,6 +28,7 @@
<?php __(" width="16" height="16" />  +
diff --git a/bureau/admin/menu_logs.php b/bureau/admin/menu_logs.php index 049e5100..1c14d257 100644 --- a/bureau/admin/menu_logs.php +++ b/bureau/admin/menu_logs.php @@ -26,7 +26,10 @@ ?>
-
<?php __(" width="16" height="16" /> 
+
+ <?php __(" width="16" height="16" />  + +
diff --git a/bureau/admin/menu_mail.php b/bureau/admin/menu_mail.php index 1292b2e4..aa0ddace 100644 --- a/bureau/admin/menu_mail.php +++ b/bureau/admin/menu_mail.php @@ -32,8 +32,8 @@ if ($q["u"] > 0 || ( $r["u"] > 0 && $q['t'] > 0 )) {
- <?php __(" />  (/) - + <?php __(" />  (/) +
diff --git a/bureau/admin/menu_mem.php b/bureau/admin/menu_mem.php index 6cbc13b3..1fec1e39 100644 --- a/bureau/admin/menu_mem.php +++ b/bureau/admin/menu_mem.php @@ -23,7 +23,10 @@ ?>
-
<?php __(" /> 
+
+ <?php __(" />  + +
diff --git a/bureau/admin/menu_piwik.php b/bureau/admin/menu_piwik.php index ee484090..634b573c 100644 --- a/bureau/admin/menu_piwik.php +++ b/bureau/admin/menu_piwik.php @@ -28,7 +28,8 @@ if (!empty($piwik->piwik_server_uri) && ($q["t"] > 0 || $r["u"] > 0)) {
- <?php __(" />  (/) + <?php __(" />  (/) +
diff --git a/bureau/admin/menu_quota.php b/bureau/admin/menu_quota.php index ccf29473..f10567b4 100644 --- a/bureau/admin/menu_quota.php +++ b/bureau/admin/menu_quota.php @@ -25,6 +25,7 @@
<?php __(" />  +
"; - echo ''; + echo ''; echo ""; echo "
"; echo '
'; diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css index 3993d51d..a3e39870 100644 --- a/bureau/admin/styles/style.css +++ b/bureau/admin/styles/style.css @@ -71,6 +71,16 @@ hr { border-width: 1px 0 0 0; } +a { + text-decoration: none; + color: #0D5689; +} + +a:hover { + text-decoration: underline; + color: #000000; +} + fieldset { border: 1px solid #555; } @@ -93,23 +103,35 @@ fieldset { } .inb { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; border: 1px solid #999; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; - padding: 4px; - padding-left: 6px; - padding-right: 6px; + padding: 4px 6px; color: black; background-color: #CFE3F1; cursor: pointer; margin-right: 4px; + height: 25px; + vertical-align: middle; } .inb:hover { background-color: #BFD3E1; } +.ina a, .ina a:hover, .inb a, .inb a:hover { + color: #000; + text-decoration: none; + vertical-align: middle; + line-height: 15px; +} + +span.inb { + display: inline-block; + height: 15px; + padding: 4px 6px; +} input.ina:hover, input.ina, input.inav, input.inav:hover { border: 1px solid #999; @@ -147,12 +169,17 @@ input.inav:hover, .inav a:hover, a.inav:hover { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + display: inline-block; + vertical-align: middle; + line-height: 15px; + height: 15px; } input[type=button], input[type=submit] { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + height: 25px; } .ina a:hover, a.ina:hover, .inav a:hover, a.inav:hover { text-decoration: none; @@ -161,7 +188,8 @@ input[type=submit] { .ina img, .ina img { vertical-align: middle; - padding: 2px 2px 5px 0; + padding: 0 2px 0 0; + float: left; } .bff { border: 1px solid #999; @@ -220,6 +248,11 @@ img { text-align: left; } +.alerte { + color: #A00; + font-style: italic; +} + /* Over quota class */ .over { color: red; @@ -408,16 +441,6 @@ table.searchtable td { margin-right: auto; } -a { - text-decoration: none; - color: #0D5689; -} - -a:hover { - text-decoration: underline; - color: #000000; -} - .border { border: 1px solid #C0DCF0; } diff --git a/bureau/class/functions.php b/bureau/class/functions.php index 18c2e218..b828dc17 100644 --- a/bureau/class/functions.php +++ b/bureau/class/functions.php @@ -269,7 +269,7 @@ function ife($test,$tr,$fa="") { return $fa; } -function format_size($size) { +function format_size($size,$html=0) { // Retourne une taille formattée en Octets, Kilo-octets, Méga-octets ou Giga-Octets, avec 2 décimales. if ("-" == $size) { return $size; @@ -300,7 +300,11 @@ function format_size($size) { } } } - return $r; + if ($html) { + return str_replace(" "," ",$r); + }else{ + return $r; + } } function getlinkhelp($hid) { @@ -635,7 +639,7 @@ function display_browser($dir="", $caller="main.dir", $width=350, $height=450) { open: function() { $('.ui-widget-overlay').css('opacity', .70); - $('.ui-dialog-content').css('background-color', '#F0F0F4'); + $('.ui-dialog-content').css('background-color', '#F0F0FA'); }, });