ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More work on cosole - split into sep. files, create sidebar

This commit is contained in:
Kyle Johnson 2014-11-01 15:26:19 +00:00
parent 8ec86ae255
commit 1a83b3053e
3 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
web/skins/bootstrap/views/console.php
View File

@ -214,7 +214,12 @@ xhtmlHeaders( __FILE__, $SLANG['Console'] );
</ul> </ul>
</div> </div>
</nav> </nav>
<div id="content" class="container-fluid"> <div id="content" class="container-fluid">
<div class="row">
<div class="col-md-2"><?php include("sidebar.php"); ?></div>
<div class="col-md-10">
<table id="consoleTable" class="table table-striped"> <table id="consoleTable" class="table table-striped">
<thead> <thead>
<tr> <tr>
@ -244,9 +249,6 @@ if ( canEdit('Monitors') )
<tfoot> <tfoot>
<tr> <tr>
<td class="colLeftButtons" colspan="3"> <td class="colLeftButtons" colspan="3">
<input class="btn btn-default" type="button" value="<?= $SLANG['Refresh'] ?>" onclick="location.reload(true);"/>
<?= makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', $SLANG['AddNewMonitor'], (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
<?= makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', $SLANG['Filters'], canView( 'Events' ) ) ?>
</td> </td>
<?php <?php
for ( $i = 0; $i < count($eventCounts); $i++ ) for ( $i = 0; $i < count($eventCounts); $i++ )
@ -258,7 +260,7 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
} }
?> ?>
<td class="colZones"><?= $zoneCount ?></td> <td class="colZones"><?= $zoneCount ?></td>
<td class="colRightButtons" colspan="<?= canEdit('Monitors')?2:1 ?>"><input class="btn btn-default" type="button" name="editBtn" value="<?= $SLANG['Edit'] ?>" onclick="editMonitor( this )" disabled="disabled"/><input class="btn btn-default" type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td> <td class="colRightButtons" colspan="<?= canEdit('Monitors')?2:1 ?>"></td>
</tr> </tr>
</tfoot> </tfoot>
<tbody> <tbody>
@ -331,25 +333,12 @@ foreach( $displayMonitors as $monitor )
?> ?>
</tbody> </tbody>
</table> </table>
</div> </div> <!-- End .col-md-10 -->
<div id="footer">
<div class="container-fluid">
<p class="pull-right text-muted"><?= $SLANG['Load'] ?>: <?= getLoad() ?> - </div> <!-- End .row -->
<?= $SLANG['Disk'] ?>: <?= getDiskPercent() ?>% - </div> <!-- End #content .container-fluid -->
<?= makePopupLink( '?view=version', 'zmVersion', 'version', 'v' . ZM_VERSION, canEdit( 'System' ) ) ?> - <?php include("footer.php"); ?>
<?php
if ( ZM_OPT_USE_AUTH )
{
?><?= $SLANG['LoggedInAs'] ?> <?= makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?= strtolower( $SLANG['ConfiguredFor'] ) ?><?php
}
else
{
?><?= $SLANG['ConfiguredFor'] ?><?php
}
?>&nbsp;<?= makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?= $SLANG['BandwidthHead'] ?>
</p>
</div>
</div>
</form> </form>
</body> </body>
</html> </html>

18
web/skins/bootstrap/views/footer.php Normal file
View File

@ -0,0 +1,18 @@
<div id="footer">
<div class="container-fluid">
<p class="pull-right text-muted"><?= $SLANG['Load'] ?>: <?= getLoad() ?> -
<?= $SLANG['Disk'] ?>: <?= getDiskPercent() ?>% -
<?= makePopupLink( '?view=version', 'zmVersion', 'version', 'v' . ZM_VERSION, canEdit( 'System' ) ) ?> -
<?php
if ( ZM_OPT_USE_AUTH )
{
?><?= $SLANG['LoggedInAs'] ?> <?= makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?= strtolower( $SLANG['ConfiguredFor'] ) ?><?php
}
else
{
?><?= $SLANG['ConfiguredFor'] ?><?php
}
?>&nbsp;<?= makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?= $SLANG['BandwidthHead'] ?>
</p>
</div>
</div> <!-- End #footer -->

12
web/skins/bootstrap/views/sidebar.php Normal file
View File

@ -0,0 +1,12 @@
<?php
?>
<ul class="nav nav-pills nav-stacked" role="tablist">
<li><input class="btn btn-default btn-block" type="button" value="<?= $SLANG['Refresh'] ?>" onclick="location.reload(true);"/></li>
<li><input class="btn btn-default btn-block" type="button" value="Add New Monitor" onclick="createPopup( '?view=monitor', 'zmMonitor0', 'monitor' ); return( false );"/></li>
<li><input class="btn btn-default btn-block" type="button" value="Filters" onclick="createPopup( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter' ); return( false );"/></li>
<li><input class="btn btn-default btn-block" type="button" name="editBtn" value="<?= $SLANG['Edit'] ?>" onclick="editMonitor( this )" disabled="disabled"/></li>
<li><input class="btn btn-default btn-block" type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" onclick="deleteMonitor( this )" disabled="disabled"/></li>
</ul>