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

minor correction: 

- login page does not display "invalid user" when first time presented to the user
- "Log Off" button removed from the print view
pull/61/head
Andrzej Dereszowski 2012-04-02 11:37:32 +02:00
parent ed298aa0dd
commit 17950b965e
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/UsersController.php
View File

@ -219,7 +219,9 @@ class UsersController extends AppController {
if ($this->Auth->login()) {
$this->redirect($this->Auth->redirect());
} else {
$this->Session->setFlash(__('Invalid username or password, try again'));
// don't display "invalid user" before first login attempt
if($this->request->is('post')) $this->Session->setFlash(__('Invalid username or password, try again'));
}
}

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

@ -55,8 +55,8 @@
<?php echo $this->fetch('content'); ?>
</div>
<div id="footer">
<h1 style="float:left;">Download: <?php echo $this->Html->link('PGP/GPG key', '/gpg.asc');?></h1>
<h1 style="float:right;"> <?php echo $this->Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout'));?></h1>
<div class="noprint"><h1 style="float:left;">Download: <?php echo $this->Html->link('PGP/GPG key', '/gpg.asc');?></h1>
<h1 style="float:right;"> <?php echo $this->Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout'));?></h1></div>
<h1 style="text-align:center;"><?php echo Configure::read('CyDefSIG.footer')?></h1>
</div>

5
app/webroot/css/print.css
View File

@ -113,6 +113,9 @@ div.view {
div.actions {
display: none;
}
div.noprint {
display: none;
}
div.actions h3 {
padding-top:0;
color:#777;
@ -169,7 +172,7 @@ td.short {
}
/* added */
div .events table tr:hover, div .events table tr.altrow:hover, div .attributes table tr:hover, div .attributes table tr.altrow:hover{
div .events table tr:hover, div .events table tr.altrow:hover, div .signatures table tr:hover, div .signatures table tr.altrow:hover{
background-color: #F5F5D7;
}