From 01e9c40b606f6af69cc4c9bcfe952d6f54ae0481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Wed, 5 Jul 2017 16:25:19 +0200 Subject: [PATCH] refactor changeset icon and style --- src/c3nav/editor/models/changeset.py | 28 +++++++++++++++++++ .../templates/editor/fragment_changesets.html | 12 +------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/c3nav/editor/models/changeset.py b/src/c3nav/editor/models/changeset.py index 11a073de..04614a48 100644 --- a/src/c3nav/editor/models/changeset.py +++ b/src/c3nav/editor/models/changeset.py @@ -373,3 +373,31 @@ class ChangeSet(models.Model): super().save(*args, **kwargs) if self._request is not None: self.activate(self._request) + + STATE_ICONS = { + 'unproposed': 'pencil', + 'proposed': 'send', + 'reproposed': 'send', + 'review': 'hourglass', + 'rejected': 'remove', + 'finallyrejected': 'remove', + 'applied': 'ok', + } + + @property + def icon(self): + return self.STATE_ICONS[self.state] + + STATE_STYLES = { + 'unproposed': 'mute', + 'proposed': 'info', + 'reproposed': 'info', + 'review': 'info', + 'rejected': 'danger', + 'finallyrejected': 'danger', + 'applied': 'success', + } + + @property + def style(self): + return self.STATE_STYLES[self.state] diff --git a/src/c3nav/editor/templates/editor/fragment_changesets.html b/src/c3nav/editor/templates/editor/fragment_changesets.html index 3e801d54..5273d1c6 100644 --- a/src/c3nav/editor/templates/editor/fragment_changesets.html +++ b/src/c3nav/editor/templates/editor/fragment_changesets.html @@ -4,17 +4,7 @@ {% for changeset in changesets %} - {% if changeset.state == 'unproposed' %} - - {% elif changeset.state == 'proposed' or changeset.state == 'reproposed' %} - - {% elif changeset.state == 'review' or changeset.state == 'rereview' %} - - {% elif changeset.state == 'rejected' or changeset.state == 'finallyrejected' %} - - {% elif changeset.state == 'applied' %} - - {% endif %} + {% if changeset.title %}{{ changeset.title }}{% else %}#{{ changeset.id }} {% trans '(no title)' %}{% endif %} {% trans 'Details' %}