diff --git a/blackrock/templates/base.html b/blackrock/templates/base.html index 7fce21d0f..794aa5c2d 100644 --- a/blackrock/templates/base.html +++ b/blackrock/templates/base.html @@ -8,7 +8,6 @@ {% include "ctlsettings/sentry_js.html" %} @@ -30,7 +29,6 @@ - {% endblock %} {% block feeds %}{% endblock %} @@ -41,7 +39,7 @@ -
+ {% block overlay %}{% endblock %}
diff --git a/blackrock/templates/optimization/base_optimization.html b/blackrock/templates/optimization/base_optimization.html index 25ab60bbf..6a367dd76 100644 --- a/blackrock/templates/optimization/base_optimization.html +++ b/blackrock/templates/optimization/base_optimization.html @@ -43,10 +43,3 @@
{% endblock %} - -{% block script_footer %} - -{% endblock %} diff --git a/blackrock/templates/optimization/index.html b/blackrock/templates/optimization/index.html index a34842825..c5bf068fd 100644 --- a/blackrock/templates/optimization/index.html +++ b/blackrock/templates/optimization/index.html @@ -44,10 +44,3 @@

{% endblock %} - -{% block script_footer %} - -{% endblock %} diff --git a/blackrock/templates/paleoecology/base_paleoecology.html b/blackrock/templates/paleoecology/base_paleoecology.html index 254f38bd3..047810027 100644 --- a/blackrock/templates/paleoecology/base_paleoecology.html +++ b/blackrock/templates/paleoecology/base_paleoecology.html @@ -21,7 +21,6 @@ - -{% endblock %} +{% endblock %} diff --git a/blackrock/templates/paleoecology/index.html b/blackrock/templates/paleoecology/index.html index 8c9aecd16..d17dba450 100644 --- a/blackrock/templates/paleoecology/index.html +++ b/blackrock/templates/paleoecology/index.html @@ -75,10 +75,3 @@

