hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #743 from LongsightGroup/DS-2275-mathjax-error

Browse Source 
DS-2275 XMLUI Error Page onclick errors
This commit is contained in:
helix84
2014-11-12 19:29:58 +01:00
parent 16621310ca 9f29cab98e
commit c93a50cfcb
6 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-xmlui-mirage2/src/main/webapp/xsl/core/elements.xsl
View File

@@ -513,6 +513,10 @@
<xsl:attribute name="name"><xsl:value-of select="@n"/></xsl:attribute>
</xsl:if>
<xsl:if test="@onclick">
<xsl:attribute name="onclick"><xsl:value-of select="@onclick"/></xsl:attribute>
</xsl:if>
<xsl:apply-templates />
</a>
</xsl:template>

15
dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl
View File

@@ -295,13 +295,13 @@
<meta name="{@element}" content="{.}"></meta>
</xsl:for-each>
<!-- Add MathJAX CDN to render scientific formulas -->
<!-- Add MathJAX JS library to render scientific formulas-->
<xsl:if test="confman:getProperty('webui.browse.render-scientific-formulas') = 'true'">
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {
inlineMath: [['$','$'], ['\\(','\\)']],
ignoreClass: "detail-field-data|detailtable"
ignoreClass: "detail-field-data|detailtable|exception"
},
TeX: {
Macros: {
@@ -310,16 +310,7 @@
}
});
</script>
<xsl:choose>
<xsl:when test="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='scheme']='https'">
<script type="text/javascript" src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">&#160;</script>
</xsl:when>
<xsl:otherwise>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">&#160;</script>
</xsl:otherwise>
</xsl:choose>
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">&#160;</script>
</xsl:if>
</head>

4
dspace-xmlui/src/main/webapp/exception2dri.xslt
View File

@@ -34,7 +34,7 @@ Created by Tim Donohue
<xsl:template match="ex:exception-report">
<document version="1.1">
<body>
<div id="exception">
<div id="exception" rend="exception">
<head><xsl:value-of select="$pageTitle"/></head>
<p>
<xref><xsl:attribute name="target"><xsl:value-of select="$contextPath"/>/</xsl:attribute><i18n:text>xmlui.general.go_home</i18n:text></xref>
@@ -45,7 +45,7 @@ Created by Tim Donohue
<p>
<xref><xsl:attribute name="target"><xsl:value-of select="$contextPath"/>/contact</xsl:attribute><i18n:text>xmlui.error.contact</i18n:text></xref> ||
<!-- Create a link which lets users optionally display the error stacktrace (using JQuery) -->
<xref target="javascript:jQuery('#errorstack').toggleClass('hidden');"><i18n:text>xmlui.error.show_stack</i18n:text></xref>
<xref target="#" onclick="javascript:jQuery('#errorstack').toggleClass('hidden');"><i18n:text>xmlui.error.show_stack</i18n:text></xref>
</p>
<!-- Include the Java stacktrace on the page, but hide it from view by default. -->
<p id="errorstack" rend="pre hidden">

15
dspace-xmlui/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl
View File

@@ -311,13 +311,13 @@
<meta name="{@element}" content="{.}"></meta>
</xsl:for-each>
<!-- Add MathJAX CDN, can do a local install, or possibly get SSL enabled-->
<!-- Add MathJAX JS library to render scientific formulas-->
<xsl:if test="confman:getProperty('webui.browse.render-scientific-formulas') = 'true'">
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {
inlineMath: [['$','$'], ['\\(','\\)']],
ignoreClass: "detail-field-data|detailtable"
ignoreClass: "detail-field-data|detailtable|exception"
},
TeX: {
Macros: {
@@ -326,16 +326,7 @@
}
});
</script>
<xsl:choose>
<xsl:when test="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='scheme']='https'">
<script type="text/javascript" src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">&#160;</script>
</xsl:when>
<xsl:otherwise>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">&#160;</script>
</xsl:otherwise>
</xsl:choose>
<script type="text/javascript" src="//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">&#160;</script>
</xsl:if>
</head>

4
dspace-xmlui/src/main/webapp/themes/dri2xhtml-alt/core/elements.xsl
View File

@@ -646,6 +646,10 @@
<xsl:attribute name="name"><xsl:value-of select="@n"/></xsl:attribute>
</xsl:if>
<xsl:if test="@onclick">
<xsl:attribute name="onclick"><xsl:value-of select="@onclick"/></xsl:attribute>
</xsl:if>
<xsl:apply-templates />
</a>
</xsl:template>

4
dspace-xmlui/src/main/webapp/themes/dri2xhtml/structural.xsl
View File

@@ -1740,6 +1740,10 @@
<xsl:attribute name="name"><xsl:value-of select="@n"/></xsl:attribute>
</xsl:if>
<xsl:if test="@onclick">
<xsl:attribute name="onclick"><xsl:value-of select="@onclick"/></xsl:attribute>
</xsl:if>
<xsl:apply-templates />
</a>
</xsl:template>