fixed graph generation

Author: Kidel

index.html

@@ -21,28 +21,14 @@
         document.write('<p class="browserupgrade"><strong>Internet Explorer<\/strong> is not supported. Please upgrade your browser to <a href="https://www.google.com/chrome/browser/desktop/">Chrome<\/a> or <a href="https://www.mozilla.org/firefox/new/">Firefox<\/a>.<\/p>');
 </script>
 
-<!-- Control Panel -->
-<nav class="navbar navbar-primary navbar-kathara navbar-kathara-primary">
-    <div class="container-fluid">
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <ul class="nav navbar-nav">
-            <li><a href="#home" onclick="toggle_tab_and_submenu(event, this, 3)"><i class="fa fa-home" aria-hidden="true"></i> <strong>Home</strong></a></li>
-            <li><a href="#graph" onclick="toggle_tab_and_submenu(event, this, 3)" data-ng-click="makeGraphIfChanged(netkit)"><i class="fas fa-code-branch" aria-hidden="true"></i> <strong>Graph</strong></a></li>
-            <li id="executeDiv" class="ng-hide"><a onclick="toggle_submenu(event, 0, 3)"><i class="fa fa-play" aria-hidden="true"></i> <strong>Run on Host</strong></a></li>
-            <li><a onclick="toggle_submenu(event, 1, 3)"><i class="fa fa-download" aria-hidden="true"></i> <strong>Download Lab</strong></a></li>
-            <li><a onclick="toggle_submenu(event, 2, 3)"><i class="fa fa-save" aria-hidden="true"></i> <strong>Save &amp; Load</strong></a></li>
-        </ul>
-    </div><!-- /.container-fluid -->
-</nav>
-
 <div class="bg-primary disclaimer" id="disclaimer">
     <a onclick="collapseDisclaimer(event)" href="#" class="btn-default btn-close-disclaimer"><i class="fa fa-times" aria-hidden="true"></i></a>
     <div id="title-link" class="ng-hide">
         <h1>Netkit Lab Generator</h1>
         <h4><a href="https://github.com/Kidel/Netkit-Lab-Generator" target="_blank">https://github.com/Kidel/Netkit-Lab-Generator</a></h4>
         <hr />
     </div>
-    <div id="description">
+    <div id="description" class="margin-top">
         This tool allows to quickly generate most of the files and folders you need to run a working netkit lab.
         The main purpose is to quickly generate the files and folders needed with low configuration options, so more
         advanced funtionalities are omitted and some others are set by default (like zebra username and password). 
@@ -61,6 +47,19 @@ <h4><a href="https://github.com/Kidel/Netkit-Lab-Generator" target="_blank">http
 <br />
 
 <div data-ng-app="napp" data-ng-controller="nc">
+    <!-- Control Panel -->
+    <nav class="navbar navbar-primary navbar-kathara navbar-kathara-primary">
+        <div class="container-fluid">
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <ul class="nav navbar-nav">
+                <li><a href="#home" onclick="toggle_tab_and_submenu(event, this, 3)"><i class="fa fa-home" aria-hidden="true"></i> <strong>Home</strong></a></li>
+                <li><a href="#graph" data-ng-click="makeGraphIfChanged(netkit)" onclick="toggle_tab_and_submenu(event, this, 3)"><i class="fas fa-code-branch" aria-hidden="true"></i> <strong>Graph</strong></a></li>
+                <li id="executeDiv" class="ng-hide"><a onclick="toggle_submenu(event, 0, 3)"><i class="fa fa-play" aria-hidden="true"></i> <strong>Run on Host</strong></a></li>
+                <li><a onclick="toggle_submenu(event, 1, 3)"><i class="fa fa-download" aria-hidden="true"></i> <strong>Download Lab</strong></a></li>
+                <li><a onclick="toggle_submenu(event, 2, 3)"><i class="fa fa-save" aria-hidden="true"></i> <strong>Save &amp; Load</strong></a></li>
+            </ul>
+        </div><!-- /.container-fluid -->
+    </nav>
     <div id="col10" class="col-xs-10">
         <!-- Tab panes -->
         <div class="tab-content">

js/controller.js

@@ -174,7 +174,7 @@ app.controller('nc', function($scope) {
 
     $scope.makeGraphIfChanged = function(nk) {
         if(changed) {
-            console.log("graph");
+            console.log("Reloading graph");
             changed = false;
             return makeGraph(nk);
         }

js/make.js

@@ -178,15 +178,15 @@ function makeNameserver(nk, lab) {
         for (var mindex in nk) {
             if (typeof(nk[mindex].name)!="undefined" && nk[mindex].name != "")
                 if(nk[mindex].type=="ns" && nk[mindex].ns.authority){
-                	console.log("Zone: " + nk[mindex].ns.zone + "NkMindex: " + nk[mindex]);
+                	//console.log("Zone: " + nk[mindex].ns.zone + "NkMindex: " + nk[mindex]);
                     authority[nk[mindex].ns.zone] = nk[mindex];
                     if(nk[mindex].ns.zone != "."){
                         lab["file"][nk[mindex].name + "/etc/bind/db"+nk[mindex].ns.zone.slice(0,-1)] = "$TTL   60000\n@    IN SOA "+nk[mindex].interfaces.if[0].name + " root."+nk[mindex].interfaces.if[0].name + " 2006031201 28800 14400 3600000 0\n\n"; //ho preso il nome dell'interfaccia eth0
                         lab["file"][nk[mindex].name + "/etc/bind/named.conf"] += 'zone "'+nk[mindex].ns.zone.slice(1,-1)+'" {\n type master;\n file "/etc/bind/db'+nk[mindex].ns.zone.slice(0,-1)+'";\n};\n\n';
                     }
                 }
         }
-        console.log(authority);
+        //console.log(authority);
         //entry per l'alberatura delle zone (. conosce .com, .com conosce pippo.com, ecc)
         for (var mindex in nk) {
             if (typeof(nk[mindex].name)!="undefined" && nk[mindex].name != "")