Revert "Revert "don't publish news items with future @date""
This reverts commit 581f0be64f
.
Conflicts:
documentation/conventions.md
This commit is contained in:
parent
c3a254d26c
commit
ece908a4c1
|
@ -10,7 +10,6 @@ XSL-Stylesheet
|
|||
- Begründung: Ermöglicht Transformation in verschiedene Formate durch Angabe des entsprechenden XSL-Stylesheets
|
||||
(z.B. item-XML-Datei in HTML oder alternativ in RSS transformieren)
|
||||
|
||||
|
||||
# Features
|
||||
|
||||
Podcast-Einbettung
|
||||
|
@ -42,3 +41,7 @@ Kommentare:
|
|||
MUC:
|
||||
- Integration mit Nick input + Submit button
|
||||
- Vielleicht auch iframe?
|
||||
|
||||
## news pre-posting
|
||||
|
||||
some news shall be written right now but published later, thats why the date next to author of the news/events item etc. should be compared and if greater than the current one not considered for publication yet.
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
= was man noch machen könnte
|
||||
|
||||
== news pre-posting
|
||||
|
||||
some news shall be written right now but published later, thats why the date next to author of the news/events item etc. should be compared and if greater than the current one not considered for publication yet.
|
||||
|
||||
== potal-mediagoblin
|
||||
|
||||
eine option für das bekanntgeben eines neuen Bilcdes fehlt im Mediagobline. Derzeit werden alle Bilder von bestimmten Nutzern (john, astro, lachmoewe, bigalex) bekannt gegeben.. nuja.
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
<xsl:sort select="date:seconds(document(.)/item/@date)" data-type="number" order="descending" />
|
||||
<xsl:variable name="newsfile" select="."/>
|
||||
<xsl:if test="(position() <= $maxitems) and
|
||||
starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix)">
|
||||
|
||||
starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix) and
|
||||
starts-with(date:difference(date:date-time(), document(.)/item/@date), '-')">
|
||||
<xsl:for-each select="document($newsfile)/item">
|
||||
<xsl:call-template name="atom-entry">
|
||||
<xsl:with-param name="newsfile" select="$newsfile"/>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<xsl:stylesheet version="1.0"
|
||||
xmlns:atom="http://www.w3.org/2005/Atom"
|
||||
xmlns:date="http://exslt.org/dates-and-times"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
|
||||
<xsl:output method="xml" encoding="utf-8" indent="yes"/>
|
||||
|
||||
|
@ -17,10 +18,13 @@
|
|||
|
||||
<!-- Extract from news -->
|
||||
<xsl:for-each select="document('../news.xml')//newsfile">
|
||||
<xsl:apply-templates select="document(concat('../', .))/item" mode="news">
|
||||
<xsl:with-param name="link"
|
||||
select="concat(substring-before(substring-after(., 'content/'), '.xml'), '.html')"/>
|
||||
</xsl:apply-templates>
|
||||
<xsl:if test="starts-with(date:difference(date:date-time(), @date), '-')">
|
||||
<xsl:apply-templates select="document(concat('../', .))/item"
|
||||
mode="news">
|
||||
<xsl:with-param name="link"
|
||||
select="concat(substring-before(substring-after(., 'content/'), '.xml'), '.html')"/>
|
||||
</xsl:apply-templates>
|
||||
</xsl:if>
|
||||
</xsl:for-each>
|
||||
</portal>
|
||||
</xsl:template>
|
||||
|
@ -85,23 +89,15 @@
|
|||
</xsl:template>
|
||||
|
||||
<xsl:template match="item" mode="news">
|
||||
<xsl:param name="link"/>
|
||||
<xsl:param name="link"/>
|
||||
|
||||
<!-- date cannot be compared (to current date) in xslt 1.0 without a param handed over -->
|
||||
<!-- current-date() as of XSLT 2.0 -->
|
||||
<!--
|
||||
<xsl:if test="{@date}">
|
||||
-->
|
||||
<item date="{@date}" class="news">
|
||||
<header>News</header>
|
||||
<footer>by <xsl:value-of select="@author"/></footer>
|
||||
<content-text><xsl:value-of select="@title"/></content-text>
|
||||
<xsl:apply-templates select=".//image[1]" mode="news"/>
|
||||
<link><xsl:value-of select="$link"/></link>
|
||||
</item>
|
||||
<!--
|
||||
</xsl:if>
|
||||
-->
|
||||
<item date="{@date}" class="news">
|
||||
<header>News</header>
|
||||
<footer>by <xsl:value-of select="@author"/></footer>
|
||||
<content-text><xsl:value-of select="@title"/></content-text>
|
||||
<xsl:apply-templates select=".//image[1]" mode="news"/>
|
||||
<link><xsl:value-of select="$link"/></link>
|
||||
</item>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="item/image[1]" mode="news">
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
<xsl:sort select="date:seconds(document(.)/item/@date)" data-type="number" order="descending" />
|
||||
<xsl:variable name="newsfile" select="."/>
|
||||
<xsl:if test="(position() <= $maxitems) and
|
||||
starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix)">
|
||||
|
||||
starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix) and
|
||||
starts-with(date:difference(date:date-time(), document(.)/item/@date), '-')">
|
||||
<xsl:apply-templates select="document(.)/item">
|
||||
<xsl:with-param name="newsfile" select="$newsfile"/>
|
||||
</xsl:apply-templates>
|
||||
|
|
|
@ -135,7 +135,14 @@
|
|||
|
||||
<xsl:for-each select="newsfile">
|
||||
<xsl:sort select="date:seconds(document(concat('../', .))/item/@date)" data-type="number" order="descending" />
|
||||
<xsl:if test="position() <= 10">
|
||||
<xsl:if test="position() <= 10 and
|
||||
not(starts-with(
|
||||
date:difference(
|
||||
document(concat('../', .))/item/@date,
|
||||
date:date-time()
|
||||
),
|
||||
'-'
|
||||
))">
|
||||
|
||||
<xsl:variable name="newsfile"><xsl:value-of select="."/></xsl:variable>
|
||||
<xsl:variable name="itemposition" select="position()"/>
|
||||
|
@ -252,7 +259,17 @@
|
|||
<xsl:variable name="newsfile" select="."/>
|
||||
|
||||
<xsl:for-each select="document(concat('../', $newsfile))/item">
|
||||
<xsl:if test="((string-length($prefix) = 0) or starts-with($newsfile, concat('content/news/', $prefix))) and (($details != 'resources-only') or (count(resource) > 0))">
|
||||
<xsl:if test="((string-length($prefix) = 0) or
|
||||
starts-with($newsfile, concat('content/news/', $prefix))) and
|
||||
(($details != 'resources-only') or
|
||||
(count(resource) > 0)) and
|
||||
starts-with(
|
||||
date:difference(
|
||||
document(concat('../', .))/item/@date,
|
||||
date:date-time()
|
||||
),
|
||||
'-'
|
||||
)">
|
||||
|
||||
<div>
|
||||
<xsl:if test="($details = 'event') and event">
|
||||
|
|
Loading…
Reference in New Issue