From 96a14e3d0d94da451073a00213b15315f66d40d4 Mon Sep 17 00:00:00 2001 From: fonfon Date: Wed, 26 Nov 2014 10:50:32 +0100 Subject: [PATCH] moved 'in-app menu' from the sidebar to the top of the content; some template block renaming --- doc/themes.mdwn | 17 ++- plinth/__main__.py | 1 + plinth/modules/apps/templates/apps.html | 3 +- plinth/modules/config/templates/config.html | 2 +- .../diagnostics/templates/diagnostics.html | 3 +- .../templates/diagnostics_test.html | 2 +- plinth/modules/expert_mode/expert_mode.py | 7 +- .../expert_mode/templates/expert_mode.html | 4 +- .../modules/firewall/templates/firewall.html | 3 +- .../templates/firstboot_sidebar.html | 2 +- .../templates/firstboot_state0.html | 4 +- .../templates/firstboot_state10.html | 4 +- plinth/modules/first_boot/views.py | 10 +- plinth/modules/help/help.py | 10 +- .../templates/{about.html => help_about.html} | 13 +- .../help/templates/help_detail.html} | 13 +- .../templates/{help.html => help_index.html} | 3 +- .../modules/owncloud/templates/owncloud.html | 12 +- .../modules/packages/templates/packages.html | 7 +- plinth/modules/pagekite/pagekite.py | 26 ++-- .../templates/pagekite_configure.html | 2 +- .../templates/pagekite_introduction.html | 3 +- plinth/modules/system/templates/system.html | 4 +- plinth/modules/tor/templates/tor.html | 30 ++--- plinth/modules/users/templates/users_add.html | 6 +- .../modules/users/templates/users_edit.html | 24 ++-- plinth/modules/users/urls.py | 8 +- plinth/modules/users/users.py | 37 +++--- plinth/modules/xmpp/templates/xmpp.html | 24 +++- .../xmpp/templates/xmpp_configure.html | 4 +- .../modules/xmpp/templates/xmpp_register.html | 18 ++- plinth/modules/xmpp/xmpp.py | 26 ++-- plinth/templates/404.html | 7 +- plinth/templates/500.html | 7 +- plinth/templates/base.html | 111 ++++++++++-------- plinth/templates/login.html | 2 +- plinth/templates/submenu.html | 37 ++++++ static/themes/default/css/plinth.css | 9 -- 38 files changed, 266 insertions(+), 239 deletions(-) rename plinth/modules/help/templates/{about.html => help_about.html} (89%) rename plinth/{templates/menu_block.html => modules/help/templates/help_detail.html} (79%) rename plinth/modules/help/templates/{help.html => help_index.html} (98%) create mode 100644 plinth/templates/submenu.html diff --git a/doc/themes.mdwn b/doc/themes.mdwn index 9d95cbc73..3f5ae78c4 100644 --- a/doc/themes.mdwn +++ b/doc/themes.mdwn @@ -40,13 +40,12 @@ the title field. ### Layout -Plinth expects a `main` block. This is where the meat of the content -goes. It is the center pain in the default layout. There is a -`title` block that the program will fill with text describing the -current page. `sidebar_left` contains the submenu navigation menu, -and `sidebar_right` is where we put all short text that helps the -admin fill out forms. They don't have to be sidebars, and they don't -have to go on the left and right. +Plinth expects a `content` block. This is where the meat of the +content goes. It is the center pane in the default layout. There +is a `title` block that the program will fill with text describing +the current page. There are two bars on the left side: `submenu` +for the menu and `sidebar` where short help texts go. +The lowest layer in the navigation is `subsubmenu`, displayed on top +of the content pane. -It is possible to override the `footer`, but I haven't yet found a -reason to do so. +All these items are inside of blocks and can be overwritten. diff --git a/plinth/__main__.py b/plinth/__main__.py index 58b6a0fae..aa4079161 100644 --- a/plinth/__main__.py +++ b/plinth/__main__.py @@ -144,6 +144,7 @@ def configure_django(): 'django.core.context_processors.debug', 'django.core.context_processors.i18n', 'django.core.context_processors.media', + 'django.core.context_processors.request', 'django.core.context_processors.static', 'django.core.context_processors.tz', 'django.contrib.messages.context_processors.messages', diff --git a/plinth/modules/apps/templates/apps.html b/plinth/modules/apps/templates/apps.html index 9dd2a0df2..a7f56629f 100644 --- a/plinth/modules/apps/templates/apps.html +++ b/plinth/modules/apps/templates/apps.html @@ -18,8 +18,9 @@ # {% endcomment %} -{% block main_block %} +{% block content %} +

