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

Target

Select target project
  • hansegucker/AlekSIS-Core
  • pinguin/AlekSIS-Core
  • AlekSIS/official/AlekSIS-Core
  • sunweaver/AlekSIS-Core
  • sggua/AlekSIS-Core
  • edward/AlekSIS-Core
  • magicfelix/AlekSIS-Core
7 results
Show changes
Commits on Source (17)
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 32 deletions
CHANGELOG.rst
View file @ 1ad09b25
......@@ -12,10 +12,29 @@ Unreleased
Changed
~~~~~~~
* Use semantically correct html elements for headings and alerts.
Fixed
~~~~~
* Add missing AWS options to ignore invalid ssl certificates
`2.0b2` - 2021-06-15
--------------------
Added
~~~~~~~
* Add option to disable dashboard auto updating as a user and sitewide.
Changed
~~~~~~~
* Add verbose names for all preference sections.
* Add verbose names for all openid connect scopes and show them in grant
view.
* Include public dashboard in navigation
* Update German translations.
Fixed
~~~~~
......@@ -251,3 +270,4 @@ Fixed
.. _2.0a2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0a2
.. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b0
.. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b1
.. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b2
aleksis/core/preferences.py
View file @ 1ad09b25
......@@ -386,3 +386,23 @@ class PDFFileExpirationDuration(IntegerPreference):
default = 3
verbose_name = _("PDF file expiration duration")
help_text = _("in minutes")
@person_preferences_registry.register
class AutoUpdatingDashboard(BooleanPreference):
"""User preference for automatically updating the dashboard."""
section = general
name = "automatically_update_dashboard"
default = True
verbose_name = _("Automatically update the dashboard and its widgets")
@site_preferences_registry.register
class AutoUpdatingDashboardSite(BooleanPreference):
"""Automatic updating of dashboard."""
section = general
name = "automatically_update_dashboard_site"
default = True
verbose_name = _("Automatically update the dashboard and its widgets sitewide")
aleksis/core/settings.py
View file @ 1ad09b25
......@@ -524,7 +524,12 @@ ANY_JS = {
},
"sortablejs": {"js_url": JS_URL + "/sortablejs/Sortable.min.js"},
"jquery-sortablejs": {"js_url": JS_URL + "/jquery-sortablejs/jquery-sortable.js"},
"Roboto": {"css_url": JS_URL + "/@fontsource/roboto/index.css"},
"Roboto100": {"css_url": JS_URL + "/@fontsource/roboto/100.css"},
"Roboto300": {"css_url": JS_URL + "/@fontsource/roboto/300.css"},
"Roboto400": {"css_url": JS_URL + "/@fontsource/roboto/400.css"},
"Roboto500": {"css_url": JS_URL + "/@fontsource/roboto/500.css"},
"Roboto700": {"css_url": JS_URL + "/@fontsource/roboto/700.css"},
"Roboto900": {"css_url": JS_URL + "/@fontsource/roboto/900.css"},
}
merge_app_settings("ANY_JS", ANY_JS, True)
......@@ -848,6 +853,8 @@ if _settings.get("storage.type", "").lower() == "s3":
AWS_S3_GZIP = _settings.get("storage.s3.gzip", True)
AWS_S3_SIGNATURE_VERSION = _settings.get("storage.s3.signature_version", None)
AWS_S3_FILE_OVERWRITE = _settings.get("storage.s3.file_overwrite", False)
AWS_S3_VERIFY = _settings.get("storage.s3.verify", True)
AWS_S3_USE_SSL = _settings.get("storage.s3.use_ssl", True)
else:
DEFAULT_FILE_STORAGE = "titofisto.TitofistoStorage"
TITOFISTO_TIMEOUT = 10 * 60
......
aleksis/core/static/style.scss
View file @ 1ad09b25
......@@ -271,6 +271,23 @@ ul.footer-ul {
fill: white;
}
//////////////
// HEADINGS //
//////////////
h1 {
font-weight: 300;
font-style: normal;
font-size: 3.6rem;
line-height: 110%;
margin: 1.4rem 0 1.68rem 0;
}
h2 {
font-weight: 300;
font-size: 3.0rem;
}
/* Collections */
ul.collection .collection-item .title {
......
aleksis/core/templates/core/base.html
View file @ 1ad09b25
......@@ -18,7 +18,12 @@
{# CSS #}
{% include_css "material-design-icons" %}
{% include_css "Roboto" %}
{% include_css "Roboto100" %}
{% include_css "Roboto300" %}
{% include_css "Roboto400" %}
{% include_css "Roboto500" %}
{% include_css "Roboto700" %}
{% include_css "Roboto900" %}
<link rel="stylesheet" href="{% sass_src 'style.scss' %}">
{# Add JS URL resolver #}
......@@ -109,7 +114,7 @@
{% endif %}
{% block no_page_title %}
<h4>{% block page_title %}{% endblock %}</h4>
<h1>{% block page_title %}{% endblock %}</h1>
{% endblock %}
{% block content %}{% endblock %}
......
aleksis/core/templates/core/base_print.html
View file @ 1ad09b25
......@@ -15,7 +15,12 @@
</title>
{% include_css "material-design-icons" %}
{% include_css "Roboto" %}
{% include_css "Roboto100" %}
{% include_css "Roboto300" %}
{% include_css "Roboto400" %}
{% include_css "Roboto500" %}
{% include_css "Roboto700" %}
{% include_css "Roboto900" %}
{% include_css "paper-css" %}
<link rel="stylesheet" href="{% sass_src 'style.scss' %}"/>
<link rel="stylesheet" href="{% static "print.css" %}"/>
......
aleksis/core/templates/core/edit_dashboard.html
View file @ 1ad09b25
......@@ -45,20 +45,20 @@
{% include "core/partials/save_button.html" %}
</form>
<h5>{% trans "Available widgets" %}</h5>
<h2>{% trans "Available widgets" %}</h2>
<div class="row card-panel grey lighten-3" id="not-used-widgets">
{% for widget in not_used_widgets %}
{% include "core/partials/edit_dashboard_widget.html" %}
{% endfor %}
</div>
<h5>
<h2>
{% if not default_dashboard %}
{% trans "Your dashboard" %}
{% else %}
{% trans "Default dashboard" %}
{% endif %}
</h5>
</h2>
<div class="row card-panel grey lighten-3" id="widgets">
{% for widget in widgets %}
......
aleksis/core/templates/core/group/child_groups.html
View file @ 1ad09b25
......@@ -36,7 +36,7 @@
</a>
</form>
<h5>{% trans "Currently selected groups" %}</h5>
<h2>{% trans "Currently selected groups" %}</h2>
{% for group in filter.qs %}
<div class="chip">
......
aleksis/core/templates/core/group/full.html
View file @ 1ad09b25
......@@ -9,7 +9,7 @@
{% block browser_title %}{{ group.name }}{% endblock %}
{% block content %}
<h4>{{ group.name }} <small class="grey-text">{{ group.short_name }}</small></h4>
<h1>{{ group.name }} <small class="grey-text">{{ group.short_name }}</small></h1>
{% has_perm 'core.edit_group_rule' user group as can_change_group %}
{% has_perm 'core.change_group_preferences_rule' user group as can_change_group_preferences %}
......@@ -61,7 +61,7 @@
</table>
{% if can_view_group_stats %}
<h5>{% blocktrans %}Statistics{% endblocktrans %}</h5>
<h2>{% blocktrans %}Statistics{% endblocktrans %}</h2>
<ul>
<li>
{% trans "Count of members" %}: {{ stats.members }}
......@@ -79,10 +79,10 @@
</ul>
{% endif %}
<h5>{% blocktrans %}Owners{% endblocktrans %}</h5>
<h2>{% blocktrans %}Owners{% endblocktrans %}</h2>
{% render_table owners_table %}
<h5>{% blocktrans %}Members{% endblocktrans %}</h5>
<h2>{% blocktrans %}Members{% endblocktrans %}</h2>
{% render_table members_table %}
{% endblock %}
aleksis/core/templates/core/group/list.html
View file @ 1ad09b25
......@@ -14,7 +14,7 @@
{% trans "Create group" %}
</a>
<h5>{% trans "Filter groups" %}</h5>
<h2>{% trans "Filter groups" %}</h2>
<form method="get">
{% form form=groups_filter.form %}{% endform %}
{% trans "Search" as caption %}
......@@ -25,6 +25,6 @@
</button>
</form>
<h5>{% trans "Selected groups" %}</h5>
<h2>{% trans "Selected groups" %}</h2>
{% render_table groups_table %}
{% endblock %}
aleksis/core/templates/core/index.html
View file @ 1ad09b25
......@@ -56,7 +56,7 @@
{% if activities or notifications %}
<div class="row">
<div class="col s12 m6">
<h5>{% blocktrans %}Last activities{% endblocktrans %}</h5>
<h2>{% blocktrans %}Last activities{% endblocktrans %}</h2>
{% if activities %}
<ul class="collection">
......@@ -79,7 +79,7 @@
</div>
<div class="col s12 m6">
<h5>{% blocktrans %}Recent notifications{% endblocktrans %}</h5>
<h2>{% blocktrans %}Recent notifications{% endblocktrans %}</h2>
{% if notifications %}
<ul class="collection">
......@@ -108,5 +108,7 @@
</div>
{% endif %}
<script type="text/javascript" src="{% static "js/include_ajax_live.js" %}"></script>
{% if user.person.preferences.general__automatically_update_dashboard and request.site.preferences.general__automatically_update_dashboard_site %}
<script type="text/javascript" src="{% static "js/include_ajax_live.js" %}"></script>
{% endif %}
{% endblock %}
aleksis/core/templates/core/person/full.html
View file @ 1ad09b25
......@@ -8,7 +8,7 @@
{% block browser_title %}{{ person.first_name }} {{ person.last_name }}{% endblock %}
{% block content %}
<h4>{{ person.first_name }} {{ person.last_name }}</h4>
<h1>{{ person.first_name }} {{ person.last_name }}</h1>
{% has_perm 'core.edit_person_rule' user person as can_change_person %}
{% has_perm 'core.change_person_preferences_rule' user person as can_change_person_preferences %}
......@@ -47,7 +47,7 @@
</p>
{% endif %}
<h5>{% blocktrans %}Contact details{% endblocktrans %}</h5>
<h2>{% blocktrans %}Contact details{% endblocktrans %}</h2>
<div class="row">
<div class="col s12 m4">
{% has_perm 'core.view_photo_rule' user person as can_view_photo %}
......@@ -117,7 +117,7 @@
</div>
{% if person.description %}
<div class="col s12 m12">
<h5>{% trans "Description" %}</h5>
<h2>{% trans "Description" %}</h2>
<p>
{{ person.description }}
</p>
......@@ -127,21 +127,21 @@
{% if person.children.all and can_view_personal_details %}
<div class="col s12 m12">
<h5>{% trans "Children" %}</h5>
<h2>{% trans "Children" %}</h2>
{% include "core/person/collection.html" with persons=person.children.all %}
</div>
{% endif %}
{% if person.guardians.all and can_view_personal_details %}
<div class="col s12 m12">
<h5>{% trans "Guardians / Parents" %}</h5>
<h2>{% trans "Guardians / Parents" %}</h2>
{% include "core/person/collection.html" with persons=person.guardians.all %}
</div>
{% endif %}
{% has_perm 'core.view_person_groups_rule' user person as can_view_groups %}
{% if can_view_groups %}
<h5>{% blocktrans %}Groups{% endblocktrans %}</h5>
<h2>{% blocktrans %}Groups{% endblocktrans %}</h2>
{% render_table groups_table %}
{% endif %}
{% endblock %}
aleksis/core/templates/core/person/list.html
View file @ 1ad09b25
......@@ -18,7 +18,7 @@
</a>
{% endif %}
<h5>{% trans "Filter persons" %}</h5>
<h2>{% trans "Filter persons" %}</h2>
<form method="get">
{% form form=persons_filter.form %}{% endform %}
{% trans "Search" as caption %}
......@@ -29,6 +29,6 @@
</button>
</form>
<h5>{% trans "Selected persons" %}</h5>
<h2>{% trans "Selected persons" %}</h2>
{% render_table persons_table %}
{% endblock %}
aleksis/core/templates/oauth2_provider/application_list.html
View file @ 1ad09b25
......@@ -5,7 +5,7 @@
{% block browser_title %}{% blocktrans %}OAuth2 Applications{% endblocktrans %}{% endblock %}
{% block content %}
<h4>{% blocktrans %}OAuth2 applications{% endblocktrans %}</h4>
<h1>{% blocktrans %}OAuth2 applications{% endblocktrans %}</h1>
<a href="{% url "oauth2_provider:register" %}" class="btn green waves-effect
waves-light">
<i class="material-icons left">add</i>
......
aleksis/core/templates/search/search.html
View file @ 1ad09b25
......@@ -23,7 +23,7 @@
</button>
</p>
<h5>{% trans "Results" %}</h5>
<h2>{% trans "Results" %}</h2>
{% if query %}
<div class="collection">
......
aleksis/core/templates/socialaccount/connections.html
View file @ 1ad09b25
......@@ -34,7 +34,7 @@
<p>{% trans 'You currently have no third-party accounts connected to this account.' %}</p>
{% endif %}
<h5>{% trans 'Add a Third-party Account' %}</h5>
<h2>{% trans 'Add a Third-party Account' %}</h2>
{% include "socialaccount/snippets/provider_list.html" with process="connect" %}
......
aleksis/core/templates/two_factor/core/backup_tokens.html
View file @ 1ad09b25
......@@ -6,7 +6,7 @@
{% endblock %}
{% block content %}
<h4>{% block title %}{% trans "Backup Tokens" %}{% endblock %}</h4>
<h1>{% block title %}{% trans "Backup Tokens" %}{% endblock %}</h1>
<div class="alert info">
<p>
......
aleksis/core/templates/two_factor/core/phone_register.html
View file @ 1ad09b25
......@@ -6,7 +6,7 @@
{% endblock %}
{% block content %}
<h4>{% block title %}{% trans "Add Backup Phone" %}{% endblock %}</h4>
<h1>{% block title %}{% trans "Add Backup Phone" %}{% endblock %}</h1>
{% if wizard.steps.current == 'setup' %}
<p>{% blocktrans %}You'll be adding a backup phone number to your
......
aleksis/core/templates/two_factor/core/setup.html
View file @ 1ad09b25
......@@ -2,7 +2,7 @@
{% load i18n %}
{% block content %}
<h4>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %}</h4>
<h1>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %}</h1>
{% if wizard.steps.current == 'welcome' %}
<p class="flow-text">
......
aleksis/core/templates/two_factor/core/setup_complete.html
View file @ 1ad09b25
......@@ -6,7 +6,7 @@
{% endblock %}
{% block content %}
<h4>{% block title %}{% trans "Two-Factor Authentication successfully enabled" %}{% endblock %}</h4>
<h1>{% block title %}{% trans "Two-Factor Authentication successfully enabled" %}{% endblock %}</h1>
<div class="alert success">
<p>
......