gnuviech/gva
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

Remove duplicate functionality

Browse source 
- remove customer hosting package list
- replace useless dashboard with redirect
- move all hosting package list for superuser to top level menu item
- replace btn-default with btn-secondary
- improve email address management page
This commit is contained in:
Jan Dittberner 2023-04-29 12:35:49 +02:00
parent 2d05580ed3
commit 866f6c8083
16 changed files with 142 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

58
gnuviechadmin/templates/base.html
View file

@ -23,13 +23,7 @@
<body>
<nav class="navbar navbar-expand-lg sticky-top navbar-dark bg-dark">
<div class="container">
<a class="navbar-brand" href="{% spaceless %}
{% if user.is_authenticated %}
{% url 'customer_dashboard' slug=user.username %}
{% else %}
{% url 'dashboard' %}
{% endif %}
{% endspaceless %}" title="{% translate "Dashboard" %}">gnuviechadmin</a>
<a class="navbar-brand" href="{% url 'dashboard' %}" title="{% translate "Dashboard" %}">gnuviechadmin</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarContent"
aria-controls="navbarContent" aria-expanded="false" aria-label="{% translate "Toggle navigation" %}">
<span class="navbar-toggler-icon"></span>
@ -37,41 +31,34 @@
<div class="collapes navbar-collapse" id="navbarContent">
<ul class="navbar-nav me-auto mb-2 mg-lg-0">
{% if user.is_staff %}
<li class="nav-item dropdown{% if active_item == 'hostingpackage' %} active{% endif %}">
<li class="nav-item{% if active_item == "hosting" %} active{% endif %}">
<a class="nav-link" href="{% url 'all_hosting_packages' %}">
<i class="bi-boxes"></i> {% translate "Hosting" %}</a>
</li>
{% endif %}
{% if user.is_authenticated %}
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button"
aria-expanded="false"><i class="bi-server"></i> {% translate "Hosting" %}</a>
aria-expanded="false"><i class="bi-link"></i> {% translate "Links" %} </a>
<ul class="dropdown-menu" role="menu">
<li><a class="dropdown-item" href="{% url 'hosting_packages' user=user.username %}"><i
class="bi-box2-fill"></i> {% translate "Your hosting packages" %}</a></li>
<li><a class="dropdown-item" href="{% url 'all_hosting_packages' %}"><i
class="bi-boxes"></i> {% translate "All hosting packages" %}</a></li>
<li><a class="dropdown-item" href="{{ webmail_url }}"
title="{% translate "Web based mail system" %}"><i
class="bi-envelope-at"></i> {% translate "Webmail" %}</a></li>
<li><a class="dropdown-item" href="{{ phpmyadmin_url }}"
title="{% translate "phpMyAdmin - MySQL database administration tool" %}"><i
class="icon-mysql"></i> {% translate "phpMyAdmin" %}</a></li>
<li><a class="dropdown-item" href="{{ phppgadmin_url }}"
title="{% translate "phpPgAdmin - PostgreSQL database administration tool" %}"><i
class="icon-postgres"></i> {% translate "phpPgAdmin" %}</a></li>
</ul>
</li>
{% elif user.is_authenticated %}
<li class="nav-item{% if active_item == 'hostingpackage' %} active{% endif %}"><a
class="nav-link" href="{% url 'hosting_packages' user=user.username %}"><i
class="bi-server"></i> {% translate "Hosting" %}</a></li>
{% endif %}
<li class="nav-item dropdown">
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button"
aria-expanded="false"><i class="bi-link"></i> {% translate "Links" %} </a>
<ul class="dropdown-menu" role="menu">
<li><a class="dropdown-item" href="{{ webmail_url }}"
title="{% translate "Web based mail system" %}"><i
class="bi-envelope-at"></i> {% translate "Webmail" %}</a></li>
<li><a class="dropdown-item" href="{{ phpmyadmin_url }}"
title="{% translate "phpMyAdmin - MySQL database administration tool" %}"><i
class="icon-mysql"></i> {% translate "phpMyAdmin" %}</a></li>
<li><a class="dropdown-item" href="{{ phppgadmin_url }}"
title="{% translate "phpPgAdmin - PostgreSQL database administration tool" %}"><i
class="icon-postgres"></i> {% translate "phpPgAdmin" %}</a></li>
</ul>
</li>
<li class="nav-item{% if active_item == 'imprint' %} active{% endif %}"><a
class="nav-link" href="{% url 'imprint' %}"><i class="bi-info"></i> {% translate "Imprint" %}
</a></li>
<li class="nav-item{% if active_item == 'privacy' %} active{% endif %}"><a
class="nav-link" href="{% url 'privacy' %}"><i class="bi-file-text"></i> {% translate "Privacy policy" %}
class="nav-link" href="{% url 'privacy' %}"><i
class="bi-file-text"></i> {% translate "Privacy policy" %}
</a></li>
<li class="nav-item{% if active_item == 'contact' %} active{% endif %}"><a
class="nav-link" href="{% url 'contact_form' %}"><i
@ -79,7 +66,7 @@
</ul>
{% if user.is_authenticated %}
{% user_display user as user_display %}
{% url 'user_profile' slug=user.username as profile_url %}
{% url 'customer_dashboard' slug=user.username as profile_url %}
{% if user.is_impersonate %}
{% user_display user.impersonator as impersonator_display %}
{% url 'impersonate-stop' as stop_impersonation_url %}
@ -87,7 +74,8 @@
Signed in as
<a href="{{ profile_url }}" class="navbar-link" title="My Profile">{{ user_display }}</a>
<i class="bi-incognito" title="impersonated by {{ impersonator_display }}"></i>
<a href="{{ stop_impersonation_url }}" class="navbar-link"><i class="bi-sign-stop" title="stop impersonation"></i></a>
<a href="{{ stop_impersonation_url }}" class="navbar-link"><i class="bi-sign-stop"
title="stop impersonation"></i></a>
{% endblocktranslate %}</span>
{% else %}
<span class="navbar-text justify-content-end">{% blocktranslate trimmed %}