diff --git a/admin/dashboard.py b/admin/dashboard.py index d572a24..a4a7371 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -281,7 +281,7 @@ def pastafari2_progress(): #print(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: return "" diff --git a/app.py b/app.py index 37fd804..56cc7d3 100644 --- a/app.py +++ b/app.py @@ -5,7 +5,7 @@ try: import ujson as json except: import json - +""" server=ServerDbTask() @pastafari_app.route('/test') @@ -21,3 +21,4 @@ def test(): arr_row.append(row) return json.dumps(arr_row) +""" diff --git a/templates/admin/progress.phtml b/templates/admin/progress.phtml index 2879845..a858545 100644 --- a/templates/admin/progress.phtml +++ b/templates/admin/progress.phtml @@ -25,13 +25,12 @@ <%block name="content">

${hostname}

${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}

-

${description_task}


${lang('pastafari2', 'processing_task', 'Processing task...')}
-
+

<%block name="jscript_block"> @@ -229,5 +228,13 @@ update_progress(); + % if url_return!='': + + $('#return_block').html("${lang('webservers', 'go_back', 'Go back')}"); + + $('#return_block').show(); + + % endif +