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
  • komasolver
  • main
  • renovate/django-5.x
  • renovate/django-debug-toolbar-5.x
  • renovate/django_csp-4.x
  • renovate/djangorestframework-3.x
  • renovate/tzdata-2025.x
  • renovate/uwsgi-2.x
8 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
  • felix-master-patch-23151
  • kifplan
  • master
3 results
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 0 → 100644
View file @ 5753b2c1
{% extends "admin/base_site.html" %}
{% load compress %}
{% load django_bootstrap5 %}
{% load fontawesome_6 %}
{% load tags_AKModel %}
{% load static %}
{% block stylesheet %}{% endblock %}
{% 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;
}
.block-header {
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>
{% 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 static %}
{% load bootstrap4 %} {% load i18n %}
{% load fontawesome %} {% load django_bootstrap5 %}
{% load fontawesome_6 %}
{% 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%}
<title>{% block title %}AK Planning{% endblock %}</title> <title>{% block title %}AK Planning{% endblock %}</title>
{# Load Bootstrap CSS and JavaScript as well as font awesome #} <!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_css %} {% compress css %}
{% bootstrap_javascript jquery='slim' %} <link rel="stylesheet" type="text/x-scss" href="{% static 'common/vendor/bootswatch-lumen/theme.scss' %}">
{% fontawesome_stylesheet %} <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;
$(document).ready(function() {
// Ask before changing language if user changed main form on page
$("#language-switcher").submit(function(e){
if(changed_form) {
if(!confirm("{% trans 'Are you sure you want to change the language now? This will clear the form!' %}"))
e.preventDefault(e);
}
});
// Remember any main form edits/changes
$("form.post-form :input").change(function(){
if($(this).val() != '')
changed_form = true;
});
});
</script>
{% block imports %}{% endblock %}
</head> </head>
<body> <body>
{% block language-switcher %}
<!-- language switcher -->
<div class="container d-flex flex-row-reverse" style="margin-top:20px">
<form action="{% url 'set_language' %}"
method="post"
class="form-inline"
name="language-form"
id="language-switcher"
style="flex-direction: column;">
{% csrf_token %}
<input name="next" type="hidden" value="{{ request.path }}" />
<div class="container" style="margin-top:20px;margin-bottom: 30px;"> {% get_current_language as LANGUAGE_CODE %}
<ol class="breadcrumb"> {% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
<div class="align-content-end">
{% for language in languages %}
&nbsp;&nbsp;
<button type="submit"
class="btn {% if language.code == LANGUAGE_CODE %}btn-info{% else %}btn-outline-info{% endif %}"
name="language"
value="{{ language.code }}"
style="align-self: end;">
{{ language.code | upper }}
</button>
{% endfor %}
</div>
</form>
</div>
{% endblock %}
<div class="container mt-3 mb-4">
<ol class="breadcrumb p-3">
{% block breadcrumbs %} {% block breadcrumbs %}
{% endblock %} {% endblock %}
</ol> </ol>
...@@ -28,5 +102,26 @@ ...@@ -28,5 +102,26 @@
{% endblock %} {% endblock %}
</div> </div>
<div class="container" style="margin-top: 20px">
<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;
{% endif %}
{% if FI.impress_url %}
<a href="{{ FI.impress_url }}">{% trans "Impress" %}</a> &middot;
{% endif %}
{% if FI.repo_url %}
<a href="{{ FI.repo_url }}">{% trans "This software is open source" %}</a>
{% endif %}
</div>
</div>
{% block bottom_script %}{% endblock %}
</body> </body>
</html> </html>
templates/messages.html 0 → 100644
View file @ 5753b2c1
{% load tags_AKModel %}
{% if messages %}
{% for message in messages %}
<div class="alert alert-dismissible {{ message.tags | message_bootstrap_class }}">
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
{{ message }}
</div>
{% endfor %}
{% endif %}
uwsgi-akplanning.ini
View file @ 5753b2c1
...@@ -4,7 +4,7 @@ socket = 127.0.0.1:3035 ...@@ -4,7 +4,7 @@ socket = 127.0.0.1:3035
chdir = /srv/AKPlanning chdir = /srv/AKPlanning
wsgi-file = AKPlanning/wsgi.py wsgi-file = AKPlanning/wsgi.py
touch-reload = %(wsgi-file) touch-reload = %(wsgi-file)
virtualenv = env/ virtualenv = venv/
env = DJANGO_SETTINGS_MODULE=AKPlanning.settings_production env = DJANGO_SETTINGS_MODULE=AKPlanning.settings_production
processes = 4 processes = 4
threads = 2 threads = 2
......