Show network panel on the VM defail

project-fifo · May 2, 2014 · 7f5d01a · 7f5d01a
1 parent f98418b
commit 7f5d01a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/app/views/machine.html b/app/views/machine.html
@@ -110,7 +110,7 @@ <h3 style='display: inline-block; margin-top: 0px;'>{{vm._name}}</h3>
         <li ng-show="vm.config.type == 'zone'"><a href="#services" data-toggle="tab" translate>Services</a></li>
         <li><a href="#snapshots" data-toggle="tab" translate>Snapshots</a></li>
         <li ng-show='has_s3'><a href="#versioning" data-toggle="tab" translate>Versioning</a></li>
-        <!-- <li><a href="#net" data-toggle="tab" translate>Networking</a></li> -->
+        <li><a href="#net" data-toggle="tab" translate>Networking</a></li>
         <li><a href="#imaging" data-toggle="tab" translate>Imaging</a></li>
         <li><a href="#resize" data-toggle="tab" translate>Change</a></li>
         <li><a href="#history" data-toggle="tab" translate>History</a></li>
@@ -492,21 +492,6 @@ <h3 translate>Snapshots</h3>
             </div>
             <package pkg='packages[new_pkg]'></package>
           </div>
-          <div class="box col-md-4">
-            <div class="header">
-              <span translate>Add Network Interface</span>
-            </div>
-            <select ng-model="new_net" class='form-control'
-                    ng-options="net.id as net.name for net in networks | hash2array | orderBy: ['name']">
-            </select>
-
-            <button style='margin-bottom: 10px;' class='btn btn-success'
-                    ng-disabled="vm.mdata('locked')"
-                    ng-show="vm.state == 'stopped' && networks[new_net]"
-                    ng-click="add_nic(vm, new_net)" translate>add</button>
-
-            <div ng-show="vm.state != 'stopped'" translate>Stop the machine to add a new network interface.</div>
-          </div>
         </div>
 
         <div class="tab-pane" id="notes">

diff --git a/dist/views/machine.html b/dist/views/machine.html
@@ -110,7 +110,7 @@ <h3 style='display: inline-block; margin-top: 0px;'>{{vm._name}}</h3>
         <li ng-show="vm.config.type == 'zone'"><a href="#services" data-toggle="tab" translate>Services</a></li>
         <li><a href="#snapshots" data-toggle="tab" translate>Snapshots</a></li>
         <li ng-show='has_s3'><a href="#versioning" data-toggle="tab" translate>Versioning</a></li>
-        <!-- <li><a href="#net" data-toggle="tab" translate>Networking</a></li> -->
+        <li><a href="#net" data-toggle="tab" translate>Networking</a></li>
         <li><a href="#imaging" data-toggle="tab" translate>Imaging</a></li>
         <li><a href="#resize" data-toggle="tab" translate>Change</a></li>
         <li><a href="#history" data-toggle="tab" translate>History</a></li>
@@ -492,21 +492,6 @@ <h3 translate>Snapshots</h3>
             </div>
             <package pkg='packages[new_pkg]'></package>
           </div>
-          <div class="box col-md-4">
-            <div class="header">
-              <span translate>Add Network Interface</span>
-            </div>
-            <select ng-model="new_net" class='form-control'
-                    ng-options="net.id as net.name for net in networks | hash2array | orderBy: ['name']">
-            </select>
-
-            <button style='margin-bottom: 10px;' class='btn btn-success'
-                    ng-disabled="vm.mdata('locked')"
-                    ng-show="vm.state == 'stopped' && networks[new_net]"
-                    ng-click="add_nic(vm, new_net)" translate>add</button>
-
-            <div ng-show="vm.state != 'stopped'" translate>Stop the machine to add a new network interface.</div>
-          </div>
         </div>
 
         <div class="tab-pane" id="notes">

diff --git a/pkg/Makefile b/pkg/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.3.1
+VERSION=0.3.1p1
 COMPONENT=fifo-jingles
 
 .PHONY: build_info package package_list