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

Improved handling for favicons in Foundry 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4160 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-06-16 12:09:21 +00:00
parent 30fe57f032
commit 8ff655f792
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
View File

@ -1178,14 +1178,6 @@
<!-- Not implemented yet <xsl:call-template name="bebop:double-click-protection"/> --> <!-- Not implemented yet <xsl:call-template name="bebop:double-click-protection"/> -->
<!--
Set favicon if exists. This three different variants for including the favicon
are necessary to satisfy all browsers.
-->
<link href="{$theme-prefix}/images/favicon.ico"
type="image/x-icon"
rel="shortcut icon"/>
<xsl:apply-templates select="$data-tree//script"/> <xsl:apply-templates select="$data-tree//script"/>
</head> </head>
</xsl:template> </xsl:template>

29
ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
View File

@ -456,9 +456,32 @@
</foundry:doc-attributes> </foundry:doc-attributes>
</foundry:doc> </foundry:doc>
<xsl:template match="load-favicon"> <xsl:template match="load-favicon">
<link rel="shortcut icon" <xsl:if test="./@file">
type="image/x-icon" <link rel="shortcut icon"
href="{foundry:gen-path(./@file)}" /> type="image/x-icon"
href="{foundry:gen-path(./@file)}" />
</xsl:if>
<xsl:if test="./icon">
<link rel="shortcut icon"
type="image/x-icon"
href="{foundry:gen-path(./icon)}" />
</xsl:if>
<xsl:if test="./png">
<link rel="icon"
type="image/png"
href="{foundry:gen-path(./png)}" />
</xsl:if>
<xsl:if test="./apple-touch-icon">
<link rel="apple-touch-icon"
sizes="180x180"
href="{foundry:gen-path(./apple-touch-icon)}" />
</xsl:if>
<xsl:if test="./mstile/@color">
<meta name="msapplication-TileColor" content="#ffffff" />
</xsl:if>
<xsl:if test="./mstile">
<meta name="msapplication-TileImage" content="{foundry:gen-path(./mstile)}" />
</xsl:if>
</xsl:template> </xsl:template>
<foundry:doc section="user" type="template-tag"> <foundry:doc section="user" type="template-tag">