r3306 small fixes, making room for VLAN sync code
authorDenis Ovsienko <infrastation@yandex.ru>
Mon, 1 Mar 2010 15:47:31 +0000 (15:47 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Mon, 1 Mar 2010 15:47:31 +0000 (15:47 +0000)
inc/interface.php
inc/navigation.php

index 3998e10bc243e659b2833b4962132d47c2462340..fc1780ccb92298a8e422dba48cf24faa47cbdbf4 100644 (file)
@@ -6600,7 +6600,7 @@ function renderObjectVLANPorts ($object_id)
        $object = spotEntity ('object', $object_id);
        amplifyCell ($object);
        $port_id = array_key_exists ('port_id', $sic) ? $sic['port_id'] : 0;
-       echo '<table border=1 width="100%"><tr valign=top><td class=tdleft width="30%">';
+       echo '<table border=0 width="100%"><tr valign=top><td class=tdleft width="30%">';
        // port list
        echo '<table cellspacing=0 cellpadding=5 align=center class=widetable>';
        echo '<tr><th>port name</th><th>current config</th></tr>';
@@ -6816,4 +6816,8 @@ function renderVLANIPv4 ()
        echo '</table>';
 }
 
+function renderObjectVLANSync ($object_id)
+{
+}
+
 ?>
index f750c00ae1d8973cae2726afe8bfcc978593bb31..b5e6cc34aced186549705707421c47bdcd6b766b 100644 (file)
@@ -90,8 +90,9 @@ $tab['object']['lvsconfig'] = 'keepalived.conf';
 $tab['object']['autoports'] = 'AutoPorts';
 $tab['object']['tags'] = 'Tags';
 $tab['object']['files'] = 'Files';
-$tab['object']['vlanconfig'] = 'VLAN config';
-$tab['object']['vlanports'] = '[802.1Q]';
+$tab['object']['vlanconfig'] = '802.1Q domain';
+$tab['object']['vlanports'] = '802.1Q ports';
+$tab['object']['vlansync'] = '[802.1Q sync]';
 $tabhandler['object']['default'] = 'renderRackObject';
 $tabhandler['object']['edit'] = 'renderEditObjectForm';
 $tabhandler['object']['rackspace'] = 'renderRackSpaceForObject';
@@ -107,6 +108,7 @@ $tabhandler['object']['files'] = 'renderFilesForEntity';
 $tabhandler['object']['editrspvs'] = 'renderObjectSLB';
 $tabhandler['object']['vlanconfig'] = 'renderObjectVLANConfig';
 $tabhandler['object']['vlanports'] = 'renderObjectVLANPorts';
+$tabhandler['object']['vlansync'] = 'renderObjectVLANSync';
 $trigger['object']['rackspace'] = 'trigger_rackspace';
 $trigger['object']['ipv4'] = 'trigger_ipv4';
 $trigger['object']['nat4'] = 'trigger_natv4';