Begin launderette

core/management/commands/populate.py

@@ -52,6 +52,7 @@ class Command(BaseCommand):
             c.edit_groups = [g]
             c.save()
         self.reset_index("counter")
+        Counter(name="Eboutic", club=main_club, type='EBOUTIC').save()
         p = Page(name='Index')
         p.set_lock(root)
         p.save()
@@ -132,6 +133,18 @@ Welcome to the wiki page!
             p.save()
             PageRev(page=p, title="Aide sur la syntaxe", author=skia, content="""
 Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site.
+""").save()
+            p = Page(name='Services')
+            p.save()
+            p.set_lock(skia)
+            p.view_groups=[settings.SITH_GROUPS['public']['id']]
+            p.save()
+            PageRev(page=p, title="Services", author=skia, content="""
+|   |   |   |
+| :---: | :---: | :---: |
+| [Eboutic](/eboutic) | [Laverie](/launderette) | Matmat |
+| SAS | Weekmail | Forum|
+
 """).save()
             # Adding README
             p = Page(name='README')

core/models.py

@@ -447,7 +447,7 @@ class Page(models.Model):
         return '/'.join([self.parent.get_full_name(), self.name])
 
     def get_display_name(self):
-        return self.get_full_name()
+        return self.revisions.last().title
 
 class PageRev(models.Model):
     """

core/static/core/style.css

@@ -166,6 +166,11 @@ tbody>tr:hover {
     padding: 4px;
     line-height: 120%;
 }
+textarea {
+    white-space: pre;
+    width: 98%;
+    margin-top: 10px;
+}
 
 /*--------------------------------FOOTER-------------------------------*/
 footer{

core/templates/core/login.jinja

@@ -17,19 +17,9 @@
 
 <form method="post" action="{{ url('core:login') }}">
 {% csrf_token %}
-<table>
-<tr>
-    <td>{{ form.username.label_tag() }}</td>
-    <td>{{ form.username }}</td>
-</tr>
-<tr>
-    <td>{{ form.password.label_tag() }}</td>
-    <td>{{ form.password }}</td>
-</tr>
-</table>
-
-<input type="submit" value="{% trans %}login{% endtrans %}" />
-<input type="hidden" name="next" value="{{ next }}" />
+{{ form.as_p() }}
+<input type="hidden" name="next" value="{{ next }}">
+<p><input type="submit" value="{% trans %}login{% endtrans %}"></p>
 </form>
 
 {# Assumes you setup the password_reset view in your URLconf #}

core/templates/core/page.jinja

@@ -15,7 +15,7 @@
 {% macro print_page_name(page) %}
 {% if page %}
 {{ print_page_name(page.parent) }} >
-<a href="{{ url('core:page', page_name=page.get_full_name()) }}">{{ page.name }}</a>
+<a href="{{ url('core:page', page_name=page.get_full_name()) }}">{{ page.get_display_name() }}</a>
 {% endif %}
 {% endmacro %}