{% endblock %} - -{% block script_footer %} - -{% endblock %} diff --git a/blackrock/templates/portal/base_portal.html b/blackrock/templates/portal/base_portal.html index e10777ba8..0fd7ff846 100644 --- a/blackrock/templates/portal/base_portal.html +++ b/blackrock/templates/portal/base_portal.html @@ -17,7 +17,6 @@ @import "{% static 'css/tiny_mce.css' %}" ; @import "{% static 'css/portal/style.css' %}"; @import "{% static 'js/jquery-ui-1.8.11.custom/css/smoothness/jquery-ui-1.8.11.custom.css' %}" ; - @import "{% static 'css/shield.css' %}"; {% include "ctlsettings/sentry_js.html" %} @@ -29,7 +28,6 @@ - @@ -50,7 +48,6 @@ -
Warning: Staging Site

} jQuery(document).ready(function() { - /* Select from list: Chrome, Firefox, Safari, MSIE */ - shieldbrowser({"Chrome": 1, "Firefox": 3.6, "Safari": 4, "MSIE": 7 }); - var bits = window.location.pathname.split('/') if (bits.length > 2) { if (bits[2] == "") { diff --git a/blackrock/templates/respiration/base_respiration.html b/blackrock/templates/respiration/base_respiration.html index 9a0045c61..f7b00d339 100644 --- a/blackrock/templates/respiration/base_respiration.html +++ b/blackrock/templates/respiration/base_respiration.html @@ -10,7 +10,6 @@ {% block js %} - @@ -121,11 +120,3 @@

{% endblock %} {% endblock %} - -{% block script_footer %} - -{% endblock %} diff --git a/media/css/shield.css b/media/css/shield.css deleted file mode 100644 index 3490a5449..000000000 --- a/media/css/shield.css +++ /dev/null @@ -1,233 +0,0 @@ -.warningmessage -{ - padding: 10px; - border: 1px solid #ff9933; - background-color: #feefda; - border-radius: 10px; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - font: normal 12px/130% helvetica, arial, sans-serif; - color: #000; -} - -#shieldbox .browsers -{ - margin-bottom: 5px; - margin-bottom: 5px; -} - -#shieldbox .alert -{ - margin: 0 20px 0 0; - border: 0; - padding: 0; - display: block; - float: left; -} - -#shieldbox .alert .icon -{ - margin: 0; - border: 0; - padding: 0; - display: block; - width: 50px; - height: 65px; - float: left; - background: url('../images/icons_app.png') 0px -433px no-repeat; -} - -#shieldbox .alert .content -{ - width: 400px; - margin: 0 0 0 10px; - border: 0; - padding: 0; - display: block; - float: left; -} - -#shieldbox .alert .content .title -{ - margin: 0; - border: 0; - padding: 0; - display: block; - font-weight: bold; - font-size: 14px; -} - -#shieldbox .alert .content .comment -{ - margin: 5px 0 0 0; - border: 0; - padding: 0; - display: block; -} - -#shieldbox #minreqversion -{ - font-weight: bold; -} - -#shieldbox .solution -{ - width: 400px; - margin: 0; - border: 0; - padding: 0; - display: block; - float: left; -} - -#shieldbox .browser -{ - margin: 0 5px 0 0; - border: 0; - padding: 0; - display: none; - float: left; -} - -#shieldbox .isrequired -{ - display: block; -} - -#shieldbox .browser .icon -{ - margin: 0; - border: 0; - padding: 0; - display: block; - width: 60px; - height: 55px; -/* - float: left; -*/ -} - -#shieldbox .browser .content -{ - margin: 0; - border: 0; - padding: 0; - display: block; -/* - float: left; -*/ -} - -#shieldbox .browser .content .title -{ - width: 56px; - height: 22px; - margin: 0; - border: 0; - padding: 0; - display: block; - font-weight: normal; - font-size: 11px; - line-height: 11px; - padding: 2px; - border: 1px solid #f3ca90; - background-color: #fdf8f1; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - text-align: center; - vertical-align: middle; -} - -#shieldbox .browser .content .title:hover -{ - background-color: #e2edfd; - border: 1px solid #92beff; -} - -#shieldbox .browser .content .title a -{ - margin: 0; - border: 0; - display: block; - color: #000; - text-decoration: none; - text-align: center; - vertical-align: middle; -} - -#shieldbox .browser .content .title a:hover -{ - color: #000; - text-decoration: none; -} - -#shieldbox #chrome .icon -{ - background: url('../images/icons_app.png') 5px 0 no-repeat; -} - -#shieldbox #firefox .icon -{ - background: url('../images/icons_app.png') 5px -60px no-repeat; -} - -#shieldbox #safari .icon -{ - background: url('../images/icons_app.png') 5px -122px no-repeat; -} - -#shieldbox #msie .icon -{ - background: url('../images/icons_app.png') 5px -183px no-repeat; -} - -#shieldbox #flash .icon -{ - background: url('../images/icons_app.png') 5px -243px no-repeat; -} - -#shieldbox #quicktime .icon -{ - background: url('../images/icons_app.png') 5px -303px no-repeat; -} - -#shieldbox #acrobat .icon -{ - background: url('../images/icons_app.png') 5px -363px no-repeat; -} - -#shieldbox .nosupport_close -{ - float: right; - font-family: courier new; - font-weight: bold; -} - -#shieldbox .nosupport_close img -{ - border: 0; -} - -#shieldbox .nosupport_close a -{ - margin: 0; - padding: 0; - border: 0; - display: block; - height: 16px; - width: 16px; - background: url('../images/icons_app.png') -18px -506px no-repeat; -} - - -/* ---- Clearing block ---------- */ -.visualclear -{ - display: block; - clear: both; - margin: 0; - padding: 0; - border: 0; -} - diff --git a/media/js/shield.js b/media/js/shield.js deleted file mode 100644 index f28eaeb71..000000000 --- a/media/js/shield.js +++ /dev/null @@ -1,40 +0,0 @@ -var browserblock = '
browsermsg1
browsermsg2
'; - -var browserlist; - -function buildshieldbox() { - if (!document.getElementById("shieldbox")) return false; - var shieldwarningbox = document.getElementById("shieldbox"); - shieldwarningbox.className = "warningmessage"; - shieldwarningbox.innerHTML = browserblock; - var nobrowserwarningdiv = document.getElementById("nobrowserwarning"); - var nobrowsercommentdiv = document.getElementById("nobrowsercomment"); - nobrowserwarningdiv.innerHTML = 'You are using ' + BrowserDetect.browser + ' v.' + BrowserDetect.version + ', an unsupported browser.'; - nobrowsercommentdiv.innerHTML = '

For a better experience using this site, please upgrade to a recommended recent web browser.'; - if (BrowserDetect.browser == 'Internet Explorer') {var thisbrowsername = 'MSIE';}; - for(var key in browserlist) { - if (BrowserDetect.browser.toLowerCase()==key.toLowerCase() || (thisbrowsername && thisbrowsername.toLowerCase()==key.toLowerCase())) { - document.getElementById("minreqversion").innerHTML = 'The minimum required version for this browser is ' + browserlist[key] + '.'; - } - var currentclass = document.getElementById(key.toLowerCase()).className; - document.getElementById(key.toLowerCase()).className = currentclass + ' isrequired'; - } -} - -function shieldbrowser(reqbrowser) { - var browsername = false; - var versionmismatch = false; - if (BrowserDetect.browser == 'Internet Explorer') {var thisbrowsername = 'MSIE';}; - for(var key in reqbrowser) { - if (BrowserDetect.browser.toLowerCase()==key.toLowerCase() || (thisbrowsername && thisbrowsername.toLowerCase()==key.toLowerCase())) { - browsername = true; - if ((BrowserDetect.version)