fixed minor graphical issues and command runs on Windows

Author: Kidel

css/style.css

@@ -9,6 +9,10 @@ body {
     visibility: hidden;
     opacity: 0;
 }
+.anchor-id {
+    position: absolute;
+    margin-top: -130px;
+}
 /* scrollbar */
 ::-webkit-scrollbar {
     width: 12px;

electronClient.js

@@ -51,13 +51,13 @@ ipcMain.on('script:copy', function(e, script){
     console.log("The script file was saved to " + path.join(tmp_folder, "script.sh"));
     console.log("Running " + path.join(tmp_folder, "script.sh"));
     if(isWin) {
-      exec('' + path.join(tmp_folder, "script.sh"), function (err, stdout, stderr){
+      exec('"' + path.join(tmp_folder, 'script.sh"'), function (err, stdout, stderr){
         //console.log(err, stdout, stderr);
         return;
       });
     }
     else {
-      exec('bash \"' + path.join(tmp_folder, "script.sh\""), function (err, stdout, stderr) {
+      exec('bash "' + path.join(tmp_folder, 'script.sh"'), function (err, stdout, stderr) {
         //console.log(err, stdout, stderr);
         return;
       });
@@ -68,7 +68,8 @@ ipcMain.on('script:copy', function(e, script){
 ipcMain.on('script:execute', function(e){
   console.log("Running LStart on " + path.join(tmp_folder, "lab"));
   if(isWin) {
-    exec('start cmd /c "%NETKIT_HOME%\\lstart -d ' + path.join(tmp_folder, "lab") + '"', function (err, stdout, stderr) {
+    console.log('start cmd /c \'%NETKIT_HOME%\\lstart -d "\\\"' + path.join(tmp_folder, "lab") + '\\\""\'');
+    exec('start cmd /c \"%NETKIT_HOME%\\lstart -d "\\\"' + path.join(tmp_folder, "lab") + '\\\""\"', function (err, stdout, stderr) {
         //console.log(err, stdout, stderr);
         return;
     });
@@ -84,7 +85,7 @@ ipcMain.on('script:execute', function(e){
 ipcMain.on('script:clean', function(e){ 
   console.log("Running LClean on " + path.join(tmp_folder, "lab"));
   if(isWin) {
-    exec('start cmd /c "%NETKIT_HOME%\\lclean -d ' + path.join(tmp_folder, "lab") + '"', function (err, stdout, stderr) {
+    exec('start cmd /c \"%NETKIT_HOME%\\lclean -d "\\\"' + path.join(tmp_folder, "lab") + '\\\""\"', function (err, stdout, stderr) {
         //console.log(err, stdout, stderr);
         return;
     });

index.html

@@ -68,6 +68,7 @@ <h4><a href="https://github.com/Kidel/Netkit-Lab-Generator" target="_blank">http
                 <table id="labInfo">
                     <tr>
                         <th>Lab informations</th>
+                        <div id="labInfo_anchor" class="anchor-id"></div>
                     </tr>
                     <tr>
                         <td>
@@ -107,8 +108,9 @@ <h4><a href="https://github.com/Kidel/Netkit-Lab-Generator" target="_blank">http
                         <th colspan="4">Additional functions</th>
                     </tr>
 
-                    <tr data-ng-repeat="x in netkit track by $index" id="{{x._uid}}">
+                    <tr data-ng-repeat="x in netkit track by $index">
                         <td>
+                            <div id="{{x._uid}}" class="anchor-id"></div>
                             <div><label>Machine {{x.row}}:</label>
                                 <input type="text" data-ng-model="x.name" class="form-control" placeholder="pc" required /></div>
                             <input title="type" type="radio" value="terminale" data-ng-model="x.type" /> Terminal<br />
@@ -302,29 +304,31 @@ <h4>Bash file preview:</h4>
         <div id="minimap-body" ng-style="{ 'transform': 'scale(1, ' + minimap_transform + ')' }">
             <span id="mock-main-menu" class="mock mock-main-menu"></span>
             <span class="mock mock-disclaimer" id="mock-disclaimer"></span>
-            <div class="btn btn-default mock mock-labinfo" data-ng-click="scrollTo($event, 'labInfo')"></div>
+            <div class="btn btn-default mock mock-labinfo" data-ng-click="scrollTo($event, 'labInfo_anchor')"></div>
             <div data-ng-repeat="x in netkit track by $index" class="btn btn-default mock mock-machine" ng:class="{true:'mock-machine-first', false:''}[$index==0]" data-ng-click="scrollTo($event, x._uid)"><span>{{$index+1}}</span>{{x.name}}</div>
             <div class="mock mock-preview-text">Bash file preview:</div>
             <span class="mock mock-preview"></span>
         </div>
     </div>
 
     <!-- Sub-menu Run on Host -->
-    <nav id="submenu-0" class="navbar navbar-primary navbar-kathara navbar-kathara-secondary ng-hide">
+    <nav id="submenu-0" class="navbar navbar-primary navbar-kathara navbar-kathara-secondary ng-hide" style="height: 105px">
         <div class="container-fluid">
             <!-- Collect the nav links, forms, and other content for toggling -->
             <ul class="nav navbar-nav">
                 <li><a id="copyLab"><i class="fas fa-copy"></i> <strong>Copy lab on Host *</strong></a></li>
                 <li><a id="lstart"><i class="fas fa-play-circle"></i> <strong>Run LStart on Host **</strong></a></li>
                 <li><a id="lclean"><i class="fas fa-stop-circle"></i> <strong>Run LClean on Host **</strong></a></li>
             </ul>
-            <small>
-                <div align="right" class="margin-top">
-                    * Requires something to run .sh files (like Git bash), even on Windows.
-                    <br />
+            <div style="clear:both">
+                <span class="label label-warning">
+                    * Requires something to run .sh files, even on Windows (like Git bash, associated with .sh files).
+                </span>
+                <br />
+                <span class="label label-warning">
                     ** Requires Kathar&aacute; (or eventually Netkit) installed on Host and env configured correctly.
-                </div>
-            </small>
+                </span>
+            </div>
         </div><!-- /.container-fluid -->
     </nav>
 

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start": "electron .",
     "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds",
-    "package-win": "electron-packager . --overwrite --asar=true --platform=win32 --arch=ia32 --icon=assets/icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"KatharaGUI\"",
+    "package-win": "electron-packager . --overwrite --asar --platform=win32 --arch=ia32 --icon=assets/icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"KatharaGUI\"",
     "package-linux": "electron-packager . --overwrite --platform=linux --arch=x64 --icon=assets/icons/png/icon.png --prune=true --out=release-builds"
   },
   "author": "Gaetano Bonofiglio",
@@ -15,7 +15,7 @@
     "dom-minimap": "^1.7.2"
   },
   "devDependencies": {
-    "electron": "^1.7.10",
+    "electron": "^1.7.11",
     "electron-packager": "^10.1.1"
   }
 }