mirror of https://github.com/MISP/MISP
Changes to the UI
- login screen looks a bit fancier and is more customisable - admins can add a Logo next to the login fields, there's a MISP logo ontop with a line of text above and below it, editable via bootstrap.php - Footer re-added, has the PGP key download and the center footer text from MISP 1.1 - A logo on the right side of the footer, optionally added by bootstrap.php - Header, Footer, menu are now fixed and not affected by scrolling the screenpull/217/head
parent
32c0b4e017
commit
c58eb89013
|
@ -113,6 +113,8 @@ Configure::write('CyDefSIG.footerpart1', 'Powered by MISP');
|
|||
Configure::write('CyDefSIG.footerpart2', '© Belgian Defense CERT & NCIRC');
|
||||
Configure::write('CyDefSIG.footer', Configure::read('CyDefSIG.footerpart1') . ' ' . Configure::read('CyDefSIG.footerpart2'));
|
||||
Configure::write('CyDefSIG.footerversion', Configure::read('CyDefSIG.footerpart1') . ' version ' . Configure::read('CyDefSIG.version') . ' ' . Configure::read('CyDefSIG.footerpart2'));
|
||||
// The following field is optional
|
||||
// Configure::write('MISP.footer_logo', 'imagename'); // Logo for the bottom right corner of the screen
|
||||
Configure::write('CyDefSIG.org', 'ORGNAME'); // if sync this will be Event.org content on the peer side
|
||||
Configure::write('CyDefSIG.logo', 'orgs/ORGNAME.png'); // used in Events::index for owned events
|
||||
|
||||
|
@ -134,7 +136,7 @@ Configure::write('SecureAuth.expire', 300); // the time-window for th
|
|||
|
||||
Configure::write('CyDefSIG.dns', 'false'); // there is a nameserver available to do resolution.
|
||||
|
||||
// The following 3 fields are not mandatory:
|
||||
// The following 3 fields are optional
|
||||
|
||||
//Configure::write('MISP.welcome_text_top', 'Welcome to the Organisation community\'s'); // used in Events::login before the MISP logo
|
||||
//Configure::write('MISP.welcome_text_bottom', 'instance'); // used in Events::login after the MISP logo
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<div class="navbar-wrapper">
|
||||
<div class="navbar-wrapper" style="position:fixed;width:100%;z-index: 1;">
|
||||
<div class="navbar navbar-inverse">
|
||||
<div class="navbar-inner">
|
||||
<?php if ($me != false ):?>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
}?></h1>
|
||||
</div-->
|
||||
<?php echo $this->element('global_menu');?>
|
||||
<div class="container-fluid">
|
||||
<div class="container-fluid" style="padding-top:50px;">
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<?php echo $this->Session->flash('auth'); ?>
|
||||
|
@ -46,9 +46,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br/><br/>
|
||||
<br/><br />
|
||||
<?php echo $this->fetch('content'); ?>
|
||||
|
||||
<!--div id="footer">
|
||||
<div class="noprint">
|
||||
<h1 style="float:left;">Download: <?php echo $this->Html->link('PGP/GPG key', '/gpg.asc');?></h1>
|
||||
|
@ -57,14 +56,14 @@
|
|||
|
||||
<h1 style="text-align:center;"> <?php if (isset($me)) echo Configure::read('CyDefSIG.footerversion'); else echo Configure::read('CyDefSIG.footer')?></h1>
|
||||
</div-->
|
||||
</div>
|
||||
<?php
|
||||
echo $this->element('footer');
|
||||
echo $this->element('sql_dump');
|
||||
|
||||
echo $this->Html->script('bootstrap');
|
||||
//echo $this->Html->script('bootstrap.min');
|
||||
// echo $this->Html->script('bootstrap.min');
|
||||
echo $this->Html->script('bootstrap-datepicker');
|
||||
echo $this->Html->script('main');
|
||||
?>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -1,18 +1,20 @@
|
|||
<div class="row">
|
||||
<div class="span4">
|
||||
<?php
|
||||
if (true == Configure::read('MISP.welcome_logo')) {
|
||||
?>
|
||||
<div style="width:100%;">
|
||||
<div class="row" style="margin: 0 auto;display:table;">
|
||||
|
||||
<?php
|
||||
if (true == Configure::read('MISP.welcome_logo')) {
|
||||
?>
|
||||
<div class="span4">
|
||||
<img src="
|
||||
<?php
|
||||
echo Configure::read('CyDefSig.url') . '/img/';
|
||||
echo Configure::read('MISP.welcome_logo');
|
||||
?>
|
||||
.png">
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<div class="span8">
|
||||
<span style="font-size:18px;">
|
||||
<?php
|
||||
|
@ -49,3 +51,4 @@
|
|||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
|
@ -55,6 +55,7 @@ pre {
|
|||
top: 0;
|
||||
visibility: hidden;
|
||||
margin-top: -1px;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.dropdown-menu li:hover .sub-menu {
|
||||
|
@ -146,10 +147,12 @@ div.view {
|
|||
width:85%;
|
||||
border-left:1px solid #666;
|
||||
padding:10px 1%;
|
||||
padding-bottom:40px;
|
||||
}
|
||||
div.actions {
|
||||
float:left;
|
||||
width:10%;
|
||||
position:fixed;
|
||||
}
|
||||
div.actions h3 {
|
||||
padding-top:0;
|
||||
|
@ -368,4 +371,12 @@ dd {
|
|||
color:#fff;
|
||||
}
|
||||
|
||||
|
||||
/* footer */
|
||||
.footer {
|
||||
clear: both;
|
||||
float: bottom;
|
||||
position:fixed;
|
||||
width:100%;
|
||||
bottom:0px;
|
||||
height:42px;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue