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

chg: [refactor] Side menu generic templates moved

pull/4155/head
iglocska 2019-02-13 14:45:01 +01:00
parent 0ab6937131
commit d8ee91be68
143 changed files with 304 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Attributes/add.ctp
View File

@ -104,7 +104,7 @@
if (!$ajax) {
$event['Event']['id'] = $event_id;
$event['Event']['published'] = $published;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
}
?>
<script type="text/javascript">

2
app/View/Attributes/add_attachment.ctp
View File

@ -82,7 +82,7 @@ echo $this->Form->end();
<?php
$event['Event']['id'] = $this->request->data['Attribute']['event_id'];
$event['Event']['published'] = $published;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addAttachment', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addAttachment', 'event' => $event));
?>
<script type="text/javascript">
<?php

2
app/View/Attributes/add_threatconnect.ctp
View File

@ -22,5 +22,5 @@ echo $this->Form->end();
<?php
$event['Event']['id'] = $this->request->data['Attribute']['event_id'];
$event['Event']['published'] = $published;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addThreatConnect', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addThreatConnect', 'event' => $event));
?>

2
app/View/Attributes/alternate_search_result.ctp
View File

@ -50,5 +50,5 @@
</table>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'searchAttributes'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'searchAttributes'));
?>

2
app/View/Attributes/edit.ctp
View File

@ -75,7 +75,7 @@
if (!$ajax) {
$event['Event']['id'] = $this->request->data['Attribute']['event_id'];
$event['Event']['published'] = $published;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
}
?>
<script type="text/javascript">

2
app/View/Attributes/index.ctp
View File

@ -144,7 +144,7 @@ if ($isSearch == 1){
}
?>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => $class));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => $class));
?>
<script type="text/javascript">
// tooltips

2
app/View/Attributes/report_validation_issues_attributes.ctp
View File

@ -16,5 +16,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
?>

2
app/View/Attributes/search.ctp
View File

@ -200,6 +200,6 @@ $('.input-xxlarge').keydown(function (e) {
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'searchAttributes'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'searchAttributes'));
echo $this->Js->writeBuffer();
?>

324
app/View/Elements/side_menu.ctp → app/View/Elements/genericElements/SideMenu/side_menu.ctp
View File

File diff suppressed because it is too large Load Diff

0
app/View/Elements/side_menu_divider.ctp → app/View/Elements/genericElements/SideMenu/side_menu_divider.ctp
View File

0
app/View/Elements/side_menu_link.ctp → app/View/Elements/genericElements/SideMenu/side_menu_link.ctp
View File

0
app/View/Elements/side_menu_post_link.ctp → app/View/Elements/genericElements/SideMenu/side_menu_post_link.ctp
View File

2
app/View/Elements/generic_table_row.ctp
View File

@ -56,4 +56,4 @@
$pagination_details,
$pagination
);
echo $this->element('side_menu', array('menuList' => 'whitelist', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'whitelist', 'menuItem' => 'index'));

2
app/View/EventBlacklists/add.ctp
View File

@ -37,5 +37,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklistsAdd'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklistsAdd'));
?>

2
app/View/EventBlacklists/edit.ctp
View File

@ -31,5 +31,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklistsAdd'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklistsAdd'));
?>

2
app/View/EventBlacklists/index.ctp
View File

@ -60,5 +60,5 @@ endforeach; ?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklists'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'eventBlacklists'));
?>

2
app/View/Events/add.ctp
View File

@ -70,7 +70,7 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'add'));
?>
<script type="text/javascript">

2
app/View/Events/add_i_o_c.ctp
View File

@ -17,5 +17,5 @@ echo $this->Form->end();
<?php
$event['Event']['id'] = $id;
$event['Event']['published'] = $published;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addIOC', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addIOC', 'event' => $event));
?>

2
app/View/Events/add_misp_export.ctp
View File

@ -29,5 +29,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addMISPExport'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addMISPExport'));
?>

2
app/View/Events/add_misp_export_result.ctp
View File

@ -46,5 +46,5 @@
</table>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addMISPExport'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addMISPExport'));
?>

