diff --git a/settings.py b/settings.py index 58726dd821dc128408187b92db94325621d34de8..4c4c93bfef8dcd549e05657600a10911bcc05796 100644 --- a/settings.py +++ b/settings.py @@ -1,4 +1,5 @@ # Django settings for gracedb project. +import os DEBUG = False TEMPLATE_DEBUG = DEBUG @@ -34,6 +35,7 @@ XMPP_ALERT_CHANNELS = [ 'test_cwb', 'cbc_lowmass', 'test_lowmass', + 'test_grb', ] DATABASE_ENGINE = 'mysql' @@ -50,7 +52,7 @@ LATENCY_MAXIMUM_CHARTED = 1800 LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc" # RSS Feed Defaults -FEED_MAX_RESULTS = 75 +FEED_MAX_RESULTS = 50 # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/settings_dev.py b/settings_dev.py index 2860a7c724c802552b51fdec314e1ef54d1ac646..c4e2a02acfde1b1a819684de78b8f84721e4a197 100644 --- a/settings_dev.py +++ b/settings_dev.py @@ -41,7 +41,7 @@ LATENCY_MAXIMUM_CHARTED = 1800 LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc" # RSS Feed Defaults -FEED_MAX_RESULTS = 75 +FEED_MAX_RESULTS = 50 # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/templates/feeds/index.html b/templates/feeds/index.html index c7a550911ba6716d3046f4b7859bb45a8d53e5fe..7050bf6e90ed5f2855dfe1b932c3b2cd58952727 100644 --- a/templates/feeds/index.html +++ b/templates/feeds/index.html @@ -7,30 +7,30 @@ {% block content %} <p> -<a href="/gracedb/feeds/latest/">All Latest Events</a> +<a href="latest/">All Latest Events</a> <ul> - <li><a href="/gracedb/feeds/latest/burst/">Burst</a></li> + <li><a href="latest/burst/">Burst</a></li> <ul> - <li><a href="/gracedb/feeds/latest/burst/omega">Omega</a></li> - <li><a href="/gracedb/feeds/latest/stochastic/cwb">CWB</a></li> - <li><a href="/gracedb/feeds/latest/burst/q">Q</a></li> - <li><a href="/gracedb/feeds/latest/burst/x">X</a></li> + <li><a href="latest/burst/omega">Omega</a></li> + <li><a href="latest/stochastic/cwb">CWB</a></li> + <li><a href="latest/burst/q">Q</a></li> + <li><a href="latest/burst/x">X</a></li> </ul> </ul> <ul> - <li><a href="/gracedb/feeds/latest/cbc/">CBC</a></li> + <li><a href="latest/cbc/">CBC</a></li> <ul> - <li><a href="/gracedb/feeds/latest/cbc/lowmass">Low Mass</a></li> - <li><a href="/gracedb/feeds/latest/cbc/highmass">High Mass</a></li> - <li><a href="/gracedb/feeds/latest/cbc/grb">GRB</a></li> - <li><a href="/gracedb/feeds/latest/cbc/ringdown">Ringdown</a></li> - <li><a href="/gracedb/feeds/latest/cbc/mbtaonline">MBTA Online</a></li> + <li><a href="latest/cbc/lowmass">Low Mass</a></li> + <li><a href="latest/cbc/highmass">High Mass</a></li> + <li><a href="latest/cbc/grb">GRB</a></li> + <li><a href="latest/cbc/ringdown">Ringdown</a></li> + <li><a href="latest/cbc/mbtaonline">MBTA Online</a></li> </ul> </ul> <ul> - <li><a href="/gracedb/feeds/latest/stochastic/">Stochastic</a></li> + <li><a href="latest/stochastic/">Stochastic</a></li> </ul> </p>