Skip to content
Snippets Groups Projects
Verified Commit ce3bb7dd authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Fix minor issues in templates

parent 32b84cc2
No related branches found
No related tags found
No related merge requests found
Pipeline #1918 passed with warnings
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 27 deletions
aleksis/core/templates/core/about.html
+ 3
− 3
View file @ ce3bb7dd
......@@ -16,8 +16,8 @@
<p>
{% blocktrans %}
This platform is powered by AlekSIS, a web-based school information system (SIS) which can be used
to manage and/or publish organisational subjects of educational institutions. AlekSIS is free software and
can be used by everyone.
to manage and/or publish organisational artifacts of educational institutions. AlekSIS is free software and
can be used by anyone.
{% endblocktrans %}
</p>
</div>
......@@ -36,7 +36,7 @@
<p>
{% blocktrans %}
The core and the official apps of AlekSIS are licenced under the EUPL, version 1.2 or later. For licence
information from third-party apps, if installed, see directly at the respective components below. The
information from third-party apps, if installed, refer to the respective components below. The
licences are marked like this:
{% endblocktrans %}
</p>
......
aleksis/core/templates/core/base.html
+ 4
− 6
View file @ ce3bb7dd
{# -*- engine:django -*- #}
{% load i18n menu_generator static sass_tags any_js pwa rules %}
{% get_current_language as LANGUAGE_CODE %}
<!DOCTYPE html>
<html lang="de">
<html lang="{{ LANGUAGE_CODE }}">
<head>
{% include "core/meta.html" %}
......@@ -25,16 +25,13 @@
{# Add i18n names for calendar (for use in datepicker) #}
{# Passing the locale is not necessary for the scripts to work, but prevents caching issues #}
{% get_current_language as LANGUAGE_CODE %}
<script src="{% url "javascript-catalog" %}?locale={{ LANGUAGE_CODE }}" type="text/javascript"></script>
<script src="{% url "calendarweek_i18n_js" %}?first_day=6&amp;locale={{ LANGUAGE_CODE }}"
type="text/javascript"></script>
{# Include jQuery to provide $(document).ready #}
{# Include jQuery early to provide $(document).ready #}
{% include_js "jQuery" %}
<script type="text/javascript" src="{% static 'js/search.js' %}"></script>
{% block extra_head %}{% endblock %}
</head>
<body>
......@@ -174,6 +171,7 @@
{% include_js "materialize" %}
<script type="text/javascript" src="{% static 'js/search.js' %}"></script>
<script type="text/javascript" src="{% static 'js/main.js' %}"></script>
</body>
</html>
aleksis/core/templates/core/base_print.html
+ 3
− 1
View file @ ce3bb7dd
{% load static i18n any_js sass_tags %}
{% get_current_language as LANGUAGE_CODE %}
<!DOCTYPE html>
<html>
<html lang="{{ LANGUAGE_CODE }}">
<head>
{% include "core/meta.html" %}
......
aleksis/core/templates/core/crud_events_ul.html
+ 1
− 0
View file @ ce3bb7dd
{# FIXME Migrate to materialize #}
<ul class="{{ class_ul }}">
{% for event in obj.crud_events %}
<li class="{{ class_li }}">
......
aleksis/core/templates/core/groups_child_groups.html
+ 4
− 4
View file @ ce3bb7dd
......@@ -17,7 +17,7 @@
<i class="material-icons left">info</i>
{% blocktrans %}
You can use this to assign child groups to groups. Please use the filters below to select groups you want to
change and click at "Next".
change and click "Next".
{% endblocktrans %}
</p>
</div>
......@@ -75,10 +75,10 @@
<div class="alert warning">
<p>
<i class="material-icons left">warning</i>
<strong>{% blocktrans %}Please be careful!{% endblocktrans %}</strong><br/>
{% blocktrans %}
<strong>Please be careful!</strong><br/>
If you click on "Back" or "Next" the current group assignments are not saved.
If you click on save, you will overwrite all existing child group relations for this group with what you
If you click "Back" or "Next" the current group assignments are not saved.
If you click "Save", you will overwrite all existing child group relations for this group with what you
selected on this page.
{% endblocktrans %}
</p>
......
aleksis/core/templates/core/index.html
+ 1
− 2
View file @ ce3bb7dd
......@@ -2,14 +2,13 @@
{% load i18n static dashboard %}
{% block browser_title %}{% blocktrans %}Home{% endblocktrans %}{% endblock %}
{% block page_title %}{{ request.site.preferences.general__title }}{% endblock %}
{% block extra_head %}
{{ media }}
{% endblock %}
{% block content %}
<p class="flow-text">{% blocktrans %}AlekSIS (School Information System){% endblocktrans %}</p>
{% if user.is_authenticated %}
{% for notification in unread_notifications %}
<div class="alert primary scale-transition">
......
aleksis/core/templates/core/meta.html
+ 6
− 9
View file @ ce3bb7dd
{% load i18n static pwa favtags %}
{% load pwa favtags %}
{# Basic meta #}
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="description" content="{{ request.site.preferences.general__description }}">
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
<meta name="description" content="{{ request.site.preferences.general__description }}"/>
<meta name="generator" content="AlekSIS School Information System"/>
{# Favicons #}
{% place_favicon %}
{# PWA meta #}
{% progressive_web_app_meta %}
aleksis/core/templates/core/system_status.html
+ 2
− 2
View file @ ce3bb7dd
......@@ -14,7 +14,7 @@
{# Maintenance mode #}
<div class="row">
{% if maintenance_mode %}
<a class="btn btn-flat btn-flat-medium right waves-effect waves-red no-padding"
<a class="btn-flat btn-flat-medium right waves-effect waves-red no-padding"
href="{% url 'maintenance_mode_off' %}"><i
class="material-icons small red-text center">power_settings_new</i></a>
<div>
......@@ -27,7 +27,7 @@
</div>
<span class="badge badge-danger mdi mdi-power"><a href="{% url 'maintenance_mode_off' %}"></a></span>
{% else %}
<a class="btn btn-flat btn-flat-medium right waves-effect waves-green no-padding"
<a class="btn-flat btn-flat-medium right waves-effect waves-green no-padding"
href="{% url 'maintenance_mode_on' %}"><i
class="material-icons small green-text center">power_settings_new</i></a>
<div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment