From PI
This commit is contained in:
holger.trampe
parent
a3ddba9ac0
commit
c35e6365ff
|
|
@ -6,13 +6,13 @@
|
|||
<!-- Then put toasts within -->
|
||||
<div id="notchange_done" class="toast alert-success" role="alert" aria-live="assertive" aria-atomic="true">
|
||||
<div class="toast-header">
|
||||
<strong class="mr-auto">Gespeichert</strong>
|
||||
<strong class="mr-auto">Gespeichert</strong>
|
||||
<!--<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>-->
|
||||
</div>
|
||||
<div class="toast-body">
|
||||
<div id="toast_savecontent">Änderungen wurden gespeichert.</div>
|
||||
<div class="toast-body">
|
||||
<div id="toast_savecontent">Änderungen wurden gespeichert.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -20,14 +20,14 @@
|
|||
<!-- Then put toasts within -->
|
||||
<div id="notchange_err" class="toast alert-danger" role="alert" aria-live="assertive" aria-atomic="true">
|
||||
<div class="toast-header">
|
||||
<strong class="mr-auto">Fehler aufgetreten</strong>
|
||||
<!--
|
||||
<strong class="mr-auto">Fehler aufgetreten</strong>
|
||||
<!--
|
||||
<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
-->
|
||||
</div>
|
||||
<div class="toast-body">
|
||||
<div class="toast-body">
|
||||
<div id="toast_errcontent">Bitte kontaktieren Sie den Support.</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -43,58 +43,58 @@
|
|||
<li class="nav-item">
|
||||
<a class="nav-link" id="notifications-tab" data-toggle="tab" href="#notifications" role="tab" aria-controls="notifications-tab" aria-selected="false">Benachrichtigungen</a>
|
||||
</li>
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="agency-tab" data-toggle="tab" href="#agency" role="tab" aria-controls="agency" aria-selected="false">Agentur</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="calc-tab" data-toggle="tab" href="#calc" role="tab" aria-controls="calc" aria-selected="false">Abrechnung</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencynetwork" %}
|
||||
{% if user|usergperm:"agencynetwork" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="agencynetwork-tab" data-toggle="tab" href="#agencynetwork" role="tab" aria-controls="agencynetwork" aria-selected="false">Agenturverbund</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"structuremanager" %}
|
||||
{% if user|usergperm:"structuremanager" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="structure-tab" data-toggle="tab" href="#structure" role="tab" aria-controls="structure" aria-selected="false">Struktur</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"usermanager" %}
|
||||
{% if user|usergperm:"usermanager" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="user-tab" data-toggle="tab" href="#user" role="tab" aria-controls="user" aria-selected="false">Mitarbeiter</a>
|
||||
<a class="nav-link" id="user-tab" data-toggle="tab" href="#user" role="tab" aria-controls="user" aria-selected="false">Mitarbeiter</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"groupmanager" %}
|
||||
{% if user|usergperm:"groupmanager" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="groups-tab" data-toggle="tab" href="#groups" role="tab" aria-controls="groups" aria-selected="false">Gruppen</a>
|
||||
<a class="nav-link" id="groups-tab" data-toggle="tab" href="#groups" role="tab" aria-controls="groups" aria-selected="false">Gruppen</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"modulesconfig" %}
|
||||
{% if user|usergperm:"modulesconfig" %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="moduls-tab" data-toggle="tab" href="#moduls" role="tab" aria-controls="moduls" aria-selected="false">Module</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
<div class="tab-content" id="settingsTabsContent">
|
||||
<div class="tab-pane fade show" id="profil" role="tabpanel" aria-labelledby="profil-tab">
|
||||
<div class="tab-pane fade show" id="profil" role="tabpanel" aria-labelledby="profil-tab">
|
||||
<h5 class="mt-3">Profileinstellungen{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Hier können Sie Einstellungen an ihrem Profil vornehmen (E-Mail, Passwort und, ob die Tooltips angezeigt werden sollen). Alle anderen Einstellungen werden von Mitarbeitern mit entsprechenden Gruppenrechten verwaltet." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
||||
<hr>
|
||||
{% block profil_content %}
|
||||
{% include "dasettings/profil_content.html" %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
<div class="tab-pane fade" id="notifications" role="tabpanel" aria-labelledby="notifications-tab">
|
||||
<h5 class="mt-3">Benachrichtigungen{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Stellen Sie hier ein, welche Art der Benachrichtigung (E-Mail oder Push) Sie für welches Ereignis (Gruppenzuweisungen, Veröffentlichung eines Standards, neue Agenturnews usw.) erhalten möchten." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
||||
|
||||
|
||||
{% block notifications_content %}
|
||||
{% include "dasettings/notifications_content.html" %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
<div class="tab-pane fade" id="agency" role="tabpanel" aria-labelledby="agency-tab">
|
||||
<h5 class="mt-3">Agenturinformationen{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier die Informationen Ihrer Agentur, z.B. Adresse, E-Mailadresse und Telefon." class="far fa-question-circle"></i></small>{% endif %}
|
||||
<small><i onclick="javascript:$('#youtubevideoinformation_agency').modal('toggle');" class="far fa-play-circle"></i></small>
|
||||
|
|
@ -103,29 +103,29 @@
|
|||
{% block agency_content %}
|
||||
{% include "dasettings/agency_content.html" %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencyinfo" %}
|
||||
<div class="tab-pane fade" id="calc" role="tabpanel" aria-labelledby="calc-tab">
|
||||
<h5 class="mt-3">Abrechnung{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Hier können Sie die aktuellen Abrechnungsinfos einsehen." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
||||
<hr>
|
||||
{% block calc_content %}
|
||||
{% include "dasettings/calc_content.html" %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencynetwork" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"agencynetwork" %}
|
||||
<div class="tab-pane fade" id="agencynetwork" role="tabpanel" aria-labelledby="agencynetwork-tab">
|
||||
<h5 class="mt-3">Agenturverbünde{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier Ihre eigenen Agenturverbünde und in welchen Sie Mitglied sind." class="far fa-question-circle"></i></small>{% endif %}
|
||||
<small><i onclick="javascript:$('#youtubevideoinformation_agencynetwork').modal('toggle');" class="far fa-play-circle"></i></small>
|
||||
</h5>
|
||||
<hr>
|
||||
<hr>
|
||||
{% block agencynetwork_content %}
|
||||
{% include "dasettings/agencynetwork_content.html" %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"structuremanager" %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"structuremanager" %}
|
||||
<div class="tab-pane fade" id="structure" role="tabpanel" aria-labelledby="structure-tab">
|
||||
<h5 class="mt-3">Struktur{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Richten Sie hier Bereiche und Tätigkeiten ein, um diese in Standards und Organigramm als Agenturstruktur zu nutzen." class="far fa-question-circle"></i></small>{% endif %}
|
||||
<small><i onclick="javascript:$('#youtubevideoinformation_structure').modal('toggle');" class="far fa-play-circle"></i></small>
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"usermanager" %}
|
||||
{% if user|usergperm:"usermanager" %}
|
||||
<div class="tab-pane fade" id="user" role="tabpanel" aria-labelledby="user-tab">
|
||||
<h5 class="mt-3">Mitarbeiter{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Legen Sie hier neue Mtarbeiter an, weisen ihnen Gruppen zu und ändern Sie Stammdaten wie Foto, Namen und Agenturfunktion." class="far fa-question-circle"></i></small>{% endif %}
|
||||
<small><i onclick="javascript:$('#youtubevideoinformation_users').modal('toggle');" class="far fa-play-circle"></i></small>
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"groupmanager" %}
|
||||
{% if user|usergperm:"groupmanager" %}
|
||||
<div class="tab-pane fade" id="groups" role="tabpanel" aria-labelledby="groups-tab">
|
||||
<h5 class="mt-3">Gruppen{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Hier werden Gruppen erstellt und bearbeitet sowie Mitglieder der Gruppen hinzugefügt und entfernt. Zudem können Rechte der Gruppen vergeben werden." class="far fa-question-circle"></i></small>{% endif %}
|
||||
<small><i onclick="javascript:$('#youtubevideoinformation_users').modal('toggle');" class="far fa-play-circle"></i></small>
|
||||
|
|
@ -158,9 +158,9 @@
|
|||
{% endblock %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if user|usergperm:"modulesconfig" %}
|
||||
{% if user|usergperm:"modulesconfig" %}
|
||||
<div class="tab-pane fade" id="moduls" role="tabpanel" aria-labelledby="moduls-tab">
|
||||
<h5 class="mt-3">Module{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Hier werden Module aktiviert oder deaktiviert sowie individuelle Einstellungen der Module gemacht. Wird ein Modul deaktiviert, gehen Einstellungen und Dateien nicht verloren." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
||||
<h5 class="mt-3">Module{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Hier werden Module aktiviert oder deaktiviert sowie individuelle Einstellungen der Module gemacht. Wird ein Modul deaktiviert, gehen Einstellungen und Dateien nicht verloren." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
||||
{% block moduls_content %}
|
||||
{% include "dasettings/moduls_content.html" %}
|
||||
{% endblock %}
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
|
||||
var defaultsettingsview = "profil";
|
||||
/* COOKIE FOR SAVING OPEN TAB */
|
||||
$(document).ready(function(){
|
||||
$(document).ready(function(){
|
||||
|
||||
$(".toast").toast({
|
||||
autohide: true,
|
||||
|
|
@ -180,15 +180,15 @@ var defaultsettingsview = "profil";
|
|||
});
|
||||
//Check prev Side
|
||||
var activeTab = localStorage.getItem('activeTabSettings');
|
||||
|
||||
if(activeTab){
|
||||
|
||||
if(activeTab){
|
||||
|
||||
if($('#' + activeTab).find().prevObject.length != 0){
|
||||
$('#' + activeTab).tab('show');
|
||||
$('#' + activeTab).tab('show');
|
||||
$(".nav-link").removeClass("active");
|
||||
|
||||
|
||||
$("#" + activeTab + "-tab").addClass("active");
|
||||
|
||||
|
||||
}
|
||||
else{
|
||||
|
||||
|
|
@ -197,19 +197,19 @@ var defaultsettingsview = "profil";
|
|||
}
|
||||
}
|
||||
else{
|
||||
|
||||
|
||||
$("#profil-tab").addClass("active");
|
||||
$('#profil').tab('show');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
$('#settingsTabs a').on('click', function (e) {
|
||||
e.preventDefault();
|
||||
$(this).tab('show');
|
||||
$(this).tab('show');
|
||||
lastview_name = $(this)[0]['hash'].substring(1);
|
||||
localStorage.setItem('activeTabSettings', lastview_name);
|
||||
localStorage.setItem('activeTabSettings', lastview_name);
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -242,9 +242,9 @@ var VIDEOTITLE_agency = "Informationsvideo Agentur und Agenturfunktionen"
|
|||
|
||||
|
||||
|
||||
$(document).ready(function(){
|
||||
$(document).ready(function(){
|
||||
|
||||
$("#modaltitle_video_agn").html(VIDEOTITLE_agn);
|
||||
$("#modaltitle_video_agn").html(VIDEOTITLE_agn);
|
||||
|
||||
//VIDEOCONTROLS
|
||||
$( MODALNAME_agn ).on('shown.bs.modal', function(e){
|
||||
|
|
@ -265,25 +265,25 @@ $(document).ready(function(){
|
|||
player_agn = new YT.Player('video-placeholder_agn', {
|
||||
width: 760,
|
||||
height: 500,
|
||||
videoId: VIDEOURL_agn,
|
||||
videoId: VIDEOURL_agn,
|
||||
});
|
||||
|
||||
player_structure = new YT.Player('video-placeholder_structure', {
|
||||
width: 760,
|
||||
height: 500,
|
||||
videoId: VIDEOURL_structure,
|
||||
videoId: VIDEOURL_structure,
|
||||
});
|
||||
|
||||
player_users = new YT.Player('video-placeholder_users', {
|
||||
width: 760,
|
||||
height: 500,
|
||||
videoId: VIDEOURL_users,
|
||||
videoId: VIDEOURL_users,
|
||||
});
|
||||
|
||||
player_agency = new YT.Player('video-placeholder_agency', {
|
||||
width: 760,
|
||||
height: 500,
|
||||
videoId: VIDEOURL_agency,
|
||||
videoId: VIDEOURL_agency,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -303,7 +303,7 @@ $(document).ready(function(){
|
|||
<div id="video-placeholder_agn"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -316,9 +316,9 @@ $(document).ready(function(){
|
|||
<small><i onclick="javascript:$('#youtubevideoinformation_structure').modal('toggle');" class="far fa-play-circle"></i></small>
|
||||
-->
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$(document).ready(function(){
|
||||
|
||||
$("#modaltitle_video_structure").html(VIDEOTITLE_structure);
|
||||
$("#modaltitle_video_structure").html(VIDEOTITLE_structure);
|
||||
|
||||
//VIDEOCONTROLS
|
||||
$( MODALNAME_structure ).on('shown.bs.modal', function(e){
|
||||
|
|
@ -344,7 +344,7 @@ $(document).ready(function(){
|
|||
<div id="video-placeholder_structure"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -359,9 +359,9 @@ $(document).ready(function(){
|
|||
|
||||
|
||||
|
||||
$(document).ready(function(){
|
||||
$(document).ready(function(){
|
||||
|
||||
$("#modaltitle_video_users").html(VIDEOTITLE_users);
|
||||
$("#modaltitle_video_users").html(VIDEOTITLE_users);
|
||||
|
||||
//VIDEOCONTROLS
|
||||
$( MODALNAME_users ).on('shown.bs.modal', function(e){
|
||||
|
|
@ -387,7 +387,7 @@ $(document).ready(function(){
|
|||
<div id="video-placeholder_users"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -397,9 +397,9 @@ $(document).ready(function(){
|
|||
|
||||
|
||||
|
||||
$(document).ready(function(){
|
||||
$(document).ready(function(){
|
||||
|
||||
$("#modaltitle_video_agency").html(VIDEOTITLE_agency);
|
||||
$("#modaltitle_video_agency").html(VIDEOTITLE_agency);
|
||||
|
||||
//VIDEOCONTROLS
|
||||
$( MODALNAME_agency ).on('shown.bs.modal', function(e){
|
||||
|
|
@ -425,7 +425,7 @@ $(document).ready(function(){
|
|||
<div id="video-placeholder_agency"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -443,4 +443,4 @@ $(document).ready(function(){
|
|||
|
||||
|
||||
|
||||
{% endblock content %}
|
||||
{% endblock content %}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 0 B |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -37,8 +37,8 @@ def loadingFreeDays(plz, year):
|
|||
filecsv = csv.reader(csvfile, delimiter=';')
|
||||
for row in filecsv:
|
||||
|
||||
if str(row[1].decode('utf-8')) == str(plz):
|
||||
land = row[6].decode('utf-8')
|
||||
if str(row[1] == str(plz)):
|
||||
land = row[6]
|
||||
break;
|
||||
|
||||
if(land != False):
|
||||
|
|
|
|||
Loading…
Reference in New Issue