christofsteel/warped
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mostly css changes

Browse source
This commit is contained in:
Christoph Stahl 2017-04-24 14:21:06 +02:00
parent b30fd580c2
commit 7453a4d3de
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
warp/static/css/app.css
View file

@ -9,6 +9,20 @@
height: 100vh; height: 100vh;
} }
ul {
padding: 0px;
margin: 0px;
}
#arguments {
padding: 0px;
}
.tabs-panel {
padding-left: 0px;
padding-right: 0px;
}
#output .out { #output .out {
color: #FFFFFF; color: #FFFFFF;
} }

21
warp/static/js/app.js
View file

@ -146,7 +146,7 @@ function createAction(action) {
var help = $("<button/>").attr("type", "button").addClass("button disabled secondary").text("?").appendTo(helpdiv); var help = $("<button/>").attr("type", "button").addClass("button disabled secondary").text("?").appendTo(helpdiv);
} }
if(action.optional === true) { if(action.optional === true) {
li.prop('disabled', true); li.prop('disabled', true).addClass('disabled');
input.prop('disabled', true).addClass('disabled'); input.prop('disabled', true).addClass('disabled');
input.find('input').prop('disabled', true).addClass('disabled'); input.find('input').prop('disabled', true).addClass('disabled');
input.find('.addbutton').prop('disabled', true).addClass('disabled'); input.find('.addbutton').prop('disabled', true).addClass('disabled');
@ -156,12 +156,12 @@ function createAction(action) {
thisli = $('#action-' + action['uuid']); thisli = $('#action-' + action['uuid']);
if(thisli.prop('disabled')) { if(thisli.prop('disabled')) {
console.log('tock'); 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'] + " input").prop('disabled', false).removeClass("disabled");
$("#action-" + action['uuid'] + " .addbutton").removeClass('disabled').prop('disabled', false); $("#action-" + action['uuid'] + " .addbutton").removeClass('disabled').prop('disabled', false);
$("#action-" + action['uuid'] + " .rembutton").removeClass('disabled').prop('disabled', false); $("#action-" + action['uuid'] + " .rembutton").removeClass('disabled').prop('disabled', false);
} else { } else {
thisli.prop('disabled', true); thisli.prop('disabled', true).addClass('disabled');
$("#action-" + action['uuid'] + " input").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'] + " .addbutton").addClass('disabled').prop('disabled', true);
$("#action-" + action['uuid'] + " .rembutton").addClass('disabled').prop('disabled', true); $("#action-" + action['uuid'] + " .rembutton").addClass('disabled').prop('disabled', true);
@ -226,16 +226,16 @@ function printErr(data){
function resumeProcess() { function resumeProcess() {
$("#resumeButton").css('display', 'none'); $("#resumeButton").css('display', 'none');
$("#sendButton").css('display', 'inline-block'); //$("#sendButton").css('display', 'inline-block');
$("#pauseButton").removeClass("disabled").prop('disabled', false); $("#pauseButton").css('display', 'inline-block');//removeClass("disabled").prop('disabled', false);
$.get({url: '/resume'}); $.get({url: '/resume'});
printErr("Process resumed") printErr("Process resumed")
} }
function pauseProcess() { function pauseProcess() {
$("#sendButton").css('display', 'none'); //$("#sendButton").css('display', 'none');
$("#resumeButton").css('display', 'inline-block'); $("#resumeButton").css('display', 'inline-block');
$("#pauseButton").addClass("disabled").prop('disabled', true); $("#pauseButton").css('display', 'none');//addClass("disabled").prop('disabled', true);
$.get({url: '/pause'}); $.get({url: '/pause'});
printErr("Process paused") printErr("Process paused")
} }
@ -258,15 +258,18 @@ function reloadProcess() {
} }
function stopProcess() { 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'); $("#stopButton").addClass("disabled").prop('disabled', true);//css('display', 'none');
$("#reloadButton").removeClass("disabled").prop('disabled', false);//css('display', 'inline-block'); $("#reloadButton").removeClass("disabled").prop('disabled', false);//css('display', 'inline-block');
$.get({url: '/stop'}); $.get({url: '/stop'});
} }
function sendData() { 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'); $("#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()); console.log(calcParams());
$.post({ $.post({
url: '/arguments', url: '/arguments',

4
warp/templates/index.html
View file

@ -20,10 +20,10 @@
<div id="control-buttons"> <div id="control-buttons">
<div class="button-group"> <div class="button-group">
<button type="button" class="button success" id="sendButton" onclick="sendData()"> <i class="fi-play"></i> </button> <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 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 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> </div>
</div> </div>

1
warp/views.py
View file

@ -56,6 +56,7 @@ def get_arguments():
@app.route("/stop") @app.route("/stop")
def stop(): def stop():
os.kill(app.module_process.pid, signal.SIGCONT)
app.module_process.terminate() app.module_process.terminate()
return "OK" return "OK"