Merge pull request #624 from normanjaeckel/MoveVersionPage

Move Version page out of config menu. Insert Link into the footer.

openslides/config/templates/config/config_form.html

@@ -13,7 +13,6 @@
             {% for config_page_dict in config_pages_list %}
                 <a href="/config/{{ config_page_dict.config_page.url }}/" class="btn btn-mini {% if config_page_dict.active %}active{% endif %}">{% trans config_page_dict.config_page.title %}</a>
             {% endfor %}
-                <a href="{% url 'core_version' %}" class="btn btn-mini">{% trans 'Version' %}</a>
             </div>
         </div>
     </small>

openslides/core/templates/core/version.html

@@ -5,20 +5,7 @@
 {% block title %}{{ block.super }} – {% trans 'Version' %}{% endblock %}
 
 {% block content %}
-    <h1>
-        {% trans 'Version' %}
-        <small>{% trans active_config_page.title %}</small>
-        <small class="pull-right">
-        <div class="btn-toolbar">
-            <div class="btn-group">
-            {% for config_page_dict in config_pages_list %}
-                <a href="/config/{{ config_page_dict.config_page.url }}/" class="btn btn-mini">{% trans config_page_dict.config_page.title %}</a>
-            {% endfor %}
-                <a href="{% url 'core_version' %}" class="btn btn-mini active">{% trans 'Version' %}</a>
-            </div>
-        </div>
-        </small>
-    </h1>
+    <h1>{% trans 'Version' %}</h1>
     {% for version in versions %}
         <p>{{ version.0 }} {% trans "Version" %}: {{ version.1 }}</p>
     {% endfor %}

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:

openslides/templates/base.html

@@ -27,7 +27,7 @@
             <div class="span12">
                 <div id="header">
                     <a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}" /></a>
-                    <span class="title optional">{% get_config 'event_name' %} - {% get_config 'event_description' %}</span>
+                    <span class="title optional">{% get_config 'event_name' %} – {% get_config 'event_description' %}</span>
                     {% block loginbutton %}
                     <div class="btn-group pull-right">
                         {% if user.is_authenticated %}
@@ -97,7 +97,7 @@
   <hr />
   <footer>
       <small>
-      &copy; Copyright 2011–2013 | Powered by <a href="http://openslides.org" target="_blank">OpenSlides</a>
+      &copy; Copyright 2011–2013 | Powered by <a href="http://openslides.org" target="_blank">OpenSlides</a> | <a href="{% url 'core_version' %}">Version</a>
       </small>
   </footer>
   </div><!--/content-->