OpenSource/sms-lapli
1
0 Fork 0
mirror of https://github.com/GFDRR/sms-lapli.git synced 2026-10-26 17:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from Esdras1995/master

Browse Source 
No conflict
This commit is contained in:
Esdras1995 committed 2015-10-27 21:53:13 -04:00
2 parents f3e19d0abe 6331618c01
commit e703d5539b
8 files changed
+88 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

smslapli/templates/admin/actions.html
+2 -2
View File
@@ -20,9 +20,9 @@
<style>
.actions select{
background-color: #ddd;
background-image: linear-gradient(#fff, #ddd);
background-image: linear-gradient(#fff, #f5f5f5);
height: 30px;
border: 1px solid #aaa;
border: 1px solid #ddd;
border-radius: 5px;
font-size: 0.8em;
}
smslapli/templates/admin/change_form.html
+32 -9
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-xs btn-info">{% trans "History" %}</a>
<a href="{% add_preserved_filters history_url %}" class="historylink pull-right btn-xs btn-info badge">{% trans "History" %}</a>
</li>
{% if has_absolute_url %}<li><a href="{{ absolute_url }}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif %}
{% endblock %}
@@ -122,14 +122,13 @@
</script>
{% endblock %}
<script type="text/javascript">
$(document).ready(function(){
// var src = '{% static "images/icon_calendar.gif" %}';
$('#calendarlink0 img').on("click", function(){
alert("tout va tres bien!!!");
});
//zzalert(images);
});
</script>
// $(document).ready(function(){
// // var src = '{% static "images/icon_calendar.gif" %}';
// $('.datetimeshortcuts #calendarlink0').append("calendartest");
// alert("Salut les zeros");
// //zzalert(images);
// });
</script>
<!-- JavaScript for prepopulated fields -->
{% prepopulated_fields_js %}
@@ -228,6 +227,30 @@ li{
padding: 2px;
background-image: none;
}
.module.aligned h2{
color: #fff;
padding: 5px;
background: #2A3F54;
margin-top: 0;
border-radius: 10px 10px 0px 0px;
/* background-color: #49AFCD;
background-image: linear-gradient(to bottom, #5BC0DE, #2F96B4);*/
}
.module.aligned{
border: 1px solid #ddd;
padding-bottom: 0;
border-radius: 10px 10px 0px 0px;
}
.selector h2{
font-size: 1em;
background-color: #49AFCD !important;
background-image: linear-gradient(to bottom, #5BC0DE, #2F96B4) !important;
}
fieldset{
margin-bottom: 10px;
}
</style>
{% endblock %}
smslapli/templates/admin/change_list.html
+1 -1
View File
@@ -75,7 +75,7 @@
{{ cl.formset.non_form_errors }}
{% endif %}
<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist" >
{% block search %}{% search_form cl %}{% endblock %}
{% block date_hierarchy %}{% date_hierarchy cl %}{% endblock %}
smslapli/templates/admin/edit_inline/tabular.html
+13 -6
View File
@@ -1,11 +1,10 @@
{% load i18n admin_urls admin_static admin_modify %}
<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
{% load i18n admin_urls admin_static admin_modify %}<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
<div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
{{ inline_admin_formset.formset.management_form }}
<fieldset class="module">
<h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
{{ inline_admin_formset.formset.non_form_errors }}
<table>
<table class="table">
<thead><tr>
{% for field in inline_admin_formset.fields %}
{% if not field.widget.is_hidden %}
@@ -48,7 +47,7 @@
{% for line in fieldset %}
{% for field in line %}
{% if not field.field.is_hidden %}
<td{% if field.field.name %} class="field-{{ field.field.name }}"{% endif %}>
<td{% if field.field.name %} class="field-{{ field.field.name }} fieldset-group"{% endif %}>
{% if field.is_readonly %}
<p>{{ field.contents }}</p>
{% else %}
@@ -70,14 +69,22 @@
</fieldset>
</div>
</div>
<script type="text/javascript">
(function($) {
$("#{{ inline_admin_formset.formset.prefix|escapejs }}-group .tabular.inline-related tbody tr").tabularFormset({
prefix: "{{ inline_admin_formset.formset.prefix|escapejs }}",
addText: "{% filter escapejs %}{% blocktrans with inline_admin_formset.opts.verbose_name|capfirst as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}{% endfilter %}",
addText: "<span class = 'btn btn-primary btn-xs pull-right'> <i class='glyphicon glyphicon-plus'> </i>{% filter escapejs %}{% blocktrans with inline_admin_formset.opts.verbose_name|capfirst as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %} {% endfilter %}</span>",
deleteText: "{% filter escapejs %}{% trans 'Remove' %}{% endfilter %}"
});
})(django.jQuery);
</script>
<style type="text/css">
.inline-group .tabular tr.add-row td a{
background: none !important;
}
td.fieldset-group input{
width: 100%;
}
</style>
smslapli/templates/admin/includes/fieldset.html
+6 -2
View File
@@ -28,7 +28,9 @@
{% endfor %}
<style>
/*fieldset.module{
padding: 5px;
}*/
.selector{
width: 100%;
}
@@ -79,7 +81,9 @@
height: 10px;
}
.fieldset-group textarea{
width: 50%;
}
.fieldset-group input:focus, .fieldset-group textarea:focus{
outline: none;
color: #525864;
smslapli/templates/admin/index.html
+20 -46
View File
@@ -127,7 +127,7 @@
<!-- ################################### -->
<body class="nav-md">
<div class="container body">
<div class="container body" >
<div class="main_container">
{% block menu %}
<div class="col-md-3 left_col">
@@ -190,49 +190,6 @@
</ul>
</li>
{% endfor %}
{% else %}
<li><a><i class="fa fa-edit"></i>Structure de base<span class="fa fa-chevron-down"></span></a>
<ul class="nav child_menu" style="display: none">
<li><a href="/admin/base/departement/">Departements</a>
</li>
<li><a href="/admin/base/commune/">Communes</a>
</li>
<li><a href="/admin/base/sectioncommunale/">Section communales</a>
</li>
<li><a href="/admin/base/sitesentinelle/">Sites sentinnelles</a>
</li>
<li><a href="/admin/base/poste/">Postes</a>
</li>
<li><a href="/admin/base/personnecontact/">Personne contacts</a>
</li>
</ul>
</li>
<li><a><i class="fa fa-edit"></i>Collecte Pluviometrique<span class="fa fa-chevron-down"></span></a>
<ul class="nav child_menu" style="display: none">
<li><a href="/admin/hydromet/typestation/">Type station pluviometrique</a>
</li>
<li><a href="/admin/hydromet/log/">Log</a>
</li>
<li><a href="/admin/hydromet/station/">Station pluviometriques</a>
</li>
<li><a href="/admin/hydromet/observation/">Observation pluviometriques</a>
</li>
<li><a href="/admin/hydromet/unitedemesure/">Unite de mesures</a>
</li>
<li><a href="/admin/hydromet/stationobservers/">Station observers</a>
</li>
</ul>
</li>
<li><a><i class="fa fa-edit"></i>Autorisation<span class="fa fa-chevron-down"></span></a>
<ul class="nav child_menu" style="display: none">
<li><a href="/admin/auth/group/">Groupes</a>
</li>
<li><a href="/admin/auth/user/">Utilisateurs</a>
</li>
</ul>
</li>
{% endif %}
</ul>
</div>
@@ -320,7 +277,7 @@
<!-- page content -->
<div class="right_col" role="main">
<div class="right_col" role="main" >
{% block content1 %}
<div class="row top_tiles">
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
@@ -347,7 +304,7 @@
</div><!-- personNotSentMsg -->
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="tile-stats">
<div class="icon"><i class="fa fa-sort-amount-desc"></i>
<div class="icon"><canvas width="50" height="50" id="sleet"></canvas>
</div>
<div class="count">{{ "personNotSentMsg"|notification }}</div>
@@ -723,6 +680,23 @@
</script>
<script src="{% static "js/skycons/skycons.js" %}"></script>
<script>
var icons = new Skycons({
"color": "#73879C"
}),
list = [
"clear-day", "clear-night", "partly-cloudy-day",
"partly-cloudy-night", "cloudy", "rain", "sleet", "snow", "wind",
"fog"
],
i;
for (i = list.length; i--;)
icons.set(list[i], list[i]);
icons.play();
</script>
</body>
smslapli/templates/admin/pagination.html
+12 -4
View File
@@ -1,12 +1,20 @@
{% load admin_list %}
{% load i18n %}
<p class="paginator">
<ul class="pagination">
{% if pagination_required %}
{% for i in page_range %}
{% paginator_number cl i %}
<li>{% paginator_number cl i %}</li>
{% endfor %}
{% endif %}
{{ cl.result_count }} {% if cl.result_count == 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endif %}
{% if show_all_url %}&nbsp;&nbsp;<a href="{{ show_all_url }}" class="showall">{% trans 'Show all' %}</a>{% endif %}
{% if cl.formset and cl.result_count %}<input type="submit" name="_save" class="default" value="{% trans 'Save' %}"/>{% endif %}
<li>{% if show_all_url %}&nbsp;&nbsp;<a href="{{ show_all_url }}" class="showall">{% trans 'Show all' %}</a>{% endif %}</li>
<li><span class="label label-info badge" style="margin-left: 5px;">{{ cl.result_count }} {% if cl.result_count == 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endif %}</span></li>
<li>{% if cl.formset and cl.result_count %}<input type="submit" name="_save" class="default" value="{% trans 'Save' %}"/>{% endif %}</li>
</ul>
</p>
<script type="text/javascript">
</script>
smslapli/templates/admin/search_form.html
+2 -2
View File
@@ -3,8 +3,8 @@
<div id="toolbar" class="pull-right search-style"><form id="changelist-search" action="" method="get">
<div><!-- DIV needed for valid HTML -->
<!-- <label for="searchbar"><img src="{% static "admin/img/search.svg" %}" alt="Search" /></label> -->
<input type="text" size="40" name="{{ search_var }}" value="{{ cl.query }}" id="searchbar" />
<input type="submit" value="{% trans 'Search' %}"/><br/>
<input type="text" size="40" name="{{ search_var }}" value="{{ cl.query }}" id="searchbar" placeholder = "{% trans 'Search' %}"/>
<!-- <input type="submit" value="{% trans 'Search' %}"/><br/> -->
{% if show_result_count %}
<span class="small quiet">{% blocktrans count counter=cl.result_count %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktrans %} (<a href="?{% if cl.is_popup %}_popup=1{% endif %}">{% if cl.show_full_result_count %}{% blocktrans with full_result_count=cl.full_result_count %}{{ full_result_count }} total{% endblocktrans %}{% else %}{% trans "Show all" %}{% endif %}</a>)</span>
{% endif %}