mirror of https://github.com/MISP/MISP
fix: [UI] Changed the querystring loading for css/js
parent
0cfe265469
commit
e6ceed598d
|
@ -8,30 +8,44 @@
|
|||
<?php echo $title_for_layout, ' - '. h(Configure::read('MISP.title_text') ? Configure::read('MISP.title_text') : 'MISP'); ?>
|
||||
</title>
|
||||
<?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');
|
||||
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');
|
||||
}
|
||||
$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 = preg_replace('/\.css$/i', '', Configure::read('MISP.custom_css'));
|
||||
echo $this->Html->css($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('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>
|
||||
|
|
Loading…
Reference in New Issue