Apps

User Applications are web apps hosted on your {{ cfg.product_name }}.

diff --git a/plinth/modules/config/templates/config.html b/plinth/modules/config/templates/config.html index ea4ed51a3..f38411fda 100644 --- a/plinth/modules/config/templates/config.html +++ b/plinth/modules/config/templates/config.html @@ -20,7 +20,7 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} {% if is_expert %} diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html index d9d1908ee..fd91b7fa3 100644 --- a/plinth/modules/diagnostics/templates/diagnostics.html +++ b/plinth/modules/diagnostics/templates/diagnostics.html @@ -18,7 +18,8 @@ # {% endcomment %} -{% block main_block %} +{% block content %} +

{{ title }}

The system diagnostic test will run a number of checks on your system to confirm that network services are running and configured diff --git a/plinth/modules/diagnostics/templates/diagnostics_test.html b/plinth/modules/diagnostics/templates/diagnostics_test.html index 04f5b0036..4a9a2fc60 100644 --- a/plinth/modules/diagnostics/templates/diagnostics_test.html +++ b/plinth/modules/diagnostics/templates/diagnostics_test.html @@ -18,7 +18,7 @@ # {% endcomment %} -{% block main_block %} +{% block content %} {% if diagnostics_error %}

The diagnostic test encountered an error:

diff --git a/plinth/modules/expert_mode/expert_mode.py b/plinth/modules/expert_mode/expert_mode.py index 14a62ec13..05eebd8ac 100644 --- a/plinth/modules/expert_mode/expert_mode.py +++ b/plinth/modules/expert_mode/expert_mode.py @@ -28,13 +28,14 @@ from plinth.modules.lib.auth import get_or_create_group class ExpertsForm(forms.Form): # pylint: disable-msg=W0232 """Form to configure expert mode""" expert_mode = forms.BooleanField( - label=_('Expert Mode'), required=False) + label=_('Enable Expert Mode'), required=False) def init(): """Initialize the module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname(_('Expert Mode'), 'glyphicon-wrench', 'expert_mode:index', 10) + menu.add_urlname(_('Expert Mode'), 'glyphicon-wrench', + 'expert_mode:index', 10) @login_required @@ -70,7 +71,7 @@ def _apply_changes(request, new_status): expert_group = get_or_create_group('Expert') if new_status['expert_mode']: - if not expert_group in request.user.groups.all(): + if expert_group not in request.user.groups.all(): request.user.groups.add(expert_group) message = (messages.success, _('Expert mode enabled')) else: diff --git a/plinth/modules/expert_mode/templates/expert_mode.html b/plinth/modules/expert_mode/templates/expert_mode.html index 4f2bc1dec..122228b85 100644 --- a/plinth/modules/expert_mode/templates/expert_mode.html +++ b/plinth/modules/expert_mode/templates/expert_mode.html @@ -20,7 +20,9 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} + +

{{ title }}

The {{ cfg.box_name }} can be administered in two modes, 'basic' and 'expert'. Basic mode hides a lot of features and configuration diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html index 7e07e3241..509a3e8d0 100644 --- a/plinth/modules/firewall/templates/firewall.html +++ b/plinth/modules/firewall/templates/firewall.html @@ -18,7 +18,8 @@ # {% endcomment %} -{% block main_block %} +{% block content %} +

{{ title }}

Firewall is a network security system that controls the incoming and outgoing network traffic on your {{ cfg.box_name }}. Keeping a diff --git a/plinth/modules/first_boot/templates/firstboot_sidebar.html b/plinth/modules/first_boot/templates/firstboot_sidebar.html index 664bbb984..d4d5decc3 100644 --- a/plinth/modules/first_boot/templates/firstboot_sidebar.html +++ b/plinth/modules/first_boot/templates/firstboot_sidebar.html @@ -17,7 +17,7 @@ # {% endcomment %} -

+

Getting Help

diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html index b48e89ba1..fe35943ce 100644 --- a/plinth/modules/first_boot/templates/firstboot_state0.html +++ b/plinth/modules/first_boot/templates/firstboot_state0.html @@ -25,7 +25,7 @@ {% endblock %} -{% block main_block %} +{% block content %}

