From d13829c6f3355f408fa6c832e91b685b54a4112a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 10:15:06 -0500
Subject: [PATCH 1/3] Add Hostname to list of servers, since we have the space
 for it.

---
 web/skins/classic/views/options.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 290790962..9c3b4a418 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -221,6 +221,7 @@ elseif ( $tab == "users" )
           <thead>
             <tr>
               <th class="colName"><?php echo translate('name') ?></th>
+              <th class="colHostname"><?php echo translate('Hostname') ?></th>
               <th class="colMark"><?php echo translate('Mark') ?></th>
 			</tr>
           </thead>
@@ -228,6 +229,7 @@ elseif ( $tab == "users" )
 <?php foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) { ?>
             <tr>
               <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>
 			</tr>
 <?php } #end foreach Server ?>

From 99dfaa97fa7ab157ec21972b0e4fc21ee04cd732 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 10:15:21 -0500
Subject: [PATCH 2/3] User Name instead of ServerName and Hostname instead of
 ServerHostname

---
 web/skins/classic/views/server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index fd22bf367..83df0501e 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -52,11 +52,11 @@ xhtmlHeaders(__FILE__, translate('Server')." - ".$newServer['Name'] );
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <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>
             </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>
             </tr>
           </tbody>

From d48ec1cfbe8a251f55158e3feba0f6381efceaff Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 8 Jan 2016 10:15:41 -0500
Subject: [PATCH 3/3] Add AddNewServer and Hostname entries

---
 web/lang/en_gb.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 9003e466f..d11cec179 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -87,6 +87,7 @@ $SLANG = array(
     'Actual'                => 'Actual',
     'AddNewControl'         => 'Add New Control',
     'AddNewMonitor'         => 'Add New Monitor',
+    'AddNewServer'          => 'Add New Server',
     'AddNewUser'            => 'Add New User',
     'AddNewZone'            => 'Add New Zone',
     'Alarm'                 => 'Alarm',
@@ -385,6 +386,7 @@ $SLANG = array(
     'HighBW'                => 'High&nbsp;B/W',
     'High'                  => 'High',
     'Home'                  => 'Home',
+    'Hostname'				=> 'Hostname',
     'Hour'                  => 'Hour',
     'Hue'                   => 'Hue',
     'Id'                    => 'Id',