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

- Foundry now shows the paginator for search page in the content centre. 

- Some reorganisation of files for the search part


git-svn-id: https://svn.libreccm.org/ccm/trunk@3090 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-01-18 12:33:33 +00:00
parent 243b62082c
commit 513ed94d55
11 changed files with 289 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ccm-core/web/themes/foundry/foundry/lib/search.xsl
View File

@ -24,12 +24,13 @@
version="2.0"> version="2.0">
<xsl:import href="search/filterControls.xsl"/> <xsl:import href="search/filterControls.xsl"/>
<xsl:import href="search/searchDocuments.xsl"/> <xsl:import href="search/documents.xsl"/>
<xsl:import href="search/searchFilter.xsl"/> <xsl:import href="search/filter.xsl"/>
<xsl:import href="search/searchObject.xsl"/> <xsl:import href="search/object.xsl"/>
<xsl:import href="search/searchPartyText.xsl"/> <xsl:import href="search/paginator.xsl"/>
<xsl:import href="search/searchQuery.xsl"/> <xsl:import href="search/partyText.xsl"/>
<xsl:import href="search/searchResults.xsl"/> <xsl:import href="search/query.xsl"/>
<xsl:import href="search/searchTerms.xsl"/> <xsl:import href="search/results.xsl"/>
<xsl:import href="search/terms.xsl"/>
</xsl:stylesheet> </xsl:stylesheet>

0
ccm-core/web/themes/foundry/foundry/lib/search/searchDocuments.xsl → ccm-core/web/themes/foundry/foundry/lib/search/documents.xsl
View File

0
ccm-core/web/themes/foundry/foundry/lib/search/searchFilter.xsl → ccm-core/web/themes/foundry/foundry/lib/search/filter.xsl
View File

0
ccm-core/web/themes/foundry/foundry/lib/search/searchObject.xsl → ccm-core/web/themes/foundry/foundry/lib/search/object.xsl
View File

145
ccm-core/web/themes/foundry/foundry/lib/search/paginator.xsl 100644
View File

