Skip to content
Snippets Groups Projects
Commit 18854f27 authored by Brian Moe's avatar Brian Moe
Browse files

Added nav bar and links to event_detail view on search results.

parent b7e591d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
static/css/style.css
+ 38
− 41
View file @ 18854f27
...@@ -12,6 +12,12 @@ tr th {text-align:left;background-color:#f0f0f0;color:#333;} ...@@ -12,6 +12,12 @@ tr th {text-align:left;background-color:#f0f0f0;color:#333;}
tr.odd td {background-color:#edf3fe;} tr.odd td {background-color:#edf3fe;}
tr.even td {background-color:#fff;} tr.even td {background-color:#fff;}
.text {
width: 500px;
margin-left: 50px;
margin-right: auto;
}
#header { #header {
height: 80px; height: 80px;
/* width: 777px; */ /* width: 777px; */
...@@ -29,6 +35,18 @@ a.link, a, a.active { ...@@ -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 { #content {
color: black; color: black;
font-size: 127%; font-size: 127%;
...@@ -38,7 +56,7 @@ a.link, a, a.active { ...@@ -38,7 +56,7 @@ a.link, a, a.active {
margin: 0 auto 0 auto; margin: 0 auto 0 auto;
border-left: 1px solid #aaa; border-left: 1px solid #aaa;
border-right: 1px solid #aaa; border-right: 1px solid #aaa;
padding: 10px; padding: 10px 10px 10px 10px;
} }
/* Nav */ /* Nav */
...@@ -52,6 +70,19 @@ a.link, a, a.active { ...@@ -52,6 +70,19 @@ a.link, a, a.active {
border-width:1px 1px; 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 { #nav li {
display:inline; display:inline;
padding:0; padding:0;
...@@ -84,17 +115,22 @@ a.link, a, a.active { ...@@ -84,17 +115,22 @@ a.link, a, a.active {
} }
#home #nav-home a, #home #nav-home a,
#create #nav-create a,
#search #nav-search a,
#feeds #nav-feeds a,
#about #nav-about a, #about #nav-about a,
#archive #nav-archive a, #archive #nav-archive a,
#lab #nav-lab a, #lab #nav-lab a,
#reviews #nav-reviews a, #reviews #nav-reviews a,
#contact #nav-contact a { #contact #nav-contact a {
/* background:#e35a00; */
background: #a9b0ba; /* Nav selected color */ background: #a9b0ba; /* Nav selected color */
/* color:#fff; / * Use if bg is dark */ /* color:#fff; / * Use if bg is dark */
text-shadow:none; text-shadow:none;
} }
#home #nav-home a:hover, #home #nav-home a:hover,
#create #nav-create a,
#search #nav-search a,
#feeds #nav-feeds a,
#about #nav-about a:hover, #about #nav-about a:hover,
#archive #nav-archive a:hover, #archive #nav-archive a:hover,
#lab #nav-lab a:hover, #lab #nav-lab a:hover,
...@@ -110,45 +146,6 @@ a.link, a, a.active { ...@@ -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 { #sidebar {
border: 1px solid #aaa; border: 1px solid #aaa;
background-color: #eee; background-color: #eee;
......
templates/base.html
+ 20
− 4
View file @ 18854f27
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<title>GraceDb | {% block title %}{% endblock %}</title> <title>GraceDb | {% block title %}{% endblock %}</title>
</head> </head>
<body> <body id="{% block pageid %}{% endblock %}">
<div id="content">
<div id="header">
<!-- Header -->
<table width="100%%"> <table width="100%%">
<tr> <tr>
<td align="center"> <td align="center">
...@@ -33,15 +33,31 @@ ...@@ -33,15 +33,31 @@
</td> </td>
</tr> </tr>
</table> </table>
<!-- End Header -->
</div>
<div id="content">
<center> <center>
<h1>GraceDB: Gravitational-Wave Candidate Event Database</h1> <h1>GraceDB: Gravitational-Wave Candidate Event Database</h1>
</center> </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>&nbsp;</p> <!-- bad way to create vertical space -->
<h2>{% block heading %}Title{% endblock %}</h2> <h2>{% block heading %}Title{% endblock %}</h2>
{% if ligouser %}Authenticated as: {{ ligouser.name }}{% endif %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
<div id="footer"> <div id="footer">
......
templates/feeds/index.html
+ 2
− 2
View file @ 18854f27
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}RSS Feeds{% endblock %} {% block title %}RSS Feeds{% endblock %}
{% block heading %}GraceDB{% endblock %} {% block heading %}RSS Feeds{% endblock %}
{% block pageid %}feeds{% endblock %}
{% block content %} {% block content %}
<h2>RSS Feeds</h2>
<p> <p>
<a href="/gracedb/feeds/latest/">All Latest Events</a> <a href="/gracedb/feeds/latest/">All Latest Events</a>
<ul> <ul>
......
templates/gracedb/create.html
+ 2
− 1
View file @ 18854f27
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
{% block title %}Create Event{% endblock %} {% block title %}Create Event{% endblock %}
{% block heading %}Create Event{% endblock %} {% block heading %}Create Event{% endblock %}
{% block pageid %}create{% endblock %}
{% block content %} {% block content %}
<h2>Create Event</h2>
<form enctype="multipart/form-data" action="" method="POST"> <form enctype="multipart/form-data" action="" method="POST">
<table> <table>
{{ form }} {{ form }}
......
templates/gracedb/event_list.html
+ 2
− 1
View file @ 18854f27
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% block title %}{{ title }}{% endblock %} {% block title %}{{ title }}{% endblock %}
{% block heading %}{{ title }}{% endblock %} {% block heading %}{{ title }}{% endblock %}
{% block pageid %}search{% endblock %}
{% block content %} {% block content %}
<p>{{ message }}</p> <p>{{ message }}</p>
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
<img src="/media/img/admin/icon-no.gif"/> <img src="/media/img/admin/icon-no.gif"/>
{% endif %} {% endif %}
</td> </td>
<td>{{ obj.graceid }}</td> <td><a href="{% url view obj.graceid %}">{{ obj.graceid }}</a></td>
<td>{{ obj.submitter }} </td> <td>{{ obj.submitter }} </td>
<td>{{ obj.group }} </td> <td>{{ obj.group }} </td>
<td>{{ obj.get_analysisType_display }} </td> <td>{{ obj.get_analysisType_display }} </td>
......
templates/gracedb/index.html
+ 4
− 10
View file @ 18854f27
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Home{% endblock %} {% block title %}Home{% endblock %}
{% block heading %}GraceDB{% endblock %} {% block heading %}GraceDB &mdash; Overview{% endblock %}
{% block pageid %}home{% endblock %}
{% block content %} {% block content %}
<p> <div class="text">
GraceDB. An event database.
<a href="{% url search %}">Search events.</a>
<a href="{% url create %}">Create event.</a>
</p>
<h2>Overview</h2>
<p>
The gravitational-wave candidate event database (GraCEDb) is a The gravitational-wave candidate event database (GraCEDb) is a
prototype system to organize candidate events from gravitational-wave prototype system to organize candidate events from gravitational-wave
searches and to provide an environment to record information about searches and to provide an environment to record information about
...@@ -22,6 +16,6 @@ to submit a candidate event to the database. ...@@ -22,6 +16,6 @@ to submit a candidate event to the database.
You can read about using the service at the 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/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>. <a href="https://www.lsc-group.phys.uwm.edu/daswg/projects/gracedb.html">Project page</a>.
</p> </div>
{% endblock %} {% endblock %}
templates/gracedb/query.html
+ 1
− 0
View file @ 18854f27
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% block title %}Query{% endblock %} {% block title %}Query{% endblock %}
{% block heading %}Query{% endblock %} {% block heading %}Query{% endblock %}
{% block pageid %}search{% endblock %}
{% block content %} {% block content %}
......
urls.py
+ 2
− 2
View file @ 18854f27
...@@ -12,7 +12,7 @@ feeds = { ...@@ -12,7 +12,7 @@ feeds = {
urlpatterns = patterns('', urlpatterns = patterns('',
(r'^$', 'gracedb.gracedb.views.index'), url (r'^$', 'gracedb.gracedb.views.index', name="home"),
(r'^events/', include('gracedb.gracedb.urls')), (r'^events/', include('gracedb.gracedb.urls')),
(r'^cli/create', 'gracedb.gracedb.views.create'), (r'^cli/create', 'gracedb.gracedb.views.create'),
(r'^cli/ping', 'gracedb.gracedb.views.ping'), (r'^cli/ping', 'gracedb.gracedb.views.ping'),
...@@ -21,7 +21,7 @@ urlpatterns = patterns('', ...@@ -21,7 +21,7 @@ urlpatterns = patterns('',
#(r'^cli/ping/(?P<arg>.*)', 'gracedb.gracedb.views.ping'), #(r'^cli/ping/(?P<arg>.*)', 'gracedb.gracedb.views.ping'),
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
{'feed_dict': feeds}), {'feed_dict': feeds}),
(r'^feeds/$', feedview), url (r'^feeds/$', feedview, name="feeds"),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs' # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation: # to INSTALLED_APPS to enable admin documentation:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment