Merge branch 'dev'

master
andryyy 2017-04-30 21:44:49 +02:00
commit 013579bae8
2 changed files with 19 additions and 5 deletions

View File

@ -56,7 +56,7 @@
if (isset($_SESSION['mailcow_cc_role'])) {
?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><?=$lang['header']['mailcow_settings'];?><span class="caret"></span></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <?=$lang['header']['mailcow_settings'];?> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<?php
if (isset($_SESSION['mailcow_cc_role'])) {
@ -86,7 +86,19 @@
<?php
endif;
?>
<?php
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><span class="glyphicon glyphicon-link" aria-hidden="true"></span> Apps <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<?php
foreach ($MAILCOW_APPS as $app):
?>
<li><a href="<?=$app['link'];?>"><?=$app['name'];?></a></li>
<?php
endforeach;
?>
</ul>
</li>
<?php
}
if (!isset($_SESSION["dual-login"]) && isset($_SESSION['mailcow_cc_username'])):
?>

View File

@ -65,9 +65,11 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
?>
<legend>mailcow Apps</legend>
<?php
foreach ($MAILCOW_APPS as $app) {
echo '<a href="' . $app['link'] . '" role="button" class="btn btn-lg btn-default">' . $app['name'] . '</a>&nbsp;';
}
foreach ($MAILCOW_APPS as $app):
?>
<a href="<?=$app['link'];?>" role="button" class="btn btn-lg btn-default"><?=$app['name'];?></a>&nbsp;
<?php
endforeach;
?>
</div>
</div>