Improve launderette rights to match with launderette club

core/management/commands/populate.py

@@ -6,6 +6,7 @@ from django.core.management.base import BaseCommand, CommandError
 from django.core.management import call_command
 from django.conf import settings
 from django.db import connection
+from django.contrib.sites.models import Site
 
 
 from core.models import Group, User, Page, PageRev, SithFile
@@ -28,6 +29,7 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         os.environ['DJANGO_COLORS'] = 'nocolor'
+        Site(id=4000, domain=settings.SITH_URL, name=settings.SITH_NAME).save()
         root_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
         for g in settings.SITH_GROUPS.values():
             Group(id=g['id'], name=g['name']).save()

core/static/core/style.css

@@ -105,6 +105,7 @@ p, pre {
 
 ul, ol {
     margin-top: 1em;
+    margin-bottom: 1em;
 	list-style-type: disc;
     margin-left: 25px;
 }
@@ -200,6 +201,10 @@ textarea {
     width: 98%;
     margin-top: 10px;
 }
+/*---------------------------LAUNDERETTE-------------------------------*/
+#token_form label {
+    display: inline;
+}
 
 /*--------------------------------FOOTER-------------------------------*/
 footer{

core/templates/core/user_tools.jinja

@@ -16,10 +16,6 @@
     {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
     <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
     {% endif %}
-    <h5>{% trans %}Launderette{% endtrans %}</h5>
-    {% if user.is_in_group(settings.SITH_GROUPS['launderette-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
-    <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Launderette{% endtrans %}</a></li>
-    {% endif %}
 </ul>
 
 <hr>

core/views/user.py

@@ -158,6 +158,12 @@ class UserToolsView(TemplateView):
     """
     template_name = "core/user_tools.jinja"
 
+    def get_context_data(self, **kwargs):
+        from launderette.models import Launderette
+        kwargs = super(UserToolsView, self).get_context_data(**kwargs)
+        kwargs['launderettes'] = Launderette.objects.all()
+        return kwargs
+
 class UserAccountView(DetailView):
     """
     Display a user's account