@ -0,0 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
<!--
Copyright: 2015 Jens Pelzetter
This file is part of the Foundry Theme Engine for LibreCCM. This file
was taken from the Mandalay theme engine at has been modified to work
with Foundry.
Foundry is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
Foundry is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Foundry If not, see <http://www.gnu.org/licenses/>.
-->
<!-- Support for the search paginator -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:foundry="http://foundry.libreccm.org"
xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0"
exclude-result-prefixes="xsl bebop cms foundry nav search"
version="2.0">
<xsl:template match="search:paginator" mode="header">
<xsl:if test="./@pageCount &gt; 1">
<span class="paginator header">
<xsl:value-of select="foundry:get-static-text('search-paginator',
'header/resultinfo/text/begin')"/>
<span class="objBegin">
<xsl:value-of select="./@objectBegin"/>
</span>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'header/resultinfo/text/inbetween1')"/>
<span class="objEnd">
<xsl:value-of select="./@objectEnd"/>
</span>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'header/resultinfo/text/inbetween2')"/>
<span id="objCount">
<xsl:value-of select="./@objectCount"/>
</span>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'header/resultinfo/text/end')"/>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'header/pageinfo/text/begin')"/>
<xsl:value-of select="./@pageSize"/>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'header/pageinfo/text/end')"/>
</span>
</xsl:if>
</xsl:template>
<xsl:template match="search:paginator" mode="navbar">
<xsl:if test="./@pageCount &gt; 1">
<xsl:variable name="page-param" select="if (./@pageParam)
then ./@pageParam
else 'pageNumber='"/>
<xsl:variable name="url">
<xsl:choose>
<xsl:when test="./@baseURL and contains(./@baseURL, '?')">
<xsl:value-of select="concat(./@baseURL, '&amp;')"/>
</xsl:when>
<xsl:when test="./@baseURL and not(contains(./@baseURL, '?'))">
<xsl:value-of select="concat(./@baseURL, '?')"/>
</xsl:when>
<xsl:when test="not(./@baseURL)
and //nav:letter
and contains(//nav:letter[./@selected = '1']/@url, '?')">
<xsl:value-of select="concat(//nav:letter[./@selected = '1']/@url, '&amp;')"/>
</xsl:when>
<xsl:when test="not(./@baseURL)
and //nav:letter
and not(contains(//nav:letter[./@selected = '1']/@url, '?'))">
<xsl:value-of select="concat(//nav:letter[@selected = '1']/@url, '?')"/>
</xsl:when>
<xsl:when test="not(./@baseURL)
and not(//nav:letter)
and not(contains(/bebop:page/@url, '?'))">
<xsl:value-of select="concat(/bebop:page/@url, '?')"/>
</xsl:when>
</xsl:choose>
</xsl:variable>
<span class="paginator navbar">
<xsl:if test="./@pageNumber &gt; 1">
<a class="prev"
href="{concat($url, ./pageParam, '=', ./pageNumber - 1)}"
accesskey="{foundry:get-static-text('search-paginator',
'navbar/prev/accesskey')}"
title="{foundry:get-static-text('search-paginator',
'navbar/prev/title')}">
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/prev/link')"/>
</a>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/separator')"/>
</xsl:if>
<span class="pages">
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/pageNumber/prefix')"/>
<xsl:value-of select="./@pageNumber"/>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/pageNumber/separator')"/>
<xsl:value-of select="./@pageCount"/>
</span>
<xsl:if test="./@pageNumber &lt; ./@pageCount">
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/separator')"/>
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/separator')"/>
<a href="{concat($url, ./@pageParam, '=', ./@pageNumber + 1)}"
accesskey="{foundry:get-static-text('search-paginator',
'navbar/next/accesskey')}"
title="{foundry:get-static-text('search-paginator',
'navbar/next/title')}">
<xsl:value-of select="foundry:get-static-text('search-paginator',
'navbar/next/link')"/>
</a>
</xsl:if>
</span>
</xsl:if>
</xsl:template>
</xsl:stylesheet>

0
ccm-core/web/themes/foundry/foundry/lib/search/searchPartyText.xsl → ccm-core/web/themes/foundry/foundry/lib/search/partyText.xsl
View File

0
ccm-core/web/themes/foundry/foundry/lib/search/searchQuery.xsl → ccm-core/web/themes/foundry/foundry/lib/search/query.xsl
View File

10
ccm-core/web/themes/foundry/foundry/lib/search/searchResults.xsl → ccm-core/web/themes/foundry/foundry/lib/search/results.xsl
View File

@ -39,6 +39,11 @@
<!-- Show the result on admin pages --> <!-- Show the result on admin pages -->
<xsl:template match="search:results"> <xsl:template match="search:results">
<div class="paginator">
<xsl:apply-templates select="./search:paginator" mode="navbar"/>
<xsl:text> | </xsl:text>
<xsl:apply-templates select="./search:paginator" mode="header"/>
</div>
<xsl:choose> <xsl:choose>
<xsl:when test="../search:query/bebop:formWidget[@name='draft_search']"> <xsl:when test="../search:query/bebop:formWidget[@name='draft_search']">
<xsl:apply-templates select="search:documents" mode="admin"/> <xsl:apply-templates select="search:documents" mode="admin"/>
@ -47,6 +52,11 @@
<xsl:apply-templates select="search:documents | info"/> <xsl:apply-templates select="search:documents | info"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<div class="paginator">
<xsl:apply-templates select="./search:paginator" mode="navbar"/>
<xsl:text> | </xsl:text>
<xsl:apply-templates select="./search:paginator" mode="header"/>
</div>
</xsl:template> </xsl:template>
<xsl:template match="info"> <xsl:template match="info">

0
ccm-core/web/themes/foundry/foundry/lib/search/searchTerms.xsl → ccm-core/web/themes/foundry/foundry/lib/search/terms.xsl
View File

