histo modif mise en forme

diff --git a/project/dashboard.py b/project/dashboard.py
index 430acde..1823720 100644 (file)
--- a/project/dashboard.py
+++ b/project/dashboard.py
@@ -41,13 +41,15 @@ class CustomIndexDashboard(Dashboard):
         ))
 
         if in_drh_or_admin(request.user):
-            revisions = format_revisions(Revision.objects.order_by('-date_created')[:10])
+            revisions = format_revisions(
+                    Revision.objects.exclude(user__isnull=True).order_by('-date_created')[:10])
             children = []
             for rev in revisions:
-                if rev['objet'] is None:
-                    continue
-                titre = u"[%s %s] %s %s" % (rev['user'], rev['date_created'],
-                        rev['objet'], rev['comment'])
+                date = rev['short_date_created']
+                user = u"<span style='font-weight: bold;'>%s</span>" % rev['user']
+                type = u"<span style='font-decoration: underligne;'>%s</span>" % rev['type']
+                titre = u"""<span style='color:black;'>[%s] %s a modifié
+                    un(e) %s :</span> %s""" % (date, user, type, rev['objet'], )
                 children.append({
                     'title': titre,
                     'url': rev['history_url'],

diff --git a/project/rh/historique.py b/project/rh/historique.py
index 8c9d105..2d4f553 100644 (file)
--- a/project/rh/historique.py
+++ b/project/rh/historique.py
@@ -3,7 +3,6 @@
 from django.core.urlresolvers import reverse
 
 def format_revisions(qs):
-
     results = []
     for rev in qs:
 
@@ -28,11 +27,12 @@ def format_revisions(qs):
         
         results.append({
             'date_created': rev.date_created.strftime("%d-%m-%Y %H:%M:%S"),
+            'short_date_created': rev.date_created.strftime("%d-%m-%Y"),
             'user': rev.user,
             'comment': rev.comment,
             'change_url': change_url,
             'history_url': history_url,
-            'type': type,
+            'type': unicode(type).capitalize(),
             'objet': objet,
 
             })

diff --git a/project/rh/views.py b/project/rh/views.py
index 1e92e6c..04e55a4 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -789,8 +789,8 @@ def historique_des_modifications(request,):
 
     from django.core.paginator import Paginator
 
-    revisions = Revision.objects.all().order_by('-date_created')
-    paginator = Paginator(revisions, 20)
+    revisions = Revision.objects.exclude(user__isnull=True).order_by('-date_created')
+    paginator = Paginator(revisions, 50)
     page = request.GET.get('page')
     try:
         page_revisions = paginator.page(page)

diff --git a/project/templates/admin_tools/dashboard/modules/link_list.html b/project/templates/admin_tools/dashboard/modules/link_list.html
new file mode 100644 (file)
index 0000000..1d05af0
--- /dev/null
+++ b/project/templates/admin_tools/dashboard/modules/link_list.html
@@ -0,0 +1,13 @@
+{% extends "admin_tools/dashboard/module.html" %}
+{% block module_content %}
+<ul class="{{ module.layout }}">
+    {% spaceless %}
+    {% for child in module.children %}
+    <li class="{% cycle 'odd' 'even' %}">
+    <a{% if child.external %} class="external-link"{% endif %} href="{{
+        child.url }}" {% if child.description %} title="{{ child.description }}"{% endif %}>{{ child.title|safe }}</a> 
+    </li>
+    {% endfor %}
+    {% endspaceless %}
+</ul>
+{% endblock %}