|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r76758 - in website/public_html/beta: feed/history generated generated/state site-tools/boost_site site-tools/templates users/download users/history
From: dnljms_at_[hidden]
Date: 2012-01-28 13:58:23
Author: danieljames
Date: 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
New Revision: 76758
URL: http://svn.boost.org/trac/boost/changeset/76758
Log:
Website: Improved version display.
Text files modified:
website/public_html/beta/feed/history/boost_1_49_0.qbk | 2 +-
website/public_html/beta/generated/home-items.html | 2 +-
website/public_html/beta/generated/state/feed-pages.txt | 6 +++---
website/public_html/beta/site-tools/boost_site/pages.py | 11 ++++++++---
website/public_html/beta/site-tools/templates/download-template.html | 2 +-
website/public_html/beta/site-tools/templates/entry-template.html | 15 ++++-----------
website/public_html/beta/site-tools/templates/index-src.html | 6 ++----
website/public_html/beta/users/download/index.html | 2 +-
website/public_html/beta/users/history/version_1_49_0.html | 6 +++---
9 files changed, 24 insertions(+), 28 deletions(-)
Modified: website/public_html/beta/feed/history/boost_1_49_0.qbk
==============================================================================
--- website/public_html/beta/feed/history/boost_1_49_0.qbk (original)
+++ website/public_html/beta/feed/history/boost_1_49_0.qbk 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -11,7 +11,7 @@
[include ext.qbk]
-[status beta]
+[status beta 1]
[download http://sourceforge.net/projects/boost/files/boost/1.49.0.beta.1/]
[section Updated Libraries]
Modified: website/public_html/beta/generated/home-items.html
==============================================================================
--- website/public_html/beta/generated/home-items.html (original)
+++ website/public_html/beta/generated/home-items.html 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -7,7 +7,7 @@
<li><span class="news-title">Version 1.48.0 (release notes)</span><span class="news-date">November 15th, 2011 15:47 GMT</span></li>
</ul><h3>Beta Release</h3>
<ul id="downloads">
-<li><span class="news-title">Version 1.49.0 - beta release (release notes)</span><span class="news-date">In Progress</span></li>
+<li><span class="news-title">Version 1.49.0 beta 1 (release notes)</span><span class="news-date">In Progress</span></li>
</ul>
<p>More Downloads...
Modified: website/public_html/beta/generated/state/feed-pages.txt
==============================================================================
--- website/public_html/beta/generated/state/feed-pages.txt (original)
+++ website/public_html/beta/generated/state/feed-pages.txt 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -1837,7 +1837,7 @@
-id
"version_1_49_0
-last_modified
-.1327763574.57
+.1327766238.22
-location
"users/history/version_1_49_0.html
-page_state
@@ -1849,9 +1849,9 @@
" Lexical Cast, Locale, Move, Property Tree, Spirit, Thread, Unordered, Uuid.
"
-qbk_hash
-"ef9be42478c225dc778bb7b001c64e9fd6771d23cdccca2572db46506a51cf88
+"2dbd7f5939d4a5c9fe761232c8b5cb6d10cdc0e96107e0190db349fd2d1b33fc
-release_status
-"beta
+"beta 1
-rss_hash
"6d95d71bb071208e80ef8e719880a05b6fc0443651af55e556c98281a3944f86
-title
Modified: website/public_html/beta/site-tools/boost_site/pages.py
==============================================================================
--- website/public_html/beta/site-tools/boost_site/pages.py (original)
+++ website/public_html/beta/site-tools/boost_site/pages.py 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -169,16 +169,21 @@
def initialise(self):
self.flags = set()
+ self.full_title_xml = self.title_xml
if self.type == 'release':
if not self.release_status and self.pub_date != 'In Progress':
self.release_status = 'released'
- if self.release_status and self.release_status not in ['released', 'beta']:
+ status_parts = self.release_status.split(' ', 2)
+ if status_parts[0] not in ['released', 'beta']:
print "Error: Unknown release status: " + self.release_status
self.release_status = None
if self.release_status:
- self.flags.add(self.release_status)
-
+ self.flags.add(status_parts[0])
+ if ('beta' in self.flags):
+ self.full_title_xml = self.full_title_xml + ' ' + self.release_status
+ elif ('released' not in self.flags):
+ self.full_title_xml = self.full_title_xml + ' - work in progress'
def state(self):
return {
Modified: website/public_html/beta/site-tools/templates/download-template.html
==============================================================================
--- website/public_html/beta/site-tools/templates/download-template.html (original)
+++ website/public_html/beta/site-tools/templates/download-template.html 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -44,7 +44,7 @@
emit('<h2 id="%s">%s</h2>' % (x['anchor'], x['label']))
for entry in x['entries']:
emit('\n')
- emit(' <h3><span class=\n "news-title">%s</span></h3>\n\n' % entry.title_xml)
+ emit(' <h3><span class=\n "news-title">%s</span></h3>\n\n' % entry.full_title_xml)
emit(' <p class="news-date">%s</p>\n\n' % entry.web_date())
emit(' <p class="news-description">\n')
emit(' <span class="brief"><span class="purpose">%s</span></span></p>\n\n' % entry.purpose_xml)
Modified: website/public_html/beta/site-tools/templates/entry-template.html
==============================================================================
--- website/public_html/beta/site-tools/templates/entry-template.html (original)
+++ website/public_html/beta/site-tools/templates/entry-template.html 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -1,16 +1,9 @@
-${
-full_title_xml = page.title_xml
-
-if page.type == 'release':
- if ('beta' in page.flags): full_title_xml = full_title_xml + ' - beta release'
- elif ('released' not in page.flags): full_title_xml = full_title_xml + ' - work in progress'
-
-}$<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>${ emit(full_title_xml) }$</title>
+ <title>${ emit(page.full_title_xml) }$</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="/favicon.ico" type="image/ico" />
<link rel="stylesheet" type="text/css" href="/style-v2/section-boost.css" />
@@ -44,7 +37,7 @@
<div class="section" id="intro">
<div class="section-0">
<div class="section-title">
- <h1>${ emit(full_title_xml) }$</h1>
+ <h1>${ emit(page.title_xml) }$</h1>
</div>
${
if page.type == 'release' and 'released' not in page.flags and 'beta' not in page.flags:
@@ -52,7 +45,7 @@
}$
<div class="section-body">
<h2><span class=
- "news-title">${ emit(page.title_xml) }$</span></h2>
+ "news-title">${ emit(page.full_title_xml) }$</span></h2>
<p><span class=
"news-date">${ emit(page.web_date()) }$</span></p>
Modified: website/public_html/beta/site-tools/templates/index-src.html
==============================================================================
--- website/public_html/beta/site-tools/templates/index-src.html (original)
+++ website/public_html/beta/site-tools/templates/index-src.html 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -15,9 +15,7 @@
emit('<li><span class="news-title">')
if entry.download_item:
emit('<a href="%s">' % entry.download_item)
- emit(entry.title_xml)
- if ('beta' in entry.flags):
- emit(' - beta release')
+ emit(entry.full_title_xml)
if entry.download_item:
emit('</a>')
emit(' (release notes)</span>' % (entry.location))
@@ -36,7 +34,7 @@
${
for entry in news:
emit('\n')
- emit(' <li><span class=\n "news-title">%s</span>\n' % (entry.location, entry.title_xml))
+ emit(' <li><span class=\n "news-title">%s</span>\n' % (entry.location, entry.full_title_xml))
emit(' <span class=\n "news-description"><span class="brief"><span class="purpose">%s</span></span></span>\n' % entry.purpose_xml)
emit(' <span class=\n "news-date">%s</span></li>' % (entry.web_date()))
}$ </ul>
Modified: website/public_html/beta/users/download/index.html
==============================================================================
--- website/public_html/beta/users/download/index.html (original)
+++ website/public_html/beta/users/download/index.html 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -57,7 +57,7 @@
<a href="/doc/libs/1_48_0/">Documentation</a></li>
</ul><h2 id="beta">Beta Release</h2>
<h3><span class=
- "news-title">Version 1.49.0</span></h3>
+ "news-title">Version 1.49.0 beta 1</span></h3>
<p class="news-date">In Progress</p>
Modified: website/public_html/beta/users/history/version_1_49_0.html
==============================================================================
--- website/public_html/beta/users/history/version_1_49_0.html (original)
+++ website/public_html/beta/users/history/version_1_49_0.html 2012-01-28 13:58:22 EST (Sat, 28 Jan 2012)
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>Version 1.49.0 - beta release</title>
+ <title>Version 1.49.0 beta 1</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="icon" href="/favicon.ico" type="image/ico" />
<link rel="stylesheet" type="text/css" href="/style-v2/section-boost.css" />
@@ -32,12 +32,12 @@
<div class="section" id="intro">
<div class="section-0">
<div class="section-title">
- <h1>Version 1.49.0 - beta release</h1>
+ <h1>Version 1.49.0</h1>
</div>
<div class="section-body">
<h2><span class=
- "news-title">Version 1.49.0</span></h2>
+ "news-title">Version 1.49.0 beta 1</span></h2>
<p><span class=
"news-date">In Progress</span></p>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk