[xiph-cvs] r6590 - in websites-ngen: . news xiph.org xiph.org/CSS xiph.org/subversion
comatoast at xiph.org
comatoast at xiph.org
Tue May 4 21:26:43 PDT 2004
Author: comatoast
Date: 2004-04-24 02:03:39 -0400 (Sat, 24 Apr 2004)
New Revision: 6590
Added:
websites-ngen/xiph.org/index.markdown
websites-ngen/xiph.org/subversion/
websites-ngen/xiph.org/subversion/index.txt
Removed:
websites-ngen/xiph.org/index.txt
Modified:
websites-ngen/news/on2004-04-19at0149inGMT-7.txt
websites-ngen/todo.txt
websites-ngen/wrapup.py
websites-ngen/xiph.org/CSS/all.css
Log:
* Some color tweaks.
* Only files with an extension of "markdown" will get the markdown treatment. Not .txt files.
I'm sick and tired of having innocent textfiles get it.
* .importables gone in that one class in wrapup.py. Use .inHeadBits.
Modified: websites-ngen/news/on2004-04-19at0149inGMT-7.txt
===================================================================
--- websites-ngen/news/on2004-04-19at0149inGMT-7.txt 2004-04-24 05:16:26 UTC (rev 6589)
+++ websites-ngen/news/on2004-04-19at0149inGMT-7.txt 2004-04-24 06:03:39 UTC (rev 6590)
@@ -1,4 +1,4 @@
-# A News Post
+# Vorbis-tools released
This is a news post. With a [link to our new website][l].
Modified: websites-ngen/todo.txt
===================================================================
--- websites-ngen/todo.txt 2004-04-24 05:16:26 UTC (rev 6589)
+++ websites-ngen/todo.txt 2004-04-24 06:03:39 UTC (rev 6590)
@@ -3,16 +3,24 @@
* Add in a way to override parts of the generated webpage from a file parallel to the
.txt file that's being used as the source for the main body.
+
* After I've implemented that, I need a way for this sort of thing to "use whatever my
ancestors used", kinda like an OO derivation thing.
+
* Anyhow, for this out-of-band data thing: In it, I'd have stuff for:
* Extra things to put in <head>
* Extra things to put **before** `<div id='content'>`
* Extra things to put **after** `<div id='content'>`
* Maybe a partially-automated way to do next and previous <link rel='...'> bits.
Maybe I could use PyYaml. Although that's probably serious overkill.
+
* We need a tagline. Lame starter: "Compressing your media into byte-size chunks"
+* Sell the Powers that Be on a hypothetical http://files.xiph.org/ so we
+ don't end up putting big, useless things like .rpms and source .tgz files and (gasp) .exe
+ files in the subversion repo, making it even more bloated and time-consuming to download.
+
+
For the News Things
------------------
Modified: websites-ngen/wrapup.py
===================================================================
--- websites-ngen/wrapup.py 2004-04-24 05:16:26 UTC (rev 6589)
+++ websites-ngen/wrapup.py 2004-04-24 06:03:39 UTC (rev 6590)
@@ -29,7 +29,6 @@
.sourceFilename -- the file containing markdown text
.destFilename -- the output html file name
.doctype -- self explanatory
- .importables -- a list of CSS files to @import
.inHeadBits -- a list of strings to be included inside the head element
.beforeContentBits -- stuff to include before the content div
.mainText -- the text from .sourceFileName after it's been turned into HTML
@@ -46,8 +45,7 @@
'"-//W3C//DTD HTML 4.01//EN" ' + \
'"http://www.w3.org/TR/html4/strict.dtd">'
- self.importables = "/CSS/all.css".split()
-
+ # Stuff .mainText with the contents of the file, after markdowning it.
self.mainText = ""
fh = os.popen(MARKDOWN_COMMAND + " " + sourceFilename)
try:
@@ -55,15 +53,20 @@
finally:
fh.close()
+ self.title = "Untitled Document"
match = TITLE_REGEX.match(self.mainText)
- self.title = "Untitled Document"
- if match:
+ if match: #TODO: needs decent error handling
self.title = match.group(1)
self.lang = 'en-US'
-
+
self.afterMainTextBits = []
- self.headBits = []
+
+ self.inHeadBits = [
+ "<style type='text/css'>@import url(/CSS/all.css);</style>",
+ "<meta http=equiv='Content-type' content='text/html; charset=UTF-8'>"
+ ]
+
self.beforeContentBits = []
self.afterContentBits = []
@@ -90,12 +93,9 @@
ret += self.doctype + '\n'
ret += "<html lang='" + self.lang + "'>\n"
ret += "<head>\n"
- ret += '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">\n'
+ for bit in self.inHeadBits:
+ ret += bit + '\n'
ret += '<title>' + self.title + '</title>\n'
- for importable in self.importables:
- ret += "<style type='text/css'>@import url(" + importable + ");</style>\n"
- for bit in self.headBits:
- ret += bit
ret += "</head>\n"
ret += "<body>\n"
for bit in self.beforeContentBits:
@@ -129,7 +129,7 @@
if __name__ == '__main__':
for dirpath, dirnames, filenames in os.walk('.'):
- for filename in filter(lambda x: x.endswith(".txt"), filenames):
+ for filename in filter(lambda x: x.endswith(".markdown"), filenames):
fullpath = os.path.join(dirpath, filename)
print fullpath
mw = MarkdownWrapper(fullpath)
Modified: websites-ngen/xiph.org/CSS/all.css
===================================================================
--- websites-ngen/xiph.org/CSS/all.css 2004-04-24 05:16:26 UTC (rev 6589)
+++ websites-ngen/xiph.org/CSS/all.css 2004-04-24 06:03:39 UTC (rev 6590)
@@ -1,12 +1,10 @@
html {
font: 80% "Helvetica Neue", Verdana, sans-serif;
- color: #010;
+ color: #000;
+ color: #122;
/* guess which colors I like... */
- background: #ffdead; /* navajo white */
- background: #696969; /* dim gray */
background: #008080; /* teal */
- background: #f5f5f5; /* white smoke */
background: #fff5ee; /* seashell */
background: #5f9ea0; /* cadet blue */
background: #2f4f4f; /* dark slate gray */
@@ -18,6 +16,9 @@
background: #1e90ff; /* cornflower blue */
background: #556b2f; /* dark olive green */
background: #333;
+ background: #696969; /* dim gray */
+ background: #f5f5f5; /* white smoke */
+ background: #ffdead; /* navajo white */
margin: 0;
padding: 0;
@@ -35,9 +36,10 @@
div#content {
margin: 0 1em 1em 19em;
padding: 0 .5em;
+ width: 40em;
border: 1px solid gray;
background: white;
- width: 40em;
+ background: #f5f5f5; /* white smoke */
}
div#sidebar {
@@ -77,10 +79,12 @@
padding: .25em;
text-decoration: none;
}
+
ul#bignavbuttons a:link,
ul#bignavbuttons a:visited {
color: black;
}
+
ul#bignavbuttons li.vorbis a:hover {
background: #74a5fd;
}
Copied: websites-ngen/xiph.org/index.markdown (from rev 6571, websites-ngen/xiph.org/index.txt)
Deleted: websites-ngen/xiph.org/index.txt
===================================================================
--- websites-ngen/xiph.org/index.txt 2004-04-24 05:16:26 UTC (rev 6589)
+++ websites-ngen/xiph.org/index.txt 2004-04-24 06:03:39 UTC (rev 6590)
@@ -1,54 +0,0 @@
-# Welcome to xiph.org!
-
-<!-- this stinks. -->
-
-Xiph.org develops multimedia codecs and tools to protect the foundations of Internet multimedia
-from control by private interests.
-
-…
-
----
-
-The Xiph.Org Foundation is a non-profit corporation dedicated to protecting the foundations of
-Internet multimedia from control by private interests. Our purpose is to support and develop free,
-open protocols and software to serve the public, developer and business markets.
-
-----------------
-
-This is some *more* text. Fancy that.
-
-------
-
-I went often to look at the collection of curiosities
-in Heidelberg Castle, and one day I surprised the keeper
-of it with my German. I spoke entirely in that language.
-He was greatly interested; and after I had talked a while
-he said my German was very rare, possibly a "unique";
-and wanted to add it to his museum.
-
-If he had known what it had cost me to acquire my art,
-he would also have known that it would break any
-collector to buy it. Harris and I had been hard at
-work on our German during several weeks at that time,
-and although we had made good progress, it had been
-accomplished under great difficulty and annoyance,
-for three of our teachers had died in the mean time.
-A person who has not studied German can form no idea
-of what a perplexing language it is.
-
-
-These things are not words, they are alphabetical processions.
-And they are not rare; one can open a German newspaper
-at any time and see them marching majestically across
-the page--and if he has any imagination he can see
-the banners and hear the music, too. They impart
-a martial thrill to the meekest subject. I take a
-great interest in these curiosities. Whenever I come
-across a good one, I stuff it and put it in my museum.
-In this way I have made quite a valuable collection.
-When I get duplicates, I exchange with other collectors,
-and thus increase the variety of my stock. Here rare
-some specimens which I lately bought at an auction sale
-of the effects of a bankrupt bric-a-brac hunter:
-
-…
Added: websites-ngen/xiph.org/subversion/index.txt
===================================================================
--- websites-ngen/xiph.org/subversion/index.txt 2004-04-24 05:16:26 UTC (rev 6589)
+++ websites-ngen/xiph.org/subversion/index.txt 2004-04-24 06:03:39 UTC (rev 6590)
@@ -0,0 +1,5 @@
+# Accessing our Subversion Repository
+
+We keep our source code in [Subversion][].
+
+ [Subversion]: http://subversion.tigris.org/
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list