Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • konstantin/akplanning
  • matedealer/akplanning
  • kif/akplanning
  • mirco/akplanning
  • lordofthevoid/akplanning
  • voidptr/akplanning
  • xayomer/akplanning-fork
  • mollux/akplanning
  • neumantm/akplanning
  • mmarx/akplanning
  • nerf/akplanning
  • felix_bonn/akplanning
  • sebastian.uschmann/akplanning
13 results
Select Git revision
Show changes
Hide whitespace changes
Inline Side-by-side
static_common/common/vendor/vuejs/vue.global.js 0 → 100644
View file @ 5753b2c1
Source diff could not be displayed: it is too large. Options to address this: view the blob.
templates/admin/base_site.html
View file @ 5753b2c1
{% extends "admin/base_site.html" %}
{% load compress %}
{% load bootstrap4 %}
{% load fontawesome_5 %}
{% load django_bootstrap5 %}
{% load fontawesome_6 %}
{% load tags_AKModel %}
{% load static %}
{% block extrastyle %}
{% if not debug %}
<link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
{% endif %}
{% endblock %}
{% block extrahead %}
<!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_css %}
{% bootstrap_javascript jquery=True %}
{% fontawesome_5_static %}
{% block stylesheet %}{% endblock %}
<style>
{% block extrastyle %}
{% compress css %}
<link rel="stylesheet" type="text/x-scss" href="{% static 'common/vendor/bootswatch-lumen/theme.scss' %}">
{% fontawesome_6_css %}
<link rel="stylesheet" href="{% static "admin/css/base.css" %}" />
{% if not debug %}
<link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
{% endif %}
<style>
a.btn {
color: #FFFFFF;
}
......@@ -24,5 +24,28 @@
.block-header {
margin-top: 20px;
}
</style>
.deleteEvent {
background-color: #6a6a6a !important;
}
.deleteEvent .fc-event-title {
font-size: 5vw;
text-align: center;
}
/* Fix delete button height in admin interface */
.submit-row a.deletelink, .delete-confirmation form .cancel-link {
height: auto!important;
}
</style>
{% endcompress %}
{% endblock %}
{% block extrahead %}
<!-- Load bootstrap, jquery and fontawesome-->
{% compress js %}
{% bootstrap_javascript %}
<script src="{% static 'common/vendor/jquery/jquery-3.6.3.min.js' %}"></script>
{% fontawesome_6_js %}
{% endcompress %}
{% endblock %}
templates/base.html
View file @ 5753b2c1
{% load compress %}
{% load static %}
{% load i18n %}
{% load bootstrap4 %}
{% load fontawesome_5 %}
{% load django_bootstrap5 %}
{% load fontawesome_6 %}
{% load tags_AKModel %}
<!DOCTYPE html>
......@@ -13,11 +14,25 @@
<title>{% block title %}AK Planning{% endblock %}</title>
<!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_css %}
{% bootstrap_javascript jquery='slim' %}
{% fontawesome_5_static %}
<link rel="stylesheet" href="{% static 'common/css/custom.css' %}">
{% compress css %}
<link rel="stylesheet" type="text/x-scss" href="{% static 'common/vendor/bootswatch-lumen/theme.scss' %}">
<link rel="stylesheet" href="{% static 'common/vendor/chosen-js/chosen.css' %}">
<link rel="stylesheet" href="{% static 'common/css/bootstrap-chosen.css' %}">
{% if 'AKDashboard'|check_app_installed %}
<link rel="stylesheet" href="{% static 'AKDashboard/style.css' %}">
{% endif %}
<link href="{% static 'common/vendor/select2/select2.min.css' %}" rel="stylesheet" />
{% fontawesome_6_css %}
<link rel="stylesheet" href="{% static 'common/css/custom.css' %}">
{% endcompress %}
{% compress js %}
{% bootstrap_javascript %}
<script src="{% static 'common/vendor/jquery/jquery-3.6.3.min.js' %}"></script>
<script src="{% static 'common/vendor/select2/select2.min.js' %}"></script>
{% fontawesome_6_js %}
<script src="{% static 'common/vendor/vuejs/vue.global.js' %}"></script>
{% endcompress %}
<script type='text/javascript'>
var changed_form = false;
......@@ -44,7 +59,7 @@
<body>
{% block language-switcher %}
<!-- language switcher -->
<div class="container" style="margin-top:20px">
<div class="container d-flex flex-row-reverse" style="margin-top:20px">
<form action="{% url 'set_language' %}"
method="post"
class="form-inline"
......@@ -59,7 +74,7 @@
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
<div style="align-self: end;">
<div class="align-content-end">
{% for language in languages %}
&nbsp;&nbsp;
<button type="submit"
......@@ -75,8 +90,8 @@
</div>
{% endblock %}
<div class="container" style="margin-top:15px;margin-bottom: 30px;">
<ol class="breadcrumb">
<div class="container mt-3 mb-4">
<ol class="breadcrumb p-3">
{% block breadcrumbs %}
{% endblock %}
</ol>
......@@ -91,6 +106,8 @@
<div id="footer" style="padding-top:10px;padding-bottom:10px;border-top:1px solid grey;">
{% block footer_custom %}
{% endblock %}
<a href="{% url "admin:index" %}">{% trans "Go to backend" %}</a> &middot;
<a href="{% url "docs_root" %}">{% trans "Docs" %}</a> &middot;
{% footer_info as FI %}
{% if FI.impress_text %}
{{ FI.impress_text }} &middot;
......
templates/messages.html
View file @ 5753b2c1
......@@ -3,7 +3,7 @@
{% if messages %}
{% for message in messages %}
<div class="alert alert-dismissible {{ message.tags | message_bootstrap_class }}">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
{{ message }}
</div>
{% endfor %}
......