diff --git a/static/css/style.css b/static/css/style.css
index 752cc94e2cee3ba23e576c1a4e2f03d0136e16a1..01345f0ec40299aecace4afae9c118cf7e8f116d 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -12,6 +12,12 @@ tr th {text-align:left;background-color:#f0f0f0;color:#333;}
tr.odd td {background-color:#edf3fe;}
tr.even td {background-color:#fff;}
+.text {
+ width: 500px;
+ margin-left: 50px;
+ margin-right: auto;
+}
+
#header {
height: 80px;
/* width: 777px; */
@@ -29,6 +35,18 @@ a.link, a, a.active {
}
+#header {
+ color: black;
+ font-size: 127%;
+ background-color: white;
+/* width: 757px; */
+ width: 95%;
+ margin: 0 auto 0 auto;
+ border-left: 1px solid #aaa;
+ border-right: 1px solid #aaa;
+ padding: 0px 10px 0px 10px;
+}
+
#content {
color: black;
font-size: 127%;
@@ -38,7 +56,7 @@ a.link, a, a.active {
margin: 0 auto 0 auto;
border-left: 1px solid #aaa;
border-right: 1px solid #aaa;
- padding: 10px;
+ padding: 10px 10px 10px 10px;
}
/* Nav */
@@ -52,6 +70,19 @@ a.link, a, a.active {
border-width:1px 1px;
}
+#nav #nav-user
+{
+ color:#000;
+ background:#eee; /* Nav base color */
+ padding:4px 20px 4px 20px;
+ float: right;
+ width: auto;
+ text-decoration:none;
+ font:bold 1em/1em Arial, Helvetica, sans-serif;
+ text-transform:uppercase;
+ text-shadow: 2px 2px 2px #555;
+}
+
#nav li {
display:inline;
padding:0;
@@ -84,17 +115,22 @@ a.link, a, a.active {
}
#home #nav-home a,
+#create #nav-create a,
+#search #nav-search a,
+#feeds #nav-feeds a,
#about #nav-about a,
#archive #nav-archive a,
#lab #nav-lab a,
#reviews #nav-reviews a,
#contact #nav-contact a {
- /* background:#e35a00; */
background: #a9b0ba; /* Nav selected color */
/* color:#fff; / * Use if bg is dark */
text-shadow:none;
}
#home #nav-home a:hover,
+#create #nav-create a,
+#search #nav-search a,
+#feeds #nav-feeds a,
#about #nav-about a:hover,
#archive #nav-archive a:hover,
#lab #nav-lab a:hover,
@@ -110,45 +146,6 @@ a.link, a, a.active {
}
-
-/*
-#nav {
- clear:both;
- padding-top:3px;
- font:1em/2 "Helvetica Neue",Arial,Helvetica,sans-serif;
-}
-#nav ul {
- float:left;
- width:100%;
- margin:0;
- padding:0;
- list-style:none;
- background:#970601 url(/i/nav-tab.png) repeat-x;
-}
-#nav li {
- display:inline;
- margin:0;
- padding:0;
-}
-#nav a {
- display:block;
- float:left;
- padding:0 12px;
- border-right:1px solid #bb1600;
- border-bottom:none;
- border-left:1px solid #b21203;
- color:#fff;
- background:#970601 url(/i/nav-tab.png) repeat-x;
- text-decoration:none;
-}
-#nav a:hover,
-#nav a:focus {background:#b31203 url(/i/nav-tab.png) repeat-x 0 -150px;}
-#nav .sel a {background:#720000 url(/i/nav-tab.png) repeat-x 0 -300px;}
-#nav .sel a:hover,
-#nav .sel a:focus {background:#b31203 url(/i/nav-tab.png) repeat-x 0 -150px;}
-*/
-
-
#sidebar {
border: 1px solid #aaa;
background-color: #eee;
diff --git a/templates/base.html b/templates/base.html
index 7d61ef3175bd5a0427998bf1a650263d547e62fd..b03f15175f0cdb8c7b8bf3d4979eed26af3809f4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -6,10 +6,10 @@
<title>GraceDb | {% block title %}{% endblock %}</title>
</head>
-<body>
-
- <div id="content">
+<body id="{% block pageid %}{% endblock %}">
+<div id="header">
+<!-- Header -->
<table width="100%%">
<tr>
<td align="center">
@@ -33,15 +33,31 @@
</td>
</tr>
</table>
+<!-- End Header -->
+</div>
+<div id="content">
<center>
<h1>GraceDB: Gravitational-Wave Candidate Event Database</h1>
</center>
+{% block nav %}
+<ul id="nav">
+ <li id="nav-home"><a href="{% url home %}">Home</a></li>
+ <li id="nav-search"><a href="{% url search %}">Search</a></li>
+ <li id="nav-create"><a href="{% url create %}">Create</a></li>
+ <li id="nav-feeds"><a href="{% url feeds %}">RSS</a></li>
+ {% if ligouser %}<li id="nav-user">Authenticated as: {{ ligouser.name }}</li>{% endif %}
+</ul>
+{% endblock %}
+
+ <p> </p> <!-- bad way to create vertical space -->
<h2>{% block heading %}Title{% endblock %}</h2>
- {% if ligouser %}Authenticated as: {{ ligouser.name }}{% endif %}
+
+
{% block content %}{% endblock %}
+
</div>
<div id="footer">
diff --git a/templates/feeds/index.html b/templates/feeds/index.html
index 154b03cecee6fddff09034b135f48c457e8a1127..0fcc907ee8e181d3edcdc367b85cf9015732d3a6 100644
--- a/templates/feeds/index.html
+++ b/templates/feeds/index.html
@@ -1,11 +1,11 @@
{% extends "base.html" %}
{% block title %}RSS Feeds{% endblock %}
-{% block heading %}GraceDB{% endblock %}
+{% block heading %}RSS Feeds{% endblock %}
+{% block pageid %}feeds{% endblock %}
{% block content %}
-<h2>RSS Feeds</h2>
<p>
<a href="/gracedb/feeds/latest/">All Latest Events</a>
<ul>
diff --git a/templates/gracedb/create.html b/templates/gracedb/create.html
index 2df5388758578bc84b21bc96af5e23d74dd6819d..604421bf31b18342c5a8b37ab4b2ecd6532b5120 100644
--- a/templates/gracedb/create.html
+++ b/templates/gracedb/create.html
@@ -2,10 +2,11 @@
{% block title %}Create Event{% endblock %}
{% block heading %}Create Event{% endblock %}
+{% block pageid %}create{% endblock %}
+
{% block content %}
-<h2>Create Event</h2>
<form enctype="multipart/form-data" action="" method="POST">
<table>
{{ form }}
diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html
index 2a620559761a4b8267bd5a1e550555d2cf2c9579..e4a10fad4d3d168073c534a3da8093d7bd349aba 100644
--- a/templates/gracedb/event_list.html
+++ b/templates/gracedb/event_list.html
@@ -2,6 +2,7 @@
{% block title %}{{ title }}{% endblock %}
{% block heading %}{{ title }}{% endblock %}
+{% block pageid %}search{% endblock %}
{% block content %}
<p>{{ message }}</p>
@@ -41,7 +42,7 @@
<img src="/media/img/admin/icon-no.gif"/>
{% endif %}
</td>
- <td>{{ obj.graceid }}</td>
+ <td><a href="{% url view obj.graceid %}">{{ obj.graceid }}</a></td>
<td>{{ obj.submitter }} </td>
<td>{{ obj.group }} </td>
<td>{{ obj.get_analysisType_display }} </td>
diff --git a/templates/gracedb/index.html b/templates/gracedb/index.html
index 745f983b90053f55d3cdea72f6bfc73d8f8bf0c3..5c18846a22f7a271a27e419711347421a6a40514 100644
--- a/templates/gracedb/index.html
+++ b/templates/gracedb/index.html
@@ -1,18 +1,12 @@
{% extends "base.html" %}
{% block title %}Home{% endblock %}
-{% block heading %}GraceDB{% endblock %}
+{% block heading %}GraceDB — Overview{% endblock %}
+{% block pageid %}home{% endblock %}
{% block content %}
-<p>
-GraceDB. An event database.
-<a href="{% url search %}">Search events.</a>
-<a href="{% url create %}">Create event.</a>
-</p>
-
-<h2>Overview</h2>
-<p>
+<div class="text">
The gravitational-wave candidate event database (GraCEDb) is a
prototype system to organize candidate events from gravitational-wave
searches and to provide an environment to record information about
@@ -22,6 +16,6 @@ to submit a candidate event to the database.
You can read about using the service at the
<a href="https://www.lsc-group.phys.uwm.edu/daswg/wiki/HowtoGraceDb">Howto page</a>. More details are available at the
<a href="https://www.lsc-group.phys.uwm.edu/daswg/projects/gracedb.html">Project page</a>.
-</p>
+</div>
{% endblock %}
diff --git a/templates/gracedb/query.html b/templates/gracedb/query.html
index 380f13b15dfca5fdaaa2e39a8ce4efe8d1809d1e..6f859dab588048efc2c3e6457f4e7806d8ef7f31 100644
--- a/templates/gracedb/query.html
+++ b/templates/gracedb/query.html
@@ -2,6 +2,7 @@
{% block title %}Query{% endblock %}
{% block heading %}Query{% endblock %}
+{% block pageid %}search{% endblock %}
{% block content %}
diff --git a/urls.py b/urls.py
index 1979ce8280a8d2afc12bc901ba40848e432fdc41..e1b5f8f8c0227656451916164f6475cd391b7ebc 100644
--- a/urls.py
+++ b/urls.py
@@ -12,7 +12,7 @@ feeds = {
urlpatterns = patterns('',
- (r'^$', 'gracedb.gracedb.views.index'),
+ url (r'^$', 'gracedb.gracedb.views.index', name="home"),
(r'^events/', include('gracedb.gracedb.urls')),
(r'^cli/create', 'gracedb.gracedb.views.create'),
(r'^cli/ping', 'gracedb.gracedb.views.ping'),
@@ -21,7 +21,7 @@ urlpatterns = patterns('',
#(r'^cli/ping/(?P<arg>.*)', 'gracedb.gracedb.views.ping'),
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
{'feed_dict': feeds}),
- (r'^feeds/$', feedview),
+ url (r'^feeds/$', feedview, name="feeds"),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation: