I wonder why contact.ihtml isn't included in the About page
( http://lilypond.org/web/about/ ); instead, '@contact.ihtml@' remains
from the source, whereas it appears correctlyu in the Documentation
page. It's certainly because the included file - site/contact.ihtml -
isn't in the same directory as site/about/index.html. So I fixed this
page, the Dutch translation and scripts/format-page.py. Here's the
patch.
John Mandereau
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/newweb/ChangeLog,v
retrieving revision 1.229
diff -u -r1.229 ChangeLog
--- ChangeLog 31 May 2005 02:00:32 -0000 1.229
+++ ChangeLog 31 May 2005 14:25:37 -0000
@@ -1,3 +1,10 @@
+2005-05-31 John Mandereau <[EMAIL PROTECTED]>
+
+ * scrips/format-page.py: fix .ihtml include : it now accepts
+ .ihtml files in a directory different than the page directory
+ * site/about/index.html:
+ * nl/about/index.html: fix contact.ihtml include
+
2005-05-31 Graham Percival <[EMAIL PROTECTED]>
* site/documentation.html: add link to LSR.
Index: nl/about/index.html
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/newweb/ChangeLog,v
retrieving revision 1.229
diff -u -r1.229 ChangeLog
--- ChangeLog 31 May 2005 02:00:32 -0000 1.229
+++ ChangeLog 31 May 2005 14:25:37 -0000
@@ -1,3 +1,10 @@
+2005-05-31 John Mandereau <[EMAIL PROTECTED]>
+
+ * scrips/format-page.py: fix .ihtml include : it now accepts
+ .ihtml files in a directory different than the page directory
+ * site/about/index.html:
+ * nl/about/index.html: fix contact.ihtml include
+
2005-05-31 Graham Percival <[EMAIL PROTECTED]>
* site/documentation.html: add link to LSR.
Index: nl/about/index.html
===================================================================
RCS file: /cvsroot/lilypond/newweb/nl/about/index.html,v
retrieving revision 1.1
diff -u -r1.1 index.html
--- nl/about/index.html 26 Apr 2005 08:41:39 -0000 1.1
+++ nl/about/index.html 31 May 2005 14:25:37 -0000
@@ -41,7 +41,7 @@
<h2>Contactinformatie</h2>
[EMAIL PROTECTED]@
+@@[EMAIL PROTECTED]@
<br>
Index: scripts/format-page.py
===================================================================
RCS file: /cvsroot/lilypond/newweb/scripts/format-page.py,v
retrieving revision 1.26
diff -u -r1.26 format-page.py
--- scripts/format-page.py 30 May 2005 18:12:08 -0000 1.26
+++ scripts/format-page.py 31 May 2005 14:25:38 -0000
@@ -285,7 +285,8 @@
i = string.index (page_template, '@MAIN@')
page = page_template[:i] + main + page_template[i+6:]
- page = re.sub ('@([-A-Za-z]*.ihtml)@', grab_ihtml, page)
+ page = re.sub ('@DEPTH@', root_url, page)
+ page = re.sub ('@([-A-Za-z/.]*.ihtml)@', grab_ihtml, page)
page = re.sub ('@LOCATION@', location, page)
page = re.sub ('@MENU@', menu, page)
page = re.sub ('@SCRIPT@', script, page)
@@ -296,7 +297,6 @@
page = re.sub ('@LANG@', slang, page)
page = re.sub ('@.LANG@', dot_lang, page)
- page = re.sub ('@DEPTH@', root_url, page)
page = re.sub ('@DOC@', os.path.join (root_url, '../doc/'), page)
page = re.sub ('@IMAGES@', os.path.join (root_url, 'images/'), page)
page = re.sub ('_ *\("([^"]*)"\)', grab_gettext, page)
Index: site/about/index.html
===================================================================
RCS file: /cvsroot/lilypond/newweb/site/about/index.html,v
retrieving revision 1.25
diff -u -r1.25 index.html
--- site/about/index.html 2 May 2005 15:07:18 -0000 1.25
+++ site/about/index.html 31 May 2005 14:25:38 -0000
@@ -41,7 +41,7 @@
<h2>Contact</h2>
[EMAIL PROTECTED]@
+@@[EMAIL PROTECTED]@
<br>
_______________________________________________
bug-lilypond mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-lilypond
