c3d2/c3d2-web
c3d2
/
c3d2-web
38
3
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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
This commit is contained in:
toidinamai 2006-06-08 10:06:10 +00:00
parent da301fa695
commit af89e2762c
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -59,28 +59,22 @@ www: $(XML_CATALOG) $(CONTENT)
export: www export: www
$(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(DESTDIR)/ $(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 ### ### Regeln für den XSLT-Prozess ###
build/news.html: $(STYLE) build/news.html: $(WWW_CCC_DE_UPDATES)
build/news-rss.xml: xsl/rss.xsl build/news-rss.xml : STYLE=xsl/rss.xsl
build/news-atom.xml: xsl/atom.xsl build/news-atom.xml : STYLE=xsl/atom.xsl
$(NEWSFILES) : STYLE=$(filter-out $(NEWSITEMS) $(NAVIGATION),$^)
$(NEWSFILES): $(NAVIGATION) $(NEWSITEMS) $(NEWSFILES): $(NAVIGATION) $(NEWSITEMS)
for item in $(NEWSITEMS) ; do \ for item in $(NEWSITEMS) ; do \
$(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \ $(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \
done done
sh scripts/gen_news.xml.sh $(NEWSITEMS) | $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) - 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 content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html
cp $< $@ 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) build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
$(VALIDATOR) $(VFLAGS) $< $(VALIDATOR) $(VFLAGS) $<
$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
$(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; }
build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
# -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan, # -- 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) build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
$(VALIDATOR) $(VFLAGS) $< $(VALIDATOR) $(VFLAGS) $<
$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
$(VALIDATOR) $(VFLAGS) $@ || { rm $@ ; exit 1 ; }
dtd/catalog.xml: dtd/catalog.xml:
sh scripts/gen_catalog.xml.sh > $@ sh scripts/gen_catalog.xml.sh > $@

26
content/news/ta-ruby.xml
View File

@ -3,19 +3,17 @@
<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?> <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
<item title="TA: Ruby &amp; Ruby on Rails" date="2006-03-19T19:00:00" author="Astro" category="Themenabend"> <item title="TA: Ruby &amp; Ruby on Rails" date="2006-03-19T19:00:00" author="Astro" category="Themenabend">
<image title="Ruby">ruby.jpg</image> <image title="Ruby">ruby.jpg</image>
<p> <dl>
<dl> <dt>Termin</dt>
<dt>Termin</dt> <dd>10. März 2006, 19:00 Uhr</dd>
<dd>10. März 2006, 19:00 Uhr</dd> <dt>Ort</dt>
<dt>Ort</dt> <dd>Berufsakademie Dresden, Raum G3, Heideparkstr. 8, 01099 Dresden</dd>
<dd>Berufsakademie Dresden, Raum G3, Heideparkstr. 8, 01099 Dresden</dd>
<dt>Themen</dt> <dt>Themen</dt>
<dd>Einführung in Ruby</dd> <dd>Einführung in Ruby</dd>
<dd>Ruby-MediaWiki</dd> <dd>Ruby-MediaWiki</dd>
<dd>Einführung in Ruby on Rails</dd> <dd>Einführung in Ruby on Rails</dd>
<dd>Erstellen eines Wiki mit Rails</dd> <dd>Erstellen eines Wiki mit Rails</dd>
<dd>Jabber-Library XMPP4R</dd> <dd>Jabber-Library XMPP4R</dd>
</dl> </dl>
</p>
</item> </item>

9
dtd/c3d2web.dtd
View File

@ -1,9 +1,10 @@
<!ENTITY % URI "CDATA"> <!ENTITY % URI "CDATA">
<!-- a Uniform Resource Identifier, see [RFC2396] --> <!-- a Uniform Resource Identifier, see [RFC2396] -->
<!ENTITY % Inline "(#PCDATA | link | pre | em | dl | image )*"> <!ENTITY % Inline "(#PCDATA | link | em | image )*">
<!ENTITY % Block "p|pre|dl|ul|ol">
<!ELEMENT page ((news)|(p|pre|dl|ul|ol)+)> <!ELEMENT page ((news)|(%Block;)*)>
<!ATTLIST page <!ATTLIST page
title CDATA #IMPLIED title CDATA #IMPLIED
pagetitle CDATA #IMPLIED pagetitle CDATA #IMPLIED
@ -12,7 +13,7 @@
<!ELEMENT news (newsfile)+> <!ELEMENT news (newsfile)+>
<!ELEMENT newsfile (#PCDATA)> <!ELEMENT newsfile (#PCDATA)>
<!ELEMENT item ((image)?, (p|pre|addendum)+)> <!ELEMENT item ((image)?, (%Block;)*, (addendum)?)>
<!ATTLIST item <!ATTLIST item
title CDATA #REQUIRED title CDATA #REQUIRED
date CDATA #REQUIRED date CDATA #REQUIRED
@ -20,7 +21,7 @@
category CDATA #REQUIRED category CDATA #REQUIRED
> >
<!ELEMENT addendum (p|pre|dl|ul|ol)*> <!ELEMENT addendum (%Block;)*>
<!ELEMENT p %Inline;> <!ELEMENT p %Inline;>
<!ATTLIST p <!ATTLIST p

1
xsl/xhtml.xsl
View File

@ -95,6 +95,7 @@
<p> <p>
<input type="text" name="phrase" size="20" value="c3d2" /> <input type="text" name="phrase" size="20" value="c3d2" />
<input type="submit" name="submit" value="Suchen!" /> <input type="submit" name="submit" value="Suchen!" />
<a href="/cgi-bin/estseek.cgi"><small>Hilfe</small></a>
</p> </p>
</form> </form>