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

Added the new server settings to the menues

pull/304/merge
iglocska 2014-09-11 10:07:06 +02:00
parent 34cc73b21a
commit 1058e418b9
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/ServersController.php
View File

@ -385,7 +385,7 @@ class ServersController extends AppController {
$this->set('issues', $issues);
$this->set('finalSettings', $results);
$dump = array('gpgStatus' => $gpgStatus, 'stix' => $stix, 'writeableDirs' => $writeableDirs, 'finalSettings' => $dumpResults);
$this->set('dump', $dump);
$this->set('dump', json_encode($dump));
$priorities = array(0 => 'Critical', 1 => 'Recommended', 2 => 'Optional', 3 => 'Deprecated');
$priorityErrorColours = array(0 => 'red', 1 => 'yellow', 2 => 'green');
$this->set('priorities', $priorities);

1
app/View/Elements/global_menu.ctp
View File

@ -113,6 +113,7 @@
<li><a href="/admin/users/email">Contact Users</a></li>
<li class="divider"></li>
<li><a href="/pages/display/administration">Administrative tools</a></li>
<li><a href="/servers/serverSettings">Server settings</a></li>
<?php if (Configure::read('MISP.background_jobs')): ?>
<li class="divider"></li>
<li><a href="/jobs/index">Jobs</a></li>

3
app/View/Elements/healthElements/tabs.ctp
View File

@ -31,4 +31,7 @@
?>
</a>
</span>
<span class="tabMenuFixed tabMenuFixedCenter tabMenuSides" style="margin-left:50px;">
<span id="download-button" title="Download report" class="discrete icon-download-alt"></span>
</span>
</div>

5
app/View/Elements/side_menu.ctp
View File

@ -155,8 +155,9 @@
<li <?php if ($menuItem === 'indexRole') echo 'class="active"';?>><?php echo $this->Html->link('List Roles', array('controller' => 'roles', 'action' => 'index', 'admin' => true)); ?> </li>
<?php if ($isSiteAdmin): ?>
<li class="divider"></li>
<li <?php if ($menuItem === 'contact') echo 'class="active"';?>><?php echo $this->Html->link('Contact users', array('controller' => 'users', 'action' => 'email', 'admin' => true)); ?> </li>
<li <?php if ($menuItem === 'adminTools') echo 'class="active"';?>><a href="/pages/display/administration">Administrative tools</a></li>
<li <?php if ($menuItem === 'contact') echo 'class="active"';?>><?php echo $this->Html->link('Contact Users', array('controller' => 'users', 'action' => 'email', 'admin' => true)); ?> </li>
<li <?php if ($menuItem === 'adminTools') echo 'class="active"';?>><a href="/pages/display/administration">Administrative Tools</a></li>
<li <?php if ($menuItem === 'serverSettings') echo 'class="active"';?>><a href="/servers/serverSettings">Server Settings</a></li>
<li class="divider"></li>
<?php if (Configure::read('MISP.background_jobs')): ?>
<li <?php if ($menuItem === 'jobs') echo 'class="active"';?>><a href="/jobs/index">Jobs</a></li>

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

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

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

@ -921,8 +921,11 @@ a.proposal_link_red:hover {
padding-right:5px;
}
.tabMenuFixed:hover {
background-color:#cfefff;
}
.tabMenuSides {
background-color: #white;
border-top: 1px solid #ddd;
}