2
app/View/Events/automation.ctp
View File

@ -341,5 +341,5 @@
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'automation'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'automation'));
?>

2
app/View/Events/contact.ctp
View File

@ -34,5 +34,5 @@ $mayPublish = ($isAclPublish && $this->request->data['Event']['orgc_id'] == $me[
</div>
<?php
$event = $this->data;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'contact', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'contact', 'event' => $event));
?>

2
app/View/Events/edit.ctp
View File

@ -61,7 +61,7 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'editEvent', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'editEvent', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
?>
<script type="text/javascript">

2
app/View/Events/export.ctp
View File

@ -122,7 +122,7 @@
</ul>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'export'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'export'));
?>
<script type="text/javascript">
function generate(i, type, id, progress, modified) {

2
app/View/Events/import_module.ctp
View File

@ -110,7 +110,7 @@ echo $this->Form->end();
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'import'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'import'));
?>
<script type="text/javascript">
$(document).ready(function() {

2
app/View/Events/index.ctp
View File

@ -95,4 +95,4 @@
</div>
<input type="hidden" class="keyboardShortcutsConfig" value="/shortcuts/event_index.json" />
<?php
if (!$ajax) echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'index'));
if (!$ajax) echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'index'));

2
app/View/Events/legacy_automation.ctp
View File

@ -494,5 +494,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'automation'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'automation'));
?>

2
app/View/Events/merge.ctp
View File

@ -29,5 +29,5 @@ echo $this->Form->end();
</div>
<?php
$event['Event']['id'] = $this->request->data['Event']['target_id'];
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'merge', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'merge', 'event' => $event));
?>

2
app/View/Events/proposal_event_index.ctp
View File

@ -100,4 +100,4 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposalIndex'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposalIndex'));

2
app/View/Events/report_validation_issues_events.ctp
View File

@ -14,5 +14,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
?>

2
app/View/Events/resolved_attributes.ctp
View File

@ -290,5 +290,5 @@
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'freetextResults'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'freetextResults'));
?>

2
app/View/Events/show_i_o_c_results.ctp
View File

@ -55,5 +55,5 @@ endforeach; ?>
<?php
$event['Event']['id'] = $eventId;
$event['Event']['published'] = 0;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addIOC', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addIOC', 'event' => $event));
?>

2
app/View/Events/upload_analysis_file.ctp
View File

@ -99,7 +99,7 @@
<?php
$event['Event']['id'] = $eventId;
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
?>
<style>
.selectedLines td,

2
app/View/Events/upload_stix.ctp
View File

@ -31,5 +31,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addSTIX'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'addSTIX'));
?>

2
app/View/Events/view.ctp
View File

@ -32,7 +32,7 @@
}
}
}
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'viewEvent', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'viewEvent', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
?>
<div class="events view">
<?php

2
app/View/Events/view_graph.ctp
View File

@ -57,6 +57,6 @@
}
if (!$ajax) {
echo $this->element('side_menu', $params);
echo $this->element('/genericElements/SideMenu/side_menu', $params);
}
?>

2
app/View/Feeds/add.ctp
View File

@ -203,7 +203,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'add'));
?>
<script type="text/javascript">

2
app/View/Feeds/compare_feeds.ctp
View File

@ -92,5 +92,5 @@
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'compare'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'compare'));
?>

2
app/View/Feeds/edit.ctp
View File

@ -198,7 +198,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'edit'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'edit'));
?>
<script type="text/javascript">
//

2
app/View/Feeds/freetext_index.ctp
View File

@ -91,7 +91,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'add'));
?>
<script type="text/javascript">

2
app/View/Feeds/import_feeds.ctp
View File

@ -21,4 +21,4 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'import'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'import'));

2
app/View/Feeds/index.ctp
View File

@ -245,4 +245,4 @@ endforeach; ?>
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'index'));

2
app/View/Feeds/preview_event.ctp
View File

@ -88,7 +88,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'previewEvent', 'id' => $event['Event']['uuid']));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'previewEvent', 'id' => $event['Event']['uuid']));
?>
<script type="text/javascript">
// tooltips

2
app/View/Feeds/preview_index.ctp
View File

@ -87,4 +87,4 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'feeds', 'menuItem' => 'previewIndex', 'id' => $id));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'previewIndex', 'id' => $id));

2
app/View/Galaxies/index.ctp
View File

@ -58,5 +58,5 @@ endforeach;?>
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'galaxies', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'index'));
?>

2
app/View/Galaxies/view.ctp
View File

@ -1,5 +1,5 @@
<?php
echo $this->element('side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view'));
?>
<div class="galaxy view">
<div class="row-fluid">

2
app/View/GalaxyClusters/view.ctp
View File

@ -1,5 +1,5 @@
<?php
echo $this->element('side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view_cluster'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view_cluster'));
?>
<div class="galaxy view">
<div class="row-fluid">

2
app/View/Jobs/index.ctp
View File

@ -172,4 +172,4 @@
</ul>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'jobs'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'jobs'));

2
app/View/Layouts/default.ctp
View File

@ -10,6 +10,7 @@
<?php
echo $this->Html->meta('icon');
echo $this->Html->css('bootstrap');
//echo $this->Html->css('bootstrap4');
echo $this->Html->css('bootstrap-datepicker');
echo $this->Html->css('bootstrap-timepicker');
echo $this->Html->css('bootstrap-colorpicker');
@ -66,6 +67,7 @@
echo $this->element('footer');
echo $this->element('sql_dump');
echo $this->Html->script('bootstrap');
//echo $this->Html->script('bootstrap4');
echo $this->Html->script('bootstrap-timepicker');
echo $this->Html->script('bootstrap-datepicker');
echo $this->Html->script('bootstrap-colorpicker');

2
app/View/Logs/admin_index.ctp
View File

@ -121,5 +121,5 @@
} else {
$class = 'index';
}
echo $this->element('side_menu', array('menuList' => 'logs', 'menuItem' => $class));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'logs', 'menuItem' => $class));
?>

2
app/View/Logs/admin_search.ctp
View File

@ -27,5 +27,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'logs', 'menuItem' => 'search'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'logs', 'menuItem' => 'search'));
?>

2
app/View/Logs/event_index.ctp
View File

@ -68,5 +68,5 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc_id'] == $me['org_id']);
<?php
// We mimic the $event from some other views to pass the ID back to the sidemenu
$event['Event']['id'] = $eventId;
echo $this->element('side_menu', array('menuList' => 'event', 'event' => $event, 'menuItem' => 'eventLog', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'event' => $event, 'menuItem' => 'eventLog', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
?>

2
app/View/Logs/test_for_stolen_attributes.ctp
View File

@ -12,5 +12,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
?>

2
app/View/News/add.ctp
View File

@ -35,5 +35,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'news', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'news', 'menuItem' => 'add'));
?>

2
app/View/News/edit.ctp
View File

@ -36,5 +36,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'news', 'menuItem' => 'edit'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'news', 'menuItem' => 'edit'));
?>

2
app/View/News/index.ctp
View File

@ -50,5 +50,5 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'news', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'news', 'menuItem' => 'index'));
?>

2
app/View/Noticelists/index.ctp
View File

@ -88,5 +88,5 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'noticelist', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'noticelist', 'menuItem' => 'index'));
?>

2
app/View/Noticelists/view.ctp
View File

@ -67,5 +67,5 @@
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'noticelist', 'menuItem' => 'view'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'noticelist', 'menuItem' => 'view'));
?>

2
app/View/ObjectTemplates/index.ctp
View File

@ -131,4 +131,4 @@ endforeach; ?>
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'objectTemplates', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'objectTemplates', 'menuItem' => 'index'));

2
app/View/ObjectTemplates/view.ctp
View File

@ -34,7 +34,7 @@
$this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
),
'<div id="ajaxContent" style="width:100%;"></div>',
$this->element('side_menu', array('menuList' => 'objectTemplates', 'menuItem' => 'view'))
$this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'objectTemplates', 'menuItem' => 'view'))
);
?>

2
app/View/Objects/add.ctp
View File

