From 7fc2738a86f83da8693ecfcdf7e4c783b95b134a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Jul 2015 12:46:24 +0200 Subject: Don't hide share links --- manage.py | 2 +- static/saclay/js/interface.js | 10 ---------- templates/chimere/blocks/share_bar.html | 7 +++---- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/manage.py b/manage.py index 7bbd479..abb366f 100755 --- a/manage.py +++ b/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import os, sys from django.core.management import execute_manager sys.path.insert(0, '/home/nim/Work/chimere-project/chimere/') diff --git a/static/saclay/js/interface.js b/static/saclay/js/interface.js index 3f23a72..cfaaae5 100644 --- a/static/saclay/js/interface.js +++ b/static/saclay/js/interface.js @@ -137,11 +137,6 @@ $(function(){ return false; }); - $('.share-icon').click(function(){ - $(this).hide(); - $(this).nextAll('.shared').show(); - return false; - }); $('.print-page').click(function(){ window.print(); return false; @@ -214,11 +209,6 @@ function display_feature_detail(data, settings){ $("#read_less_"+settings.current_feature.pk).hide(); $("#read_more_"+settings.current_feature.pk).show(); }); - $('.share-icon').click(function(){ - $(this).hide(); - $(this).parent().nextAll('.shared').show(); - return false; - }); $(document).ready(function(){ share_link_update(); $("a[rel^='prettyPhoto']").prettyPhoto({ diff --git a/templates/chimere/blocks/share_bar.html b/templates/chimere/blocks/share_bar.html index 73177fc..aaa9fc4 100644 --- a/templates/chimere/blocks/share_bar.html +++ b/templates/chimere/blocks/share_bar.html @@ -4,12 +4,11 @@ {{share_network.0}} {% endfor %}{%else%} {% endif %} {% map_menu %} -- cgit v1.2.3 From eb1b0bf8b336837dafd2e85c3a27851d76896bc6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Jun 2015 19:43:44 +0200 Subject: Search: CSS adaptation for Saclay theme --- static/saclay/css/styles.css | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 7315d09..802695c 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -441,6 +441,51 @@ a#ui-active-menuitem.ui-state-hover{ background-image:none; } +#search-box{ + display:none; + left:7px; + top:10px; +} + +#haystack-search{ + width:35px; + height:28px; + background-image:url(../images/search.png); + background-repeat:no-repeat; + background-position:center; + background-color: #fff; + border: 1px solid #ddd; + vertical-align:top; +} + +#search-listing img{ + vertical-align:middle; +} + +#search-listing ul{ + padding:4px; +} + +#search-listing ul li { + padding: 0; +} + +ul.pager{ + list-style:none; +} + +ul.pager li{ + display:block; +} + +ul.pager.next{ + float:right; +} + +ul.pager.right{ + float:right; +} + #logos{ width:340px; margin-left:auto; -- cgit v1.2.3 From 6d40954dc747015f516fc19d2bb8207d04cbb647 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Jun 2015 19:54:46 +0200 Subject: Search: minor CSS adjustment --- static/saclay/css/styles.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 802695c..6864ece 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -476,15 +476,13 @@ ul.pager{ ul.pager li{ display:block; + width:100%; } -ul.pager.next{ - float:right; +ul.pager .next{ + text-align:right; } -ul.pager.right{ - float:right; -} #logos{ width:340px; -- cgit v1.2.3 From 3fac033079aa12dd350633092dbb8e5809e0ae40 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Jun 2015 20:50:59 +0200 Subject: Search: add missing image --- static/saclay/images/search.png | Bin 0 -> 686 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/saclay/images/search.png diff --git a/static/saclay/images/search.png b/static/saclay/images/search.png new file mode 100644 index 0000000..0eff19b Binary files /dev/null and b/static/saclay/images/search.png differ -- cgit v1.2.3 From 1aa5fe3f570c5a124ce8fccdc7229144e6fbf67f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Jun 2015 21:04:46 +0200 Subject: Search: fix bad action image --- static/saclay/images/button-cat-three-off.png | Bin 805 -> 1340 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/static/saclay/images/button-cat-three-off.png b/static/saclay/images/button-cat-three-off.png index a581a6b..55822a3 100644 Binary files a/static/saclay/images/button-cat-three-off.png and b/static/saclay/images/button-cat-three-off.png differ -- cgit v1.2.3 From 9ecf5503154344df99afbb6726171530ea640fa2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 6 Sep 2015 18:42:35 +0200 Subject: Update settings for HAYSTACK --- settings.py | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/settings.py b/settings.py index a66eecc..a228d72 100644 --- a/settings.py +++ b/settings.py @@ -30,11 +30,7 @@ JQUERY_CSS_URLS = [] OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"] GPSBABEL = '/usr/bin/gpsbabel' -# simplify with an  error of 5 meters -GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' -# GPSBABEL_OPTIONS = 'simplify,count=100' - -# chimere specific ## +# # chimere specific ## CHIMERE_DEFAULT_ZOOM = 10 # center of the map CHIMERE_DEFAULT_CENTER = (-1.679444, 48.114722) @@ -94,17 +90,18 @@ CHIMERE_ENABLE_CLUSTERING = False # enable routing in Chimère CHIMERE_ENABLE_ROUTING = False -CHIMERE_ROUTING_TRANSPORT = (('foot', _(u"Foot")), - ('bicycle', _(u"Bicycle")), - ('motorcar', _(u"Motorcar")), - ) +CHIMERE_ROUTING_TRANSPORT = ( + ('foot', _(u"Foot")), + ('bicycle', _(u"Bicycle")), + ('motorcar', _(u"Motorcar")), +) -CHIMERE_ROUTING_SPEEDS = {'foot': ((3, _(u"You are walking slowly")), - (6, _(u"You are walking pretty quickly")),), - 'bicycle': ((16, _(u"You are riding pretty slowly")), - (22, _(u"You are riding pretty quickly")) - ) - } +CHIMERE_ROUTING_SPEEDS = { + 'foot': ((3, _(u"You are walking slowly")), + (6, _(u"You are walking pretty quickly")),), + 'bicycle': ((16, _(u"You are riding pretty slowly")), + (22, _(u"You are riding pretty quickly")),) +} # available routing engine: 'routino' CHIMERE_ROUTING_ENGINE = { @@ -203,7 +200,6 @@ MEDIA_URL = '/media/' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', - # 'django.template.loaders.eggs.load_template_source', ) MIDDLEWARE_CLASSES = ( @@ -302,6 +298,17 @@ LOGGING = { }, } +CHIMERE_SEARCH_ENGINE = False +# default haystack parameters when search engine is activated +HAYSTACK_CONNECTIONS = { + 'default': { + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', + 'URL': 'http://127.0.0.1:8080/solr' + }, +} +HAYSTACK_SEARCH_RESULTS_PER_PAGE = 12 +HAYSTACK_AUTOCOMPLETE = False + try: from local_settings import * except ImportError, e: @@ -321,7 +328,6 @@ if not JQUERY_CSS_URLS: JQUERY_CSS_URLS = (STATIC_URL + 'jquery-ui/smoothness/jquery-ui.css', STATIC_URL + 'jquery-ui/base/jquery.ui.all.css') - LOGGING['handlers']['logfile']['filename'] = LOGFILENAME if 'CHIMERE_SHARE_NETWORKS' not in globals(): -- cgit v1.2.3 From 20b1e1dea6fc21682f014fa586565f52e6b80379 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 6 Sep 2015 19:12:50 +0200 Subject: Small CSS adjustment --- static/saclay/css/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 6864ece..6ed9e9f 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -445,6 +445,7 @@ a#ui-active-menuitem.ui-state-hover{ display:none; left:7px; top:10px; + width: 281px; } #haystack-search{ -- cgit v1.2.3 From 482be6fa1fc1f6fe1dbb3a3dba7f10bafba23f6b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 6 Sep 2015 19:36:43 +0200 Subject: CSS fixes --- static/saclay/css/styles.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index 6ed9e9f..3fdde4e 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -72,6 +72,10 @@ caption{ font-size:0.9em; } +#detail_footer a { + display: inline-block; +} + /* * Background colors */ @@ -1164,6 +1168,13 @@ a.share_id_email_single{ font-size:0; } +ul.share { + display: inline; + text-align: center; + font-style: normal; + padding: 2px 0; +} + #footer-panel{ text-align:center; padding:3px; -- cgit v1.2.3 From efc532b2e93567034cc2e9631f1c035020127e20 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 6 Sep 2015 19:42:00 +0200 Subject: Update images for search --- static/saclay/images/button-cat-three-off.png | Bin 1340 -> 4039 bytes static/saclay/images/button-cat-three-on.png | Bin 1232 -> 3957 bytes static/saclay/images/button-route-three-off.png | Bin 900 -> 3604 bytes static/saclay/images/button-route-three-on.png | Bin 806 -> 3499 bytes static/saclay/images/button-search-off.png | Bin 805 -> 3736 bytes static/saclay/images/button-search-on.png | Bin 640 -> 3556 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/static/saclay/images/button-cat-three-off.png b/static/saclay/images/button-cat-three-off.png index 55822a3..9d728de 100644 Binary files a/static/saclay/images/button-cat-three-off.png and b/static/saclay/images/button-cat-three-off.png differ diff --git a/static/saclay/images/button-cat-three-on.png b/static/saclay/images/button-cat-three-on.png index 1c90751..d9bcc7e 100644 Binary files a/static/saclay/images/button-cat-three-on.png and b/static/saclay/images/button-cat-three-on.png differ diff --git a/static/saclay/images/button-route-three-off.png b/static/saclay/images/button-route-three-off.png index ad65794..388fd9d 100644 Binary files a/static/saclay/images/button-route-three-off.png and b/static/saclay/images/button-route-three-off.png differ diff --git a/static/saclay/images/button-route-three-on.png b/static/saclay/images/button-route-three-on.png index ea096b3..9581525 100644 Binary files a/static/saclay/images/button-route-three-on.png and b/static/saclay/images/button-route-three-on.png differ diff --git a/static/saclay/images/button-search-off.png b/static/saclay/images/button-search-off.png index 8aa6f96..9188039 100644 Binary files a/static/saclay/images/button-search-off.png and b/static/saclay/images/button-search-off.png differ diff --git a/static/saclay/images/button-search-on.png b/static/saclay/images/button-search-on.png index 27f6d69..b7ed487 100644 Binary files a/static/saclay/images/button-search-on.png and b/static/saclay/images/button-search-on.png differ -- cgit v1.2.3