Welcome to Your FreedomBox!

@@ -42,7 +42,7 @@ {% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} {% include "firstboot_sidebar.html" %} {% endblock %} diff --git a/plinth/modules/first_boot/templates/firstboot_state10.html b/plinth/modules/first_boot/templates/firstboot_state10.html index 24d00ca26..deb02db2d 100644 --- a/plinth/modules/first_boot/templates/firstboot_state10.html +++ b/plinth/modules/first_boot/templates/firstboot_state10.html @@ -20,7 +20,7 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} {% if user.is_authenticated %}

Have fun with your {{ cfg.box_name }}!

@@ -30,7 +30,7 @@ {% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} {% include "firstboot_sidebar.html" %} diff --git a/plinth/modules/first_boot/views.py b/plinth/modules/first_boot/views.py index 74f672272..ffc7e622c 100644 --- a/plinth/modules/first_boot/views.py +++ b/plinth/modules/first_boot/views.py @@ -33,13 +33,6 @@ class State0View(CreateView): form_class = State0Form success_url = reverse_lazy('first_boot:state10') - def get_context_data(self, **kwargs): - """Set 'sidebar_right' to display the sidebar_right in the templates. - Otherwise we wouldn't be able to include firstboot_sidebar.html""" - context = super(State0View, self).get_context_data(**kwargs) - context['sidebar_right'] = "a" - return context - def get_initial(self): initial = super(State0View, self).get_initial() initial['hostname'] = config.get_hostname() @@ -62,6 +55,5 @@ def state10(request): kvstore.set('firstboot_state', 10) return render_to_response('firstboot_state10.html', - {'title': _('Setup Complete'), - 'sidebar_right': 'a'}, + {'title': _('Setup Complete')}, context_instance=RequestContext(request)) diff --git a/plinth/modules/help/help.py b/plinth/modules/help/help.py index 536b91b70..49279a858 100644 --- a/plinth/modules/help/help.py +++ b/plinth/modules/help/help.py @@ -40,14 +40,14 @@ def init(): def index(request): """Serve the index page""" - return TemplateResponse(request, 'help.html', + return TemplateResponse(request, 'help_index.html', {'title': _('Documentation and FAQ')}) def about(request): """Serve the about page""" title = _('About the {box_name}').format(box_name=cfg.box_name) - return TemplateResponse(request, 'about.html', {'title': title}) + return TemplateResponse(request, 'help_about.html', {'title': title}) def helppage(request, page): @@ -55,10 +55,10 @@ def helppage(request, page): try: with open(os.path.join(cfg.doc_dir, '%s.part.html' % page), 'r') \ as input_file: - main = input_file.read() + content = input_file.read() except IOError: raise Http404 title = _('%s Documentation') % cfg.product_name - return TemplateResponse(request, 'base.html', - {'title': title, 'main': main}) + return TemplateResponse(request, 'help_detail.html', + {'title': title, 'content': content}) diff --git a/plinth/modules/help/templates/about.html b/plinth/modules/help/templates/help_about.html similarity index 89% rename from plinth/modules/help/templates/about.html rename to plinth/modules/help/templates/help_about.html index c2eaaf08e..2e05289da 100644 --- a/plinth/modules/help/templates/about.html +++ b/plinth/modules/help/templates/help_about.html @@ -19,7 +19,7 @@ # {% endcomment %} -{% block main_block %} +{% block content %} @@ -38,16 +38,15 @@ runs on must be cheap. The software it runs on must be easy to install and administrate by anybody. It must be easy to transition from existing services.

-

- Learn more» -

+

Learn more +»

{% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} -
+

Our Goal

diff --git a/plinth/templates/menu_block.html b/plinth/modules/help/templates/help_detail.html similarity index 79% rename from plinth/templates/menu_block.html rename to plinth/modules/help/templates/help_detail.html index 2c543d95b..8756fb05a 100644 --- a/plinth/templates/menu_block.html +++ b/plinth/modules/help/templates/help_detail.html @@ -1,3 +1,4 @@ +{% extends 'base.html' %} {% comment %} # # This file is part of Plinth. @@ -17,11 +18,7 @@ # {% endcomment %} -
    -
  • {{ menu.title }}
    • - {% for item in menu.items %} -
  • - {{ item.text }} -
    • - {% endfor %} -
+{% block content %} + {{ content|safe }} +{% endblock %} + diff --git a/plinth/modules/help/templates/help.html b/plinth/modules/help/templates/help_index.html similarity index 98% rename from plinth/modules/help/templates/help.html rename to plinth/modules/help/templates/help_index.html index 6269ecfa7..d65a14f55 100644 --- a/plinth/modules/help/templates/help.html +++ b/plinth/modules/help/templates/help_index.html @@ -18,8 +18,9 @@ # {% endcomment %} -{% block main_block %} +{% block content %} +

Help

There are a variety of places to go for help with {{ cfg.product_name }} and the box it runs on.

diff --git a/plinth/modules/owncloud/templates/owncloud.html b/plinth/modules/owncloud/templates/owncloud.html index 3a93fa886..f22e57439 100644 --- a/plinth/modules/owncloud/templates/owncloud.html +++ b/plinth/modules/owncloud/templates/owncloud.html @@ -20,13 +20,12 @@ {% load bootstrap %} -{% block main_block %} +{% block content %}
{% csrf_token %} - {{ form|bootstrap }} - +

OwnCloud

When enabled, the owncloud installation will be available from owncloud on the web server. Visit this URL to set up the initial administration account for @@ -36,15 +35,16 @@ 5 minutes or more, depending on download bandwidth from the Debian APT sources.

- + {{ form|bootstrap }} +
{% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} -
+

ownCloud

diff --git a/plinth/modules/packages/templates/packages.html b/plinth/modules/packages/templates/packages.html index 03ae6a545..8127b6543 100644 --- a/plinth/modules/packages/templates/packages.html +++ b/plinth/modules/packages/templates/packages.html @@ -20,7 +20,8 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} +

{{ title }}

aptitude purge modules

@@ -44,9 +45,9 @@ {% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} -
+

Help

diff --git a/plinth/modules/pagekite/pagekite.py b/plinth/modules/pagekite/pagekite.py index 3a4fa2a58..78bb87f8b 100644 --- a/plinth/modules/pagekite/pagekite.py +++ b/plinth/modules/pagekite/pagekite.py @@ -24,8 +24,6 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from django.core import validators from django.core.urlresolvers import reverse_lazy -from django.template import RequestContext -from django.template.loader import render_to_string from django.template.response import TemplateResponse from gettext import gettext as _ import logging @@ -36,27 +34,26 @@ from plinth import cfg LOGGER = logging.getLogger(__name__) +subsubmenu = {'title': _('PageKite'), + 'items': [{'url': reverse_lazy('pagekite:index'), + 'text': _('About PageKite')}, + {'url': reverse_lazy('pagekite:configure'), + 'text': _('Configure PageKite')}]} + def init(): """Intialize the PageKite module""" menu = cfg.main_menu.get('apps:index') - menu.add_urlname(_('Public Visibility (PageKite)'), 'glyphicon-globe', - 'pagekite:index', 50) + menu.add_urlname(_('Public Visibility (PageKite)'), + 'glyphicon-flag', 'pagekite:index', 50) @login_required def index(request): - """Serve introdution page""" - menu = {'title': _('PageKite'), - 'items': [{'url': reverse_lazy('pagekite:configure'), - 'text': _('Configure PageKite')}]} - - sidebar_right = render_to_string('menu_block.html', {'menu': menu}, - RequestContext(request)) - + """Serve introduction page""" return TemplateResponse(request, 'pagekite_introduction.html', {'title': _('Public Visibility (PageKite)'), - 'sidebar_right': sidebar_right}) + 'subsubmenu': subsubmenu}) class TrimmedCharField(forms.CharField): @@ -123,7 +120,8 @@ def configure(request): return TemplateResponse(request, 'pagekite_configure.html', {'title': _('Configure PageKite'), - 'form': form}) + 'form': form, + 'subsubmenu': subsubmenu}) def get_status(): diff --git a/plinth/modules/pagekite/templates/pagekite_configure.html b/plinth/modules/pagekite/templates/pagekite_configure.html index a10fc441a..63e853843 100644 --- a/plinth/modules/pagekite/templates/pagekite_configure.html +++ b/plinth/modules/pagekite/templates/pagekite_configure.html @@ -20,7 +20,7 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} {% if pagekite_status = 'not_installed' %} diff --git a/plinth/modules/pagekite/templates/pagekite_introduction.html b/plinth/modules/pagekite/templates/pagekite_introduction.html index ff4020902..ba8947f86 100644 --- a/plinth/modules/pagekite/templates/pagekite_introduction.html +++ b/plinth/modules/pagekite/templates/pagekite_introduction.html @@ -18,7 +18,8 @@ # {% endcomment %} -{% block main_block %} +{% block content %} +

