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» -
+ {% endblock %} -{% block sidebar_right_block %} +{% block sidebar %} -