Subject: [Boost-commit] svn:boost r77962 - in website/public_html/live: . site-tools/boost_site site-tools/templates
From: dnljms_at_[hidden]
Date: 2012-04-13 18:15:37
Author: danieljames
Date: 2012-04-13 18:15:36 EDT (Fri, 13 Apr 2012)
New Revision: 77962
URL: http://svn.boost.org/trac/boost/changeset/77962
Log:
Website: Merge some minor generation changes from beta to live.
Properties modified:
website/public_html/live/ (props changed)
Text files modified:
website/public_html/live/site-tools/boost_site/util.py | 6 ++++--
website/public_html/live/site-tools/templates/download-template.html | 21 ++++++++++-----------
website/public_html/live/site-tools/templates/history-template.html | 17 ++++++++++++-----
website/public_html/live/site-tools/templates/index-src.html | 5 +++--
website/public_html/live/site-tools/templates/news-template.html | 18 ++++++++++++------
5 files changed, 41 insertions(+), 26 deletions(-)
Modified: website/public_html/live/site-tools/boost_site/util.py
==============================================================================
--- website/public_html/live/site-tools/boost_site/util.py (original)
+++ website/public_html/live/site-tools/boost_site/util.py 2012-04-13 18:15:36 EDT (Fri, 13 Apr 2012)
@@ -3,7 +3,7 @@
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-import urlparse
+import urlparse, re
def htmlencode(text):
return text.replace('&', '&').replace('<', '<').replace('>', '&rt;')
@@ -15,7 +15,9 @@
Because 'toxml' doesn't work:
http://bugs.python.org/issue9883
"""
- return ''.join(x.toxml('utf-8').decode('utf-8') for x in fragment.childNodes)
+ x = ''.join(x.toxml('utf-8').decode('utf-8') for x in fragment.childNodes)
+ x = re.sub(r' +$', '', x, flags = re.M)
+ return x
def base_links(node, base_link):
transform_links(node, lambda x: urlparse.urljoin(base_link,x))
Modified: website/public_html/live/site-tools/templates/download-template.html
==============================================================================
--- website/public_html/live/site-tools/templates/download-template.html (original)
+++ website/public_html/live/site-tools/templates/download-template.html 2012-04-13 18:15:36 EDT (Fri, 13 Apr 2012)
@@ -19,20 +19,19 @@
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)
- emit(' <ul class="menu">\n')
- emit(' <li>\n')
- emit(' Details' % htmlencode(entry.location))
+ emit('<ul class="menu">\n')
+ emit('<li>')
+ emit('Details' % htmlencode(entry.location))
emit('</li>\n')
if(entry.download_item):
- emit('\n')
- emit(' <li>\n')
- emit(' Download</li>' % htmlencode(entry.download_item))
+ emit('<li>')
+ emit('Download' % htmlencode(entry.download_item))
+ emit('</li>\n')
if(entry.documentation):
- emit('\n')
- emit(' <li>\n')
- emit(' Documentation</li>' % htmlencode(entry.documentation))
- emit('\n')
- emit(' </ul>')
+ emit('<li>')
+ emit('Documentation' % htmlencode(entry.documentation))
+ emit('</li>\n')
+ emit('</ul>\n')
}$
<h2><a name="history" id="history"></a>Old Boost Releases</h2>
Modified: website/public_html/live/site-tools/templates/history-template.html
==============================================================================
--- website/public_html/live/site-tools/templates/history-template.html (original)
+++ website/public_html/live/site-tools/templates/history-template.html 2012-04-13 18:15:36 EDT (Fri, 13 Apr 2012)
@@ -12,10 +12,17 @@
emit(' <div class="news-description">\n')
emit(' <span class="brief"><span class="purpose">%s</span></span>' % (entry.purpose_xml))
emit(' </div>\n\n')
- emit(' <ul class="menu">\n')
- emit(' <li>\n')
- emit(' Details</li>\n\n' % (htmlencode(entry.location)))
+ emit('<ul class="menu">\n')
+ emit('<li>')
+ emit('Details' % htmlencode(entry.location))
+ emit('</li>\n')
if(entry.download_item):
- emit(' <li>Download</li>\n' % (htmlencode(entry.download_item)))
- emit(' </ul>')
+ emit('<li>')
+ emit('Download' % htmlencode(entry.download_item))
+ emit('</li>\n')
+ if(entry.documentation):
+ emit('<li>')
+ emit('Documentation' % htmlencode(entry.documentation))
+ emit('</li>\n')
+ emit('</ul>\n')
}$ </div>
Modified: website/public_html/live/site-tools/templates/index-src.html
==============================================================================
--- website/public_html/live/site-tools/templates/index-src.html (original)
+++ website/public_html/live/site-tools/templates/index-src.html 2012-04-13 18:15:36 EDT (Fri, 13 Apr 2012)
@@ -25,8 +25,9 @@
emit('</div>')
emit('<div class="news-date">')
emit('Release Notes' % (htmlencode(entry.location)))
- emit(' | ')
- emit('Documentation' % (htmlencode(entry.documentation)))
+ if entry.documentation:
+ emit(' | ')
+ emit('Documentation' % (htmlencode(entry.documentation)))
emit('</div>')
emit('<div class="news-date">%s</div>' % (entry.web_date()))
emit('</li>\n')
Modified: website/public_html/live/site-tools/templates/news-template.html
==============================================================================
--- website/public_html/live/site-tools/templates/news-template.html (original)
+++ website/public_html/live/site-tools/templates/news-template.html 2012-04-13 18:15:36 EDT (Fri, 13 Apr 2012)
@@ -19,11 +19,17 @@
emit(' <div class="news-description">\n')
emit(' <span class="brief"><span class="purpose">%s</span></span>' % (entry.purpose_xml))
emit(' </div>\n\n')
- emit(' <ul class="menu">\n')
- emit(' <li>\n')
- emit(' Details</li>' % htmlencode(entry.location))
+ emit('<ul class="menu">\n')
+ emit('<li>')
+ emit('Details' % htmlencode(entry.location))
+ emit('</li>\n')
if(entry.download_item):
- emit('\n\n')
- emit(' <li>Download</li>' % htmlencode(entry.download_item))
- emit('\n </ul>')
+ emit('<li>')
+ emit('Download' % htmlencode(entry.download_item))
+ emit('</li>\n')
+ if(entry.documentation):
+ emit('<li>')
+ emit('Documentation' % htmlencode(entry.documentation))
+ emit('</li>\n')
+ emit('</ul>\n')
}$ </div>