Use <a> elements intead of makePopupLink() in header

This commit is contained in:
Kyle Johnson 2014-11-02 00:47:32 +00:00
parent 1436414ddc
commit 23b367614b
1 changed files with 5 additions and 10 deletions

View File

@ -14,19 +14,14 @@
</a> </a>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<li><a href="?view=console"><?= $SLANG['Console']; ?></a></li> <li><a href="?view=console"><?= $SLANG['Console']; ?></a></li>
<li> <li><a href="?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now"><?= $SLANG['Filters'] ?></a></li>
<?= makePopupLink( '?view=options', 'zmOptions', 'options', $SLANG['Options'] ) ?> <li><a href="?view=options"><?= $SLANG['Options'] ?></a></li>
</li>
<?php if ( logToDatabase() > Logger::NOLOG ) { ?> <?php if ( logToDatabase() > Logger::NOLOG ) { ?>
<li> <li><a href="?view=log"><?= $SLANG['Log'] ?></a></li>
<?= makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.$SLANG['Log'].'</span>' ) ?>
</li>
<?php } ?> <?php } ?>
<li> <li><a href="?view=groups"><?= sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ).($group?' ('.$group['Name'].')':'')?></a></li>
<?= makePopupLink( '?view=groups', 'zmGroups', 'groups', sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ).($group?' ('.$group['Name'].')':''), canView( 'System' ) ); ?>
</li>
<?php if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?> <?php if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?>
<li><?= makePopupLink( '?view=devices', 'zmDevices', 'devices', $SLANG['Devices'] ) ?></li> <li><a href="?view=devices"><?= $SLANG['Devices'] ?></a></li>
<?php } ?> <?php } ?>
<?php if ($running) ?> <?php if ($running) ?>
<li><a href="?view=cycle&amp;group=<?= $cycleGroup ?>"><?= $SLANG['Cycle'] ?></a></li> <li><a href="?view=cycle&amp;group=<?= $cycleGroup ?>"><?= $SLANG['Cycle'] ?></a></li>