Commit 0ebe8d07 authored by sebastien letort's avatar sebastien letort

Merge branch 'maint' into django

parents 1ef3517e 913d5a86
Pipeline #57655 failed with stage
in 1 minute and 10 seconds
......@@ -1315,7 +1315,7 @@ class JobFileDownload(JobAuthMixin, View):
return redirect("/datastore/%s/%s" % (job_id, filename))
class JobFileDownloadAll(JobAuthMixin, View):
class JobFileDownloadAll(JobAuthMixin, SingleObjectMixin, View):
"""Archive and download all files of a given job
"""
model = Job
......
......@@ -42,7 +42,7 @@
</div>
<div class="logos">
<a href="https://inria.fr"><img class="float-left" src="{% static 'images/inria.png' %}"></a>
<a href="https://irisa.fr"><img class="float-right" src="{% static 'images/irisa.png' %}"></a>
<a href="https://www.irisa.fr"><img class="float-right" src="{% static 'images/irisa.png' %}"></a>
</div>
</div>
</footer>
......@@ -14,10 +14,8 @@
<h6 class="card-subtitle text-muted text-center">{{ webapp.contact | email2name }} - Updated {{ webapp.updated_at | naturalday }}</h6>
</div>
<div class="card-body">
{% if user.is_authenticated %}
<nav class="navbar">
<ul class="nav nav-bar mx-auto">
{% if webapp.sandbox_version_id %}
<li class="nav-item">
<a
class="nav-link"
......@@ -33,61 +31,18 @@
title="Start a Jupyter notebook"
data-toggle="tooltip"
data-placement="bottom"><i class="fas fa-sticky-note" data-fa-transform="shrink-10 up-.5" data-fa-mask="fas fa-circle"></i><span class="text-hide">Run notebook</a></li>
{% endif %}
{% if webapp.user == user %}
{% if webapp.notebook_gitrepo %}
<li class="nav-item">
<a
class="nav-link"
href="/jupyter?repo={{ webapp.notebook_gitrepo }}"
title="Start a Jupyter notebook"
data-toggle="tooltip"
data-placement="bottom"><i class="fas fa-sticky-note" data-fa-transform="shrink-10 up-.5" data-fa-mask="fas fa-circle"></i><span class="text-hide">Run notebook</a></li>
{% endif %}
{% if webapp.user == user %}
<li class="nav-item">
<a
class="nav-link"
href="{% url 'main:webapp_update' webapp.docker_name %}"
title="Edit the application properties"
data-toggle="tooltip"
data-placement="bottom"><i class="fas fa-pencil-alt" data-fa-transform="shrink-10 up-.5" data-fa-mask="fas fa-circle"></i><span class="text-hide">Run notebook</a></li>
{% endif %}
{% else %}
{% endif %}
{% if webapp.user == user and webapp.sandbox_state != webapp.IDLE %}
<li class="nav-item">
<a
class="nav-link app-unfinished"
href="{% url 'main:webapp_sandbox_panel' webapp.docker_name %}"
title="Finish the configuration of your app"
title="There is an active sandbox"
data-toggle="tooltip"
data-placement="bottom"><i class="fas fa-exclamation-circle"></i><span class="text-hide">Finish the app configuration</span></a></li>
data-placement="bottom"><i class="fas fa-exclamation-circle"></i><span class="text-hide">There is an active sandbox</span></a></li>
{% endif %}
</ul>
</nav>
{% else %}
<li class="nav-item">
<a
class="nav-link app-unfinished"
href="{% url 'main:webapp_sandbox_panel' webapp.docker_name %}"
title="Finish the configuration of your app"
data-toggle="tooltip"
data-placement="bottom"><i class="fas fa-exclamation-circle"></i><span class="text-hide">Finish the app configuration</span></a></li>
{% endif %}
</ul>
</nav>
{% else %}
<nav class="navbar">
<ul class="nav nav-bar mx-auto">
<li class="nav-item">
<a
class="nav-link"
href="{% url 'main:webapp_detail' webapp.docker_name %}"
title="Start a job"
data-toggle="tooltip"
data-placement="bottom" ><i class="fas fa-play" data-fa-transform="shrink-10 up-.5" data-fa-mask="fas fa-circle"></i><span class="text-hide">Run a job</a></li>
</ul>
</nav>
{% endif %}
<p class="card-text">
{% if webapp.description %}
{{ webapp.description|truncatechars:200 }}
......
......@@ -30,7 +30,7 @@
<ul>
<li>start a sandbox, connect to it via ssh, then install the
application manually</li>
<li>create a docker image and push it to allgo (see the Docker pane)</li>
<li><del>create a docker image and push it to allgo (see the Docker pane)</del> (not yet available)</li>
</ul>
</p>
......@@ -73,8 +73,7 @@
<p class="mt-3">
In order to install your application, you can connect in SSH using
the command below or click to the Docker panel if you prefer to use this method
or are using continuous development.
the command below.
<h5>1. Connect via SSH</h5>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment