projects
/
qcg-portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strictly match and of url for login views
[qcg-portal.git]
/
qcg
/
templates
/
qcg
/
task.html
diff --git
a/qcg/templates/qcg/task.html
b/qcg/templates/qcg/task.html
index
e4fcf11
..
a610ea6
100644
(file)
--- a/
qcg/templates/qcg/task.html
+++ b/
qcg/templates/qcg/task.html
@@
-1,8
+1,9
@@
-{% extends 'qcg/base.html' %}
+{% extends 'qcg/details_base.html' %}
{% load qcg_utils staticfiles %}
{% block extra_js %}
{% include 'filex/source.js.html' %}
{% load qcg_utils staticfiles %}
{% block extra_js %}
{% include 'filex/source.js.html' %}
+ {{ block.super }}
<script>
var filex = filex || {};
<script>
var filex = filex || {};
@@
-13,6
+14,10
@@
$('.working-dir').on('click', function() {
filex.load($(this).data('url'));
});
$('.working-dir').on('click', function() {
filex.load($(this).data('url'));
});
+
+ $('#gridftp').one('show.bs.modal', function() {
+ $(this).find('.modal-body').css('height', window.innerHeight - 120 + 'px');
+ });
});
</script>
{% endblock extra_js %}
});
</script>
{% endblock extra_js %}
@@
-20,18
+25,18
@@
{% block container %}
<ol class="breadcrumb">
<li><a href="{% url 'jobs' %}">Zadania</a></li>
{% block container %}
<ol class="breadcrumb">
<li><a href="{% url 'jobs' %}">Zadania</a></li>
- <li><a href="{{ task.job.get_absolute_url }}">{{ task.job.job_id }}</a></li>
+ <li><a href="{{ job.get_absolute_url }}">{{ job.job_id }}</a></li>
<li class="active">{{ task.task_id }}</li>
</ol>
<div class="pull-right">
{% if not task.terminated %}
<li class="active">{{ task.task_id }}</li>
</ol>
<div class="pull-right">
{% if not task.terminated %}
- <form action="{% url 'task_cancel' task.job.job_id task.task_id %}" method="post">
+ <form action="{% url 'task_cancel' job.job_id task.task_id %}" method="post">
{% csrf_token %}
<button type="submit" class="btn btn-default">Anuluj zadanie</button>
</form>
{% elif not task.purged %}
{% csrf_token %}
<button type="submit" class="btn btn-default">Anuluj zadanie</button>
</form>
{% elif not task.purged %}
- <form action="{% url 'task_clean' task.job.job_id task.task_id %}" method="post">
+ <form action="{% url 'task_clean' job.job_id task.task_id %}" method="post">
{% csrf_token %}
<button type="submit" class="btn btn-default">Usuń katalog roboczy</button>
</form>
{% csrf_token %}
<button type="submit" class="btn btn-default">Usuń katalog roboczy</button>
</form>
@@
-105,7
+110,7
@@
</div>
<div role="tabpanel" class="tab-pane" id="desc">
</div>
<div role="tabpanel" class="tab-pane" id="desc">
- <pre>{{ task.description|format_xml }}</pre>
+ {% include 'qcg/job_description.html' %}
</div>
</div>
</div>
</div>
</div>
</div>