From 7453a4d3ded41cb990147ce6ac26ff9191cb5464 Mon Sep 17 00:00:00 2001
From: Christoph Stahl <christoph.stahl@uni-dortmund.de>
Date: Mon, 24 Apr 2017 14:21:06 +0200
Subject: [PATCH] mostly css changes

---
 warp/static/css/app.css   | 14 ++++++++++++++
 warp/static/js/app.js     | 21 ++++++++++++---------
 warp/templates/index.html |  4 ++--
 warp/views.py             |  1 +
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/warp/static/css/app.css b/warp/static/css/app.css
index 0d5532d..f9eca6b 100644
--- a/warp/static/css/app.css
+++ b/warp/static/css/app.css
@@ -9,6 +9,20 @@
     height: 100vh;
 }
 
+ul {
+    padding: 0px;
+    margin: 0px;
+}
+
+#arguments {
+    padding: 0px;
+}
+
+.tabs-panel {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
 #output .out {
     color: #FFFFFF;
 }
diff --git a/warp/static/js/app.js b/warp/static/js/app.js
index 9381bb7..fe402cc 100644
--- a/warp/static/js/app.js
+++ b/warp/static/js/app.js
@@ -146,7 +146,7 @@ function createAction(action) {
             var help = $("<button/>").attr("type", "button").addClass("button disabled secondary").text("?").appendTo(helpdiv);
         }
         if(action.optional === true) {
-            li.prop('disabled', true);
+            li.prop('disabled', true).addClass('disabled');
             input.prop('disabled', true).addClass('disabled');
             input.find('input').prop('disabled', true).addClass('disabled');
             input.find('.addbutton').prop('disabled', true).addClass('disabled');
@@ -156,12 +156,12 @@ function createAction(action) {
                 thisli = $('#action-' + action['uuid']);
                 if(thisli.prop('disabled')) {
                     console.log('tock');
-                    thisli.prop('disabled', false);
+                    thisli.prop('disabled', false).removeClass('disabled');
                     $("#action-" + action['uuid'] + " input").prop('disabled', false).removeClass("disabled");
                     $("#action-" + action['uuid'] + " .addbutton").removeClass('disabled').prop('disabled', false);
                     $("#action-" + action['uuid'] + " .rembutton").removeClass('disabled').prop('disabled', false);
                 } else {
-                    thisli.prop('disabled', true);
+                    thisli.prop('disabled', true).addClass('disabled');
                     $("#action-" + action['uuid'] + " input").prop('disabled', true).addClass('disabled');
                     $("#action-" + action['uuid'] + " .addbutton").addClass('disabled').prop('disabled', true);
                     $("#action-" + action['uuid'] + " .rembutton").addClass('disabled').prop('disabled', true);
@@ -226,16 +226,16 @@ function printErr(data){
 
 function resumeProcess() {
     $("#resumeButton").css('display', 'none');
-    $("#sendButton").css('display', 'inline-block');
-    $("#pauseButton").removeClass("disabled").prop('disabled', false);
+    //$("#sendButton").css('display', 'inline-block');
+    $("#pauseButton").css('display', 'inline-block');//removeClass("disabled").prop('disabled', false);
     $.get({url: '/resume'});
     printErr("Process resumed")
 }
 
 function pauseProcess() {
-    $("#sendButton").css('display', 'none');
+    //$("#sendButton").css('display', 'none');
     $("#resumeButton").css('display', 'inline-block');
-    $("#pauseButton").addClass("disabled").prop('disabled', true);
+    $("#pauseButton").css('display', 'none');//addClass("disabled").prop('disabled', true);
     $.get({url: '/pause'});
     printErr("Process paused")
 }
@@ -258,15 +258,18 @@ function reloadProcess() {
 }
 
 function stopProcess() {
+    $("#sendButton").css('display', 'inline-block').prop('disabled', true).addClass('disabled');
+    $("#pauseButton").css('display', 'none');
+    $("#resumeButton").css('display', 'none');
     $("#stopButton").addClass("disabled").prop('disabled', true);//css('display', 'none');
     $("#reloadButton").removeClass("disabled").prop('disabled', false);//css('display', 'inline-block');
     $.get({url: '/stop'});
 }
 
 function sendData() {
-    $("#sendButton").addClass("disabled").prop('disabled', true);
+    $("#sendButton").css('display', 'none');//addClass("disabled").prop('disabled', true);
     $("#stopButton").removeClass("disabled").prop('disabled', false);//css('display', 'inline-block');
-    $("#pauseButton").removeClass("disabled").prop('disabled', false);//css('display', 'inline-block');
+    $("#pauseButton").css('display', 'inline-block').removeClass("disabled").prop('disabled', false);//css('display', 'inline-block');
     console.log(calcParams());
     $.post({
         url: '/arguments', 
diff --git a/warp/templates/index.html b/warp/templates/index.html
index 158957a..dd4e601 100644
--- a/warp/templates/index.html
+++ b/warp/templates/index.html
@@ -20,10 +20,10 @@
                     <div id="control-buttons">
                     <div class="button-group">
                         <button type="button" class="button success" id="sendButton" onclick="sendData()"> <i class="fi-play"></i> </button>
-                        <button type="button" style="display: none;" class="button" id="resumeButton" onclick="resumeProcess()"> <i class="fi-play"></i> </button>
+                        <button type="button" style="display: none;" class="button secondary disabled" disabled id="pauseButton" onclick="pauseProcess()"> <i class="fi-pause"></i> </button>
+                        <button type="button" style="display: none;" class="button secondary" id="resumeButton" onclick="resumeProcess()"> <i class="fi-play"></i> </button>
                         <button type="button" class="button alert disabled" disabled id="stopButton" onclick="stopProcess()"> <i class="fi-stop"></i> </button>
                         <button type="button" class="button disabled" disabled id="reloadButton" onclick="reloadProcess()"> <i class="fi-refresh"></i> </button>
-                        <button type="button" class="button secondary disabled" disabled id="pauseButton" onclick="pauseProcess()"> <i class="fi-pause"></i> </button>
                     </div>
                     </div>
                 </div>
diff --git a/warp/views.py b/warp/views.py
index 6c561e1..6d33f3e 100644
--- a/warp/views.py
+++ b/warp/views.py
@@ -56,6 +56,7 @@ def get_arguments():
 
 @app.route("/stop")
 def stop():
+    os.kill(app.module_process.pid, signal.SIGCONT)
     app.module_process.terminate()
     return "OK"