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

Merge pull request #15 from ppasq/styles

Browse Source 
Fix Styles
This commit is contained in:
Paolo Pasquali authored and GitHub committed 2017-10-21 10:38:29 +02:00
2 parents f3d3d6b96f 4b41ad4feb
commit 127e3dc2e6
9 files changed
+42 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

haitidata/locale/fr/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
haitidata/locale/fr/LC_MESSAGES/django.po
+5
View File
@@ -137,6 +137,11 @@ msgstr ""
" Publié de <b>%(publish_start)s</b> à <b>%(publish_end)s</b>.\n"
" "
#: haitidata/templates/base/_resourcebase_snippet.html:5
#: haitidata/templates/charts_app/chart_list.html:22
msgid "No content found."
msgstr "Aucun contenu trouvé."
#: haitidata/templates/base/_resourcebase_snippet.html:37
#: haitidata/templates/layers/layer_detail.html:498
#: haitidata/templates/search/_search_content.html:16
haitidata/static/css/haitidata.css
+1 -1
View File
@@ -2,4 +2,4 @@
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,*:before,*:after{background:transparent !important;color:#000 !important;box-shadow:none !important;text-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:#fff !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeatLine truncated
*//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,*:before,*:after{background:transparent !important;color:#000 !important;box-shadow:none !important;text-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:#fff !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeatLine truncated
haitidata/static/js/search/cart.js
+8 -8
View File
@@ -5,7 +5,7 @@
.controller('CartList', function($scope, cart){
$scope.cart = cart;
$scope.layers_params = '';
$scope.newMap = function(){
var items = cart.getCart().items;
var params = '';
@@ -21,7 +21,7 @@
var selected_ids = $.map(items, function(item){return item.id});
var message = $('#bulk_perms_message');
if(selected_ids.length == 0){
message.find('.message').html('Please select at least one resource to set the permissions');
message.find('.message').html('Veuillez sélectionner au moins une ressource pour définir les autorisations');
message.addClass('alert-danger').removeClass('alert-success alert-warning hidden');
return;
}
@@ -35,14 +35,14 @@
},
success: function(data) {
var not_changed = $.parseJSON(data).not_changed;
if (not_changed.length > 0){
message.find('.message').html('Permissions correctly registered, although the following resources were'+
' skipped because you don\'t have the rights to edit their permissions:');
if (not_changed.length > 0){
message.find('.message').html('Autorisations correctement enregistrées, bien que les ressources suivantes aient été'+
' sauté parce que vous n\'avez pas le droit de modifier leurs autorisations');
message.find('.extra_content').html(not_changed.join('</br>'));
message.addClass('alert-warning').removeClass('alert-success alert-danger hidden');
}
else{
message.find('.message').html('Permissions correctly registered.');
message.find('.message').html('Autorisations correctement enregistrées.');
message.addClass('alert-success').removeClass('alert-warning alert-danger hidden');
}
},
@@ -63,7 +63,7 @@
}])
.service('cart', function(){
this.init = function(){
this.$cart = {
items: []
@@ -122,4 +122,4 @@
.run(['cart', function(cart){
cart.init();
}])
})();
})();
haitidata/static/less/haitidata.less
+17 -10
View File
@@ -434,23 +434,23 @@ footer {
margin-bottom: 1em;
}
.keywords {
border-radius: .4em;
border-radius: 0.6em;
color: white;
&:hover {
background: darken(@brand-primary, 10%);
background: @brand-primary;
color: white;
text-decoration: none;
transition: 0.5s all;
-webkit-transition: 0.5s all;
-moz-transition: 0.5s all;
-o-transition: 0.5s all;
-ms-transition: 0.5s all;
transition: 1s all;
-webkit-transition: 1s all;
-moz-transition: 1s all;
-o-transition: 1s all;
-ms-transition: 1s all;
}
}
.keywords a {
color: white;
&:hover {
background: darken(@brand-primary, 10%);
background: @brand-primary;
color: white;
text-decoration: none;
}
@@ -962,6 +962,10 @@ body.importer {
}
/* ------ Search
------------------------------ */
.btn-tools {
font-size: 0.75em;
}
nav.filter {
h4 {
background: @gray-dark;
@@ -980,10 +984,13 @@ nav.filter {
margin-left: 8px;
}
}
li a {
color: @gray;
}
.active {
color: @brand-info;
color: @brand-primary;
.badge {
background: @brand-info;
background: @brand-primary;
}
}
haitidata/templates/base/_resourcebase_snippet.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% verbatim %}
<div class="row">
<div ng-if="results.length == 0" ng-cloak>
<div><h3>Aucun contenu trouvé.</h3></div>
<div><h3>{% trans "No content found." %}</h3></div>
</div>
<article ng-repeat="item in results" resource_id="{{ item.id }}" ng-cloak class="ng-cloak">
<div class="col-xs-12 item-container">
haitidata/templates/charts_app/chart_list.html
+6 -11
View File
@@ -11,21 +11,16 @@
{% block body_class %}charts{% endblock %}
{% block body %}
<ul>
{% for chart in object_list %}
<li>{{ chart.title }}</li>
<li>{{ chart.layer }} - {{ chart.category }} - {{ chart.quantity }}</li>
<li>{{ chart.type }} - {{ chart.agg_type }}</li>
<li>{{ chart.abstract }}</li>
<h4>{{ chart.title }}</h4>
<p>{% trans "Source" %}: {{ chart.layer }}<!-- {{ chart.category }} - {{ chart.quantity }}--></p>
<!-- <p>{{ chart.type }} - {{ chart.agg_type }}</p> -->
<p><small>{{ chart.abstract }}</small></p>
<br>
{% empty %}
<li>No Charts yet!</li>
<h3>{% trans "No content found." %}</h3>
{% endfor %}
</ul>
{% include "_bulk_permissions_form.html" %}
{% include "_bulk_permissions_form.html" %}
{% endblock %}
{% block extra_script %}
haitidata/templates/search/_search_content.html
+2 -2
View File
@@ -8,12 +8,12 @@
<div class="btn-group btn-group-justified" role="group" aria-label="tools">
{% if request.user.is_authenticated %}
<div class="btn-group" role="group">
<button type="button" class="btn btn-default" ng-disabled="!cart.getCart().items.length" data-toggle="modal" data-target="#_bulk_permissions">{% trans "Set permissions" %}</button>
<button type="button" class="btn btn-default btn-tools" ng-disabled="!cart.getCart().items.length" data-toggle="modal" data-target="#_bulk_permissions">{% trans "Set permissions" %}</button>
</div>
{% endif %}
{% if facet_type == 'layers' %}
<div class="btn-group" role="group">
<button type="button" class="btn btn-default" ng-disabled="!cart.getCart().items.length" ng-click="newMap()">{% trans "Create a Map" %}</button>
<button type="button" class="btn btn-default btn-tools" ng-disabled="!cart.getCart().items.length" ng-click="newMap()">{% trans "Create a Map" %}</button>
</div>
{% endif %}
</div>
haitidata/templates/search/search_scripts.html
+2 -2
View File
@@ -16,9 +16,9 @@
{% include 'search/_spatial_tags.html' %}
{% endif %}
<script src="{{ STATIC_URL }}geonode/js/search/explore.js?v={{ VERSION }}"></script>
<script src="{{ STATIC_URL }}js/search/explore.js?v={{ VERSION }}"></script>
<script src="{{ STATIC_URL }}js/search/search.js?v={{ VERSION }}"></script>
<script src="{{ STATIC_URL }}geonode/js/search/cart.js"></script>
<script src="{{ STATIC_URL }}js/search/cart.js"></script>
<script type="text/javascript">
$("body").attr('ng-controller', 'geonode_search_controller');
CATEGORIES_ENDPOINT = '{% url 'api_dispatch_list' api_name='api' resource_name='categories' %}';