PageKite is a system for exposing {{ cfg.box_name }} services when you don't have a direct connection to the Internet. You only need this service if your {{ cfg.box_name }} services are unreachable from the diff --git a/plinth/modules/system/templates/system.html b/plinth/modules/system/templates/system.html index 24f53b350..1641ac5c8 100644 --- a/plinth/modules/system/templates/system.html +++ b/plinth/modules/system/templates/system.html @@ -18,7 +18,9 @@ # {% endcomment %} -{% block main_block %} +{% block content %} + +

System

In this section, you can control the {{ cfg.product_name }}'s underlying system, as opposed to its various applications and diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html index c7341ed71..ca32f8176 100644 --- a/plinth/modules/tor/templates/tor.html +++ b/plinth/modules/tor/templates/tor.html @@ -20,7 +20,7 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} {% if is_installed %} @@ -42,12 +42,12 @@ Here is the current configuration:

  • Ports: {{ tor_hs_ports }}
    • -
    + {% csrf_token %} {{ form|bootstrap }} - +

    Bridge

    @@ -56,15 +56,17 @@ can help circumvent censorship. If your {{ cfg.box_name }} is behind a router or firewall, you should make sure the following ports are open, and port-forwarded, if necessary:

    -
    - - {% for name, port in tor_ports.items %} - - - - - {% endfor %} -
    {{ name }}{{ port }}
    +
    +
    + + {% for name, port in tor_ports.items %} + + + + + {% endfor %} +
    {{ name }}{{ port }}
    +

    @@ -84,9 +86,9 @@ port-forwarded, if necessary:

    {% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} -
    +

    Tor

    diff --git a/plinth/modules/users/templates/users_add.html b/plinth/modules/users/templates/users_add.html index 703e2c8f4..f275523b0 100644 --- a/plinth/modules/users/templates/users_add.html +++ b/plinth/modules/users/templates/users_add.html @@ -20,7 +20,7 @@ {% load bootstrap %} -{% block main_block %} +{% block content %}
    {% csrf_token %} @@ -33,9 +33,9 @@ {% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} -
    +

    Add User

    diff --git a/plinth/modules/users/templates/users_edit.html b/plinth/modules/users/templates/users_edit.html index 2e69f4f1d..dd6aa47ed 100644 --- a/plinth/modules/users/templates/users_edit.html +++ b/plinth/modules/users/templates/users_edit.html @@ -20,7 +20,13 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} + +

    Delete Users

    + + Currently you can not edit but only delete users from {{ cfg.product_name }} + and the {{ cfg.box_name }} system. +

    Deleting users is permanent!

    {% csrf_token %} @@ -32,19 +38,3 @@ {% endblock %} - -{% block sidebar_right_block %} - -
    - -

    Delete Users

    - -

    Check the box next to a users' names and then click "Delete - User" to remove users from {{ cfg.product_name }} and the - {{ cfg.box_name }} system.

    - -

    Deleting users is permanent!

    - -
    - -{% endblock %} diff --git a/plinth/modules/users/urls.py b/plinth/modules/users/urls.py index 0308837ec..febb6a63c 100644 --- a/plinth/modules/users/urls.py +++ b/plinth/modules/users/urls.py @@ -20,11 +20,15 @@ URLs for the Users module """ from django.conf.urls import patterns, url +from django.views.generic import RedirectView urlpatterns = patterns( # pylint: disable-msg=C0103 'plinth.modules.users.users', - url(r'^sys/users/$', 'index', name='index'), + # create an index page (that only forwards) to have correct highlighting + # of submenu items + url(r'^sys/users/$', RedirectView.as_view(pattern_name='users:add'), + name='index'), url(r'^sys/users/add/$', 'add', name='add'), - url(r'^sys/users/edit/$', 'edit', name='edit') + url(r'^sys/users/edit/$', 'edit', name='edit'), ) diff --git a/plinth/modules/users/users.py b/plinth/modules/users/users.py index 0bb00c175..126b99c21 100644 --- a/plinth/modules/users/users.py +++ b/plinth/modules/users/users.py @@ -21,8 +21,6 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.core import validators from django.core.urlresolvers import reverse_lazy -from django.template import RequestContext -from django.template.loader import render_to_string from django.template.response import TemplateResponse from gettext import gettext as _ import logging @@ -34,27 +32,18 @@ from plinth.modules.lib.auth import add_user LOGGER = logging.getLogger(__name__) +subsubmenu = {'title': _('Users and Groups'), + 'items': [{'url': reverse_lazy('users:add'), + 'text': _('Add User')}, + {'url': reverse_lazy('users:edit'), + 'text': _('Edit Users')}]} + + def init(): """Intialize the module""" menu = cfg.main_menu.get('system:index') - menu.add_urlname(_('Users and Groups'), 'glyphicon-user', 'users:index', 15) - - -@login_required -def index(request): - """Return a rendered users page""" - menu = {'title': _('Users and Groups'), - 'items': [{'url': reverse_lazy('users:add'), - 'text': _('Add User')}, - {'url': reverse_lazy('users:edit'), - 'text': _('Edit Users')}]} - - sidebar_right = render_to_string('menu_block.html', {'menu': menu}, - RequestContext(request)) - - return TemplateResponse(request, 'base.html', - {'title': _('Manage Users and Groups'), - 'sidebar_right': sidebar_right}) + menu.add_urlname(_('Users and Groups'), 'glyphicon-user', 'users:index', + 15) class UserAddForm(forms.Form): # pylint: disable-msg=W0232 @@ -90,7 +79,8 @@ def add(request): return TemplateResponse(request, 'users_add.html', {'title': _('Add User'), - 'form': form}) + 'form': form, + 'subsubmenu': subsubmenu}) def _add_user(request, data): @@ -134,8 +124,9 @@ def edit(request): form = UserEditForm(prefix='user') return TemplateResponse(request, 'users_edit.html', - {'title': _('Delete Users'), - 'form': form}) + {'title': _('Edit or Delete User'), + 'form': form, + 'subsubmenu': subsubmenu}) def _apply_edit_changes(request, data): diff --git a/plinth/modules/xmpp/templates/xmpp.html b/plinth/modules/xmpp/templates/xmpp.html index 2ac856837..43928d469 100644 --- a/plinth/modules/xmpp/templates/xmpp.html +++ b/plinth/modules/xmpp/templates/xmpp.html @@ -20,16 +20,28 @@ {% load bootstrap %} -{% block main_block %} +{% block content %} -

    XMPP Server Accounts and Configuration

    +{% if is_installed %} -{% if not is_installed %} +

    XMPP is an open and standardized communication protocol. +Here you can run and configure your XMPP server, called ejabberd. +To actually communicate you can use the +web client +or any other + +XMPP client +.

    + + Launch web client + -

    ejabberd is not installed, please install it. ejabberd comes pre-installed - with {{ cfg.box_name }}. On any Debian-based system (such as +{% else %} +

    XMPP Server

    +

    The XMPP server ejabberd is not installed.
    ejabberd comes + pre-installed with {{ cfg.box_name }}. On any Debian-based system (such as {{ cfg.box_name }}) you may install it using the command - 'aptitude install ejabberd'.

    + aptitude install ejabberd.

    {% endif %} diff --git a/plinth/modules/xmpp/templates/xmpp_configure.html b/plinth/modules/xmpp/templates/xmpp_configure.html index 0101ca830..06230657a 100644 --- a/plinth/modules/xmpp/templates/xmpp_configure.html +++ b/plinth/modules/xmpp/templates/xmpp_configure.html @@ -20,14 +20,14 @@ {% load bootstrap %} -{% block main_block %} +{% block content %}
    {% csrf_token %} {{ form|bootstrap }} - +
    diff --git a/plinth/modules/xmpp/templates/xmpp_register.html b/plinth/modules/xmpp/templates/xmpp_register.html index 10a33fd3b..7bad2de5e 100644 --- a/plinth/modules/xmpp/templates/xmpp_register.html +++ b/plinth/modules/xmpp/templates/xmpp_register.html @@ -20,16 +20,24 @@ {% load bootstrap %} -{% block main_block %} +{% block content %}
    {% csrf_token %} - {{ form|bootstrap }} - - +
    +
    + {{ form|bootstrap }} + +
    +
    {% endblock %} + +{% block page_js %} + +{% endblock %} diff --git a/plinth/modules/xmpp/xmpp.py b/plinth/modules/xmpp/xmpp.py index d9f09cad4..7adcc01ae 100644 --- a/plinth/modules/xmpp/xmpp.py +++ b/plinth/modules/xmpp/xmpp.py @@ -19,8 +19,6 @@ from django import forms from django.contrib import messages from django.contrib.auth.decorators import login_required from django.core.urlresolvers import reverse_lazy -from django.template import RequestContext -from django.template.loader import render_to_string from django.template.response import TemplateResponse from gettext import gettext as _ import logging @@ -32,9 +30,13 @@ from plinth import service LOGGER = logging.getLogger(__name__) -SIDE_MENU = { +subsubmenu = { 'title': _('XMPP'), 'items': [ + { + 'url': reverse_lazy('xmpp:index'), + 'text': _('About'), + }, { 'url': reverse_lazy('xmpp:configure'), 'text': _('Configure XMPP Server'), @@ -50,7 +52,6 @@ SIDE_MENU = { def init(): """Initialize the XMPP module""" menu = cfg.main_menu.get('apps:index') - menu.add_item('Chat', 'glyphicon-comment', '/../jwchat', 20) menu.add_urlname('XMPP', 'glyphicon-comment', 'xmpp:index', 40) service.Service( @@ -72,15 +73,14 @@ def index(request): ['get-installed']).strip() == 'installed' if is_installed: - sidebar_right = render_to_string('menu_block.html', {'menu': SIDE_MENU}, - RequestContext(request)) + index_subsubmenu = subsubmenu else: - sidebar_right = None + index_subsubmenu = None return TemplateResponse(request, 'xmpp.html', {'title': _('XMPP Server'), 'is_installed': is_installed, - 'sidebar_right': sidebar_right}) + 'subsubmenu': index_subsubmenu}) class ConfigureForm(forms.Form): # pylint: disable-msg=W0232 @@ -108,13 +108,10 @@ def configure(request): else: form = ConfigureForm(initial=status, prefix='xmpp') - sidebar_right = render_to_string('menu_block.html', {'menu': SIDE_MENU}, - RequestContext(request)) - return TemplateResponse(request, 'xmpp_configure.html', {'title': _('Configure XMPP Server'), 'form': form, - 'sidebar_right': sidebar_right}) + 'subsubmenu': subsubmenu}) def get_status(): @@ -171,13 +168,10 @@ def register(request): else: form = RegisterForm(prefix='xmpp') - sidebar_right = render_to_string('menu_block.html', {'menu': SIDE_MENU}, - RequestContext(request)) - return TemplateResponse(request, 'xmpp_register.html', {'title': _('Register XMPP Account'), 'form': form, - 'sidebar_right': sidebar_right}) + 'subsubmenu': subsubmenu}) def _register_user(request, data): diff --git a/plinth/templates/404.html b/plinth/templates/404.html index 23c06b8bf..6682de38c 100644 --- a/plinth/templates/404.html +++ b/plinth/templates/404.html @@ -18,11 +18,8 @@ # {% endcomment %} -{% block title_block %} -404 -{% endblock %} - -{% block main_block %} +{% block content %} +

    404

    Requested page {{ request_path }} was not found.

    diff --git a/plinth/templates/500.html b/plinth/templates/500.html index 7dd5e8244..358cdf7d3 100644 --- a/plinth/templates/500.html +++ b/plinth/templates/500.html @@ -18,11 +18,8 @@ # {% endcomment %} -{% block title_block %} -500 -{% endblock %} - -{% block main_block %} +{% block content %} +

    500

    This is an internal error and not something you caused or can fix. Please report the error on diff --git a/plinth/templates/base.html b/plinth/templates/base.html index 7fea70c5c..563b62649 100644 --- a/plinth/templates/base.html +++ b/plinth/templates/base.html @@ -25,43 +25,48 @@ - + - - + + - - + + - - - - - - - {% if title %} {{ title }} {% else %} FreedomBox {% endif %} + + + + + + + {% block title %} + + {% if title %} {{ title }} {% else %} FreedomBox {% endif %} + + {% endblock %} - - + + - - - - + + + + - - - + + + {% block app_head %}{% endblock %} {% block page_head %}{% endblock %} +