Browse Source

Switched news and event archives to index.html

pull/855/head
Reinhard Müller 6 months ago
parent
commit
db38bbf73e

+ 6
- 6
.gitignore View File

@@ -8,11 +8,11 @@ tools/.texts-??.xml
.*.xmllist
tags/tagged-*.en.xhtml
tags/.tags.??.xml
events/????/????.??.xhtml
events/????/????.sources
events/????/????.xsl
news/????/????.??.xhtml
news/????/????.sources
news/????/????.xsl
events/????/index.??.xhtml
events/????/index.sources
events/????/index.xsl
news/????/index.??.xhtml
news/????/index.sources
news/????/index.xsl
news/*/.*.??.xml
about/printable/archive/printable.en.xml

+ 2
- 2
build/makerules.sh View File

@@ -58,7 +58,7 @@ EOF

for lang in ${languages}; do
cat<<EOF
\$(OUTPUTDIR)/%.${lang}.html: \$(INPUTDIR)/%.*.xhtml \$\$(XMLLIST_DEP) \$\$(XSL_DEP) \$(INPUTDIR)/tools/menu-global.xml \$(INPUTDIR)/tools/.texts-${lang}.xml \$(INPUTDIR)/tools/texts-en.xml \$(INPUTDIR)/.fundraising.${lang}.xml \$(INPUTDIR)/fundraising.en.xml
\$(filter %.${lang}.html,\$(HTML_DST_FILES)): \$(OUTPUTDIR)/%.${lang}.html: \$(INPUTDIR)/%.*.xhtml \$\$(XMLLIST_DEP) \$\$(XSL_DEP) \$(INPUTDIR)/tools/menu-global.xml \$(INPUTDIR)/tools/.texts-${lang}.xml \$(INPUTDIR)/tools/texts-en.xml \$(INPUTDIR)/.fundraising.${lang}.xml \$(INPUTDIR)/fundraising.en.xml
echo "* Building \$*.${lang}.html"
\${PROCESSOR} \${PROCFLAGS} process_file "\$(INPUTDIR)/\$*.${lang}.xhtml" > "\$@"
EOF
@@ -93,7 +93,7 @@ EOF

for lang in ${languages}; do
cat<<EOF
\$(OUTPUTDIR)/%/index.${lang}.html:
\$(filter %/index.${lang}.html,\$(INDEX_DST_LINKS)): \$(OUTPUTDIR)/%/index.${lang}.html:
echo "* Creating symlink \$*/index.${lang}.html"
ln -sf "\$(notdir \$*).${lang}.html" "\$@"
EOF

+ 3
- 3
events/Makefile View File

@@ -22,7 +22,7 @@ ARCH_YEARS := $(filter-out $(lastword $(ARCH_YEARS)),$(ARCH_YEARS))
ARCH_LANGS := $(suffix $(basename $(wildcard archive-template.??.xhtml)))

# .xhtml files to generate
ARCH_XHTML := $(foreach year,$(ARCH_YEARS),$(foreach lang,$(ARCH_LANGS),$(year)/$(year)$(lang).xhtml))
ARCH_XHTML := $(foreach year,$(ARCH_YEARS),$(foreach lang,$(ARCH_LANGS),$(year)/index$(lang).xhtml))

all: $(ARCH_XHTML)
$(ARCH_XHTML): %.xhtml: archive-template$$(suffix $$*).xhtml
@@ -31,7 +31,7 @@ $(ARCH_XHTML): %.xhtml: archive-template$$(suffix $$*).xhtml
@sed 's/:YYYY:/$(dir $@)g' $< > $@

# .sources files to generate
ARCH_SOURCES := $(foreach year,$(ARCH_YEARS),$(year)/$(year).sources)
ARCH_SOURCES := $(foreach year,$(ARCH_YEARS),$(year)/index.sources)

all: $(ARCH_SOURCES)
$(ARCH_SOURCES): %.sources:
@@ -39,7 +39,7 @@ $(ARCH_SOURCES): %.sources:
@echo "events/$(dir $@)event-*:[]\nevents/$(dir $@).event-*:[]\nlocalmenuinfo:[]\n" > $@