@ -167,7 +167,7 @@
</div>
<?php
if (!$ajax) {
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addObject', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addObject', 'event' => $event));
}
?>
<script type="text/javascript">

2
app/View/Objects/orphaned_object_diagnostics.ctp
View File

@ -73,5 +73,5 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
?>

2
app/View/Objects/revise_object.ctp
View File

@ -91,5 +91,5 @@
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addObject', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addObject', 'event' => $event));
?>

2
app/View/OrgBlacklists/add.ctp
View File

@ -30,5 +30,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklistsAdd'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklistsAdd'));
?>

2
app/View/OrgBlacklists/edit.ctp
View File

@ -24,5 +24,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklistsAdd'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklistsAdd'));
?>

2
app/View/OrgBlacklists/index.ctp
View File

@ -58,4 +58,4 @@ endforeach; ?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklists'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'orgBlacklists'));

2
app/View/Organisations/admin_add.ctp
View File

@ -50,7 +50,7 @@
echo $this->Form->end();?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'addOrg'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'addOrg'));
?>
<script type="text/javascript">
$("#OrganisationName").on('input propertychange paste focusout', function() {

2
app/View/Organisations/admin_edit.ctp
View File

@ -61,7 +61,7 @@
echo $this->Form->end();?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'editOrg', 'orgId' => $orgId));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'editOrg', 'orgId' => $orgId));
?>
<script type="text/javascript">
$(document).ready(function() {

4
app/View/Organisations/index.ctp
View File

@ -147,5 +147,5 @@ endforeach; ?>
</div>
<?php
if ($isSiteAdmin) echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'indexOrg'));
else echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'indexOrg'));
if ($isSiteAdmin) echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'indexOrg'));
else echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'indexOrg'));

4
app/View/Organisations/view.ctp
View File

@ -70,8 +70,8 @@
<div id="ajaxContent" style="width:100%;"></div>
</div>
<?php
if ($isSiteAdmin) echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'viewOrg'));
else echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'viewOrg'));
if ($isSiteAdmin) echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'viewOrg'));
else echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'viewOrg'));
?>
<script type="text/javascript">
<?php

2
app/View/Pages/administration.ctp
View File

@ -36,5 +36,5 @@ if (!$isSiteAdmin) exit();
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'adminTools'));
?>

2
app/View/Posts/add.ctp
View File

@ -68,5 +68,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'threads', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'threads', 'menuItem' => 'add'));
?>

2
app/View/Posts/edit.ctp
View File

@ -21,5 +21,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'threads', 'menuItem' => 'edit'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'threads', 'menuItem' => 'edit'));
?>

2
app/View/Regexp/admin_add.ctp
View File

@ -34,5 +34,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'regexp', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'regexp', 'menuItem' => 'add'));
?>

2
app/View/Regexp/admin_edit.ctp
View File

@ -44,5 +44,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'regexp', 'menuItem' => 'edit', 'id' => $this->Form->value('Regexp.id')));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'regexp', 'menuItem' => 'edit', 'id' => $this->Form->value('Regexp.id')));
?>

2
app/View/Regexp/admin_index.ctp
View File

@ -56,5 +56,5 @@ endforeach;?>
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'regexp', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'regexp', 'menuItem' => 'index'));
?>

2
app/View/Regexp/index.ctp
View File

@ -50,5 +50,5 @@ endforeach;?>
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'regexp', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'regexp', 'menuItem' => 'index'));
?>

2
app/View/Roles/admin_add.ctp
View File

@ -46,7 +46,7 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'addRole'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'addRole'));
?>
<script type="text/javascript">

2
app/View/Roles/admin_edit.ctp
View File

@ -44,7 +44,7 @@
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'editRole'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'editRole'));
?>
<script type="text/javascript">

2
app/View/Roles/admin_index.ctp
View File

@ -87,4 +87,4 @@ endforeach; ?>
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'indexRole'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'indexRole'));

2
app/View/Roles/index.ctp
View File

@ -60,4 +60,4 @@ endforeach; ?>
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'roles'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'roles'));

2
app/View/Roles/view.ctp
View File

@ -24,6 +24,6 @@
__('Role'),
$this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
),
$this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'roles'))
$this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'roles'))
);
?>

2
app/View/Servers/add.ctp
View File

@ -122,7 +122,7 @@ echo $this->Form->end();
<?php echo $this->element('serverRuleElements/pull'); ?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'add'));
?>
<script type="text/javascript">

2
app/View/Servers/edit.ctp
View File

@ -169,7 +169,7 @@
<?php echo $this->element('serverRuleElements/pull'); ?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'edit'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'edit'));
?>

2
app/View/Servers/index.ctp
View File

@ -167,4 +167,4 @@ endforeach; ?>
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'index'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'index'));

2
app/View/Servers/preview_event.ctp
View File

@ -112,7 +112,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'previewEvent', 'id' => $event['Event']['id']));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'previewEvent', 'id' => $event['Event']['id']));
?>
<script type="text/javascript">
// tooltips

2
app/View/Servers/preview_index.ctp
View File

@ -169,4 +169,4 @@
</div>
</div>
<?php
if (!$ajax) echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'previewIndex', 'id' => $id));
if (!$ajax) echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'previewIndex', 'id' => $id));

2
app/View/Servers/pull.ctp
View File

@ -35,5 +35,5 @@ endif;?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'pull'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'pull'));
?>

2
app/View/Servers/push.ctp
View File

@ -24,5 +24,5 @@ endif;?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'sync', 'menuItem' => 'push'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'push'));
?>

2
app/View/Servers/rest.ctp
View File

@ -141,7 +141,7 @@
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'rest'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'rest'));
echo $this->Html->script('doT');
echo $this->Html->script('extendext');

2
app/View/Servers/server_settings.ctp
View File

@ -20,5 +20,5 @@
<div style="font-style: italic;"><?php echo __('To edit a setting, simply double click it.');?></div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'admin', 'menuItem' => 'serverSettings'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'serverSettings'));
?>

2
app/View/ShadowAttributes/add.ctp
View File

@ -70,7 +70,7 @@
<?php
$event['Event']['id'] = $this->request->data['ShadowAttribute']['event_id'];
if (!$ajax) {
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'proposeAttribute', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'proposeAttribute', 'event' => $event));
}
?>
<script type="text/javascript">

2
app/View/ShadowAttributes/add_attachment.ctp
View File

@ -38,7 +38,7 @@
</div>
<?php
$event['Event']['id'] = $this->request->data['ShadowAttribute']['event_id'];
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'proposeAttachment', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'proposeAttachment', 'event' => $event));
?>
<script type="text/javascript">

2
app/View/ShadowAttributes/edit.ctp
View File

@ -68,7 +68,7 @@
</div>
<?php
$event['Event']['id'] = $this->request->data['ShadowAttribute']['event_id'];
echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'proposeAttribute', 'event' => $event));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'proposeAttribute', 'event' => $event));
?>
<script type="text/javascript">

2
app/View/ShadowAttributes/index.ctp
View File

@ -113,5 +113,5 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposals'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'viewProposals'));
?>

2
app/View/SharingGroups/add.ctp
View File

@ -76,7 +76,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'addSG'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'addSG'));
?>
<script type="text/javascript">
var lastPage = 4;

2
app/View/SharingGroups/edit.ctp
View File

@ -84,7 +84,7 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'editSG'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'editSG'));
?>
<script type="text/javascript">
var lastPage = 4;

2
app/View/SharingGroups/index.ctp
View File

@ -96,4 +96,4 @@ endforeach; ?>
});
</script>
<?php
echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'indexSG'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'indexSG'));

2
app/View/SharingGroups/view.ctp
View File

@ -86,5 +86,5 @@
</div>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'viewSG'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'viewSG'));
?>

2
app/View/TagCollections/add.ctp
View File

@ -23,5 +23,5 @@ echo $this->Form->end();
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'tag-collections', 'menuItem' => 'add'));
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'tag-collections', 'menuItem' => 'add'));
?>

Some files were not shown because too many files have changed in this diff Show More