Merge branch 'master' into thresholdMethods

templates/layout.html

@@ -82,41 +82,6 @@
         <div class="wrap {% block content-class %}{% endblock %}" id="content">
             {% block content %}{% endblock %}
         </div>
-        {% if ENVIRONMENT == 'staging' %}
-            <!-- Piwik -->
-            <script type="text/javascript">
-              var _paq = _paq || [];
-              _paq.push(['trackPageView']);
-              _paq.push(['enableLinkTracking']);
-              (function() {
-                var u="//piwik.babubabu.de/";
-                _paq.push(['setTrackerUrl', u+'piwik.php']);
-               _paq.push(['setSiteId', 2]);
-               var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-               g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-             })();
-           </script>
-           <noscript><p><img src="//piwik.babubabu.de/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
-           <!-- End Piwik Code -->
-       {% endif %}
-
-       {% if ENVIRONMENT == 'prod' %}
-           <!-- Piwik -->
-           <script type="text/javascript">
-             var _paq = _paq || [];
-             _paq.push(['trackPageView']);
-             _paq.push(['enableLinkTracking']);
-             (function()
-               var u="//piwik.babubabu.de/";
-               _paq.push(['setTrackerUrl', u+'piwik.php']);
-               _paq.push(['setSiteId', 1]);
-               var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-               g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-             })();
-           </script>
-           <noscript><p><img src="//piwik.babubabu.de/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-           <!-- End Piwik Code -->
-       {% endif %}
         <script type="text/javascript">
             domFinished = true;
             startApplication();

templates/volumes/render.html

@@ -189,8 +189,12 @@
             </div>
             <div id="volume-information" class="float-left">
                 volume name: <span class="bold">{{ volume.name }}</span> current texture res: <span class="bold" id="currentRes"></span> px<br />
-                <div id="resolution-link-holder"><div id="resolution-links"></div></div>
+                <div id="resolution-link-holder" class="{% if ENVIRONMENT == 'prod' %} hidden {% endif %}">
+                    <div id="resolution-links"></div>
+                </div>
+
                 <div id="zoom-status">zoomed out</div>
+
                 <div id="progress">
                     <div id="progress-container" class="hidden">
                         <p>Downloading <span id="texturePath"></span></p>