From 4e5e1a42e0782fa75ef22cb347588e0f0c101249 Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Thu, 4 Dec 2014 23:40:02 -0500 Subject: Redesign news list --- static/main.css | 10 ++--- templates/layout.html | 2 +- templates/news/list.html | 115 ++++++++++++++++++++++++++++------------------- 3 files changed, 75 insertions(+), 52 deletions(-) diff --git a/static/main.css b/static/main.css index 5dfa186..f4f67c7 100644 --- a/static/main.css +++ b/static/main.css @@ -1,7 +1,3 @@ -body { - font-size: 14px; -} - .borderless td, .borderless tr { border: none !important; @@ -15,4 +11,8 @@ body { .date { color: rgba(0, 0, 0, 0.6); font-size: 14px; -} \ No newline at end of file +} + +article > header { + margin-bottom: 2em; +} diff --git a/templates/layout.html b/templates/layout.html index da1dd57..6b67943 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -4,8 +4,8 @@ {% block title %}Site de la famille{% endblock %} - + diff --git a/templates/news/list.html b/templates/news/list.html index d25715b..eba2495 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,54 +1,77 @@ {% extends 'layout.html' %} {% block content %} -
- Ajouter une actualité -
-
-

Dernières visites

- - - {% for user in users %} - - - - - {% endfor %} -
{{user.user_name}}{{user.last_seen|format_ago('%a %d %b à %Hh%M')|safe}}
- -

Derniers commentaires

- +
+ +
+ +

+ Ajouter une actualité +

+ + + +{% for news in news %} + + +
+ +{% endfor %}
-
- {% for news in news %} -
-

{{ news.title }} -

- {% if news.user_name==session.user_name %} -
- Modifier cette actualité +
+ +
+
Dernières visites
+
+ + {% for user in users %} + + + + + {% endfor %} +
{{user.user_name}}{{user.last_seen|format_ago('%a %d %b à %Hh%M')|safe}}
+
- {% endif %} -

Posté par {{ news.user_name }} le {{news.date|format_date}}

-
-

- {{"Commentaire"|pluralize(news.ncomments)}} | - Ajouter un commentaire -

-
-

{{ news.content_cache|safe }}

-
- {% endfor %} + + +
+
Derniers commentaires
+
+
    + {% for comment in comments %} +
  • {{comment.user_name}} + {{comment.date|format_ago('%a %d %b à %Hh%M')|safe}}
    + {{comment.content_cache|shortify|safe}} […] +
    • + {% else %} + Pas de commentaires. + {% endfor %} +
+
+
+
-
+ +
+ {% endblock %} -- cgit v1.2.3-70-g09d2