[snapshot/master] move pieces of root.mako into separate files to be %included
Reason: separate design (table) from the domain-specific content to
prevent merge conflicts for derived (e.g. neurodebian) snapshot
portals which have their own design/description/sidebar/news
---
web/app/snapshot/templates/description.mako | 68 ++++++++++++
web/app/snapshot/templates/news.mako | 35 ++++++
web/app/snapshot/templates/root.mako | 155 +--------------------------
web/app/snapshot/templates/sidebar.mako | 44 ++++++++
4 files changed, 150 insertions(+), 152 deletions(-)
create mode 100644 web/app/snapshot/templates/description.mako
create mode 100644 web/app/snapshot/templates/news.mako
create mode 100644 web/app/snapshot/templates/sidebar.mako
diff --git a/web/app/snapshot/templates/description.mako b/web/app/snapshot/templates/description.mako
new file mode 100644
index 0000000..7affc5c
--- /dev/null
+++ b/web/app/snapshot/templates/description.mako
@@ -0,0 +1,68 @@
+<h1>snapshot.debian.org</h1>
+<p>
+The snapshot archive is a wayback machine that allows access to old
+packages based on dates and version numbers. It consists of all
+past and current packages the Debian archive provides.
+</p>
+
+<p>
+The ability to install packages and view source code from any given date can be
+very helpful to developers and users. It provides a valuable resource for
+tracking down when regressions were introduced, or for providing a specific
+environment that a particular application may require to run. The snapshot
+archive is accessible like any normal apt repository, allowing it to be easily
+used by all.
+</p>
+
+<p>
+The Debian Project wants to thank <a href="http://www.sanger.ac.uk/";>Wellcome
+Trust Sanger Institute</a> and the <a href="http://www.ece.ubc.ca/";>UBC
+Electrical and Computer Engineering</a> for providing hardware and hosting and
+<a href="http://www.nordicbet.com/";>Nordic Gaming</a> for sponsoring additional
+hardware.
+</p>
+
+<h2>Usage</h2>
+<p>
+In order to browse snapshots of the archives kept on snapshot.debian.org, simply
+follow the links on the top left. They will lead you to a list of months for
+which data was imported, and the list entries in turn will point you to all
+timestamps of a given month's snapshots.
+</p>
+
+<p>For example,
+<a href="/archive/debian/"><code>/archive/debian/</code></a>
+shows that we have imports for the main Debian archive,
+<a href="http://ftp.debian.org/debian/";><code>http://ftp.debian.org/debian/</code></a>,
+from 2005 until the present.
+Picking October of 2009,
+<a href="/archive/debian/?year=2009;month=10"><code>/archive/debian/?year=2009;month=10</code></a>,
+provides us with a list of many different states of the debian archive, roughly spaced 6 hours apart
+(the update frequency of ftp.debian.org at that time).
+Following any of these links, say
+<a href="/archive/debian/20091004T111800Z/"><code>/archive/debian/20091004T111800Z/</code></a>,
+shows how <code>ftp.debian.org/debian</code> looked on the 4th of October 2009 at around 11:18 UTC.
+</p>
+
+<p style="margin-top:2em;">
+If you want to add a specific date's archive to your apt <code>sources.list</code> simply
+add an entry like these:
+</p>
+<pre>
+deb <a href="/archive/debian/20091004T111800Z/">http://snapshot.debian.org/archive/debian/20091004T111800Z/</a> lenny main
+deb-src <a href="/archive/debian/20091004T111800Z/">http://snapshot.debian.org/archive/debian/20091004T111800Z/</a> lenny main
+deb <a href="/archive/debian-security/20091004T121501Z/">http://snapshot.debian.org/archive/debian-security/20091004T121501Z/</a> lenny/updates main
+deb-src <a href="/archive/debian-security/20091004T121501Z/">http://snapshot.debian.org/archive/debian-security/20091004T121501Z/</a> lenny/updates main
+</pre>
+<p>
+To learn which snapshots exist, i.e. which date strings are valid, simply
+browse the list as mentioned above. Valid date formats are
+<code><i>yyyymmdd</i>T<i>hhmmss</i>Z</code> or simply <code><i>yyyymmdd</i></code>. If there
+is no import at the exact time you specified you will get the latest
+available timestamp which is before the time you specified.
+</p>
+
+<p style="margin-top:2em;">
+If you want anything related to a specific package simply enter the
+<em>source package name</em> in the form, or find it in the package index.
+</p>
diff --git a/web/app/snapshot/templates/news.mako b/web/app/snapshot/templates/news.mako
new file mode 100644
index 0000000..fbe38d5
--- /dev/null
+++ b/web/app/snapshot/templates/news.mako
@@ -0,0 +1,35 @@
+<h1>News</h1>
+<h2>2010-09-07</h2>
+<p>
+Renamed the backports.org archive to debian-backports as it has now
+<a href="http://lists.debian.org/20100905211658.GH7615@lisa.snow-crash.org";>moved
+to debian.org infrastructure</a>. A rewrite rule has been put in place
+so old URLs should continue to work (at least for HTTP clients that know
+how to follow HTTP redirects).
+</p>
+
+<h2>2010-08-16</h2>
+<p>
+Set up a caching proxy in front of the two snapshot webservers. This will help
+in cases where an entire organisation uses various apt sources.list entries on
+a lot of their machines.
+</p>
+<p>
+Usually such entities would use proxy caches like squid and then there is no
+problem, assuming the cache works correctly. Unfortunately apt-cacher, apparently
+a common choice which is supposed to be smarter for debian archives, completely ignores the
+Cache-Control headers that snapshot sends and hits this service for all
+requests made to anything under <code>dist/</code>. A single <code>apt-get
+update</code> can cause up to a few dozen of such requests and when multiplied
+by scores of machines - all running the update at the same time - this caused
+the snapshot backend to run into limits. Now such requests won't hit the backend
+any more.
+</p>
+
+<h2>2010-04-12</h2>
+<p>
+Publicly <a href="http://www.debian.org/News/2010/20100412";>announce the snapshot.debian.org service</a>. Yay.
+</p>
+
+<hr style="height:1px;" />
+<p>For older entries see <a href="oldnews">the older news page</a>.</p>
diff --git a/web/app/snapshot/templates/root.mako b/web/app/snapshot/templates/root.mako
index 9f03982..c6bd68c 100644
--- a/web/app/snapshot/templates/root.mako
+++ b/web/app/snapshot/templates/root.mako
@@ -1,163 +1,14 @@
<%inherit file="/page.mako" />
-
<table class="rootmaintable">
<tr>
<td>
-<h1>Archives</h1>
-
-<p>Browse ftp archive snapshots from one of the following archives:</p>
-
-<ul>
- % for name in c.names:
- <li><a href="archive/${name['quoted']}/">${name['raw']}</a></li>
- %endfor
-</ul>
-
-<h1>Packages</h1>
-
-<h2>source packages:</h2>
-
-Search in the index of source packages:<br />
-<ul class="inlineList">
-%for letter in c.srcstarts:
- <li><a href="package/?cat=${letter['quoted']}">${letter['raw']}</a></li>
-%endfor
-</ul>
-
-<form action="package/">
-<p>Or enter a <strong>source</strong> package name directly: <input name="src" /> <input type="submit" value="Submit" /></p>
-</form>
-
-<h2>binary packages:</h2>
-
-<ul class="inlineList">
-%for letter in c.binstarts:
- <li><a href="binary/?cat=${letter['quoted']}">${letter['raw']}</a></li>
-%endfor
-</ul>
-
-<form action="binary/">
-<p>Search for a <strong>binary</strong> package name: <input name="bin" /> <input type="submit" value="Submit" /></p>
-</form>
-
-<h1>Miscellaneous</h1>
-<ul>
- <li><a href="oldnews">older news</a></li>
- <li><a href="http://lists.debian.org/debian-snapshot/";>mailinglist</a></li>
- <li><a href="http://git.debian.org/?p=mirror/snapshot.debian.org.git;a=blob_plain;f=API";>machine-usable interface</a></li>
- <li><a href="http://${g.masterdomain}/removal";>removal logs</a></li>
-</ul>
-
+<%include file="/sidebar.mako" />
</td>
-
<td>
<div class="rootmaintext">
-<h1>snapshot.debian.org</h1>
-<p>
-The snapshot archive is a wayback machine that allows access to old
-packages based on dates and version numbers. It consists of all
-past and current packages the Debian archive provides.
-</p>
-
-<p>
-The ability to install packages and view source code from any given date can be
-very helpful to developers and users. It provides a valuable resource for
-tracking down when regressions were introduced, or for providing a specific
-environment that a particular application may require to run. The snapshot
-archive is accessible like any normal apt repository, allowing it to be easily
-used by all.
-</p>
-
-<p>
-The Debian Project wants to thank <a href="http://www.sanger.ac.uk/";>Wellcome
-Trust Sanger Institute</a> and the <a href="http://www.ece.ubc.ca/";>UBC
-Electrical and Computer Engineering</a> for providing hardware and hosting and
-<a href="http://www.nordicbet.com/";>Nordic Gaming</a> for sponsoring additional
-hardware.
-</p>
-
-<h2>Usage</h2>
-<p>
-In order to browse snapshots of the archives kept on snapshot.debian.org, simply
-follow the links on the top left. They will lead you to a list of months for
-which data was imported, and the list entries in turn will point you to all
-timestamps of a given month's snapshots.
-</p>
-
-<p>For example,
-<a href="/archive/debian/"><code>/archive/debian/</code></a>
-shows that we have imports for the main Debian archive,
-<a href="http://ftp.debian.org/debian/";><code>http://ftp.debian.org/debian/</code></a>,
-from 2005 until the present.
-Picking October of 2009,
-<a href="/archive/debian/?year=2009;month=10"><code>/archive/debian/?year=2009;month=10</code></a>,
-provides us with a list of many different states of the debian archive, roughly spaced 6 hours apart
-(the update frequency of ftp.debian.org at that time).
-Following any of these links, say
-<a href="/archive/debian/20091004T111800Z/"><code>/archive/debian/20091004T111800Z/</code></a>,
-shows how <code>ftp.debian.org/debian</code> looked on the 4th of October 2009 at around 11:18 UTC.
-</p>
-
-<p style="margin-top:2em;">
-If you want to add a specific date's archive to your apt <code>sources.list</code> simply
-add an entry like these:
-</p>
-<pre>
-deb <a href="/archive/debian/20091004T111800Z/">http://snapshot.debian.org/archive/debian/20091004T111800Z/</a> lenny main
-deb-src <a href="/archive/debian/20091004T111800Z/">http://snapshot.debian.org/archive/debian/20091004T111800Z/</a> lenny main
-deb <a href="/archive/debian-security/20091004T121501Z/">http://snapshot.debian.org/archive/debian-security/20091004T121501Z/</a> lenny/updates main
-deb-src <a href="/archive/debian-security/20091004T121501Z/">http://snapshot.debian.org/archive/debian-security/20091004T121501Z/</a> lenny/updates main
-</pre>
-<p>
-To learn which snapshots exist, i.e. which date strings are valid, simply
-browse the list as mentioned above. Valid date formats are
-<code><i>yyyymmdd</i>T<i>hhmmss</i>Z</code> or simply <code><i>yyyymmdd</i></code>. If there
-is no import at the exact time you specified you will get the latest
-available timestamp which is before the time you specified.
-</p>
-
-<p style="margin-top:2em;">
-If you want anything related to a specific package simply enter the
-<em>source package name</em> in the form, or find it in the package index.
-</p>
-
-<h1>News</h1>
-<h2>2010-09-07</h2>
-<p>
-Renamed the backports.org archive to debian-backports as it has now
-<a href="http://lists.debian.org/20100905211658.GH7615@lisa.snow-crash.org";>moved
-to debian.org infrastructure</a>. A rewrite rule has been put in place
-so old URLs should continue to work (at least for HTTP clients that know
-how to follow HTTP redirects).
-</p>
-
-<h2>2010-08-16</h2>
-<p>
-Set up a caching proxy in front of the two snapshot webservers. This will help
-in cases where an entire organisation uses various apt sources.list entries on
-a lot of their machines.
-</p>
-<p>
-Usually such entities would use proxy caches like squid and then there is no
-problem, assuming the cache works correctly. Unfortunately apt-cacher, apparently
-a common choice which is supposed to be smarter for debian archives, completely ignores the
-Cache-Control headers that snapshot sends and hits this service for all
-requests made to anything under <code>dist/</code>. A single <code>apt-get
-update</code> can cause up to a few dozen of such requests and when multiplied
-by scores of machines - all running the update at the same time - this caused
-the snapshot backend to run into limits. Now such requests won't hit the backend
-any more.
-</p>
-
-<h2>2010-04-12</h2>
-<p>
-Publicly <a href="http://www.debian.org/News/2010/20100412";>announce the snapshot.debian.org service</a>. Yay.
-</p>
-
-<hr style="height:1px;" />
-<p>For older entries see <a href="oldnews">the older news page</a>.</p>
-
+ <%include file="/description.mako" />
+ <%include file="/news.mako" />
</div>
</td>
</tr>
diff --git a/web/app/snapshot/templates/sidebar.mako b/web/app/snapshot/templates/sidebar.mako
new file mode 100644
index 0000000..3c34d42
--- /dev/null
+++ b/web/app/snapshot/templates/sidebar.mako
@@ -0,0 +1,44 @@
+<h1>Archives</h1>
+
+<p>Browse ftp archive snapshots from one of the following archives:</p>
+
+<ul>
+ % for name in c.names:
+ <li><a href="archive/${name['quoted']}/">${name['raw']}</a></li>
+ %endfor
+</ul>
+
+<h1>Packages</h1>
+
+<h2>source packages:</h2>
+
+Search in the index of source packages:<br />
+<ul class="inlineList">
+%for letter in c.srcstarts:
+ <li><a href="package/?cat=${letter['quoted']}">${letter['raw']}</a></li>
+%endfor
+</ul>
+
+<form action="package/">
+<p>Or enter a <strong>source</strong> package name directly: <input name="src" /> <input type="submit" value="Submit" /></p>
+</form>
+
+<h2>binary packages:</h2>
+
+<ul class="inlineList">
+%for letter in c.binstarts:
+ <li><a href="binary/?cat=${letter['quoted']}">${letter['raw']}</a></li>
+%endfor
+</ul>
+
+<form action="binary/">
+<p>Search for a <strong>binary</strong> package name: <input name="bin" /> <input type="submit" value="Submit" /></p>
+</form>
+
+<h1>Miscellaneous</h1>
+<ul>
+ <li><a href="oldnews">older news</a></li>
+ <li><a href="http://lists.debian.org/debian-snapshot/";>mailinglist</a></li>
+ <li><a href="http://git.debian.org/?p=mirror/snapshot.debian.org.git;a=blob_plain;f=API";>machine-usable interface</a></li>
+ <li><a href="http://${g.masterdomain}/removal";>removal logs</a></li>
+</ul>
--
1.5.6.5
Reply to: