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

fix: [UI] Reverted some breaking changes

pull/4399/head
iglocska 2019-04-04 10:48:10 +02:00
parent 31ac700a15
commit 4d3d8b1b9a
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,44 +8,30 @@
<?php echo $title_for_layout, ' - '. h(Configure::read('MISP.title_text') ? Configure::read('MISP.title_text') : 'MISP'); ?>
</title>
<?php
$css_collection = array(
'bootstrap',
//'bootstrap4',
'bootstrap-datepicker',
'bootstrap-colorpicker',
'famfamfam-flags',
'font-awesome',
'jquery-ui',
'chosen.min',
'main'
);
if (Configure::read('MISP.custom_css')) {
$css_collection[] = preg_replace('/\.css$/i', '', Configure::read('MISP.custom_css'));
//echo $this->Html->css($css);
}
$js_collection = array(
'misp',
'jquery',
'misp-touch',
'jquery-ui',
'chosen.jquery.min'
);
foreach ($css_collection as $css) {
if ($me) {
echo $this->Html->css($css . '.css?' . $queryVersion);
} else {
echo $this->Html->css($css);
}
}
foreach ($js_collection as $js) {
if ($me) {
echo $this->Html->script($js . '.js?' . $queryVersion);
} else {
echo $this->Html->script($js);
}
}
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');
echo $this->Html->css('famfamfam-flags');
echo $this->Html->css('font-awesome');
if ($me) {
echo $this->Html->css('main.css?' . $queryVersion);
} else {
echo $this->Html->css('main');
}
if (Configure::read('MISP.custom_css')) {
$css = preg_replace('/\.css$/i', '', Configure::read('MISP.custom_css'));
echo $this->Html->css($css);
}
echo $this->Html->css('print', 'stylesheet', array('media' => 'print'));
echo $this->Html->css('jquery-ui');
echo $this->Html->script('jquery'); // Include jQuery library
echo $this->Html->script('misp-touch'); // touch interface support
echo $this->Html->script('jquery-ui'); // UI support
echo $this->Html->css('chosen.min');
echo $this->Html->script('chosen.jquery.min');
?>
</head>