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

chg: [internal] Simplified menu code

pull/6360/head
Jakub Onderka 2020-09-28 21:33:12 +02:00
parent 640db51321
commit 1d580f1f96
5 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/View/Elements/genericElements/GlobalMenu/global_menu_separator.ctp
View File

@ -1,8 +1,7 @@
<?php
/*
* This template creates a separator and check for the conditions under which it hsould be displayed.
*/
if (!isset($data['requirement']) || $data['requirement']) {
echo sprintf('<li class="divider"></li>');
}
?>
/*
* This template creates a separator and check for the conditions under which it should be displayed.
*/
if (!isset($data['requirement']) || $data['requirement']) {
echo '<li class="divider"></li>';
}

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

@ -130,7 +130,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'function' => 'getPopup',
'params' => array($eventId, 'events', 'importChoice')
),
'text' => __('Populate from...')
'text' => __('Populate from…')
));
if ($menuItem === 'populateFromtemplate') {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@ -149,7 +149,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'element_id' => 'merge',
'url' => $baseurl . '/events/merge/' . $eventId,
'text' => __('Merge attributes from...')
'text' => __('Merge attributes from…')
));
}
if (($isSiteAdmin && (!isset($mayModify) || !$mayModify)) || (!isset($mayModify) || !$mayModify)) {
@ -262,7 +262,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'function' => 'getPopup',
'params' => array($eventId, 'events', 'exportChoice')
),
'text' => __('Download as...')
'text' => __('Download as…')
));
echo $divider;
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@ -287,7 +287,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'url' => $baseurl . '/tag_collections/add',
'text' => __('Add Tag Collection')
));
if (($menuItem === 'edit')) {
if ($menuItem === 'edit') {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
'url' => $baseurl . '/tag_collections/edit/' . $id,
'text' => __('Add Tag Collection')
@ -349,7 +349,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'function' => 'getPopup',
'params' => array(0, 'attributes', 'exportSearch')
),
'text' => __('Download as...')
'text' => __('Download as…')
));
}
echo $divider;
@ -380,7 +380,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'text' => __('Automation')
));
}
if (!$isSiteAdmin && (int)$me['org_id'] === Configure::read('MISP.host_org_id')) {
if (!$isSiteAdmin && $hostOrgUser) {
echo $divider;
if (Configure::read('MISP.enableEventBlocklisting') !== false) {
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@ -426,7 +426,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
'url' => $baseurl . '/admin/regexp/delete/' . h($id),
'text' => __('Delete Regexp'),
'message' => __('Are you sure you want to delete # %s?', h($id))
'message' => __('Are you sure you want to delete #%s?', h($id))
));
}
break;
@ -494,7 +494,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
'url' => $baseurl . '/admin/allowedlists/delete/' . h($id),
'text' => __('Delete Allowedlist'),
'message' => __('Are you sure you want to delete # %s?', h($id))
'message' => __('Are you sure you want to delete #%s?', h($id))
));
}
break;
@ -666,7 +666,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
$this->Form->value('Server.id')
),
'text' => __('Delete'),
'message' => __('Are you sure you want to delete # %s?', $this->Form->value('Server.id'))
'message' => __('Are you sure you want to delete #%s?', $this->Form->value('Server.id'))
));
}
echo $this->element('/genericElements/SideMenu/side_menu_link', array(
@ -742,7 +742,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'event_id' => 'deleteUser',
'url' => $baseurl . '/admin/users/delete/' . h($id),
'text' => __('Delete User'),
'message' => __('Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead.', h($id))
'message' => __('Are you sure you want to delete #%s? It is highly recommended to never delete users but to disable them instead.', h($id))
));
echo $divider;
}
@ -756,7 +756,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
'event_id' => 'deleteRole',
'url' => $baseurl . '/admin/roles/delete/' . h($id),
'text' => __('Delete Role'),
'message' => __('Are you sure you want to delete # %s?', h($id))
'message' => __('Are you sure you want to delete #%s?', h($id))
));
echo $divider;
}
@ -823,7 +823,7 @@ $divider = $this->element('/genericElements/SideMenu/side_menu_divider');
echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
'url' => $baseurl . '/admin/organisations/delete/' . h($id),
'text' => __('Delete Organisation'),
'message' => __('Are you sure you want to delete # %s?', h($id))
'message' => __('Are you sure you want to delete #%s?', h($id))
));
}
echo $this->element('/genericElements/SideMenu/side_menu_link', array(

59
app/View/Elements/global_menu.ctp
View File

@ -3,8 +3,8 @@
$menu = array(
array(
'type' => 'root',
'url' =>empty($homepage['path']) ? $baseurl .'/' : $baseurl . h($homepage['path']),
'html' => (Configure::read('MISP.home_logo') ? $logo = '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;">' : __('Home'))
'url' => empty($homepage['path']) ? $baseurl .'/' : $baseurl . h($homepage['path']),
'html' => Configure::read('MISP.home_logo') ? '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;" alt="' . __('Home') . '">' : __('Home'),
),
array(
'type' => 'root',
@ -92,23 +92,21 @@
'requirement' =>
Configure::read('MISP.enableEventBlocklisting') !== false &&
!$isSiteAdmin &&
(int)$me['org_id'] === (int)Configure::read('MISP.host_org_id')
$hostOrgUser
),
array(
'text' => __('Blocklist Event'),
'url' => $baseurl . '/eventBlocklists/add',
'requirement' =>
Configure::read('MISP.enableEventBlocklisting') !== false &&
!$isSiteAdmin &&
(int)$me['org_id'] === (int)Configure::read('MISP.host_org_id')
!$isSiteAdmin && $hostOrgUser
),
array(
'text' => __('Manage Event Blocklists'),
'url' => $baseurl . '/eventBlocklists',
'requirement' =>
Configure::read('MISP.enableEventBlocklisting') !== false &&
!$isSiteAdmin &&
(int)$me['org_id'] === (int)Configure::read('MISP.host_org_id')
!$isSiteAdmin && $hostOrgUser
),
)
),
@ -257,52 +255,52 @@
array(
'type' => 'root',
'text' => __('Sync Actions'),
'requirement' => ($isAclSync || $isAdmin || $hostOrgUser),
'requirement' => $isAclSync || $isAdmin || $hostOrgUser,
'children' => array(
array(
'text' => __('Create Sync Config'),
'url' => $baseurl . '/servers/createSync',
'requirement' => ($isAclSync && !$isSiteAdmin)
'requirement' => $isAclSync && !$isSiteAdmin
),
array(
'text' => __('Import Server Settings'),
'url' => $baseurl . '/servers/import',
'requirement' => ($isSiteAdmin)
'requirement' => $isSiteAdmin
),
array(
'text' => __('List Servers'),
'url' => $baseurl . '/servers/index',
'requirement' => ($isAclSync || $isAdmin)
'requirement' => $isAclSync || $isAdmin
),
array(
'text' => __('List Feeds'),
'url' => $baseurl . '/feeds/index',
'requirement' => ($isSiteAdmin || $hostOrgUser)
'requirement' => $isSiteAdmin || $hostOrgUser
),
array(
'text' => __('Search Feed Caches'),
'url' => $baseurl . '/feeds/searchCaches',
'requirement' => ($isSiteAdmin || $hostOrgUser)
'requirement' => $isSiteAdmin || $hostOrgUser
),
array(
'text' => __('List SightingDB Connections'),
'url' => $baseurl . '/sightingdb/index',
'requirement' => ($isSiteAdmin)
'requirement' => $isSiteAdmin
),
array(
'text' => __('Add SightingDB Connection'),
'url' => $baseurl . '/sightingdb/add',
'requirement' => ($isSiteAdmin)
'requirement' => $isSiteAdmin
),
array(
'text' => __('List Communities'),
'url' => $baseurl . '/communities/index',
'requirement' => ($isSiteAdmin)
'requirement' => $isSiteAdmin
),
array(
'text' => __('Event ID translator'),
'url' => '/servers/idTranslator',
'requirement' => ($isSiteAdmin || $hostOrgUser)
'requirement' => $isSiteAdmin || $hostOrgUser
)
)
),
@ -310,7 +308,7 @@
'type' => 'root',
'text' => __('Administration'),
'url' => $baseurl . '/servers/serverSettings',
'requirement' => ($isAdmin),
'requirement' => $isAdmin,
'children' => array(
array(
'text' => __('List Users'),
@ -423,7 +421,7 @@
array(
'type' => 'root',
'text' => __('Audit'),
'requirement' => ($isAclAudit),
'requirement' => $isAclAudit,
'children' => array(
array(
'text' => __('List Logs'),
@ -450,7 +448,7 @@
),
array(
'type' => 'root',
'url' =>empty($homepage['path']) ? $baseurl : $baseurl . h($homepage['path']),
'url' => empty($homepage['path']) ? $baseurl : $baseurl . h($homepage['path']),
'html' => '<span class="logoBlueStatic bold" id="smallLogo">MISP</span>'
),
array(
@ -476,20 +474,20 @@
);
}
?>
<div id="topBar" class="navbar navbar-inverse <?php echo $debugMode;?>" style="z-index: 20;">
<div id="topBar" class="navbar navbar-inverse <?php echo $debugMode;?>">
<div class="navbar-inner">
<ul class="nav">
<?php
if (!empty($menu)) {
foreach ($menu as $root_element) {
echo $this->element('/genericElements/GlobalMenu/global_menu_root', array('data' => $root_element));
}
if (isset($menu)) {
foreach ($menu as $root_element) {
echo $this->element('/genericElements/GlobalMenu/global_menu_root', array('data' => $root_element));
}
}
?>
</ul>
<ul class="nav pull-right">
<?php
if (!empty($menu_right)) {
if (isset($menu_right)) {
foreach ($menu_right as $root_element) {
echo $this->element('/genericElements/GlobalMenu/global_menu_root', array('data' => $root_element));
}
@ -499,11 +497,4 @@
</div>
</div>
<input type="hidden" class="keyboardShortcutsConfig" value="/shortcuts/global_menu.json" />
<script type="text/javascript">
$(document).ready(function() {
$('#setHomePage').click(function(event) {
event.preventDefault();
setHomePage();
})
});
</script>

7
app/webroot/css/main.css
View File

@ -4,9 +4,10 @@ body {
}
#topBar {
height:42px;
width:100%;
min-width:1300px;
height:42px;
width:100%;
min-width:1300px;
z-index: 20;
}
input[type="file"] {

5
app/webroot/js/misp.js
View File

@ -4635,6 +4635,11 @@ $(document).ready(function() {
$('.quickToggleCheckbox').toggle(function() {
var url = $(this).data('checkbox-url');
});
$('#setHomePage').click(function(event) {
event.preventDefault();
setHomePage();
})
});
$("body").on("click", ".correlation-expand-button", function() {