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

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2016-01-10 20:59:01 -05:00
parent 47d4331d62 7e4a12e7f7
commit 3ebeaec8ab
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/lang/en_gb.php
View File

@ -87,6 +87,7 @@ $SLANG = array(
'Actual' => 'Actual', 'Actual' => 'Actual',
'AddNewControl' => 'Add New Control', 'AddNewControl' => 'Add New Control',
'AddNewMonitor' => 'Add New Monitor', 'AddNewMonitor' => 'Add New Monitor',
'AddNewServer' => 'Add New Server',
'AddNewUser' => 'Add New User', 'AddNewUser' => 'Add New User',
'AddNewZone' => 'Add New Zone', 'AddNewZone' => 'Add New Zone',
'Alarm' => 'Alarm', 'Alarm' => 'Alarm',
@ -385,6 +386,7 @@ $SLANG = array(
'HighBW' => 'High B/W', 'HighBW' => 'High B/W',
'High' => 'High', 'High' => 'High',
'Home' => 'Home', 'Home' => 'Home',
'Hostname' => 'Hostname',
'Hour' => 'Hour', 'Hour' => 'Hour',
'Hue' => 'Hue', 'Hue' => 'Hue',
'Id' => 'Id', 'Id' => 'Id',

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

@ -221,6 +221,7 @@ elseif ( $tab == "users" )
<thead> <thead>
<tr> <tr>
<th class="colName"><?php echo translate('name') ?></th> <th class="colName"><?php echo translate('name') ?></th>
<th class="colHostname"><?php echo translate('Hostname') ?></th>
<th class="colMark"><?php echo translate('Mark') ?></th> <th class="colMark"><?php echo translate('Mark') ?></th>
</tr> </tr>
</thead> </thead>
@ -228,6 +229,7 @@ elseif ( $tab == "users" )
<?php foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) { ?> <?php foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) { ?>
<tr> <tr>
<td class="colName"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Name']), $canEdit ) ?></td> <td class="colName"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Name']), $canEdit ) ?></td>
<td class="colHostname"><?php echo makePopupLink( '?view=server&amp;id='.$row['Id'], 'zmServer', 'server', validHtmlStr($row['Hostname']), $canEdit ) ?></td>
<td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $row['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $row['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php } #end foreach Server ?> <?php } #end foreach Server ?>

4
web/skins/classic/views/server.php
View File

@ -52,11 +52,11 @@ xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['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('ServerName') ?></th> <th scope="row"><?php echo translate('Name') ?></th>
<td><input type="text" name="newServer[Name]" value="<?php echo $newServer['Name'] ?>"/></td> <td><input type="text" name="newServer[Name]" value="<?php echo $newServer['Name'] ?>"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?php echo translate('ServerHostname') ?></th> <th scope="row"><?php echo translate('Hostname') ?></th>
<td><input type="text" name="newServer[Hostname]" value="<?php echo $newServer['Hostname'] ?>"/></td> <td><input type="text" name="newServer[Hostname]" value="<?php echo $newServer['Hostname'] ?>"/></td>
</tr> </tr>
</tbody> </tbody>