Network tree 0.1

front/php/server/devices.php

@@ -584,7 +584,8 @@ function getDevicesList() {
     array("dev_Status", 10, -1),            
     array("dev_MAC_full", 11, -1),          
     array("dev_LastIP_orderable", 12, -1),  
-    array("rowid", 13, -1)                  
+    array("rowid", 13, -1),            
+    array("dev_Network_Node_MAC_ADDR", 14, -1)                  
   );
 
   // get device columns order
@@ -632,7 +633,8 @@ function getDevicesList() {
                             $row['dev_Status'],
                             $row['dev_MAC'], // MAC (hidden)
                             formatIPlong ($row['dev_LastIP']), // IP orderable
-                            $row['rowid'] // Rowid (hidden)      
+                            $row['rowid'], // Rowid (hidden)      
+                            $row['dev_Network_Node_MAC_ADDR'] // 
                             );
 
     $newOrder = array();

front/php/templates/language/en_us.php

@@ -68,6 +68,7 @@ $lang['en_us'] = array(
 'Device_TableHead_Type' => 'Type',
 'Device_TableHead_Icon' => 'Icon',
 'Device_TableHead_RowID' => 'Row ID',
+'Device_TableHead_Parent_MAC' => 'Parent node MAC',
 'Device_TableHead_Favorite' => 'Favorite',
 'Device_TableHead_Group' => 'Group',
 'Device_TableHead_FirstSession' => 'First Session',
@@ -76,7 +77,6 @@ $lang['en_us'] = array(
 'Device_TableHead_MAC' => 'MAC',
 'Device_TableHead_MAC_full' => 'Full MAC',
 'Device_TableHead_LastIPOrder' => 'Last IP Order',
-'Device_TableHead_Rowid' => 'Rowid',
 'Device_TableHead_Status' => 'Status',
 'Device_Searchbox' => 'Search',
 'Device_Tablelenght' => 'Show _MENU_ entries',
@@ -255,8 +255,8 @@ $lang['en_us'] = array(
 'Maintenance_Tools_Tab_Tools' => 'Tools',
 'Maintenance_Tools_Tab_BackupRestore' => 'Backup / Restore',
 'Maintenance_Tools_Tab_Logging' => 'Logs',
-'Maintenance_Tool_displayed_columns_text' => 'Which columns should be displayed in the <a href="devices.php"><b> <i class="fa fa-laptop"></i> Devices</b></a> page.',
-'Maintenance_Tool_order_columns_text' => 'Change the order of the columns in the <a href="devices.php"><b> <i class="fa fa-laptop"></i> Devices</b></a> page.',
+'Maintenance_Tool_displayed_columns_text' => 'Change the order of the columns in the <a href="devices.php"><b> <i class="fa fa-laptop"></i> Devices</b></a> page. (The drag-and-drop is a bit clunky, but for now workable, not a common task).',
+'Maintenance_Tool_order_columns_text' => '',
 'Maintenance_Tool_darkmode' => 'Toggle Modes (Dark/Light)',
 'Maintenance_Tool_drag_me' => 'Drag me to reorder columns.',
 'Maintenance_Tool_check_visible' => 'Uncheck to hide column.',