From 04009cdf792a74417948d74694f2f9b5e259731c Mon Sep 17 00:00:00 2001 From: Esdras1995 Date: Mon, 12 Oct 2015 13:17:48 -0400 Subject: [PATCH] Delete style added --- base/templatetags/base_extras.py | 14 +++++++++-- smslapli/templates/admin/change_form.html | 2 +- .../templates/admin/delete_confirmation.html | 25 +++++++++++-------- .../admin/delete_selected_confirmation.html | 15 +++++++---- .../templates/admin/includes/fieldset.html | 2 +- smslapli/templates/admin/index.html | 22 +++++++++------- smslapli/templates/admin/logout.html | 13 ---------- static/css/custom.css | 2 +- 8 files changed, 52 insertions(+), 43 deletions(-) delete mode 100644 smslapli/templates/admin/logout.html diff --git a/base/templatetags/base_extras.py b/base/templatetags/base_extras.py index 329d0aa..2a033d4 100644 --- a/base/templatetags/base_extras.py +++ b/base/templatetags/base_extras.py @@ -1,7 +1,8 @@ from base.models import PersonneContact from hydromet.models import Observation +from datetime import * -__author__ = 'alexing' +__author__ = 'esdras' from django import template @@ -11,7 +12,16 @@ register = template.Library() def notification(texte): nmbAgent = PersonneContact.objects.filter(isactif=False).count(); msgNotValidate = Observation.objects.filter(valider = False).count() - listQueryDash = {"nbAgent":str(nmbAgent), "msgNotValidate":str(msgNotValidate)} + + dt = datetime.now() + dateFin = str(dt.year)+'-'+str(dt.month)+'-'+str(dt.day) + dtD=date.today() - timedelta(days=1) + dateDebut = str(dtD.year)+'-'+str(dtD.month)+'-'+str(dtD.day) + + personNotSentMsg = PersonneContact.objects.filter(isactif=True).count()-Observation.objects.filter(dateDebut=dateDebut, dateFin=dateFin).values('observer').distinct().count() + + listQueryDash = {"nbAgent":str(nmbAgent), "msgNotValidate":str(msgNotValidate), "personNotSentMsg":str(personNotSentMsg)} result = listQueryDash[texte] + return result diff --git a/smslapli/templates/admin/change_form.html b/smslapli/templates/admin/change_form.html index d69691e..8f46c5c 100644 --- a/smslapli/templates/admin/change_form.html +++ b/smslapli/templates/admin/change_form.html @@ -67,7 +67,7 @@ {% if to_field %}{% endif %} {% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} {% if errors %} -

+

{% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}

{{ adminform.form.non_field_errors }} diff --git a/smslapli/templates/admin/delete_confirmation.html b/smslapli/templates/admin/delete_confirmation.html index 12c1c70..c316f3f 100644 --- a/smslapli/templates/admin/delete_confirmation.html +++ b/smslapli/templates/admin/delete_confirmation.html @@ -3,20 +3,21 @@ {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %} {% block content1 %} - + {% block breadcrumbs %} -
+{% comment %} + +{% endcomment %} {% endblock %} {% block content %} +
{% if perms_lacking %}

{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

    @@ -32,19 +33,21 @@ {% endfor %}
{% else %} -

{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}

+

{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}

{% include "admin/includes/object_delete_summary.html" %}

{% trans "Objects" %}

    {{ deleted_objects|unordered_list }}
+
{% csrf_token %}
- - {% if is_popup %}{% endif %} - {% if to_field %}{% endif %} - - {% trans "No, take me back" %} + + {% if is_popup %}{% endif %} + {% if to_field %}{% endif %} + + {% trans "No, take me back" %}
{% endif %} +
{% endblock %} {% endblock %} \ No newline at end of file diff --git a/smslapli/templates/admin/delete_selected_confirmation.html b/smslapli/templates/admin/delete_selected_confirmation.html index 6b2d175..210e903 100644 --- a/smslapli/templates/admin/delete_selected_confirmation.html +++ b/smslapli/templates/admin/delete_selected_confirmation.html @@ -4,15 +4,18 @@ {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %} {% block content1 %} {% block breadcrumbs %} -
+{% comment %} + +{% endcomment %} {% endblock %} {% block content %} +
{% if perms_lacking %}

{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

    @@ -28,12 +31,13 @@ {% endfor %}
{% else %} -

{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}

+

{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}

{% include "admin/includes/object_delete_summary.html" %}

{% trans "Objects" %}

{% for deletable_object in deletable_objects %}
    {{ deletable_object|unordered_list }}
{% endfor %} +
{% csrf_token %}
{% for obj in queryset %} @@ -41,10 +45,11 @@ {% endfor %} - - {% trans "No, take me back" %} + + {% trans "No, take me back" %}
{% endif %} +
{% endblock %} {% endblock %} \ No newline at end of file diff --git a/smslapli/templates/admin/includes/fieldset.html b/smslapli/templates/admin/includes/fieldset.html index b46150c..f2d2ae4 100644 --- a/smslapli/templates/admin/includes/fieldset.html +++ b/smslapli/templates/admin/includes/fieldset.html @@ -5,7 +5,7 @@ {% endif %} {% for line in fieldset %}
- {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %} +
{% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
{% for field in line %}
{% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %} diff --git a/smslapli/templates/admin/index.html b/smslapli/templates/admin/index.html index 88f813d..6428379 100755 --- a/smslapli/templates/admin/index.html +++ b/smslapli/templates/admin/index.html @@ -47,6 +47,11 @@ + -
- +
{{ "nbAgent"|notification }}
-

Agent inactif

+

{% if "nbAgent"|notification < '2' %} Agent inactif {% else %} Agents inactifs {% endif %}

Observateur

@@ -310,17 +314,17 @@

Message non valide

Observation pluviometrique

-
- +
-
179
+
{{ "personNotSentMsg"|notification }}
-

New Sign ups

-

Lorem ipsum psdea itgum rixt.

+

{% if "personNotSentMsg"|notification < '2' %}Agent n'a pas envoye{% else %} Agents n'ont pas envoyes{% endif %}

+

Observation pluviometrique

-
--> +
diff --git a/smslapli/templates/admin/logout.html b/smslapli/templates/admin/logout.html deleted file mode 100644 index ba0120a..0000000 --- a/smslapli/templates/admin/logout.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "admin/base.html" %} - -{% block title %}Logged out{% endblock %} - -{% block content_header %}Logged out{% endblock %} - -{% block main_content %} -

You've been logged out

-{% endblock %} - -{% block content %} -

Thanks Thanks Thanks Thanks for stopping by; when you come back, don't forget to log in again.

-{% endblock %} \ No newline at end of file diff --git a/static/css/custom.css b/static/css/custom.css index 8ea79e2..5d070fc 100755 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -3955,7 +3955,7 @@ html > body > .ui-pnotify { border-color: rgba(243, 156, 18, 0.88); } -.alert-danger, +/* J'ai envele alert-danger ici..*/ .alert-error { color: #E9EDEF; background-color: rgba(231, 76, 60, 0.88);