[PyObjC-svn] r2251 - in trunk/pyobjc/pyobjc-website: . lib news templates templates/global
[email protected] Tue, 26 May 2009 05:01:40 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Tue May 26 05:01:40 2009
New Revision: 2251
Log:
New website release
Added:
trunk/pyobjc/pyobjc-website/lib/source_directive.py (contents, props changed)
trunk/pyobjc/pyobjc-website/news/20090526_pyobjc22b2.rst
Modified:
trunk/pyobjc/pyobjc-website/lib/docs.py
trunk/pyobjc/pyobjc-website/lib/samples.py
trunk/pyobjc/pyobjc-website/setup.py
trunk/pyobjc/pyobjc-website/templates/documentation-index.html
trunk/pyobjc/pyobjc-website/templates/global/layout.html
trunk/pyobjc/pyobjc-website/templates/sample-framework-index.html
Modified: trunk/pyobjc/pyobjc-website/lib/docs.py
==============================================================================
--- trunk/pyobjc/pyobjc-website/lib/docs.py (original)
+++ trunk/pyobjc/pyobjc-website/lib/docs.py Tue May 26 05:01:40 2009
@@ -22,9 +22,12 @@
from pygments.lexers import get_lexer_for_filename
from pygments.formatters import HtmlFormatter
+from genshi.core import Markup
+
from docutils.core import publish_parts
from distutils import log
+import source_directive
def nameForProject(project):
if project == 'pyobjc-core':
@@ -81,7 +84,7 @@
'documentation-doc.html',
name=name,
- title=title,
+ title=Markup(title),
body=parts['body'],
bottommenu=allProjects,
)
@@ -114,14 +117,14 @@
title=parts['title']
if not title:
title = os.path.splitext(fn)[0]
- doclist.append((title, docurl))
+ doclist.append((Markup(title), docurl))
generator.emitHTML(
docurl,
'documentation-doc.html',
name=name,
- title=title,
+ title=Markup(title),
body=parts['body'],
bottommenu=allProjects,
)
@@ -181,14 +184,14 @@
title = os.path.splitext(fn)[0]
if fn == 'index.txt':
- doclist.append((title, tuturl))
+ doclist.append((Markup(title), tuturl))
generator.emitHTML(
tuturl,
'documentation-doc.html',
name=name,
- title=title,
+ title=Markup(title),
body=parts['body'],
bottommenu=allProjects,
)
Modified: trunk/pyobjc/pyobjc-website/lib/samples.py
==============================================================================
--- trunk/pyobjc/pyobjc-website/lib/samples.py (original)
+++ trunk/pyobjc/pyobjc-website/lib/samples.py Tue May 26 05:01:40 2009
@@ -96,7 +96,7 @@
fullpath = os.path.join(dirpath, fn)
lexer = get_lexer_for_filename(fullpath)
- formatter = HtmlFormatter(linenos = False, cssclass='source')
+ formatter = HtmlFormatter(cssclass='source', linenos='inline')
result = highlight(open(fullpath, 'r').read(), lexer, formatter)
style=formatter.get_style_defs()
coloredFiles.append((path, colorFn, style, result))
@@ -206,6 +206,12 @@
bottommenu.append((title, subdir))
for dirpath, dirnames, filenames in os.walk(inputdir):
+ if '.svn' in dirnames:
+ dirnames.remove('.svn')
+
+ toremove=[]
+
+ l = len(samples)
for dn in dirnames:
if os.path.exists(os.path.join(dirpath, dn, 'setup.py')):
# Found a sample
@@ -214,6 +220,20 @@
os.path.join(outputdir, relpath),
dn, os.path.join(dirpath, dn), allProjects)
samples.append((relpath, dn, summary))
+ toremove.append(dn)
+
+ for dn in toremove:
+ # Don't peek inside examples for subexamples.
+ dirnames.remove(dn)
+
+
+ if len(samples) != l and dirpath != inputdir:
+ # We added some samples from a subdirectory, add subheader.
+ relpath = dirpath[len(inputdir)+1:]
+ samples.append((relpath, relpath, -1))
+
+
+ samples.sort()
if samples:
Modified: trunk/pyobjc/pyobjc-website/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-website/setup.py (original)
+++ trunk/pyobjc/pyobjc-website/setup.py Tue May 26 05:01:40 2009
@@ -94,8 +94,8 @@
log.info("Emitting homepage")
generator.emitHTML("/index.html", "site-index.html",
- pyobjc_version='2.2b1',
- pyobjc_release_date='October 24th 2007',
+ pyobjc_version='2.2b2',
+ pyobjc_release_date='May 26th 2009',
news=news.newsSelection(newsItems),
bottommenu=root_menu)
Modified: trunk/pyobjc/pyobjc-website/templates/documentation-index.html
==============================================================================
--- trunk/pyobjc/pyobjc-website/templates/documentation-index.html (original)
+++ trunk/pyobjc/pyobjc-website/templates/documentation-index.html Tue May 26 05:01:40 2009
@@ -10,9 +10,10 @@
<body class="index">
<p>The documentation reflects the current development version
- of PyObjC. This is currently moving towards a 2.1 release
- and fully compatible with PyObjC 2.0 unless noted otherwise.</p>
- <p>All documentats except the introduction need work</p>
+ of PyObjC. This is currently moving towards a 2.2 release.</p>
+ <p>The documentation is sadly enough slightly behind reality,
+ I'm slowly working through it and hope to finish that work before
+ 2.2 is actually released.</p>
<div py:for="section, description, links in documentation_sections">
<h2>${section}</h2>
Modified: trunk/pyobjc/pyobjc-website/templates/global/layout.html
==============================================================================
--- trunk/pyobjc/pyobjc-website/templates/global/layout.html (original)
+++ trunk/pyobjc/pyobjc-website/templates/global/layout.html Tue May 26 05:01:40 2009
@@ -100,6 +100,15 @@
Subversion hosting<br />
<a href="http://www.red-bean.com/"><img src="http://www.red-bean.com/images/bean-brought.jpg" width="100" /></a>
</p>
+ <hr/>
+ <p>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <input type="hidden" name="cmd" value="_s-xclick" />
+ <input type="hidden" name="hosted_button_id" value="5655733" />
+ <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!" />
+ <img alt="" border="0" src="https://www.paypal.com/nl_NL/i/scr/pixel.gif" width="1" height="1" />
+ </form>
+ </p>
</td>
<td align="left" width="100%">
${select('*|text()')}
@@ -107,7 +116,7 @@
</tr>
<tr valign="middle" align="left">
<td bgcolor="#EEEEEE" align="center" width="120" style="background-image:url(${url('/img/stripes.gif')})">
- <a href="../legal.php" style="text-decoration:none;color:black;font-size:10pt;">Copyright © 2003 - 2008 The PyObjC Project</a>
+ <a href="../legal.php" style="text-decoration:none;color:black;font-size:10pt;">Copyright © 2003 - 2009 The PyObjC Project</a>
</td>
<td class="layout">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
Modified: trunk/pyobjc/pyobjc-website/templates/sample-framework-index.html
==============================================================================
--- trunk/pyobjc/pyobjc-website/templates/sample-framework-index.html (original)
+++ trunk/pyobjc/pyobjc-website/templates/sample-framework-index.html Tue May 26 05:01:40 2009
@@ -6,14 +6,23 @@
<xi:include href="layout.html" />
<head>
<title py:content="title">Sample name</title>
+ <style>
+ .sampledescr {
+ margin-left: 20px;
+ }
+ </style>
+
</head>
<body>
<h1 py:content="title">Sample name</h1>
<div py:for="path, name, summary in samples">
- <a href="${path}/index.html"><h2>${name}</h2></a>
- <p py:if="summary">${Markup(summary)}</p>
+ <h2 py:if="summary == -1">${name}</h2>
+ <div py:if="summary != -1" class="sampledescr">
+ <a href="${path}/index.html"><h3>${name}</h3></a>
+ <p py:if="summary">${Markup(summary)}</p>
+ </div>
</div>
</body>
</html>
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
pyobjc-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/pyobjc-checkins