From aeaa345060b0e255133172ae0d7ee42b30fada6f Mon Sep 17 00:00:00 2001 From: Brian Moe <bmoe@gravity.phys.uwm.edu> Date: Thu, 20 Oct 2011 13:24:26 -0500 Subject: [PATCH] Added GRB to lvalert list and rss feeds. --- settings.py | 4 +++- settings_dev.py | 2 +- templates/feeds/index.html | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/settings.py b/settings.py index 58726dd82..4c4c93bfe 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 2860a7c72..c4e2a02ac 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 c7a550911..7050bf6e9 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> -- GitLab