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

Little fixes

Browse source
This commit is contained in:
absurdo 2023-04-07 00:54:25 +02:00
parent 6336ce6587
commit fc85704a31
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/dashboard.py
View file

@ -280,8 +280,11 @@ def pastafari2_progress():
arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where() arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where()
#print(arr_task) #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'])
else:
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 ""

10
templates/admin/progress.phtml
View file

@ -14,18 +14,24 @@
color: #fff; color: #fff;
text-shadow: 1px 1px 0 #000; text-shadow: 1px 1px 0 #000;
} }
.return_block {
display: none;
}
</style> </style>
</%block> </%block>
<%block name="content"> <%block name="content">
<h3>${hostname}</h3> <h3>${hostname}</h3>
<%block name="return_block"></%block>
<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>
<%block name="return_bottom_block"></%block> <div id="return_block"></div>
</%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>