diff --git a/html/css/style-classic7.css b/html/css/style-classic7.css index 3067934a5..9064dd8b4 100644 --- a/html/css/style-classic7.css +++ b/html/css/style-classic7.css @@ -194,7 +194,8 @@ div.recherche_form{ div.content{ padding-top:0.0030%; margin-top:0.0030%; - width:98%; + margin-right: 0.15%; + width:99.7%; font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif; font-family: 'OpenSansRegular'; font-size:12px; @@ -2893,3 +2894,65 @@ span.tagcell { .content .h3, .content h3 { font-size: 1.4rem; } +/*** + * Main Menu + */ +.nav-fill .nav-item +{ + margin: 1px; + background: navy; + color: white; + border-radius: 3px; +} +.nav-fill .nav-item:hover { + background-color:#6393c1; + color:navy; + text-decoration: none; +} +.nav-fill .nav-item:visited{ + color:white; +} +.nav-pills .nav-link.active { + background-color: #b1c0d7 !important; + border-radius: 0px; +} +.nav-pills .nav-link { + color:white !important; + +} +li.li-active { + background-color: lightgray !important; + +} +.nav-level2 { + background-color: #4a4a7d;; +} +.nav-level2>li { + border-right: 1px #9fbcd6 ridge; + border-bottom: 1px #9fbcd6 ridge; +} +.nav-level2>li:hover{ + background-color:#6393c1; + color:navy; + text-decoration: none; +} +.nav-level3 { + background-color:#336699; + + +} +.nav-level3>li { + border-right: 1px #9fbcd6 ridge; + border-bottom: 1px #9fbcd6 ridge; +} +.nav-level3>li:hover{ + background-color:#6393c1; + color:navy; + text-decoration: none; +} +.nav-level3 .active { + border-radius:0px !important; +} +.nav-level2 .active { + border-radius:0px !important; +} diff --git a/include/constant.php b/include/constant.php index 9f4254919..ef088ffa9 100644 --- a/include/constant.php +++ b/include/constant.php @@ -116,7 +116,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) { if ( ! defined ("SYSINFO_DISPLAY")) { define ("SYSINFO_DISPLAY",TRUE); } -define ("DBVERSION",159); +define ("DBVERSION",160); define ("MONO_DATABASE",25); define ("DBVERSIONREPO",19); define ('NOTFOUND','--not found--'); diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index d952e4cb8..974abafa5 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -523,73 +523,54 @@ function sql_string($p_string) * \param $p_array array like ( 0=>HREF reference, 1=>visible item (name),2=>Help(opt), * 3=>selected (opt) 4=>javascript (normally a onclick event) (opt) * \param $p_dir direction of the menu (H Horizontal V vertical) - * \param $class CSS for TD tag + * \param $class CSS for li tag * \param $class_ref CSS for the A tag * \param $default selected item * \param $p_extra extra code for the table tag (CSS or javascript) */ /* \return : string */ -function ShowItem($p_array, $p_dir='V', $class="mtitle", $class_ref="mtitle", $default="", $p_extra="") +function ShowItem($p_array, $p_dir='V', $class="nav-item", $class_ref="nav-link", $default="", $p_extra="nav nav-pills nav-fill") { - - $ret = ""; + $ret = ''; + // for comptability with old application mtitle for anchor is replace by nav-link + + // direction Vertical if ($p_dir == 'V') + { + $ret .= "'; - } - else - { - $ret.=''; - } + $javascript = (isset($href[4])) ? $href[4] : ""; + $title = ""; + $set = "XX"; + if (isset($href[2])) + { + $title=$href[2]; } + if (isset($href[3])) + { + $set=$href[3]; + } + + if ($set==$default) + { + $ret.='
  • '.$href[1].'
    • '; + } + else + { + $ret.='
  • '.$href[1].'
    • '; + } + } - //direction Horizontal - else if ($p_dir == 'H') - { - - $ret.=""; - foreach ($p_array as $all => $href) - { - $title = ""; - $javascript = (isset($href[4])) ? $href[4] : ""; - - $set = "A"; - if (isset($href[2])) - $title = $href[2]; - - if (isset($href[3])) - $set = $href[3]; - - if ($default === $href[0] || $set === $default) - { - $ret.=''; - } - else - { - $ret.=''; - } - } - $ret.=""; - } - $ret.="
    '.$href[1].'
    '.$href[1].'
    ' . $href[1] . '' . $href[1] . '
    "; + + $ret.=""; return $ret; } diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php index 2f33dca4f..64fcb8e37 100644 --- a/include/lib/user_menu.php +++ b/include/lib/user_menu.php @@ -101,7 +101,7 @@ function MenuAdmin() ); } - $menu=ShowItem($item,'H',"mtitle","mtitle",$def); + $menu=ShowItem($item,'H',"nav-item","nav-link",$def,'nav nav-pills nav-fill '); return $menu; } diff --git a/include/sql/patch/upgrade159.sql b/include/sql/patch/upgrade159.sql new file mode 100644 index 000000000..e2c0668f5 --- /dev/null +++ b/include/sql/patch/upgrade159.sql @@ -0,0 +1,5 @@ +begin; + update menu_ref set me_menu = replace(me_menu,'Configuration','') where me_menu like 'Configuration%'; + +insert into version (val,v_description) values (160,'correct menu item'); +commit ; \ No newline at end of file diff --git a/include/template/menu.php b/include/template/menu.php index 74cb26144..ecdb5fd56 100644 --- a/include/template/menu.php +++ b/include/template/menu.php @@ -1,52 +1,45 @@ 1 ) { + echo << LEVEL MENU IS {$level} + access_code {$access_code} +EOF; + // print_r($amenu); +}; -?>
    - 4 && $level == 0) { - $style ='style= "width:100%"'; - } - elseif ($level==0){ - $http=new HttpInput(); - $access_code=$http->request("ac"); - switch (count($amenu)) - { - case 4: - case 3: - $width=count($amenu)*20; - $left=round((100-$width)/2); - $style="style=\"width:$width%;margin-left:$left%\""; - break; - default: - $style=""; - } +?>
    + '; + }elseif ($level == 1) { + echo '
      '; + + } else { + echo '
        '; + } + ?> + -} - else { - $style=" class=\"mtitle\""; - - }?> - > - - - - + 1 && - $url.'/'.$amenu[$i]['me_code'] == $a_request[0].'/'.$a_request[1]) - $class="selectedcell"; } elseif ($level == 1) { $url=$a_request[0].'/'.$a_request[1]; + + } + elseif ($level == 2) + { + $url=$a_request[0].'/'.$a_request[1].'/'.$a_request[2]; + } $url.='/'.$amenu[$i]['me_code']; - if ($url == $access_code ) $class="mtitle selectedcell"; + if ($url == $access_code ) { $class="nav-link active"; } $url="do.php?gDossier=".Dossier::id()."&ac=".$url; } + ?> - + - -
        - +
      • + -
        		• - title=""> +
      • + title=""> -
        		•
        +
    diff --git a/include/upgrade.inc.php b/include/upgrade.inc.php index ce155bd75..cf73cc9f2 100644 --- a/include/upgrade.inc.php +++ b/include/upgrade.inc.php @@ -37,7 +37,7 @@ $menu=array( ); $sb=$http->request("sb", "string", "application"); echo '
    '; -echo ShowItem($menu, "H", "mtitle", "mtitle", $sb); +echo ShowItem($menu, "H", "nav-item", "nav-link", $sb); echo '
    '; $sc=$http->get("sc", "string", "none");