0.8.3 final
This commit is contained in:
parent
9ad4e7c621
commit
c3b6392e10
|
|
@ -40,7 +40,7 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="content-section col-10">
|
<div class="content-section col-10">
|
||||||
<h3>Profil von {{user_fullname}} bearbeiten <small><i data-toggle="tooltip" data-placement="top" title="Geben Sie hier die Profildaten für den Mitarbeiter ein." class="far fa-question-circle"></i></small></h3>
|
<h3>Mitarbeiter {{user_fullname}} <small><i data-toggle="tooltip" data-placement="top" title="Geben Sie hier die Profildaten für den Mitarbeiter ein." class="far fa-question-circle"></i></small></h3>
|
||||||
<hr>
|
<hr>
|
||||||
{% if newuser == 1 %}
|
{% if newuser == 1 %}
|
||||||
<div class="progress mb-3" style="max-height: 15px;">
|
<div class="progress mb-3" style="max-height: 15px;">
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -15,7 +15,6 @@ import os
|
||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
|
|
||||||
############################################## DEV #####################################
|
############################################## DEV #####################################
|
||||||
BASE_URL = "https://dev01.digitale-agentur.com/"
|
BASE_URL = "https://dev01.digitale-agentur.com/"
|
||||||
|
|
||||||
|
|
@ -55,8 +54,6 @@ X_FRAME_OPTIONS = 'SAMEORIGIN'
|
||||||
# SECURITY WARNING: keep the secret key used in production secret!
|
# SECURITY WARNING: keep the secret key used in production secret!
|
||||||
SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q'
|
SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost', 'dev01.digitale-agentur.com']
|
ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost', 'dev01.digitale-agentur.com']
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@
|
||||||
<div class="content-section col-12">
|
<div class="content-section col-12">
|
||||||
<div class="row"><div class="content-section col-12">
|
<div class="row"><div class="content-section col-12">
|
||||||
{% if user|usergperm:"moduleorganizer" %}
|
{% if user|usergperm:"moduleorganizer" %}
|
||||||
<a class="btn btn-primary" href="{% url 'addcontact' %}"><i class="fas fa-plus"></i> Kontakt</a>
|
<!--<a class="btn btn-primary" href="{% url 'addcontact' %}"><i class="fas fa-plus"></i> Kontakt</a>
|
||||||
<button class="btn btn-secondary mr-l btn-sm" style="vertical-align: bottom;" onclick="javascript:showCategoryMod()"><i class="fas fa-pen"></i> Kategorien</button>
|
<button class="btn btn-secondary mr-l btn-sm" style="vertical-align: bottom;" onclick="javascript:showCategoryMod()"><i class="fas fa-pen"></i> Kategorien</button>-->
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<hr>
|
<!--<hr>-->
|
||||||
</div></div>
|
</div></div>
|
||||||
<div class="table-responsive ">
|
<div class="table-responsive ">
|
||||||
<table class="table table-hover" id="table_contactsall" >
|
<table class="table table-hover" id="table_contactsall" >
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,9 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="tab-pane fade show" id="quicklinks" role="tabpanel" aria-labelledby="quicklinks-tab">
|
<div class="tab-pane fade show" id="quicklinks" role="tabpanel" aria-labelledby="quicklinks-tab">
|
||||||
<h5 class="mt-3">Quicklinks{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier Links auf andere Webseiten." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
<h5 class="mt-3">Quicklinks{% if request.user.profile.showtooltips %} <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> Quicklink</a></span>{% endif %}
|
||||||
|
</h5>
|
||||||
<hr>
|
<hr>
|
||||||
{% block quicklinks_content %}
|
{% block quicklinks_content %}
|
||||||
{% include "organizer/quicklinks_content.html" %}
|
{% include "organizer/quicklinks_content.html" %}
|
||||||
|
|
@ -33,7 +35,13 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="tab-pane fade show" id="contacts" role="tabpanel" aria-labelledby="contacts-tab">
|
<div class="tab-pane fade show" id="contacts" role="tabpanel" aria-labelledby="contacts-tab">
|
||||||
<h5 class="mt-3">Kontakte{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier wichtige Kontakte." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
<h5 class="mt-3">Kontakte{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier wichtige Kontakte." class="far fa-question-circle"></i></small>{% endif %}
|
||||||
|
{% if user|usergperm:"moduleorganizer" %}
|
||||||
|
<span style="float: right; margin-top: -5px">
|
||||||
|
<button class="btn btn-secondary mr-l btn-sm" style="vertical-align: bottom;" onclick="javascript:showCategoryMod()"><i class="fas fa-pen"></i> Kategorien</button>
|
||||||
|
<a class="btn btn-primary btn-sm" href="{% url 'addcontact' %}"><i class="fas fa-plus"></i> Kontakt</a></span>
|
||||||
|
{% endif %}
|
||||||
|
</h5>
|
||||||
<hr>
|
<hr>
|
||||||
{% block contacts_content %}
|
{% block contacts_content %}
|
||||||
{% include "organizer/contacts_content.html" %}
|
{% include "organizer/contacts_content.html" %}
|
||||||
|
|
@ -41,7 +49,11 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="tab-pane fade show" id="passwords" role="tabpanel" aria-labelledby="passwords-tab">
|
<div class="tab-pane fade show" id="passwords" role="tabpanel" aria-labelledby="passwords-tab">
|
||||||
<h5 class="mt-3">Passwörter{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Passwörter für andere Portale, die für ihre gessamte Agentur zugreifbar sein sollen. Sie können die Einsicht der Passwörter mit entsprechenden Gruppen einschränken." class="far fa-question-circle"></i></small>{% endif %}</h5>
|
<h5 class="mt-3">Passwörter{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Passwörter für andere Portale, die für ihre gessamte Agentur zugreifbar sein sollen. Sie können die Einsicht der Passwörter mit entsprechenden Gruppen einschränken." 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 'add-agpass' %}"><i class="fas fa-plus"></i> Passwort</a></span>
|
||||||
|
{% endif %}
|
||||||
|
</h5>
|
||||||
<hr>
|
<hr>
|
||||||
{% block passwords_content %}
|
{% block passwords_content %}
|
||||||
{% include "organizer/passwords_content.html" %}
|
{% include "organizer/passwords_content.html" %}
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,11 @@
|
||||||
<div class="content-section col-12">
|
<div class="content-section col-12">
|
||||||
<div class="row"><div class="content-section col-9">
|
<div class="row"><div class="content-section col-9">
|
||||||
{% if user|usergperm:"moduleorganizer" %}
|
{% if user|usergperm:"moduleorganizer" %}
|
||||||
<a class="btn btn-primary " href="{% url 'add-agpass' %}"><i class="fas fa-plus"></i> Passwort</a>
|
<!--<a class="btn btn-primary " href="{% url 'add-agpass' %}"><i class="fas fa-plus"></i> Passwort</a>-->
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</div></div>
|
</div></div>
|
||||||
<hr>
|
<!--<hr>-->
|
||||||
<div class="table-responsive" style="min-height: 400px;">
|
<div class="table-responsive" style="min-height: 400px;">
|
||||||
<table class="table hover" id="pstable">
|
<table class="table hover" id="pstable">
|
||||||
<thead>
|
<thead>
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
{% if user|usergperm:"moduleorganizer" %}
|
{% if user|usergperm:"moduleorganizer" %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="content-section col-4">
|
<div class="content-section col-4">
|
||||||
<a class="btn btn-primary" href="{% url 'ql-addql' %}"><i class="fas fa-plus"></i> Quicklink</a>
|
<!--<a class="btn btn-primary" href="{% url 'ql-addql' %}"><i class="fas fa-plus"></i> Quicklink</a>-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<hr>
|
<!--<hr>-->
|
||||||
<div class="row col-12 " >
|
<div class="row col-12 " >
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover" id="qltable">
|
<table class="table table-hover" id="qltable">
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
<div class="card-header" id="st_freefield">
|
<div class="card-header" id="st_freefield">
|
||||||
<h5 class="mb-0">
|
<h5 class="mb-0">
|
||||||
<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#freefield_content" aria-expanded="false" aria-controls="freefield_content">
|
<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#freefield_content" aria-expanded="false" aria-controls="freefield_content">
|
||||||
<i class="fas fa-file-alt"></i> Freifeld{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Vergeben Sie für ein freies Textfeld einen Titel und einen entsprechenden Inhalt." class="far fa-question-circle"></i></small>{% endif %}
|
<i class="fas fa-file-alt"></i> Freitextfeld{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Vergeben Sie für ein freies Textfeld einen Titel und einen entsprechenden Inhalt." class="far fa-question-circle"></i></small>{% endif %}
|
||||||
</button>
|
</button>
|
||||||
</h5>
|
</h5>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,8 @@
|
||||||
<ul class="nav nav-tabs" id="area_tabs" role="tablist" >
|
<ul class="nav nav-tabs" id="area_tabs" role="tablist" >
|
||||||
{% for area in areas %}
|
{% for area in areas %}
|
||||||
<li class="nav-item " >
|
<li class="nav-item " >
|
||||||
<a class="nav-link" id="{{area.id}}" data-toggle="tab" href="#t_{{area.id}}" role="tab" aria-controls="t_{{area.id}}" aria-selected="false">{{area.name}}</a>
|
<!--<a class="nav-link " id="{{area.id}}" style="opacity:0.8;background-color: {{area.color}}; color: #FFFFFF" data-toggle="tab" href="#t_{{area.id}}" role="tab" aria-controls="t_{{area.id}}" aria-selected="false">{{area.name}}</a>-->
|
||||||
|
<a class="nav-link " id="{{area.id}}" style="" data-toggle="tab" href="#t_{{area.id}}" role="tab" aria-controls="t_{{area.id}}" aria-selected="false">{{area.name}}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
|
@ -222,6 +223,12 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<style type="text/css">
|
||||||
|
/*.active {
|
||||||
|
margin-top: -10px !important;
|
||||||
|
height: 53px;
|
||||||
|
}*/
|
||||||
|
</style>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
<div class="card-header" id="st_freefield">
|
<div class="card-header" id="st_freefield">
|
||||||
<h5 class="mb-0">
|
<h5 class="mb-0">
|
||||||
<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#freefield_content" aria-expanded="false" aria-controls="freefield_content">
|
<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#freefield_content" aria-expanded="false" aria-controls="freefield_content">
|
||||||
<i class="fas fa-file-alt"></i> Freifeld{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Vergeben Sie für ein freies Textfeld einen Titel und einen entsprechenden Inhalt." class="far fa-question-circle"></i></small>{% endif %}
|
<i class="fas fa-file-alt"></i> Freitextfeld{% if request.user.profile.showtooltips %} <small><i data-toggle="tooltip" data-placement="top" title="Vergeben Sie für ein freies Textfeld einen Titel und einen entsprechenden Inhalt." class="far fa-question-circle"></i></small>{% endif %}
|
||||||
</button>
|
</button>
|
||||||
</h5>
|
</h5>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,8 @@
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<div style="" class="sidebar-heading">
|
<div style="" class="sidebar-heading">
|
||||||
<img src="{% static 'users/img/VVE-Logo.png' %}" width="30%" class="mb-2">
|
<!--<span style="float: left"><small>poweder by </small><img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2"></span>-->
|
||||||
|
<img src="{% static 'users/img/VVE-Logo.png' %}" width="27%" class="mb-2">
|
||||||
<br />
|
<br />
|
||||||
<a style="color: #999; text-decoration: none;" href="{% url 'datenschutzda' %}">Datenschutz</a><br />
|
<a style="color: #999; text-decoration: none;" href="{% url 'datenschutzda' %}">Datenschutz</a><br />
|
||||||
<a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a>
|
<a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue