From 32e94058f683eff272649088da179567e0042c71 Mon Sep 17 00:00:00 2001 From: fonfon Date: Mon, 4 May 2015 11:04:35 +0200 Subject: [PATCH] More consistent renaming from default to standard services --- plinth/modules/pagekite/forms.py | 2 +- ...efault_services.html => pagekite_standard_services.html} | 0 plinth/modules/pagekite/urls.py | 5 +++-- plinth/modules/pagekite/views.py | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) rename plinth/modules/pagekite/templates/{pagekite_default_services.html => pagekite_standard_services.html} (100%) diff --git a/plinth/modules/pagekite/forms.py b/plinth/modules/pagekite/forms.py index bd1c07843..ea746f0eb 100644 --- a/plinth/modules/pagekite/forms.py +++ b/plinth/modules/pagekite/forms.py @@ -207,7 +207,7 @@ class AddCustomServiceForm(BaseCustomServiceForm): except KeyError: is_predefined = False if is_predefined: - msg = _("""This service is available as a default service. Please + msg = _("""This service is available as a standard service. Please use the 'Standard Services' page to enable it.""") raise forms.ValidationError(msg) return cleaned_data diff --git a/plinth/modules/pagekite/templates/pagekite_default_services.html b/plinth/modules/pagekite/templates/pagekite_standard_services.html similarity index 100% rename from plinth/modules/pagekite/templates/pagekite_default_services.html rename to plinth/modules/pagekite/templates/pagekite_standard_services.html diff --git a/plinth/modules/pagekite/urls.py b/plinth/modules/pagekite/urls.py index bed6835f6..32c13548d 100644 --- a/plinth/modules/pagekite/urls.py +++ b/plinth/modules/pagekite/urls.py @@ -31,8 +31,9 @@ urlpatterns = patterns( # pylint: disable-msg=C0103 url(r'^apps/pagekite/$', login_required(index), name='index'), url(r'^apps/pagekite/configure/$', login_required(ConfigurationView.as_view()), name='configure'), - url(r'^apps/pagekite/services/default$', - login_required(StandardServiceView.as_view()), name='default-services'), + url(r'^apps/pagekite/services/standard$', + login_required(StandardServiceView.as_view()), + name='standard-services'), url(r'^apps/pagekite/services/custom$', login_required(CustomServiceView.as_view()), name='custom-services'), url(r'^apps/pagekite/services/custom/delete$', diff --git a/plinth/modules/pagekite/views.py b/plinth/modules/pagekite/views.py index 4d347c29f..185ed391d 100644 --- a/plinth/modules/pagekite/views.py +++ b/plinth/modules/pagekite/views.py @@ -35,7 +35,7 @@ subsubmenu = [{'url': reverse_lazy('pagekite:index'), 'text': _('About PageKite')}, {'url': reverse_lazy('pagekite:configure'), 'text': _('Configure PageKite')}, - {'url': reverse_lazy('pagekite:default-services'), + {'url': reverse_lazy('pagekite:standard-services'), 'text': _('Standard Services')}, {'url': reverse_lazy('pagekite:custom-services'), 'text': _('Custom Services')}] @@ -106,10 +106,10 @@ class CustomServiceView(ContextMixin, TemplateView): class StandardServiceView(ContextMixin, FormView): - template_name = 'pagekite_default_services.html' + template_name = 'pagekite_standard_services.html' title = 'PageKite Standard Services' form_class = StandardServiceForm - success_url = reverse_lazy('pagekite:default-services') + success_url = reverse_lazy('pagekite:standard-services') def get_initial(self): return get_pagekite_services()[0]