nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-03-04 08:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

More consistent renaming from default to standard services

Browse Source
This commit is contained in:
fonfon 2015-05-04 11:04:35 +02:00
parent 5cca1f99cf
commit 32e94058f6
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plinth/modules/pagekite/forms.py
View File

@ -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

0
plinth/modules/pagekite/templates/pagekite_default_services.html → plinth/modules/pagekite/templates/pagekite_standard_services.html
View File

5
plinth/modules/pagekite/urls.py
View File

@ -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$',

6
plinth/modules/pagekite/views.py
View File

@ -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]