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
  • koma/feature/preference-polling-form
  • main
  • renovate/django-5.x
  • renovate/django-bootstrap5-25.x
  • renovate/django-debug-toolbar-6.x
  • renovate/djangorestframework-3.x
  • renovate/jsonschema-4.x
7 results

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
  • 520-akowner
  • 520-fix-event-wizard-datepicker
  • 520-fix-scheduling
  • 520-improve-scheduling
  • 520-improve-scheduling-2
  • 520-improve-submission
  • 520-improve-trackmanager
  • 520-improve-wall
  • 520-message-resolved
  • 520-status
  • 520-upgrades
  • add_express_interest_to_ak_overview
  • admin-production-color
  • bugfixes
  • csp
  • featire-ical-export
  • feature-ak-requirement-lists
  • feature-akslide-export-better-filename
  • feature-akslides
  • feature-better-admin
  • feature-better-cv-list
  • feature-colors
  • feature-constraint-checking
  • feature-constraint-checking-wip
  • feature-dashboard-history-button
  • feature-event-status
  • feature-event-wizard
  • feature-export-flag
  • feature-improve-admin
  • feature-improve-filters
  • feature-improved-user-creation-workflow
  • feature-interest-view
  • feature-mails
  • feature-modular-status
  • feature-plan-autoreload
  • feature-present-default
  • feature-register-link
  • feature-remaining-constraint-validation
  • feature-room-import
  • feature-scheduler-improve
  • feature-scheduling-2.0
  • feature-special-attention
  • feature-time-input
  • feature-tracker
  • feature-wiki-wishes
  • feature-wish-slots
  • feature-wizard-buttons
  • features-availabilities
  • fix-ak-times-above-folg
  • fix-api
  • fix-constraint-violation-string
  • fix-cv-checking
  • fix-default-slot-length
  • fix-default-slot-localization
  • fix-doc-minor
  • fix-duration-display
  • fix-event-tz-pytz-update
  • fix-history-interest
  • fix-interest-view
  • fix-js
  • fix-pipeline
  • fix-plan-timezone-now
  • fix-room-add
  • fix-scheduling-drag
  • fix-slot-defaultlength
  • fix-timezone
  • fix-translation-scheduling
  • fix-virtual-room-admin
  • fix-wizard-csp
  • font-locally
  • improve-admin
  • improve-online
  • improve-slides
  • improve-submission-coupling
  • interest_restriction
  • main
  • master
  • meta-debug-toolbar
  • meta-export
  • meta-makemessages
  • meta-performance
  • meta-tests
  • meta-tests-gitlab-test
  • meta-upgrades
  • mollux-master-patch-02906
  • port-availabilites-fullcalendar
  • qs
  • remove-tags
  • renovate/configure
  • renovate/django-4.x
  • renovate/django-5.x
  • renovate/django-bootstrap-datepicker-plus-5.x
  • renovate/django-bootstrap5-23.x
  • renovate/django-bootstrap5-24.x
  • renovate/django-compressor-4.x
  • renovate/django-debug-toolbar-4.x
  • renovate/django-registration-redux-2.x
  • renovate/django-simple-history-3.x
  • renovate/django-split-settings-1.x
  • renovate/django-timezone-field-5.x
100 results
Show changes
Show whitespace changes
Inline Side-by-side
static_common/common/vendor/vuejs/vue.global.js 0 → 100644
View file @ 2288c5f9
Source diff could not be displayed: it is too large. Options to address this: view the blob.
templates/admin/base_site.html
View file @ 2288c5f9
{% extends "admin/base_site.html" %} {% extends "admin/base_site.html" %}
{% load compress %}
{% load bootstrap4 %} {% load django_bootstrap5 %}
{% load fontawesome_5 %} {% load fontawesome_6 %}
{% load tags_AKModel %}
{% load static %} {% load static %}
{% block stylesheet %}{% static "common/css/admin-bootstrap.css" %}{% endblock %} {% block stylesheet %}{% endblock %}
{% block extrastyle %} {% 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 %} {% if not debug %}
<link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
{% endif %} {% endif %}
{% endblock %} <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
{% block extrahead %}
<!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_javascript jquery=True %}
{% fontawesome_5_static %}
<style> <style>
a.btn { a.btn {
color: #FFFFFF; color: #FFFFFF;
...@@ -25,5 +25,29 @@ ...@@ -25,5 +25,29 @@
.block-header { .block-header {
margin-top: 20px; margin-top: 20px;
} }
.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> </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 %}
<script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
{% endcompress %}
{% endblock %} {% endblock %}
templates/base.html
View file @ 2288c5f9
{% load compress %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load bootstrap4 %} {% load django_bootstrap5 %}
{% load fontawesome_5 %} {% load fontawesome_6 %}
{% load tags_AKModel %} {% load tags_AKModel %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
{% block meta %}{% endblock%} <meta name="viewport" content="width=device-width, initial-scale=1">
{% block meta %}
{% endblock meta %}
<title>{% block title %}AK Planning{% endblock %}</title> <title>{% block title %}AK Planning{% endblock %}</title>
<!-- Load bootstrap, jquery and fontawesome--> <!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_css %} {% compress css %}
{% bootstrap_javascript jquery='full' %} <link rel="stylesheet" type="text/x-scss" href="{% static 'common/vendor/bootswatch-lumen/theme.scss' %}">
{% fontawesome_5_static %} <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' %}"> <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'> <script type='text/javascript'>
var changed_form = false; var changed_form = false;
...@@ -44,7 +62,7 @@ ...@@ -44,7 +62,7 @@
<body> <body>
{% block language-switcher %} {% block language-switcher %}
<!-- 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' %}" <form action="{% url 'set_language' %}"
method="post" method="post"
class="form-inline" class="form-inline"
...@@ -59,7 +77,7 @@ ...@@ -59,7 +77,7 @@
{% get_available_languages as LANGUAGES %} {% get_available_languages as LANGUAGES %}
{% get_language_info_list for 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 %} {% for language in languages %}
&nbsp;&nbsp; &nbsp;&nbsp;
<button type="submit" <button type="submit"
...@@ -75,8 +93,8 @@ ...@@ -75,8 +93,8 @@
</div> </div>
{% endblock %} {% endblock %}
<div class="container" style="margin-top:15px;margin-bottom: 30px;"> <div class="container mt-3 mb-4">
<ol class="breadcrumb"> <ol class="breadcrumb p-3">
{% block breadcrumbs %} {% block breadcrumbs %}
{% endblock %} {% endblock %}
</ol> </ol>
...@@ -92,6 +110,7 @@ ...@@ -92,6 +110,7 @@
{% block footer_custom %} {% block footer_custom %}
{% endblock %} {% endblock %}
<a href="{% url "admin:index" %}">{% trans "Go to backend" %}</a> &middot; <a href="{% url "admin:index" %}">{% trans "Go to backend" %}</a> &middot;
<a href="{% url "docs_root" %}">{% trans "Docs" %}</a> &middot;
{% footer_info as FI %} {% footer_info as FI %}
{% if FI.impress_text %} {% if FI.impress_text %}
{{ FI.impress_text }} &middot; {{ FI.impress_text }} &middot;
......
templates/messages.html
View file @ 2288c5f9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}
<div class="alert alert-dismissible {{ message.tags | message_bootstrap_class }}"> <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 }} {{ message }}
</div> </div>
{% endfor %} {% endfor %}
......