makes admin target blank

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index bc77455560774def2f6cb6e3f22a6468d8843555..82aa047a733ce901cbab5a466e3d08de755dc5c4 100644 (file)
--- 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 3ba31637048ee0852621e14fe1041f4a27cffdbc..0cc1d6c978fed86c0ce1209c30e0aa720cc6383c 100644 (file)
--- 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 cc55d82ee8fddc7958bb50f43f2e0c245367a377..5c8debed7e2dfe641d7c7c713e65e925e22590f8 100644 (file)
--- 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 71fb8e8b4664b74bc16f35c7c6ded3ec1a331d9b..780119b058ed7532e14392b57014937164c58c89 100644 (file)
--- a/telemeta/templates/telemeta/admin_general.html
+++ b/telemeta/templates/telemeta/admin_general.html
@@ -19,5 +19,3 @@
  </script>
 
 {% endblock %}
-
-

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 79c14cb718ac1e6e8f5d171b9475298828efdb19..5bc2dba4d20423c6d6dc248103ef55019b3c5c66 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -133,7 +133,7 @@
  {% if user.is_staff %}
  <li><a href="#admin#" class="violet">{% trans "Admin" %}</a>
  <ul>
- <li><a href="{% url "telemeta-admin-general" %}">{% trans "General" context "admin" %}</a></li>
+ <li><a href="{% url "telemeta-home" %}admin/django/" target="_blank">{% trans "General" context "admin" %}</a></li>
  <li><a href="{% url "telemeta-admin-enumerations" %}">{% trans "Enumerations" %}</a></li>
  <li><a href="{% url "telemeta-instrument-edit" %}">{% trans "Instruments" %}</a></li>
  <li><a href="{% url "telemeta-instrument-alias-edit" %}">{% trans "Instrument aliases" %}</a></li>