From 76d6249368e55ba6fc775810db4894905444357e Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 26 Feb 2016 10:58:15 +0100 Subject: [PATCH] makes admin target blank --- app/deploy/start_app.sh | 2 +- docker-compose.yml | 4 ++-- telemeta/static/telemeta/js/resourcemap.js | 1 + telemeta/templates/telemeta/admin_general.html | 2 -- telemeta/templates/telemeta/base.html | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh index bc774555..82aa047a 100644 --- a/app/deploy/start_app.sh +++ b/app/deploy/start_app.sh @@ -17,7 +17,7 @@ uid='www-data' gid='www-data' # stating apps -pip install django-environ redis +# pip install django-environ redis # waiting for other services sh $app/deploy/wait.sh diff --git a/docker-compose.yml b/docker-compose.yml index 3ba31637..0cc1d6c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (c) 2015 Parisson SARL +# Copyright (c) 2015-2016 Parisson SARL # This file is part of Telemeta. @@ -9,7 +9,7 @@ # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. -# TimeSide is distributed in the hope that it will be useful, +# Telemeta is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/telemeta/static/telemeta/js/resourcemap.js b/telemeta/static/telemeta/js/resourcemap.js index cc55d82e..5c8debed 100644 --- a/telemeta/static/telemeta/js/resourcemap.js +++ b/telemeta/static/telemeta/js/resourcemap.js @@ -107,6 +107,7 @@ function ResourceMap(list, cfg) { that.map = new google.maps.Map2(that.container[0]); var bounds = new GLatLngBounds(); that.map.setCenter(new GLatLng(46.0, 2.0), that.map.getBoundsZoomLevel(bounds)); // France + //that.map.setZoom(3.5); that.map.setUIToDefault(); } else { that.log("Browser isn't compatible with GMap ?!"); diff --git a/telemeta/templates/telemeta/admin_general.html b/telemeta/templates/telemeta/admin_general.html index 71fb8e8b..780119b0 100644 --- a/telemeta/templates/telemeta/admin_general.html +++ b/telemeta/templates/telemeta/admin_general.html @@ -19,5 +19,3 @@ {% endblock %} - - diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 79c14cb7..5bc2dba4 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -133,7 +133,7 @@ {% if user.is_staff %}
  • {% trans "Admin" %}