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

Some bugfixes etc. for Foundry and the foundry-base theme 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2997 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-11-29 17:08:54 +00:00
parent 58a27ac0d7
commit b8d58952a7
6 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ccm-core/web/themes/foundry-base/conf/bebop-contextbar.xsl → ccm-core/web/themes/foundry-base/conf/bebop-contextbar.xml
View File

9
ccm-core/web/themes/foundry-base/conf/css-files.xml
View File

@ -3,18 +3,21 @@
<application name="admin"> <application name="admin">
<css-file origin="internal">admin.css</css-file> <css-file origin="internal">admin.css</css-file>
</application> </application>
<application name="cms-admin"> <application name="login">
<css-file origin="internal">admin.css</css-file> <css-file origin="internal">admin.css</css-file>
</application> </application>
<application name="navigation"> <application name="navigation">
<css-file>public.css</css-file> <css-file>public.css</css-file>
<css-file media="screen">public.css</css-file> <css-file media="screen">public.css</css-file>
</application> </application>
<application name="navigation" class="portalGridPage"> <application name="navigation" class="portalGridPage">
<css-file media="screen">portal.css</css-file> <css-file media="screen">portal.css</css-file>
<css-file>public.css</css-file> <css-file>public.css</css-file>
<css-file media="screen">public.css</css-file> <css-file media="screen">public.css</css-file>
</application> </application>
<application name="none" class="cms-admin">
<css-file origin="internal">admin.css</css-file>
</application>
<application name="portal"> <application name="portal">
<css-file media="screen">portal.css</css-file> <css-file media="screen">portal.css</css-file>
<css-file>public.css</css-file> <css-file>public.css</css-file>
@ -23,5 +26,5 @@
<default> <default>
<css-file>public.css</css-file> <css-file>public.css</css-file>
<css-file media="screen">public.css</css-file> <css-file media="screen">public.css</css-file>
</default> </default>
</css-files> </css-files>

0
ccm-core/web/themes/foundry/conf/bebop-contextbar.xsl → ccm-core/web/themes/foundry/conf/bebop-contextbar.xml
View File

6
ccm-core/web/themes/foundry/conf/css-files.xml
View File

@ -3,17 +3,19 @@
<application name="admin"> <application name="admin">
<css-file origin="internal">admin.css</css-file> <css-file origin="internal">admin.css</css-file>
</application> </application>
<application name="cms-admin"> <application name="login">
<css-file origin="internal">admin.css</css-file> <css-file origin="internal">admin.css</css-file>
</application> </application>
<application name="navigation"> <application name="navigation">
<css-file>bootstrap/css/bootstrap.min.css</css-file>
<css-file>public.css</css-file> <css-file>public.css</css-file>
</application> </application>
<application name="navigation" class="portalGridPage"> <application name="navigation" class="portalGridPage">
<css-file>portal.css</css-file> <css-file>portal.css</css-file>
<css-file>public.css</css-file> <css-file>public.css</css-file>
</application> </application>
<application name="none" class="cms-admin">
<css-file origin="internal">admin.css</css-file>
</application>
<application name="portal"> <application name="portal">
<css-file>portal.css</css-file> <css-file>portal.css</css-file>
<css-file>public.css</css-file> <css-file>public.css</css-file>

26
ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
View File

@ -84,16 +84,6 @@
</foundry:doc> </foundry:doc>
<xsl:template match="show-text"> <xsl:template match="show-text">
<xsl:variable name="module" select="if (./@module) then ./@module else ''"/> <xsl:variable name="module" select="if (./@module) then ./@module else ''"/>
<!--<xsl:variable name="module">
<xsl:choose>
<xsl:when test="./@module">
<xsl:value-of select="./@module"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="''"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>-->
<xsl:choose> <xsl:choose>
<xsl:when test="@id != '' or @class != '' or with-colorset = 'true'"> <xsl:when test="@id != '' or @class != '' or with-colorset = 'true'">
@ -108,4 +98,20 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template match="show-internal-text">
<xsl:variable name="module" select="if (./@module) then ./@module else ''"/>
<xsl:choose>
<xsl:when test="@id != '' or @class != '' or with-colorset = 'true'">
<span>
<xsl:call-template name="foundry:set-id-and-class"/>
<xsl:value-of select="foundry:get-internal-static-text($module, .)"/>
</span>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="foundry:get-internal-static-text($module, .)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

38
ccm-core/web/themes/foundry/foundry/lib/utils.xsl
View File

@ -703,34 +703,32 @@
<xsl:param name="lang" as="xs:string"/> <xsl:param name="lang" as="xs:string"/>
<xsl:param name="internal" as="xs:boolean"/> <xsl:param name="internal" as="xs:boolean"/>
<!--<xsl:message> <xsl:variable name="origin"
select="if ($internal)
then 'internal'
else ''"/>
<xsl:message>
<xsl:value-of select="foundry:message-info('get-static-text(string, string, boolean, string) called')"/> <xsl:value-of select="foundry:message-info('get-static-text(string, string, boolean, string) called')"/>
</xsl:message> </xsl:message>
<xsl:message> <xsl:message>
<xsl:value-of select="foundry:message-info(concat('Trying to get ', $theme-prefix, '/texts/', $module ,'.xml/foundry:static-texts/text[@id=', $id, ']/translation[@lang = ', $lang, ']'))"/> <xsl:value-of select="foundry:message-info(concat('Trying to get ',
</xsl:message>--> foundry:gen-path(concat('texts/',
$module,
<xsl:variable name="text-dir"> '.xml')),
<xsl:choose> '/foundry:static-texts/text[@id=', $id, ']/translation[@lang = ', $lang, ']'))"/>
<xsl:when test="$internal"> </xsl:message>
<xsl:value-of select="'foundry/texts'"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="'texts'"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:choose> <xsl:choose>
<xsl:when test="$module = '' and document(foundry:gen-path(concat($text-dir, '/global.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"> <xsl:when test="$module = '' and document(foundry:gen-path('texts/global.xml', $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]">
<xsl:message> <xsl:message>
<xsl:value-of select="'using global.xml for texts...'"/> <xsl:value-of select="'using global.xml for texts...'"/>
</xsl:message> </xsl:message>
<xsl:sequence select="document(foundry:gen-path(concat($text-dir, '/global.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/> <xsl:sequence select="document(foundry:gen-path('texts/global.xml', $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
</xsl:when> </xsl:when>
<xsl:when test="not($module = '') and document(foundry:gen-path(concat($text-dir, '/', $module, '.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"> <xsl:when test="not($module = '') and document(foundry:gen-path(concat('texts/', $module, '.xml'), $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]">
<xsl:sequence select="document(foundry:gen-path(concat($text-dir, '/', $module, '.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/> <xsl:sequence select="document(foundry:gen-path(concat('texts/', $module, '.xml'), $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:message> <xsl:message>
@ -750,10 +748,10 @@
<span class="foundry-missing-translation-path"> <span class="foundry-missing-translation-path">
<xsl:choose> <xsl:choose>
<xsl:when test="$module = ''"> <xsl:when test="$module = ''">
<xsl:value-of select="document(foundry:gen-path(concat($text-dir, '/global.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/> <xsl:value-of select="concat(foundry:gen-path('texts/global.xml'), '/foundry:static-texts/text[@id=', $id, ']/translation[@lang=', $lang, ']')"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="document(foundry:gen-path(concat($text-dir, '/', $module, '.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/> <xsl:value-of select="concat(foundry:gen-path(concat('texts/', $module, '.xml')), '/foundry:static-texts/text[@id=', $id, ']/translation[@lang=', $lang, ']')"/>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</span> </span>