MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [UI] Use correct menu for categories_and_types page

pull/8613/head
Jakub Onderka 2022-10-06 12:24:01 +02:00
parent ce850e209c
commit 359d692ff0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

@ -730,6 +730,11 @@ $divider = '<li class="divider"></li>';
'url' => $baseurl . '/pages/display/doc/general',
'text' => __('User Guide')
));
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'categoriesAndTypes',
'url' => $baseurl . '/pages/display/doc/categories_and_types',
'text' => __('Categories & Types'),
));
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/users/terms',
'text' => __('Terms & Conditions')

10
app/View/Pages/doc/categories_and_types.ctp
View File

@ -1,15 +1,10 @@
<div class="actions <?php echo $debugMode;?>">
<ol class="nav nav-list">
<li class="active"><?php echo $this->Html->link(__('Categories and Types'), array('controller' => 'pages', 'action' => 'display', 'doc', 'categories_and_types')); ?></li>
</ol>
</div>
<div class="index">
<h2><?php echo __('Attribute Categories and Types');?></h2>
<h3><?php echo __('Attribute Categories vs. Types');?></h3>
<table class="table table-striped table-hover table-condensed table-bordered">
<tr>
<th><?php echo __('Category');?></th>
<?php foreach ($categoryDefinitions as $cat => $catDef): ?>
<?php foreach ($categoryDefinitions as $cat => $catDef): ?>
<th style="width:5%; text-align:center; white-space:normal">
<a href="#<?php echo $cat; ?>"><?php echo $cat; ?></a>
</th>
@ -21,7 +16,7 @@
<th><a href="#<?php echo $type; ?>"><?php echo $type; ?></a></th>
<?php foreach ($categoryDefinitions as $cat => $catDef): ?>
<td style="text-align:center">
<?php echo in_array($type, $catDef['types'])? 'X' : ''; ?>
<?php echo in_array($type, $catDef['types'], true)? 'X' : ''; ?>
</td>
<?php endforeach; ?>
<th><a href="#<?php echo $type; ?>"><?php echo $type; ?></a></th>
@ -73,3 +68,4 @@
</table>
<p><a href="<?php echo $baseurl;?>/pages/display/doc/md/categories_and_types"><?php echo __('Click here to get the .md version for gitbook generation.');?></a></p>
</div>
<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'categoriesAndTypes'));