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

Logos moved around to get rid of wasted space on top.

parent cda8b8e0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
templates/base.html
+ 30
− 48
View file @ a0a5715a
......@@ -22,44 +22,12 @@ function changeTime(obj, label) {
<body id="{% block pageid %}{% endblock %}"{% block bodyattrs %}{% endblock %}>
<div id="header">
<!-- Header -->
<table width="100%%">
<tr>
<td align="left" valign="bottom">
<h1>GraceDB</h1>
</td>
<td align="center">
<img width="52" height="37" src="/gracedb-static/images/ligo-blue.gif">
<!-- 673px 487px -->
</td>
<td align="center">
<img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
<!-- 4,829px 884px -->
</td>
<td align="center">
<img width="107" height="37" src="/gracedb-static/images/anim2.gif">
<!-- 287px 101px -->
</td>
<td align="center">
<img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
<!-- 6,261px 2,652px -->
</td>
</tr>
<tr>
<td colspan="5" align="left">
<h2>Gravitational-Wave Candidate Event Database</h2>
</tr>
</table>
<!-- End Header -->
</div>
<div id="content">
<center>
<h1> GraceDB &mdash; Gravitational-wave Candidate Event Database</h1>
</center>
{% block nav %}
<ul id="nav">
<li id="nav-home"><a href="{% url home %}">Home</a></li>
......@@ -86,19 +54,33 @@ function changeTime(obj, label) {
</div>
<div id="footer">
<table><tr><td><img
width="50" height="36"
src="/gracedb-static/images/ligo-blue.gif"
alt="LIGO" /></td>
<td width="50%">&nbsp;</td>
<td>
<!--<p>GraceDB is a product of the LIGO Scientific Collaboration</p>-->
<!-- <p>Copyright &#169; 2008 LIGO</p> -->
</td>
</tr></table>
</div>
<div id="header">
<!-- Header. Yea, this is actually a footer. It *was* as header once, though. -->
<table align="center" width="90%%">
<tr>
<td align="center">
<img width="52" height="36" src="/gracedb-static/images/ligo-blue.gif">
<!-- 673px 487px -->
</td>
<td align="center">
<img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
<!-- 4,829px 884px -->
</td>
<td align="center">
<img width="107" height="37" src="/gracedb-static/images/anim2.gif">
<!-- 287px 101px -->
</td>
<td align="center">
<img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
<!-- 6,261px 2,652px -->
</td>
</tr>
</table>
<!-- End Header -->
</div>
</body>
</html>
templates/base2.html deleted 100644 → 0
+ 0
− 86
View file @ cda8b8e0
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"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" />
<title>GraceDb | {% block title %}{% endblock %}</title>
<!-- START TESTING -->
<script type="text/javascript">
function changeTime(obj, label) {
var timetype= obj[obj.selectedIndex].value;
if (timetype=="") { return; }
var times = document.getElementsByName("time-"+label);
for (i=0; i<times.length; i++) {
newtime = times[i].getAttribute(timetype);
times[i].innerHTML = newtime;
}
}
</script>
<!-- END TESTING -->
{% block jscript %}{% endblock %}
</head>
<body id="{% block pageid %}{% endblock %}"{% block bodyattrs %}{% endblock %}>
<div id="content">
<center>
<h1> GraceDB &mdash; 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>
<li id="nav-userprofile"><a href="{% url userprofile-home %}">Options</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 -->
{% load flash %}
{% flash %}
<div id="status_block" class="{{ params.class }}">{{ msg }}</div>
{% endflash %}
<h2>{% block heading %}Title{% endblock %}</h2>
{% block content %}{% endblock %}
</div>
<div id="header">
<!-- Header -->
<table align="center" width="70%%">
<tr>
<td align="center">
<img width="52" height="36" src="/gracedb-static/images/ligo-blue.gif">
<!-- 673px 487px -->
</td>
<td align="center">
<img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
<!-- 4,829px 884px -->
</td>
<td align="center">
<img width="107" height="37" src="/gracedb-static/images/anim2.gif">
<!-- 287px 101px -->
</td>
<td align="center">
<img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
<!-- 6,261px 2,652px -->
</td>
</tr>
</table>
<!-- End Header -->
</div>
</body>
</html>
templates/feeds/index.html
+ 1
− 1
View file @ a0a5715a
{% extends "base2.html" %}
{% extends "base.html" %}
{% block title %}RSS Feeds{% endblock %}
{% block heading %}RSS Feeds{% endblock %}
......
templates/profile/notifications.html
+ 1
− 1
View file @ a0a5715a
{% extends "base2.html" %}
{% extends "base.html" %}
{% block title %}Options | Notifications{% endblock %}
{% block heading %}Notifications{% endblock %}
......
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