diff --git a/settings/branson.py b/settings/branson.py index 51bc88d33491401a0270faad02a8b142e509ef38..1f9a81d18b8eb80753aa8196d47ae523f9f61408 100644 --- a/settings/branson.py +++ b/settings/branson.py @@ -16,6 +16,8 @@ DATABASES = { } } +MEDIA_URL = "/branson-static/" + GRACEDB_DATA_DIR = "/home/branson/fake_data" ALERT_EMAIL_FROM = "Dev Alert <root@moe.phys.uwm.edu>" diff --git a/static/css/style.css b/static/css/style.css index 8da6bfa9503c640fb8987077c021348838fe6c9e..6975d8248f58dbc0ed6481498ed172b7db3c2702 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -37,12 +37,12 @@ table.figures {width:300px;height:270px;border:1px solid gray;} } .tundra.eventDetail .pmTitlePaneClass .dijitClosed .dijitArrowNode { - background-image: url('/gracedb-static/images/plusButton.gif'); + background-image: url('../images/plusButton.gif'); background-position: 0px 0px; } .tundra.eventDetail .pmTitlePaneClass .dijitOpen .dijitArrowNode { - background-image: url('/gracedb-static/images/minusButton.gif'); + background-image: url('../images/minusButton.gif'); background-position: 0px 0px; } @@ -315,6 +315,6 @@ span.code { thead th a:link, thead th a:visited { color:#666; display:block; } table thead th.sorted { background-position:bottom left !important; } table thead th.sorted a { padding-right:13px; } -table thead th.ascending a { background:url(/gracedb-static/images/arrow-down.gif) right .4em no-repeat; } -table thead th.descending a { background:url(/gracedb-static/images/arrow-up.gif) right .4em no-repeat; } +table thead th.ascending a { background:url('../images/arrow-down.gif') right .4em no-repeat; } +table thead th.descending a { background:url('../images/arrow-up.gif') right .4em no-repeat; } diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index d531014fe246942a467fbd7f7a98eff14f19897c..d2d77abe3594c9e6f570f13ec2f93f77804eea3b 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -2,7 +2,7 @@ {% load i18n %} {% block extrastyle %} - <link rel="stylesheet" href="/gracedb-static/css/admin-nav.css" /> + <link rel="stylesheet" href="{{MEDIA_URL}}css/admin-nav.css" /> {% endblock %} diff --git a/templates/base.html b/templates/base.html index f9eec575d1aba079a5c7d27d8730603ecf10cb99..dc32d8af6cd4cef0992cafe4522edb78067df46b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="stylesheet" href="/gracedb-static/css/style.css" /> + <link rel="stylesheet" href="{{MEDIA_URL}}css/style.css" /> <title>GraceDb | {% block title %}{% endblock %}</title> <!-- START TESTING --> <script type="text/javascript"> @@ -68,28 +68,28 @@ function changeTime(obj, label) { <table align="center" width="90%%"> <tr> <td align="center"> - <img width="52" height="36" src="/gracedb-static/images/ligo-blue.gif"> + <img width="52" height="36" src="{{MEDIA_URL}}images/ligo-blue.gif"> <!-- 673px 487px --> </td> <td align="center"> - <img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png"> + <img width="164" height="30" src="{{MEDIA_URL}}images/Virgo_logo50.png"> <!-- 4,829px 884px --> </td> <td align="center"> {% if ligouser and ligouser.name == "Chad Hanna" %} - <img width="194" height="37" src="/gracedb-static/images/PI_Logo-anim.gif"> + <img width="194" height="37" src="{{MEDIA_URL}}images/PI_Logo-anim.gif"> {% else %}{% if ligouser and ligouser.name == "Kipp Cannon" %} - <img width="194" height="37" src="/gracedb-static/images/CITA_logo-anim.gif"> + <img width="194" height="37" src="{{MEDIA_URL}}images/CITA_logo-anim.gif"> {% else %} - <img width="107" height="37" src="/gracedb-static/images/anim2.gif"> + <img width="107" height="37" src="{{MEDIA_URL}}images/anim2.gif"> {% endif %}{% endif %} <!-- 287px 101px --> </td> <td align="center"> - <img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png"> + <img width="87" height="37" src="{{MEDIA_URL}}images/LSC_logo50.png"> <!-- 6,261px 2,652px --> </td> </tr> diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html index 6fd33e950051dc7453d0f3f598304a6c36822b70..5d654f273b56742d5ec14e6ec1012e8ddbfc49ee 100644 --- a/templates/gracedb/event_list.html +++ b/templates/gracedb/event_list.html @@ -8,23 +8,23 @@ {% block jscript %} <link rel="stylesheet" type="text/css" media="screen" - href="/gracedb-static/css/jqgrid/theme/jquery-ui.css"/> + href="{{MEDIA_URL}}css/jqgrid/theme/jquery-ui.css"/> <link rel="stylesheet" type="text/css" media="screen" - href="/gracedb-static/css/jqgrid/theme/ui.all.css"/> + href="{{MEDIA_URL}}css/jqgrid/theme/ui.all.css"/> <!-- <link rel="stylesheet" type="text/css" media="screen" - href="/gracedb-static/css/jqgrid/ui-lightness/jquery-ui-1.7.2.custom.css"/> + href="{{MEDIA_URL}}css/jqgrid/ui-lightness/jquery-ui-1.7.2.custom.css"/> --> <link rel="stylesheet" type="text/css" media="screen" - href="/gracedb-static/css/jqgrid/ui.jqgrid.css"/> + href="{{MEDIA_URL}}css/jqgrid/ui.jqgrid.css"/> -<script src="/gracedb-static/js/jquery-1.3.2.min.js" type="text/javascript"></script> -<script src="/gracedb-static/js/grid.locale-en.js" type="text/javascript"></script> -<script src="/gracedb-static/js/jquery.jqGrid.min.js" type="text/javascript"></script> -<script src="/gracedb-static/js/jquery-ui-1.7.2.custom.min.js" type="text/javascript"></script> +<script src="{{MEDIA_URL}}js/jquery-1.3.2.min.js" type="text/javascript"></script> +<script src="{{MEDIA_URL}}js/grid.locale-en.js" type="text/javascript"></script> +<script src="{{MEDIA_URL}}js/jquery.jqGrid.min.js" type="text/javascript"></script> +<script src="{{MEDIA_URL}}js/jquery-ui-1.7.2.custom.min.js" type="text/javascript"></script> <script src="{{MEDIA_URL}}js/labeltips.js" type="text/javascript"></script>