diff --git a/doc/modules.mdwn b/doc/modules.mdwn index f4d6f0172..63757e7a1 100644 --- a/doc/modules.mdwn +++ b/doc/modules.mdwn @@ -12,11 +12,17 @@ installation is as simple as `aptitude install freedombox-foo`. As an intermediate step, we'll start scripting module installation. But until then, we can install them manually. -A module can be represented inside of Plinth via a django app. -To enable a module, put a file containing its python path into -`data/etc/plinth/modules-enabled/`. Django is configured to use all -modules of the `modules-enabled` folder as apps. With the python path -you can also include modules/apps outside of plinth. +A Plinth module is a Django application with some additional Plinth +specific extensions. To enable a module, create a file containing its +Python module path into `data/etc/plinth/modules-enabled/`. During +installation, this file will be copied to +`/etc/plinth/modules-enabled/`. The file in `/etc` will be read during +normal execution of Plinth. The file in `data/etc/` in the source code +directory will be used when running Plinth under the run-without-install +mode. Plinth will read the module path from the file in one of these +paths during start-up and configure Django to use it as a Django +application. With this approach, you can install your Plinth module +anywhere on the system and use it in Plinth (just like in Django). TODO: automatically prune dead links to clear out old module installs. This is something the install scripts should do. diff --git a/plinth/modules/config/templates/config.html b/plinth/modules/config/templates/config.html index 94f7d491b..5dd2acf1f 100644 --- a/plinth/modules/config/templates/config.html +++ b/plinth/modules/config/templates/config.html @@ -22,7 +22,6 @@ {% block content %} -
{% csrf_token %} @@ -32,5 +31,4 @@
- {% endblock %} diff --git a/plinth/modules/users/urls.py b/plinth/modules/users/urls.py index 80cecad8d..7f7c38246 100644 --- a/plinth/modules/users/urls.py +++ b/plinth/modules/users/urls.py @@ -39,7 +39,7 @@ urlpatterns = patterns( url(r'^sys/users/(?P[\w.@+-]+)/change_password/$', login_required(views.UserChangePassword.as_view()), name='change_password'), - # add djangos login/logout urls + # Add Django's login/logout urls url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout',