From 25958c297ac83599065dfa54d69b5ff3a849c93f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 24 Dec 2012 22:26:55 +0100 Subject: [PATCH] correction notices et modifs css --- mw/app/data/modules/share/mw_data_utils.php | 4 ++-- mw/app/out/default/css/style.css | 31 +++++++++++++++-------------- mw/app/out/default/views/navig.php | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/mw/app/data/modules/share/mw_data_utils.php b/mw/app/data/modules/share/mw_data_utils.php index ab8ca17..17fb639 100644 --- a/mw/app/data/modules/share/mw_data_utils.php +++ b/mw/app/data/modules/share/mw_data_utils.php @@ -13,8 +13,8 @@ $maximumTemporaire = 0; for($i = 0; $i < $maximum; $i++){ if( - ($order == "ASC" && $values[$i][$key] > $values[$i + 1][$key]) - || ($order == "DESC" && $values[$i][$key] < $values[$i + 1][$key]) + (isset($values[$i + 1]) && $order == "ASC" && $values[$i][$key] > $values[$i + 1][$key]) + || (isset($values[$i + 1]) && $order == "DESC" && $values[$i][$key] < $values[$i + 1][$key]) ){ $tmp = $values[$i]; $values[$i] = $values[$i + 1]; diff --git a/mw/app/out/default/css/style.css b/mw/app/out/default/css/style.css index e144d5b..fdbdaab 100644 --- a/mw/app/out/default/css/style.css +++ b/mw/app/out/default/css/style.css @@ -50,9 +50,6 @@ body{ #menu_top ul{ float: right; padding-bottom: 0; - border: solid 1px #e9e9e9; - background-color: #ffffff; - margin-top: 0.4em; } #menu_top ul:after{ @@ -65,16 +62,21 @@ body{ list-style-type: none; float: left; position: relative; - border-left: solid 1px #e9e9e9; -} - -#menu_top ul li:first-child{ - border-left: none; + padding: 2px 5px 0 0; } #menu_top ul li a{ display: block; padding: 5px 10px 5px 10px; + white-space : nowrap; + border: solid 1px #e9e9e9; + background-color: #ffffff; + border-radius: 2px; +} + +#menu_top ul li a:hover{ + color: #000066; + background-color: #f1f1f1; } #menu_top ul li ul{ @@ -82,17 +84,10 @@ body{ top: 100%; left: 0; display: none; - margin-top: 0; } #menu_top ul li ul li{ float: none; - border-left: none; - border-bottom: solid 1px #e9e9e9; -} - -#menu_top ul li ul li:last-child{ - border-bottom: none; } #menu_top ul li ul li ul{ @@ -325,6 +320,12 @@ table.admin td.action{ width: 50px; } +.navig{ + text-align: right; + border: solid 1px #d5d5d5; + margin: 10px 0; + padding: 3px; +} /* --------------------------------------------- MESSAGES */ diff --git a/mw/app/out/default/views/navig.php b/mw/app/out/default/views/navig.php index 6afaf1b..6d2b4c8 100644 --- a/mw/app/out/default/views/navig.php +++ b/mw/app/out/default/views/navig.php @@ -3,7 +3,7 @@ param("start")], + ( isset($_GET[$this->param("start")]) ? $_GET[$this->param("start")] : 0, $this->out[$items]["total"], $this->config("max_list"), $_SERVER["REQUEST_URI"], -- 2.1.4