This commit is contained in:
Daniel Grams 2020-10-04 12:18:21 +02:00
parent 73bb9576bc
commit 0e2c17f92f
17 changed files with 98 additions and 97 deletions

View File

@ -36,10 +36,6 @@ h3 {
margin-left: 30px;
} */
.body-content {
padding: 10px;
}
footer {
padding: 10px;
}

View File

@ -471,27 +471,6 @@
{% endif %}
{% endmacro %}
{% macro render_tab(id, title, link, active_id=None) %}
<li class="nav-item">
<a class="nav-link{% if active_id == id %} active{% endif %}" href="{{ link }}">{{ title }}</a>
</li>
{% endmacro %}
{% macro render_manage_menu(admin_unit, active_id=None) %}
<ul class="nav nav-pills">
{{ render_tab('reviews', _('Reviews'), url_for('manage_admin_unit_event_reviews', id=admin_unit.id), active_id) }}
{{ render_tab('events', _('Events'), url_for('manage_admin_unit_events', id=admin_unit.id), active_id) }}
{{ render_tab('references_incoming', _('Incoming references'), url_for('manage_admin_unit_references_incoming', id=admin_unit.id), active_id) }}
{{ render_tab('references_outgoing', _('Outgoing references'), url_for('manage_admin_unit_references_outgoing', id=admin_unit.id), active_id) }}
{{ render_tab('reference_requests_incoming', _('Incoming reference requests'), url_for('manage_admin_unit_reference_requests_incoming', id=admin_unit.id), active_id) }}
{{ render_tab('reference_requests_outgoing', _('Outgoing reference requests'), url_for('manage_admin_unit_reference_requests_outgoing', id=admin_unit.id), active_id) }}
{{ render_tab('organizers', _('Organizers'), url_for('manage_admin_unit_organizers', id=admin_unit.id), active_id) }}
{{ render_tab('places', _('Places'), url_for('manage_admin_unit_event_places', id=admin_unit.id), active_id) }}
{{ render_tab('members', _('Members'), url_for('manage_admin_unit_members', id=admin_unit.id), active_id) }}
{{ render_tab('widgets', _('Widgets'), url_for('manage_admin_unit_widgets', id=admin_unit.id), active_id) }}
</ul>
{% endmacro %}
{% macro render_event_organizer_places_header() %}
<script>
$( function() {

View File

@ -1,12 +1,9 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_manage_menu, render_field_with_errors, render_field %}
{% extends "layout_manage.html" %}
{% set active_id = "members" %}
{% from "_macros.html" import render_field_with_errors, render_field %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'members') }}
<h2>{{ _('Invite user') }}</h2>
<h1>{{ _('Invite user') }}</h1>
<form action="" method="POST">
{{ form.hidden_tag() }}

View File

@ -1,12 +1,9 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_manage_menu, render_field_with_errors, render_field %}
{% extends "layout_manage.html" %}
{% set active_id = "members" %}
{% from "_macros.html" import render_field_with_errors, render_field %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'members') }}
<h2>{{ _('Update member') }}</h2>
<h1>{{ _('Update member') }}</h1>
<form action="" method="POST">
{{ form.hidden_tag() }}

View File

@ -41,7 +41,7 @@
{% block navbar %}
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="{{ url_for('home') }}">
oveda
<i class="fa fa-bullseye fa-fw"></i> oveda
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
@ -88,8 +88,12 @@
{% include "_messages.html" %}
{% block content -%}
{%- endblock content %}
{% block content_container -%}
<main class="p-3">
{% block content -%}
{%- endblock content %}
</main>
{%- endblock content_container %}
<!-- Footer -->
{% block footer -%}

View File

@ -0,0 +1,40 @@
{% extends "layout.html" %}
{% macro render_submenu_item(id, title, link, active_id=None) %}
<li class="nav-item">
<a class="nav-link pl-0{% if active_id == id %} active{% endif %}" href="{{ link }}">{{ title }}</a>
</li>
{% endmacro %}
{% block content_container -%}
<div class="container-fluid">
<div class="row wrapper min-vh-100 flex-column flex-sm-row">
<aside class="col-12 col-sm-3 p-0 bg-light flex-shrink-1">
<nav class="navbar navbar-expand-sm navbar-light bg-light align-items-start flex-sm-column flex-row">
<a class="navbar-brand" href="#">{{ admin_unit.name }}</a>
<a href class="navbar-toggler" data-toggle="collapse" data-target=".sidebar">
<span class="navbar-toggler-icon"></span>
</a>
<div class="collapse navbar-collapse sidebar">
<ul class="flex-column navbar-nav w-100 justify-content-between">
{{ render_submenu_item('reviews', _('Reviews'), url_for('manage_admin_unit_event_reviews', id=admin_unit.id), active_id) }}
{{ render_submenu_item('events', _('Events'), url_for('manage_admin_unit_events', id=admin_unit.id), active_id) }}
{{ render_submenu_item('references_incoming', _('Incoming references'), url_for('manage_admin_unit_references_incoming', id=admin_unit.id), active_id) }}
{{ render_submenu_item('references_outgoing', _('Outgoing references'), url_for('manage_admin_unit_references_outgoing', id=admin_unit.id), active_id) }}
{{ render_submenu_item('reference_requests_incoming', _('Incoming reference requests'), url_for('manage_admin_unit_reference_requests_incoming', id=admin_unit.id), active_id) }}
{{ render_submenu_item('reference_requests_outgoing', _('Outgoing reference requests'), url_for('manage_admin_unit_reference_requests_outgoing', id=admin_unit.id), active_id) }}
{{ render_submenu_item('organizers', _('Organizers'), url_for('manage_admin_unit_organizers', id=admin_unit.id), active_id) }}
{{ render_submenu_item('places', _('Places'), url_for('manage_admin_unit_event_places', id=admin_unit.id), active_id) }}
{{ render_submenu_item('members', _('Members'), url_for('manage_admin_unit_members', id=admin_unit.id), active_id) }}
{{ render_submenu_item('widgets', _('Widgets'), url_for('manage_admin_unit_widgets', id=admin_unit.id), active_id) }}
</ul>
</div>
</nav>
</aside>
<main class="col bg-faded p-3">
{% block content -%}
{%- endblock content %}
</main>
</div>
</div>
{%- endblock content_container %}