# .xsl files to generate
ARCH_XSL := $(foreach year,$(ARCH_YEARS),$(year)/$(year).xsl)
ARCH_XSL := $(foreach year,$(ARCH_YEARS),$(year)/index.xsl)

all: $(ARCH_XSL)
$(ARCH_XSL): %.xsl: events.xsl

+ 1
- 1
events/archive-template.en.xhtml View File

@@ -8,7 +8,7 @@
<body class="article">
<p id="category"><a href="/events/events.html">Events</a></p>

<localmenu dir="/events/" set="year" id=":YYYY:" link=":YYYY:/:YYYY:.html">:YYYY:</localmenu>
<localmenu dir="/events/" set="year" id=":YYYY:" link=":YYYY:/index.html">:YYYY:</localmenu>

<h1>Event Archive for :YYYY:</h1>


+ 2
- 2
events/events.en.xhtml View File

@@ -10,11 +10,11 @@

<include-events/>

<h2><a href="2017/2017.html">Event archives</a></h2>
<h2><a href="2017/index.html">Event archives</a></h2>

<p>
For older events, please see our event archives.
<a class="learn-more" href="2017/2017.html"/>
<a class="learn-more" href="2017/index.html"/>
</p>
</body>


+ 3
- 3
news/Makefile View File

@@ -22,7 +22,7 @@ ARCH_YEARS := $(filter-out $(lastword $(ARCH_YEARS)),$(ARCH_YEARS))
ARCH_LANGS := $(suffix $(basename $(wildcard archive-template.??.xhtml)))

# .xhtml files to generate
ARCH_XHTML := $(foreach year,$(ARCH_YEARS),$(foreach lang,$(ARCH_LANGS),$(year)/$(year)$(lang).xhtml))
ARCH_XHTML := $(foreach year,$(ARCH_YEARS),$(foreach lang,$(ARCH_LANGS),$(year)/index$(lang).xhtml))

all: $(ARCH_XHTML)
$(ARCH_XHTML): %.xhtml: archive-template$$(suffix $$*).xhtml
@@ -31,7 +31,7 @@ $(ARCH_XHTML): %.xhtml: archive-template$$(suffix $$*).xhtml
@sed 's/:YYYY:/$(dir $@)g' $< > $@

# .sources files to generate
ARCH_SOURCES := $(foreach year,$(ARCH_YEARS),$(year)/$(year).sources)
ARCH_SOURCES := $(foreach year,$(ARCH_YEARS),$(year)/index.sources)

all: $(ARCH_SOURCES)
$(ARCH_SOURCES): %.sources:
@@ -39,7 +39,7 @@ $(ARCH_SOURCES): %.sources:
@echo "news/$(dir $@)news-*:[]\nnews/$(dir $@).news-*:[]\nlocalmenuinfo:[]\n" > $@

# .xsl files to generate
ARCH_XSL := $(foreach year,$(ARCH_YEARS),$(year)/$(year).xsl)
ARCH_XSL := $(foreach year,$(ARCH_YEARS),$(year)/index.xsl)

all: $(ARCH_XSL)
$(ARCH_XSL): %.xsl: news.xsl

+ 1
- 1
news/archive-template.en.xhtml View File

@@ -8,7 +8,7 @@
<body class="article">
<p id="category"><a href="/news/news.html">News</a></p>

<localmenu dir="/news/" set="year" id=":YYYY:" link=":YYYY:/:YYYY:.html">:YYYY:</localmenu>
<localmenu dir="/news/" set="year" id=":YYYY:" link=":YYYY:/index.html">:YYYY:</localmenu>

<h1>News Archive for :YYYY:</h1>


+ 2
- 2
news/news.en.xhtml View File

@@ -34,11 +34,11 @@

<include-news/>

<h2><a href="2017/2017.html">News archives</a></h2>
<h2><a href="2017/index.html">News archives</a></h2>

<p>
For older news items, please see our news archives.
<a class="learn-more" href="2017/2017.html"/>
<a class="learn-more" href="2017/index.html"/>
</p>
</body>


Loading…
Cancel
Save