Gitlab CSE Unil

Commit 73108969 authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'dev' of...

Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
parents 7780b988 5ad15eb7
......@@ -217,12 +217,13 @@
{# Advanced Parameters #}
{# ---------------------------------------- #}
{% if user|has_env_perm %}
<div class="aom-info-advanced aom-prop-collapsible collapsed">
<h5>Paramètres avancés &nbsp;<small><span class="icon-plus-sign"></span></small></h5>
<form class="form-horizontal aom-advanced-form aom-prop-collapsible-content hidden" onsubmit="return false;">
<div class="aom-prop-locked-status aom-shm-frontdrop"></div>
{% if user|has_env_perm %}
<div class="form-group">
<label class="col-sm-4 control-label" for="aom-prop-env-id">Environnement</label>
<div class="col-sm-8">
......@@ -237,7 +238,7 @@
</div>
</div>
{% endif %}
{# ----- CIMAF ----- #}
<div class="aom-prop-env-opts hidden" data-env="cimaf">
<div class="form-group">
......@@ -273,7 +274,7 @@
</form>
</div>
{% endif %}
</div>
</div>
......
Supports Markdown
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