From b6f2176cc8416307ff49c361e66bf371376d0eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 25 Apr 2013 12:37:44 +0200 Subject: [PATCH] Move Version page out of config menu. Insert Link into the footer. --- .../config/templates/config/config_form.html | 1 - openslides/core/templates/core/version.html | 15 +-------------- openslides/core/views.py | 8 -------- openslides/templates/base.html | 4 ++-- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/openslides/config/templates/config/config_form.html b/openslides/config/templates/config/config_form.html index 0fc66c08d..545653328 100644 --- a/openslides/config/templates/config/config_form.html +++ b/openslides/config/templates/config/config_form.html @@ -13,7 +13,6 @@ {% for config_page_dict in config_pages_list %} {% trans config_page_dict.config_page.title %} {% endfor %} - {% trans 'Version' %} diff --git a/openslides/core/templates/core/version.html b/openslides/core/templates/core/version.html index 00a730a16..ee118188c 100644 --- a/openslides/core/templates/core/version.html +++ b/openslides/core/templates/core/version.html @@ -5,20 +5,7 @@ {% block title %}{{ block.super }} – {% trans 'Version' %}{% endblock %} {% block content %} -

- {% trans 'Version' %} - {% trans active_config_page.title %} - -
-
- {% for config_page_dict in config_pages_list %} - {% trans config_page_dict.config_page.title %} - {% endfor %} - {% trans 'Version' %} -
-
- -

+

{% trans 'Version' %}

{% for version in versions %}

{{ version.0 }} {% trans "Version" %}: {{ version.1 }}

{% endfor %} diff --git a/openslides/core/views.py b/openslides/core/views.py index 90434f3c3..8d0384deb 100644 --- a/openslides/core/views.py +++ b/openslides/core/views.py @@ -15,7 +15,6 @@ from django.utils.importlib import import_module from openslides import get_version, get_git_commit_id, RELEASE from openslides.utils.views import TemplateView -from .signals import config_signal class VersionView(TemplateView): @@ -36,13 +35,6 @@ class VersionView(TemplateView): openslides_version_string += ' Commit: %s' % get_git_commit_id() context['versions'] = [('OpenSlides', openslides_version_string)] - # collect other config pages - config_pages_list = [] - for receiver, config_page in config_signal.send(sender=self): - if config_page.is_shown(): - config_pages_list.append({'config_page': config_page}) - context['config_pages_list'] = sorted(config_pages_list, key=lambda config_page_dict: config_page_dict['config_page'].weight) - # Versions of plugins. for plugin in settings.INSTALLED_PLUGINS: try: diff --git a/openslides/templates/base.html b/openslides/templates/base.html index 460687564..dbfb66681 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -27,7 +27,7 @@