Fix bug 1179847: Support pontoon.m.o in dev mode.

mozilla · Jul 2, 2015 · 14e18d3 · 14e18d3
1 parent 1f7fac7
commit 14e18d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html
@@ -161,6 +161,9 @@ <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('img/sandstone/header-moz
       <script src="{{ settings.CDN_BASE_URL }}{{ url('tabzilla') }}"></script>
     {% endblock %}
     {% block js %}{% endblock %}
+    {% if settings.DEV %}
+      <script src="https://pontoon.mozilla.org/pontoon.js"></script>
+    {% endif %}
     {% if settings.USE_GRUNT_LIVERELOAD %}
       <script src="//localhost:35729/livereload.js"></script>
     {% endif %}

diff --git a/bedrock/base/templates/base.html b/bedrock/base/templates/base.html
@@ -144,6 +144,9 @@ <h2><a href="{{ url('mozorg.home') }}">{{ high_res_img('img/sandstone/header-moz
       <script src="{{ settings.CDN_BASE_URL }}{{ url('tabzilla') }}"></script>
     {% endblock %}
     {% block js %}{% endblock %}
+    {% if settings.DEV %}
+      <script src="https://pontoon.mozilla.org/pontoon.js"></script>
+    {% endif %}
     {% if settings.USE_GRUNT_LIVERELOAD %}
       <script src="//localhost:35729/livereload.js"></script>
     {% endif %}

diff --git a/bedrock/settings/__init__.py b/bedrock/settings/__init__.py
@@ -25,6 +25,9 @@
 
 if DEV:
     ALLOWED_HOSTS = ['*']
+else:
+    MIDDLEWARE_CLASSES += ('commonware.middleware.FrameOptionsHeader',)
+
 
 # waffle flags, switches, and samples should default to True in DEV mode
 WAFFLE_FLAG_DEFAULT = WAFFLE_SWITCH_DEFAULT = WAFFLE_SAMPLE_DEFAULT = DEV

diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py
@@ -295,7 +295,6 @@ def JINJA_CONFIG():
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'commonware.middleware.FrameOptionsHeader',
     'bedrock.mozorg.middleware.CacheMiddleware',
     'dnt.middleware.DoNotTrackMiddleware',
     'lib.l10n_utils.middleware.FixLangFileTranslationsMiddleware',