paramecio/pastafari2
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fixes in progress

Browse source
This commit is contained in:
absurdo 2023-04-08 01:46:34 +02:00
parent fc85704a31
commit 0e777c4d75
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/dashboard.py
View file

@ -281,7 +281,7 @@ def pastafari2_progress():
#print(arr_task) #print(arr_task)
if arr_task: if arr_task:
return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname']) return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=arr_task['url_return'])
else: else:
return "" return ""

3
app.py
View file

@ -5,7 +5,7 @@ try:
import ujson as json import ujson as json
except: except:
import json import json
"""
server=ServerDbTask() server=ServerDbTask()
@pastafari_app.route('/test') @pastafari_app.route('/test')
@ -21,3 +21,4 @@ def test():
arr_row.append(row) arr_row.append(row)
return json.dumps(arr_row) return json.dumps(arr_row)
"""

11
templates/admin/progress.phtml
View file

@ -25,13 +25,12 @@
<%block name="content"> <%block name="content">
<h3>${hostname}</h3> <h3>${hostname}</h3>
<h2>${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}</h2> <h2>${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}</h2>
<div class="return_block"></div>
<p>${description_task}</p> <p>${description_task}</p>
<hr /> <hr />
<i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i> <i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i>
<div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div> <div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div>
<div id="no_progress" style="border: solid #cbcbcb 1px;height:150px;overflow:scroll;padding:2px;"></div> <div id="no_progress" style="border: solid #cbcbcb 1px;height:150px;overflow:scroll;padding:2px;"></div>
<div id="return_block"></div> <p id="return_block"></p>
</%block> </%block>
<%block name="jscript_block"> <%block name="jscript_block">
<script language="Javascript" src="${make_media_url('js/jquery-ui.min.js', 'pastafari2')}"></script> <script language="Javascript" src="${make_media_url('js/jquery-ui.min.js', 'pastafari2')}"></script>
@ -229,5 +228,13 @@
update_progress(); update_progress();
% if url_return!='':
$('#return_block').html("<a href=\"${url_return}\">${lang('webservers', 'go_back', 'Go back')}</a>");
$('#return_block').show();
% endif
</script> </script>
</%block> </%block>