DEV FÜR 0.9.0

This commit is contained in:
holger.trampe 2020-05-10 17:14:34 +02:00
parent 00c7b2ac24
commit ed95d39b26
7 changed files with 18 additions and 16 deletions

View File

@ -41,6 +41,7 @@
<td>
{% if agc.category != None%} {{agc.category}} {% endif%}
</td>
{% if user|usergperm:"moduleorganizer" %}
<td>
{% if user|usergperm:"moduleorganizer" %}
<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'cont-delete' agc.pk %}">
@ -53,6 +54,7 @@
</small></a>
{% endif %}
</td>
{% endif %}
</tr>
{% endfor %}
</tbody>

View File

@ -28,7 +28,7 @@
<h5 class="mt-3">Quicklinks{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier Links auf andere Webseiten." class="far fa-question-circle"></i></small>{% endif %}
{% if user|usergperm:"moduleorganizer" %} <span style="float: right; margin-top: -5px"><a class="btn btn-primary btn-sm" href="{% url 'ql-addql' %}"><i class="fas fa-plus"></i>&nbsp;Quicklink</a></span>{% endif %}
</h5>
<hr>
{% if user|usergperm:"moduleorganizer" %}<hr>{% endif %}
{% block quicklinks_content %}
{% include "organizer/quicklinks_content.html" %}
{% endblock %}
@ -42,7 +42,7 @@
<a class="btn btn-primary btn-sm" href="{% url 'addcontact' %}"><i class="fas fa-plus"></i>&nbsp;Kontakt</a></span>
{% endif %}
</h5>
<hr>
{% if user|usergperm:"moduleorganizer" %}<hr>{% endif %}
{% block contacts_content %}
{% include "organizer/contacts_content.html" %}
{% endblock %}
@ -54,7 +54,7 @@
<span style="float: right; margin-top: -5px"><a class="btn btn-primary btn-sm" href="{% url 'add-agpass' %}"><i class="fas fa-plus"></i>&nbsp;Passwort</a></span>
{% endif %}
</h5>
<hr>
{% if user|usergperm:"moduleorganizer" %}<hr>{% endif %}
{% block passwords_content %}
{% include "organizer/passwords_content.html" %}
{% endblock %}

View File

@ -59,8 +59,8 @@
<a href="#\" onclick="javascript:copyPassToCB({{ap.pk}})"><i class="far fa-copy"></i></a>
<span id="pass_cl_cop_{{ap.pk}}" style="display: none;">Kopiert!</span>
</td>
<td>
{% if user|usergperm:"moduleorganizer" %}
<td>
<div class="dropdown no-arrow">
<a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
@ -72,13 +72,14 @@
<a class="dropdown-item text-danger" href="{% url 'pass-delete' ap.pk %}" >Löschen</a>
</div>
</div>
{% endif %}
</div>
</td>
{% endif %}
</tr>
{% else %}
<tr><td id="pass_{{ap.pk}}" class="droppable_tr" data-toggle="popover" data-placement="top" data-trigger="hover" title="Zugriffsbeschränkung" data-content="Zugriff beschränkt auf {% for passgroup in ap.visibleby.all %}{{passgroup.agencygroupname}}{% if forloop.counter < d.visibleby.all|length %}, {%endif%}{% endfor %}">
<span class="text-secondary"><i class="fas fa-lock"></i>&nbsp;{{ap.name}}</span></td><td></td><td></td><td></td><td></td></tr>
<span class="text-secondary"><i class="fas fa-lock"></i>&nbsp;{{ap.name}}</span></td><td></td><td></td><td></td>{% if user|usergperm:"moduleorganizer" %} <td></td>{% endif %}
</tr>
{% endif %}
{% endfor %}
</tbody>

View File

@ -26,6 +26,7 @@
<td>{{ql.name }}</td>
<td><a href="{{ ql.link }}" target="_blank">{{ ql.link }}</a></td>
<!--<td><img src="{{ ql.get_photo_url }}" width="15%"></td> -->
{% if user|usergperm:"moduleorganizer" %}
<td>
{% if user|usergperm:"moduleorganizer" %}
<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'ql-delete' ql.pk%}">
@ -39,6 +40,7 @@
{% endif %}
</div>
</td>
{% endif %}
</tr>
{% endfor %}
</tbody>

View File

@ -141,8 +141,8 @@
<a class="dropdown-item" href="{% url 'standard-status' standard.pk %}">Veröffentlichung aufheben</a>
{% else %}
{% if standard.area != None and standard.task != None %}
<a class="dropdown-item" href="{% url 'standard-status' standard.pk %}">Veröffentlichen</a>
{% endif %}
<a class="dropdown-item" href="{% url 'standard-status' standard.pk %}">Veröffentlichen</a>
{% endif %}
{% endif %}
{% endif %}
{% if standard.created_standard_by == request.user or perms.users.standardmanager %}

View File

@ -25,7 +25,7 @@
</h2>
<hr>
<div class="row col">
{% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %}
{% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %}
<div class="card col-9" style="min-height: 500px">
{% else %}
<div class="card col-12" style="min-height: 500px">
@ -38,10 +38,7 @@
</p>
</div>
</div>
<div class="col-3">
{% if standard.freefield_title|length > 0 %}
<div class="card col-14 ml-1 mb-2" style="">
<div class="card-body">