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

Nachziehen r1697 aus release 2.0: Unterstützung für Formeln in Xinha und Mandalay. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1699 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2012-06-08 07:17:45 +00:00
parent 89720efcd6
commit b1cf78e059
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
View File

@ -13,7 +13,7 @@ xinha_init=xinha_init?xinha_init:function(){
xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"]; xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"];
xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","CharCounter", xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","CharCounter",
"ContextMenu","DefinitionList","FindReplace","ListType","QuickTag", "ContextMenu","DefinitionList","FindReplace","ListType","QuickTag",
"SmartReplace","Stylist","TableOperations","UnFormat"]; "SmartReplace","Stylist","TableOperations","UnFormat","Equation"];
if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){ if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){
return; return;
} }

6
ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
View File

@ -52,6 +52,7 @@
<xsl:value-of select="$lang"/> <xsl:value-of select="$lang"/>
</xsl:attribute> </xsl:attribute>
<xsl:apply-templates/> <xsl:apply-templates/>
<script type="text/javascript" src="/assets/xinha/plugins/Equation/ASCIIMathML.js"></script>
</html> </html>
</xsl:template> </xsl:template>
@ -76,7 +77,7 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="colorClass"> <xsl:variable name="colorClass">
<xsl:if test="@withColorset='true'"> <xsl:if test="@withColorset='true'">
<xsl:call-template name="mandalay:getColorset"/> <xsl:call-template name="mandalay:getColorset"/>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>
@ -179,9 +180,6 @@
</title> </title>
</xsl:template> </xsl:template>
<xsl:template match="useImageGallery">
<xsl:call-template name="mandalay:imageGallery"/>
</xsl:template>
<!-- ************************************************************************************************************ --> <!-- ************************************************************************************************************ -->
<!-- ************************************************************************************************************ --> <!-- ************************************************************************************************************ -->