LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

incorporating APLAWS patch: 

r1661 | chrisg23 | 2007-09-19 09:33:20 +0200 (Mi, 19 Sep 2007)

Include applications on navigation pages where they have been assigned to navigation categories 
(currently possible for forums if the optional ccm-categorised-forum module in contrib/wsx is loaded).


git-svn-id: https://svn.libreccm.org/ccm/trunk@26 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2008-02-15 18:36:38 +00:00
parent e1cf71ad56
commit fcd00bdf1b
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-ldn-aplaws/web/__ccm__/themes/aplaws/lib/lib.xsl
View File

@ -258,8 +258,8 @@
<xsl:for-each select="nav:item"> <xsl:for-each select="nav:item">
<a> <a>
<xsl:attribute name="href"><xsl:value-of select="nav:path" /></xsl:attribute> <xsl:attribute name="href"><xsl:value-of select="nav:path" /></xsl:attribute>
<xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='title']" /></xsl:attribute> <xsl:attribute name="displayName"><xsl:value-of select="nav:attribute[@name='displayName']" /></xsl:attribute>
<xsl:value-of select="nav:attribute[@name='title']" /> <xsl:value-of select="nav:attribute[@name='displayName']" />
</a> </a>
<span class="hide">|</span> <span class="hide">|</span>
</xsl:for-each> </xsl:for-each>
@ -282,10 +282,10 @@
<xsl:sort select="nav:attribute[@name='launchDate']/@hour" order = "{$order}" data-type="number"/> <xsl:sort select="nav:attribute[@name='launchDate']/@hour" order = "{$order}" data-type="number"/>
<xsl:sort select="nav:attribute[@name='launchDate']/@minute" order = "{$order}" data-type="number"/> <xsl:sort select="nav:attribute[@name='launchDate']/@minute" order = "{$order}" data-type="number"/>
<xsl:sort select="nav:attribute[@name='launchDate']/@second" order = "{$order}" data-type="number"/> <xsl:sort select="nav:attribute[@name='launchDate']/@second" order = "{$order}" data-type="number"/>
<xsl:sort select="nav:attribute[@name='title']"/> <xsl:sort select="nav:attribute[@name='displayName']"/>
<a> <a>
<xsl:attribute name="href"><xsl:value-of select="nav:path" /></xsl:attribute> <xsl:attribute name="href"><xsl:value-of select="nav:path" /></xsl:attribute>
<xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='title']" /></xsl:attribute> <xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='displayName']" /></xsl:attribute>
<!-- if there is a launch date, prepend title with date, so that the order of <!-- if there is a launch date, prepend title with date, so that the order of
entries makes sense --> entries makes sense -->
<xsl:if test="nav:attribute[@name='launchDate']"> <xsl:if test="nav:attribute[@name='launchDate']">
@ -300,7 +300,7 @@
<xsl:value-of select="nav:attribute[@name='launchDate']/@month"/>/ <xsl:value-of select="nav:attribute[@name='launchDate']/@month"/>/
<xsl:value-of select="nav:attribute[@name='launchDate']/@year"/> - --> <xsl:value-of select="nav:attribute[@name='launchDate']/@year"/> - -->
</xsl:if> </xsl:if>
<xsl:value-of select="nav:attribute[@name='title']" /> <xsl:value-of select="nav:attribute[@name='displayName']" />
</a> </a>
<span class="hide">|</span> <span class="hide">|</span>
</xsl:for-each> </xsl:for-each>

18
ccm-ldn-navigation/web/packages/navigation/templates/default.jsp
View File

@ -9,6 +9,9 @@
<jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/> <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/> <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/> <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
<jsp:directive.page import="com.arsdigita.london.navigation.DataCollectionDefinition"/>
<jsp:directive.page import="com.arsdigita.london.navigation.DataCollectionRenderer"/>
<jsp:scriptlet> <jsp:scriptlet>
long age = Navigation.getConfig().getIndexPageCacheLifetime(); long age = Navigation.getConfig().getIndexPageCacheLifetime();
@ -32,6 +35,9 @@
classname="com.arsdigita.london.navigation.ui.category.Menu"/> classname="com.arsdigita.london.navigation.ui.category.Menu"/>
<define:component name="itemList" <define:component name="itemList"
classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/> classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
<define:component name="applicationList"
classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
@ -43,7 +49,19 @@
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType"); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title"); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("displayName");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate"); ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("launchDate");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setDefinition(new DataCollectionDefinition());
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).setRenderer(new DataCollectionRenderer());
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setObjectType("com.arsdigita.web.Application");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().setDescendCategories(false);
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getDefinition().addOrder("categories.link.sortKey");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().setPageSize(30);
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) applicationList).getRenderer().addAttribute("displayName");
</jsp:scriptlet> </jsp:scriptlet>
<define:component name="assignedTerms" <define:component name="assignedTerms"