diff options
author | Brandon Lo <lobrandon1217@gmail.com> | 2019-07-01 15:29:07 -0400 |
---|---|---|
committer | Brandon Lo <lobrandon1217@gmail.com> | 2019-07-02 09:43:53 -0400 |
commit | 661a309cdd609d514abf4b8f8d9c98021b6b9759 (patch) | |
tree | 6e23ab9b18d6c7ac49bd8e52f479468352642f18 /src/templates/workflow/viewport-base.html | |
parent | 8149a888fe6f7c1c3b1b3be2b3996c6d225d5a53 (diff) |
Reduce forms to required content
Change iframe to div and ajax as a workaround
Add css and js to avoid errors in parent locations
Change-Id: I22a17ad5e5e04ff7112bd4e6ed98ba63d150fc15
Signed-off-by: Brandon Lo <lobrandon1217@gmail.com>
Diffstat (limited to 'src/templates/workflow/viewport-base.html')
-rw-r--r-- | src/templates/workflow/viewport-base.html | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/templates/workflow/viewport-base.html b/src/templates/workflow/viewport-base.html index d219386..ed367c7 100644 --- a/src/templates/workflow/viewport-base.html +++ b/src/templates/workflow/viewport-base.html @@ -80,14 +80,13 @@ <div class="container-fluid d-flex flex-column h-100"> <div class="row d-flex flex-grow-1 p-4"> <div class="col-12 d-flex border flex-grow-1 px-0"> - <iframe src="/wf/workflow" class="w-100 h-100" scrolling="yes" id="viewport-iframe" - frameBorder="0"></iframe> + <div id="formContainer" class="h-100 w-100"></div> </div> </div> </div> </div> {% csrf_token %} - +<script src="{% static "js/dashboard.js" %}"></script> <script type="text/javascript"> update_context(); var step = 0; @@ -131,7 +130,7 @@ req.onload = function (e) { if (req.readyState === 4) { if (req.status < 300) { - document.getElementById("viewport-iframe").srcdoc = this.responseText; + write_iframe(this.responseText); } else { problem(); } @@ -143,10 +142,6 @@ req.send(); } - function step_on_leave() { - document.getElementById("viewport-iframe").contentWindow.step_on_leave(); - } - function errors_exist(data) { var stat = data['steps'][data['active']]['valid']; if (stat >= 100 && stat < 200) { @@ -272,16 +267,13 @@ url = "/wf/workflow/"; req.open("GET", url, true); req.onload = function (e) { - var doc = document.getElementById("viewport-iframe").contentWindow.document; - doc.open(); - doc.write(this.responseText); - doc.close(); + write_iframe(this.responseText); } req.send(); } function write_iframe(contents) { - document.getElementById("viewport-iframe").contentWindow.document.innerHTML = contents; + $("#formContainer").html(contents); } function redirect_root() { @@ -319,6 +311,15 @@ function refresh_wf_iframe() { window.location = window.location; } + + // Load the actual first page + $(document).ready(function(){ + $.ajax("/wf/workflow", { + success: function(data) { + write_iframe(data); + } + }); + }); </script> <div class="d-none" id="workflow_pop_form_div"> <form id="workflow_pop_form" action="/wf/workflow/finish/" method="post"> |