Test okay.

This commit is contained in:
Esdras1995 committed 2015-10-18 23:41:07 -04:00
1 parent dc9b6a4812
commit dfe604ef50
6 files changed
+19 -152

No files matched your search

+1 -1
View File
@@ -18,7 +18,7 @@ def notification(texte):
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()
personNotSentMsg = PersonneContact.objects.all().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]
+2 -2
View File
@@ -71,7 +71,7 @@
</div>
{% endblock %}
{% endif %}
{% comment %}
{% block messages %}
{% if messages %}
<ul class="messagelist">{% for message in messages %}
@@ -79,7 +79,7 @@
{% endfor %}</ul>
{% endif %}
{% endblock messages %}
{% endcomment %}
<!-- Content -->
<div id="content" class="{% block coltype %}colM{% endblock %}">
{% block pretitle %}{% endblock %}
+11 -82
View File
@@ -33,7 +33,7 @@
{% block object-tools-items %}
<li>
{% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %}
<a href="{% add_preserved_filters history_url %}" class="historylink pull-right btn btn-info">{% trans "History" %}</a>
<a href="{% add_preserved_filters history_url %}" class="historylink pull-right btn-xs btn-info">{% trans "History" %}</a>
</li>
{% if has_absolute_url %}<li><a href="{{ absolute_url }}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif %}
{% endblock %}
@@ -135,32 +135,11 @@
</div>
<style>
li{
list-style: none;
}
/*.selector-filter label{
{# background-color: yellow;#}
width: 20px;
}*/
/*.selector-filter input{
width: 100px;
margin-bottom: 0;
}*/
/* .form-style{
{# background: #DDD;#}
width: 700px;
margin: auto;
padding: 20px;
}*/
/*.form-style select{
width: 110px;
display: inline-block;
top: 0px;
}*/
li{
list-style: none;
}
.btn-custom {
.btn-custom {
display: inline-block;
padding: 4px 12px;
width: 140px;
@@ -213,70 +192,20 @@
border-bottom: 1px solid #ddd;
}
.clockbox{
-webkit-box-shadow: 0px 0px 5px 0px #ddd;
-moz-box-shadow: 0px 0px 5px 0px #ddd;
box-shadow: 0px 0px 5px 0px #ddd;
-webkit-box-shadow: 0px 0px 5px 0px #999;
-moz-box-shadow: 0px 0px 5px 0px #999;
box-shadow: 0px 0px 5px 0px #999;
border-radius: 5px;
padding: 2px;
}
.calendar{
-webkit-box-shadow: 0px 0px 5px 0px #ddd;
-moz-box-shadow: 0px 0px 5px 0px #ddd;
box-shadow: 0px 0px 5px 0px #ddd;
-webkit-box-shadow: 0px 0px 5px 0px #999;
-moz-box-shadow: 0px 0px 5px 0px #999;
box-shadow: 0px 0px 5px 0px #999;
border-radius: 5px;
padding: 2px;
}
/*input, button, select, textarea {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
}
label, input, button, select, textarea {
font-size: 12px;
font-weight: normal;
line-height: 18px;
}
label, select, button, input[type="button"], input[type="reset"], input[type="submit"], input[type="radio"], input[type="checkbox"] {
cursor: pointer;
}
button, html input[type="button"], input[type="reset"], input[type="submit"] {
cursor: pointer;
}
button, input {
line-height: normal;
}
button, input, select, textarea {
margin: 0px;
font-size: 100%;
vertical-align: middle;
}
.save-box {
text-align: center;
}
.save-box .btn.btn-high {
width: 150px;
min-height: 40px;
}
.save-box .btn {
width: 150px;
margin-bottom: 10px;
}
.btn:focus {
outline: thin dotted #333;
outline-offset: -2px;
}
.btn:hover, .btn:focus {
color: #333;
text-decoration: none;
background-position: 0px -15px;
transition: background-position 0.1s linear 0s;
}
.btn:hover, .btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
color: #333;
background-color: #E6E6E6;
}
button.btn, input.btn[type="submit"] {
}*/
</style>
{% endblock %}
@@ -28,7 +28,6 @@
{% endfor %}
<style>
/* ######################################### */
.selector{
width: 100%;
@@ -37,12 +36,7 @@
width: 40%;
}
/*.selector-available{
background-color: #f5f5f5;
}
.selector-chosen{
background-color: #DDD;
}*/
.selector-available select, .selector-chosen select{
width: 100%;
height: 100px;
@@ -66,11 +60,9 @@
border-radius: 5px 0px 0px 5px;
}
.selector-filter input{
/*background: yellow;*/
width: 80% !important;
}
/* #################################### */
@@ -97,9 +89,7 @@
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 7px #96c7ec;
}
/*.fieldset-group p input{
margin-left: 55px;
}*/
.fieldset-group input, .fieldset-group textarea{
background: #ffffff;
border: 1px solid #ddd;
@@ -111,23 +101,10 @@
}
/*.selector div{
width: 100%;
padding: 5px;
background: #DDD;
}*/
/*.selector div select{
height: 50px;
width: 120px;
}*/
.fieldset-group{
margin-bottom: 10px;
}
/*.fieldset-group p input{
margin-bottom: 10px;
}*/
</style>
</fieldset>
+3 -41
View File
@@ -3,13 +3,13 @@
{% block content1 %}
{% block breadcrumbs %}
<div class="breadcrumbs">
<!-- <div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ module_name }}</a>
&rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
&rsaquo; {% trans 'History' %}
</div>
</div> -->
{% endblock %}
{% block content %}
@@ -25,22 +25,6 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2>Daily active users <small>Sessions</small></h2>
<ul class="nav navbar-right panel_toolbox">
<li><a href="#"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Settings 1</a>
</li>
<li><a href="#">Settings 2</a>
</li>
</ul>
</li>
<li><a href="#"><i class="fa fa-close"></i></a>
</li>
</ul>
<div class="clearfix"></div>
</div>
{% if action_list %}
@@ -77,29 +61,7 @@
</div>
</div>
{# <table id="change-history">#}
{# <thead>#}
{# <tr>#}
{# <th scope="col">{% trans 'Date/time' %}</th>#}
{# <th scope="col">{% trans 'User' %}</th>#}
{# <th scope="col">{% trans 'Action' %}</th>#}
{# </tr>#}
{# </thead>#}
{# <tbody>#}
{# {% for action in action_list %}#}
{# <tr>#}
{# <th scope="row">{{ action.action_time|date:"DATETIME_FORMAT" }}</th>#}
{# <td>{{ action.user.get_username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td>#}
{# <td>{{ action.change_message }}</td>#}
{# </tr>#}
{# {% endfor %}#}
{# </tbody>#}
{# </table>#}
{#{% else %}#}
{# <p>{% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %}</p>#}
{#{% endif %}#}
{#</div>#}
{#</div>#}
{% endblock %}
{% endblock %}
``
@@ -13,7 +13,6 @@
.submit-row{
text-align: center;
padding: 10px;
{# background-color: yellow;#}
}
.submit-row input{
display: inline-block;