63
ccm-core/web/themes/foundry/foundry/texts/search-paginator.xml 100644
View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8" ?>
<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
<text id="navbar/prev/link">
<translation lang="de">Zurück </translation>
<translation lang="en">Back </translation>
</text>
<text id="navbar/prev/title">
<translation lang="de">Zurück</translation>
<translation lang="en">Back</translation>
</text>
<text id="navbar/prev/accesskey">
<translation lang="de">&lt;</translation>
<translation lang="en">&lt;</translation>
</text>
<text id="navbar/next/link">
<translation lang="de"> Weiter </translation>
<translation lang="en"> Continue </translation>
</text>
<text id="navbar/next/title">
<translation lang="de">Weiter</translation>
<translation lang="en">Continue</translation>
</text>
<text id="navbar/next/accesskey">
<translation lang="de">&gt;</translation>
<translation lang="en">&gt;</translation>
</text>
<text id="navbar/pageNumber/prefix">
<translation lang="de">Seite </translation>
<translation lang="en">Page </translation>
</text>
<text id="navbar/pageNumber/separator">
<translation lang="de"> von </translation>
<translation lang="en"> from </translation>
</text>
<text id="header/resultinfo/text/begin">
<translation lang="de"> Zeige Ergebnisse </translation>
<translation lang="en"> Show results </translation>
</text>
<text id="header/resultinfo/text/inbetween1">
<translation lang="de"> bis </translation>
<translation lang="en"> to </translation>
</text>
<text id="header/resultinfo/text/inbetween2">
<translation lang="de"> von </translation>
<translation lang="en"> from </translation>
</text>
<text id="header/resultinfo/text/end">
<translation lang="de">.</translation>
<translation lang="en">.</translation>
</text>
<text id="header/pageinfo/text/begin">
<translation lang="de"> Zeige </translation>
<translation lang="en"> Showing </translation>
</text>
<text id="header/pageinfo/text/end">
<translation lang="de"> Ergebnisse pro Seite </translation>
<translation lang="en"> results per page.</translation>
</text>
</foundry:static-texts>

63
ccm-core/web/themes/foundry/texts/search-paginator.xml 100644
View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8" ?>
<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
<text id="navbar/prev/link">
<translation lang="de">Zurück </translation>
<translation lang="en">Back </translation>
</text>
<text id="navbar/prev/title">
<translation lang="de">Zurück</translation>
<translation lang="en">Back</translation>
</text>
<text id="navbar/prev/accesskey">
<translation lang="de">&lt;</translation>
<translation lang="en">&lt;</translation>
</text>
<text id="navbar/next/link">
<translation lang="de"> Weiter </translation>
<translation lang="en"> Continue </translation>
</text>
<text id="navbar/next/title">
<translation lang="de">Weiter</translation>
<translation lang="en">Continue</translation>
</text>
<text id="navbar/next/accesskey">
<translation lang="de">&gt;</translation>
<translation lang="en">&gt;</translation>
</text>
<text id="navbar/pageNumber/prefix">
<translation lang="de">Seite </translation>
<translation lang="en">Page </translation>
</text>
<text id="navbar/pageNumber/separator">
<translation lang="de"> von </translation>
<translation lang="en"> from </translation>
</text>
<text id="header/resultinfo/text/begin">
<translation lang="de"> Zeige Ergebnisse </translation>
<translation lang="en"> Show results </translation>
</text>
<text id="header/resultinfo/text/inbetween1">
<translation lang="de"> bis </translation>
<translation lang="en"> to </translation>
</text>
<text id="header/resultinfo/text/inbetween2">
<translation lang="de"> von </translation>
<translation lang="en"> from </translation>
</text>
<text id="header/resultinfo/text/end">
<translation lang="de">.</translation>
<translation lang="en">.</translation>
</text>
<text id="header/pageinfo/text/begin">
<translation lang="de"> Zeige </translation>
<translation lang="en"> Showing </translation>
</text>
<text id="header/pageinfo/text/end">
<translation lang="de"> Ergebnisse pro Seite </translation>
<translation lang="en"> results per page.</translation>
</text>
</foundry:static-texts>