View File

@ -5,7 +5,7 @@
{% block content %}
{% if invitations %}
<h2>{{ _('Invitations') }}</h2>
<h1>{{ _('Invitations') }}</h1>
<div class="list-group">
{% for invitation in invitations %}
<a href="{{ url_for('admin_unit_member_invitation', id=invitation.id) }}" class="list-group-item">{{ invitation.adminunit.name }}</a>
@ -13,7 +13,7 @@
</div>
{% endif %}
<h2>{{ _('Admin Units') }}</h2>
<h1>{{ _('Admin Units') }}</h1>
<div class="my-4">
<a class="btn btn-outline-secondary my-1" href="{{ url_for('admin_unit_create') }}" role="button"><i class="fa fa-plus"></i> {{ _('Create admin unit') }}</a>
</div>

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_event_review_status_pill, render_event_status_pill, render_pagination, render_event_date, render_field_with_errors, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "events" %}
{% from "_macros.html" import render_event_review_status_pill, render_event_status_pill, render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
{% block title %}
{{ _('Events') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'events') }}
<h1>{{ _('Events') }}</h1>
<div class="my-4">
<form action="" class="form-inline" method="GET">

View File

@ -1,15 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_roles, render_pagination, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "members" %}
{% from "_macros.html" import render_roles, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Members') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'members') }}
<h2>{{ _('Invitations') }}</h2>
<h1>{{ _('Invitations') }}</h1>
<div class="my-4">
{% if can_invite_users %}
<a class="btn btn-outline-secondary my-1" href="{{ url_for('manage_admin_unit_member_invite', id=admin_unit.id) }}" role="button"><i class="fa fa-plus"></i> {{ _('Invite user') }}</a>
@ -28,7 +25,7 @@
{% endfor %}
</ul>
<h2>{{ _('Members') }}</h2>
<h1>{{ _('Members') }}</h1>
<ul class="list-group">
{% for member in members %}
<li class="list-group-item">

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_pagination, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "organizers" %}
{% from "_macros.html" import render_pagination, render_event_organizer %}
{% block title %}
{{ _('Organizers') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'organizers') }}
<h1>{{ _('Organizers') }}</h1>
<div class="my-4">
<a class="btn btn-outline-secondary my-1" href="{{ url_for('manage_admin_unit_organizer_create', id=admin_unit.id) }}" role="button"><i class="fa fa-plus"></i> {{ _('Create organizer') }}</a>

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_pagination, render_field_with_errors, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "places" %}
{% from "_macros.html" import render_pagination, render_field_with_errors, render_event_organizer %}
{% block title %}
{{ _('Places') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'places') }}
<h1>{{ _('Places') }}</h1>
<div class="my-4">
<form action="" class="form-inline" method="GET">

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "reference_requests_incoming" %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Reference requests') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'reference_requests_incoming') }}
<h1>{{ _('Incoming reference requests') }}</h1>
<ul class="list-group mt-4">
{% for request in requests %}

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "reference_requests_outgoing" %}
{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Reference requests') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'reference_requests_outgoing') }}
<h1>{{ _('Outgoing reference requests') }}</h1>
<ul class="list-group mt-4">
{% for request in requests %}

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "references_incoming" %}
{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('References') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'references_incoming') }}
<h1>{{ _('Incoming references') }}</h1>
<ul class="list-group mt-4">
{% for reference in references %}

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "references_outgoing" %}
{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('References') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'references_outgoing') }}
<h1>{{ _('Outgoing references') }}</h1>
<ul class="list-group mt-4">
{% for reference in references %}

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_pagination, render_event_date, render_field_with_errors, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "reviews" %}
{% from "_macros.html" import render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
{% block title %}
{{ _('Reviews') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'reviews') }}
<h1>{{ _('Reviews') }}</h1>
<ul class="list-group my-4">
{% for event in events %}

View File

@ -1,13 +1,12 @@
{% extends "layout.html" %}
{% from "_macros.html" import render_pagination, render_event_date, render_field_with_errors, render_event_organizer, render_manage_menu %}
{% extends "layout_manage.html" %}
{% set active_id = "widgets" %}
{% from "_macros.html" import render_pagination, render_event_date, render_field_with_errors, render_event_organizer %}
{% block title %}
{{ _('Widgets') }}
{% endblock %}
{% block content %}
<h1>{{ admin_unit.name }}</h1>
{{ render_manage_menu(admin_unit, 'widgets') }}
<h1>{{ _('Widgets') }}</h1>
<h2>{{ _('Veranstaltungen als iFrame einbetten') }}</h2>
<textarea class="form-control"><iframe src="{{ url_for('widget_event_dates', au_short_name=admin_unit.short_name, _external=True) }}"></iframe></textarea>