From af89e2762c5ea1bbb1ca1d736fd85bf82a58c88e Mon Sep 17 00:00:00 2001
From: toidinamai
Date: Thu, 8 Jun 2006 10:06:10 +0000
Subject: [PATCH] Hilfe-Link dtd fix check html pages for validity right after
processing TA Ruby refixed
git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@376 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
Makefile | 22 +++++++++-------------
content/news/ta-ruby.xml | 26 ++++++++++++--------------
dtd/c3d2web.dtd | 9 +++++----
xsl/xhtml.xsl | 1 +
4 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/Makefile b/Makefile
index 315ea9e98..15074bfa4 100644
--- a/Makefile
+++ b/Makefile
@@ -59,28 +59,22 @@ www: $(XML_CATALOG) $(CONTENT)
export: www
$(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(DESTDIR)/
-.SILENT: check
-.PHONY: check
-check: $(PAGES)
- # XXX
- for page in $^ ; do \
- echo "Checking $${page}..." ; \
- $(VALIDATOR) $(VFLAGS) $${page} ; \
- done
-
### Regeln für den XSLT-Prozess ###
-build/news.html: $(STYLE)
-build/news-rss.xml: xsl/rss.xsl
-build/news-atom.xml: xsl/atom.xsl
+build/news.html: $(WWW_CCC_DE_UPDATES)
+build/news-rss.xml : STYLE=xsl/rss.xsl
+build/news-atom.xml : STYLE=xsl/atom.xsl
-$(NEWSFILES) : STYLE=$(filter-out $(NEWSITEMS) $(NAVIGATION),$^)
$(NEWSFILES): $(NAVIGATION) $(NEWSITEMS)
for item in $(NEWSITEMS) ; do \
$(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \
done
sh scripts/gen_news.xml.sh $(NEWSITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) -
+# XXX: only check news.html
+ if [ $(STYLE) = xsl/xhtml.xsl ] ; then \
+ $(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; } ;\
+ fi
content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html
cp $< $@
@@ -88,6 +82,7 @@ content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.ht
build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
$(VALIDATOR) $(VFLAGS) $<
$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
+ $(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; }
build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
# -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan,
@@ -98,6 +93,7 @@ build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
$(VALIDATOR) $(VFLAGS) $<
$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
+ $(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; }
dtd/catalog.xml:
sh scripts/gen_catalog.xml.sh > $@
diff --git a/content/news/ta-ruby.xml b/content/news/ta-ruby.xml
index e83f916b4..0c44b2ff0 100644
--- a/content/news/ta-ruby.xml
+++ b/content/news/ta-ruby.xml
@@ -3,19 +3,17 @@
-
ruby.jpg
-
-
- - Termin
- - 10. März 2006, 19:00 Uhr
- - Ort
- - Berufsakademie Dresden, Raum G3, Heideparkstr. 8, 01099 Dresden
+
+ - Termin
+ - 10. März 2006, 19:00 Uhr
+ - Ort
+ - Berufsakademie Dresden, Raum G3, Heideparkstr. 8, 01099 Dresden
- - Themen
- - Einführung in Ruby
- - Ruby-MediaWiki
- - Einführung in Ruby on Rails
- - Erstellen eines Wiki mit Rails
- - Jabber-Library XMPP4R
-
-
+ Themen
+ Einführung in Ruby
+ Ruby-MediaWiki
+ Einführung in Ruby on Rails
+ Erstellen eines Wiki mit Rails
+ Jabber-Library XMPP4R
+
diff --git a/dtd/c3d2web.dtd b/dtd/c3d2web.dtd
index ed1bca641..e75d9d037 100644
--- a/dtd/c3d2web.dtd
+++ b/dtd/c3d2web.dtd
@@ -1,9 +1,10 @@
-
+
+
-
+
-
+
-
+
+ Hilfe