From b17c9716410e140fa38bd220b5208913d198a1d8 Mon Sep 17 00:00:00 2001 From: Leonidas Poulopoulos Date: Thu, 19 Apr 2012 11:25:45 +0300 Subject: [PATCH 1/1] Added a moving dot gif to response to indicate ongoing activity --- flowspec/views.py | 6 +++--- static/dots.gif | Bin 0 -> 134 bytes templates/user_routes.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 static/dots.gif diff --git a/flowspec/views.py b/flowspec/views.py index d321558..ad25e81 100644 --- a/flowspec/views.py +++ b/flowspec/views.py @@ -111,7 +111,7 @@ def add_route(request): if not request.user.is_superuser: route.applier = request.user route.status = "PENDING" - route.response = "Applying..." + route.response = "Applying" route.source = IPNetwork("%s/%s" %(IPNetwork(route.source).network.compressed, IPNetwork(route.source).prefixlen)).compressed route.destination = IPNetwork("%s/%s" %(IPNetwork(route.destination).network.compressed, IPNetwork(route.destination).prefixlen)).compressed route.save() @@ -181,7 +181,7 @@ def edit_route(request, route_slug): route.applier = request.user if bool(set(changed_data) & set(critical_changed_values)) or (not route_original.status == 'ACTIVE'): route.status = "PENDING" - route.response = "Applying..." + route.response = "Applying" route.source = IPNetwork("%s/%s" %(IPNetwork(route.source).network.compressed, IPNetwork(route.source).prefixlen)).compressed route.destination = IPNetwork("%s/%s" %(IPNetwork(route.destination).network.compressed, IPNetwork(route.destination).prefixlen)).compressed route.save() @@ -235,7 +235,7 @@ def delete_route(request, route_slug): route.expires = datetime.date.today() if not request.user.is_superuser: route.applier = request.user - route.response = "Suspending..." + route.response = "Suspending" route.save() route.commit_delete() requesters_address = request.META['HTTP_X_FORWARDED_FOR'] diff --git a/static/dots.gif b/static/dots.gif new file mode 100644 index 0000000000000000000000000000000000000000..e7f856ea894651fceebc08fa8af2af6f22e8419b GIT binary patch literal 134 zcmZ?wbhEHbjEB@#9a}5c0b_{Se(lcNN2`m0&VU%NFWY7UA0V!r+ gV(sZ)c{&0i!w8gS0zw8Rrj|g2Fbj5Jb`)W20HYZc%m4rY literal 0 HcmV?d00001 diff --git a/templates/user_routes.html b/templates/user_routes.html index 6819724..d25460c 100644 --- a/templates/user_routes.html +++ b/templates/user_routes.html @@ -277,7 +277,7 @@ function delete_route(route){ style="border-bottom:2px dashed red;" title="Expires {% ifequal route.days_to_expire '0' %}today{% else%}in {{route.days_to_expire}} day{{ route.days_to_expire|pluralize }}{% endifequal %}" {% endif %}{% endif %}>{{ route.expires }} - {% if route.status == 'EXPIRED' %}Rule expired{% else %}{% if route.status == 'ADMININACTIVE' %}Suspended by administrator{% else %}{% if route.status == 'INACTIVE' %}Suspended by user{% else %}{{ route.response }}{% endif %}{% endif %}{% endif %} + {% if route.status == 'EXPIRED' %}Rule expired{% else %}{% if route.status == 'ADMININACTIVE' %}Suspended by administrator{% else %}{% if route.status == 'INACTIVE' %}Suspended by user{% else %}{{ route.response }}{% if route.status == 'PENDING' %}{% endif %}{% endif %}{% endif %}{% endif %} {% ifequal route.status 'ACTIVE' %} Edit -- 1.7.10.4