Merge branch 'master' of git.c3d2.de:c3d2-web

This commit is contained in:
nek0 2016-05-01 01:17:58 +02:00
commit 8690a9dbf2
5 changed files with 452 additions and 2 deletions

View File

@ -4076,4 +4076,10 @@
<location><link href="http://slub-dresden.de/">SLUB Dresden</link>, Hauptgebäude <link href="http://3d.slub-dresden.de/viewer?project_id=3&amp;language=de&amp;activate_location=3022">Raum -2.115</link>, <link href="http://www.openstreetmap.org/#map=18/51.02822/13.73593">Zellescher Weg 18, 01069 Dresden</link></location>
<link>https://pad.fsfw-dresden.de/p/fsfw-dd-20160428</link>
</event>
<event title="Freifunk Sprechstunde">
<start>2016-05-04T19:00:00</start>
<end>2016-05-04T20:00:00</end>
<location><link href="http://www.rosenwerk.co/">Rosenwerk</link>, <link href="https://www.openstreetmap.org/node/3140655489#map=19/51.04639/13.71596">Jagdweg 1-3, 01159 Dresden</link></location>
<link>http://wiki.freifunk-dresden.de/index.php/Freifunk-Sprechstunde</link>
</event>
</calendar>

View File

@ -9,4 +9,5 @@
<gallery id="media-joerg">https://media.c3d2.de/u/joerg/atom/</gallery>
<!-- https://www.mediawiki.org/wiki/API:Recentchanges -->
<wiki id="wiki">https://wiki.c3d2.de/w/api.php?action=query&amp;list=recentchanges&amp;format=xml&amp;rcnamespace=0|4|6&amp;rclimit=20&amp;rcprop=title|user|comment|timestamp&amp;rcshow=!minor</wiki>
<issues id="redmine-zentralwerk" title="Hackspace-Umzug" category="public">https://redmine.c3d2.de/issues.xml?key=a7bb15ffa84bf84d193dc8ea45513307ef8d1561&amp;project_id=56</issues>
</config>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 41 KiB

View File

@ -38,6 +38,9 @@
<xsl:apply-templates select="document(concat('../portal/portal-', @id, '.xml'))/api/query/recentchanges" mode="wiki"/>
</xsl:template>
<xsl:template match="/config/issues">
</xsl:template>
<xsl:template match="*">
</xsl:template>

View File

@ -381,8 +381,28 @@
<p class="footer">ccc.de</p>
</article-->
<!-- 8..30 -->
<xsl:apply-templates select="item[position() &gt;= 8 and position() &lt;= 30]"/>
<!-- 8..12 -->
<xsl:apply-templates select="item[position() &gt;= 8 and position() &lt;= 12]"/>
<!-- Zentralwerk-Issues -->
<article class="upcoming">
<h3>Hackspace-Umzug</h3>
<ul>
<xsl:for-each select="document('../portal/portal-redmine-zentralwerk.xml')/issues/issue[category/@name='public']">
<xsl:sort select="date:seconds(updated_on)" data-type="number" order="descending" />
<li>
<a href="https://redmine.c3d2.de/issues/{id}">
<xsl:value-of select="subject"/>
</a>
</li>
</xsl:for-each>
</ul>
<p class="footer">…ins Zentralwerk</p>
</article>
<!-- 13..30 -->
<xsl:apply-templates select="item[position() &gt;= 13 and position() &lt;= 30]"/>
</section>
</xsl:template>