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

Fix for search in content centre (#2293) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3135 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-02-11 13:18:09 +00:00
parent 14e2984d19
commit 8c295036d1
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-core/web/themes/foundry/foundry/lib/bebop/form.xsl
View File

@ -33,7 +33,8 @@
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:foundry="http://foundry.libreccm.org" xmlns:foundry="http://foundry.libreccm.org"
xmlns:nav="http://ccm.redhat.com/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop cms nav" xmlns="http://www.w3.org/1999/xhtml"
exclude-result-prefixes="xsl bebop cms foundry nav"
version="2.0"> version="2.0">
<!-- DE Formulare --> <!-- DE Formulare -->
@ -45,7 +46,7 @@
</div> </div>
</xsl:if> </xsl:if>
<form> <form>
<xsl:if test="not(@method)"> <xsl:if test="not(./@method)">
<xsl:attribute name="method">post</xsl:attribute> <xsl:attribute name="method">post</xsl:attribute>
</xsl:if> </xsl:if>
<xsl:call-template name="foundry:process-datatree-attributes"/> <xsl:call-template name="foundry:process-datatree-attributes"/>

3
ccm-core/web/themes/foundry/foundry/lib/bebop/page.xsl
View File

@ -39,6 +39,9 @@
<!-- DE Schreibe den PageState in versteckte Input-Felder --> <!-- DE Schreibe den PageState in versteckte Input-Felder -->
<!-- EN Save the page state in hidden input fields --> <!-- EN Save the page state in hidden input fields -->
<xsl:template match="bebop:pageState"> <xsl:template match="bebop:pageState">
<xsl:message>
Creating hidden input for pageState
</xsl:message>
<input> <input>
<xsl:attribute name="type"> <xsl:attribute name="type">
<xsl:value-of select="'hidden'"/> <xsl:value-of select="'hidden'"/>

21
ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
View File

@ -25,6 +25,7 @@
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:foundry="http://foundry.libreccm.org" xmlns:foundry="http://foundry.libreccm.org"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns="http://www.w3.org/1999/xhtml"
exclude-result-prefixes="xsl xs bebop cms foundry ui" exclude-result-prefixes="xsl xs bebop cms foundry ui"
version="2.0"> version="2.0">
@ -43,12 +44,19 @@
<xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget] <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget]
| $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right[//bebop:formWidget]"> | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right[//bebop:formWidget]">
<form> <form>
<xsl:if test="not(@method)"> <xsl:attribute name="method"
<xsl:attribute name="method">post</xsl:attribute> select="if ($data-tree//bebop:form/@method)
</xsl:if> then $data-tree//bebop:form/@method
else 'post'"/>
<xsl:call-template name="foundry:process-datatree-attributes"/> <xsl:call-template name="foundry:process-datatree-attributes"/>
<xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body
| $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/> | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/>
<xsl:message>
<xsl:value-of select="concat('Applying template for bebop:pageState to ',
count($data-tree//bebop:currentPane/bebop:form//bebop:pageState),
' objects...')"/>
</xsl:message>
<xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:pageState"/>
</form> </form>
</xsl:when> </xsl:when>
@ -87,9 +95,10 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left[//bebop:formWidget]"> <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left[//bebop:formWidget]">
<form> <form>
<xsl:if test="not(@method)"> <xsl:attribute name="method"
<xsl:attribute name="method">post</xsl:attribute> select="if ($data-tree//bebop:form/@method)
</xsl:if> then $data-tree//bebop:form/@method
else 'post'"/>
<xsl:call-template name="foundry:process-datatree-attributes"/> <xsl:call-template name="foundry:process-datatree-attributes"/>
<xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left"/> <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left"/>
</form> </form>