admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #1807: Boutons indistincts – thème 7 classic

Browse source
This commit is contained in:
sparkyx 2021-05-09 09:57:15 +02:00
parent 581940306e
commit 83307eb5de
7 changed files with 149 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

65
html/css/style-classic7.css
View file

@ -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;
}

2
include/constant.php
View file

@ -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--');

91
include/lib/ac_common.php
View file

@ -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 = "<TABLE $p_extra>";
$ret = '';
// for comptability with old application mtitle for anchor is replace by nav-link
// direction Vertical
if ($p_dir == 'V')
{
$ret .= "<ul class=\"$p_extra \" flex-row>";
} else {
$ret .= "<ul class=\"$p_extra \" >";
}
foreach ($p_array as $all => $href)
{
foreach ($p_array as $all => $href)
{
$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.='<TR><TD CLASS="selectedcell"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></TD></TR>';
}
else
{
$ret.='<TR><TD CLASS="'.$class.'"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></TD></TR>';
}
$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.='<li class="nav-item"><A class="'.$class_ref.' active'.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></li>';
}
else
{
$ret.='<li class="nav-item"><A class="'.$class_ref.'" HREF="'.$href[0].'" title="'.$title.'" '.$javascript.'>'.$href[1].'</A></li>';
}
}
//direction Horizontal
else if ($p_dir == 'H')
{
$ret.="<TR>";
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.='<TD CLASS="selectedcell"><A class="' . $class_ref . '" HREF="' . $href[0] . '" title="' . $title . '" ' . $javascript . '>' . $href[1] . '</A></TD>';
}
else
{
$ret.='<TD CLASS="' . $class . '"><A class="' . $class_ref . '" HREF="' . $href[0] . '" title="' . $title . '" ' . $javascript . '>' . $href[1] . '</A></TD>';
}
}
$ret.="</TR>";
}
$ret.="</TABLE>";
$ret.="</ul>";
return $ret;
}

2
include/lib/user_menu.php
View file

@ -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;
}

5
include/sql/patch/upgrade159.sql Normal file
View file

@ -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 ;

82
include/template/menu.php
View file

@ -1,52 +1,45 @@
<?php
//This file is part of NOALYSS and is under GPL
//see licence.txt
if (DEBUGNOALYSS > 1 ) {
echo <<<EOF
<p> LEVEL MENU IS {$level}
access_code {$access_code}
EOF;
// print_r($amenu);
};
?><div class="<?php echo $style_menu; ?>">
<?php if ( count($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="";
}
?><div class="">
<?php
if ($level == 0) {
echo '<ul class="nav nav-pills nav-fill flex-column flex-md-row" >';
}elseif ($level == 1) {
echo '<ul class="nav nav-pills nav-level2 ">';
} else {
echo '<ul class="nav nav-pills nav-level3 ">';
}
?>
}
else {
$style=" class=\"mtitle\"";
}?>
<table <?php echo $style?> >
<tr>
<?php
global $g_user;
// Display the menu
$class="nav-item ";
for($i=0;$i < count($amenu);$i++):
if ( (count($amenu)==1)) {
$class="mtitle selectedcell";
?>
<td class="<?php echo $class?>">
<a class="mtitle" href="do.php?gDossier=<?php echo Dossier::id()?>&ac=<?php echo $access_code?>" title="<?php echo h(gettext($amenu[$i]['me_description']))?>" >
<li class="<?php echo $class?>">
<a class="nav-link active" href="do.php?gDossier=<?php echo Dossier::id()?>&ac=<?php echo $access_code?>" title="<?php echo h(gettext($amenu[$i]['me_description']))?>" >
<?php echo gettext($amenu[$i]['me_menu'])?>
</a>
</td>
</li>
<?php
}
else {
$class="mtitle";
$js="";
$class_list_element="nav-item";
$class_link="nav-link";
if ( $amenu[$i]['me_url']!='')
{
@ -60,27 +53,35 @@
else
{
$a_request=explode('/', $access_code);
if ( isset($a_request [$level+1]) && $a_request[$level+1]==$amenu[$i]['me_code']) {
$class_link="nav-link active";
$class_list_element="nav-item li-active";
}
if ( $level == 0) {
$url=$a_request[0];
if (count($a_request) > 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;
}
?>
<td class="<?php echo $class?>">
<a class="mtitle" href="<?php echo $url;?>" <?php echo $js?> title="<?php echo h(gettext($amenu[$i]['me_description']))?>">
<li class="<?=$class_list_element?>">
<a class="<?=$class_link?> <" href="<?php echo $url;?>" <?php echo $js?> title="<?php echo h(gettext($amenu[$i]['me_description']))?>">
<?php echo gettext($amenu[$i]['me_menu'])?>
</a>
</td>
</li>
<?php
@ -90,8 +91,7 @@
<?php
endfor;
?>
</tr>
</table>
</ul>
</div>

2
include/upgrade.inc.php
View file

@ -37,7 +37,7 @@ $menu=array(
);
$sb=$http->request("sb", "string", "application");
echo '<div class="menu2">';
echo ShowItem($menu, "H", "mtitle", "mtitle", $sb);
echo ShowItem($menu, "H", "nav-item", "nav-link", $sb);
echo '</div>';
$sc=$http->get("sc", "string", "none");