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

make navbar static instead of fixed, sync up dark theme, and improve storage editing styles

This commit is contained in:
Isaac Connor 2017-01-30 21:16:21 -05:00
parent 7ab6818fa0
commit f3378207c0
9 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/skins/classic/css/classic/views/storage.css Normal file
View File

@ -0,0 +1,3 @@
input[type="url"] {
width: 100%;
}

3
web/skins/classic/css/dark/views/storage.css Normal file
View File

@ -0,0 +1,3 @@
input[type="url"] {
width: 100%;
}

4
web/skins/classic/css/flat/views/console.css
View File

@ -94,7 +94,3 @@
#consoleTable .colRightButtons input { #consoleTable .colRightButtons input {
margin: 0 8px; margin: 0 8px;
} }
body {
padding-top:81px;
}

4
web/skins/classic/css/flat/views/options.css
View File

@ -21,7 +21,3 @@ input.large {
#contentTable.userTable .colMonitor, #contentTable.userTable .colUsername { #contentTable.userTable .colMonitor, #contentTable.userTable .colUsername {
text-align: left; text-align: left;
} }
body {
padding-top:81px;
}

2
web/skins/classic/includes/functions.php
View File

@ -200,7 +200,7 @@ function getNavBarHTML() {
global $user; global $user;
global $bwArray; global $bwArray;
?> ?>
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-static-top">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-header-nav" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-header-nav" aria-expanded="false">

9
web/skins/classic/views/js/server.js
View File

@ -1,12 +1,9 @@
function validateForm( form, newServer ) function validateForm( form, newServer ) {
{
var errors = new Array(); var errors = new Array();
if ( !form.elements['newServer[Name]'].value ) if ( !form.elements['newServer[Name]'].value ) {
{
errors[errors.length] = "You must supply a name"; errors[errors.length] = "You must supply a name";
} }
if ( errors.length ) if ( errors.length ) {
{
alert( errors.join( "\n" ) ); alert( errors.join( "\n" ) );
return( false ); return( false );
} }

14
web/skins/classic/views/js/storage.js Normal file
View File

@ -0,0 +1,14 @@
function validateForm( form, newStorage ) {
var errors = new Array();
if ( !form.elements['newStorage[Name]'].value ) {
errors[errors.length] = "You must supply a name";
}
if ( !form.elements['newStorage[Path]'].value ) {
errors[errors.length] = "You must supply a path";
}
if ( errors.length ) {
alert( errors.join( "\n" ) );
return( false );
}
return( true );
}

2
web/skins/classic/views/options.php
View File

@ -240,7 +240,7 @@ elseif ( $tab == "users" )
<input type="hidden" name="tab" value="<?php echo $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
<input type="hidden" name="action" value="delete"/> <input type="hidden" name="action" value="delete"/>
<input type="hidden" name="object" value="storage"/> <input type="hidden" name="object" value="storage"/>
<table id="contentTable" class="major storageTable" cellspacing="0"> <table id="contentTable" class="table table-striped" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colId"><?php echo translate('Id') ?></th> <th class="colId"><?php echo translate('Id') ?></th>

15
web/skins/classic/views/storage.php
View File

@ -18,15 +18,14 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
if ( !canEdit( 'System' ) ) if ( !canEdit( 'System' ) ) {
{ $view = 'error';
$view = "error";
return; return;
} }
if ( $_REQUEST['id'] ) { if ( $_REQUEST['id'] ) {
if ( !($newStorage = dbFetchOne( 'SELECT * FROM Storage WHERE Id = ?', NULL, ARRAY($_REQUEST['id'])) ) ) { if ( !($newStorage = dbFetchOne( 'SELECT * FROM Storage WHERE Id = ?', NULL, ARRAY($_REQUEST['id'])) ) ) {
$view = "error"; $view = 'error';
return; return;
} }
} else { } else {
@ -52,17 +51,17 @@ xhtmlHeaders(__FILE__, translate('Storage')." - ".$newStorage['Name'] );
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?php echo translate('StorageName') ?></th> <th scope="row"><?php echo translate('Name') ?></th>
<td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage['Name'] ?>"/></td> <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage['Name'] ?>"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?php echo translate('StoragePath') ?></th> <th scope="row"><?php echo translate('Path') ?></th>
<td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage['Path'] ?>"/></td> <td><input type="url" name="newStorage[Path]" value="<?php echo $newStorage['Path'] ?>"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="hidden" name="action" value="Save"/> <input type="hidden" name="action" value="Save"/>
<input type="submit" value="<?php echo translate('Save') ?>"/> <input type="submit" value="<?php echo translate('Save') ?>"/>
<input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/> <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
</div> </div>