Index: lams_build/3rdParty.userlibraries =================================================================== diff -u -r588fe01186ff8c7c5b215e15f5ac4763137e0284 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf --- lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 588fe01186ff8c7c5b215e15f5ac4763137e0284) +++ lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -24,6 +24,7 @@ + Index: lams_build/build.xml =================================================================== diff -u -r8636b175edec8304175215f79a5deaa3dae5e361 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf --- lams_build/build.xml (.../build.xml) (revision 8636b175edec8304175215f79a5deaa3dae5e361) +++ lams_build/build.xml (.../build.xml) (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -568,6 +568,16 @@ + + + + + + + + + Index: lams_build/lib/jlatexmath/jlatexmath-1.0.3.jar =================================================================== diff -u Binary files differ Index: lams_build/lib/jlatexmath/jlatexmath.module.xml =================================================================== diff -u --- lams_build/lib/jlatexmath/jlatexmath.module.xml (revision 0) +++ lams_build/lib/jlatexmath/jlatexmath.module.xml (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -0,0 +1,29 @@ + + + + + + + + + \ No newline at end of file Index: lams_build/liblist.txt =================================================================== diff -u -r588fe01186ff8c7c5b215e15f5ac4763137e0284 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf --- lams_build/liblist.txt (.../liblist.txt) (revision 588fe01186ff8c7c5b215e15f5ac4763137e0284) +++ lams_build/liblist.txt (.../liblist.txt) (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -35,6 +35,8 @@ joda joda-time-2.1.jar 2.1 Apache License 2.0 Joda.org time calculation library +jlatexmath jlatexmath-1.0.3.jar 1.0.3 + joid joid.jar 2.0 Apache License 2.0 Java Open ID library lucene lucene-core-2.4.0.jar 2.4.0 Apache License 2.0 Apache text search engine library Index: lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -0,0 +1,94 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.web; + +import java.awt.AlphaComposite; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.OutputStream; + +import javax.imageio.ImageIO; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.swing.JLabel; + +import org.apache.commons.lang.StringUtils; +import org.lamsfoundation.lams.util.WebUtil; +import org.scilab.forge.jlatexmath.TeXConstants; +import org.scilab.forge.jlatexmath.TeXFormula; +import org.scilab.forge.jlatexmath.TeXIcon; + +/** + * @author Andrey Balan + * + * @web:servlet name="jlatexmath" + * @web:servlet-mapping url-pattern="/servlet/jlatexmath" + */ +public class JlatexmathServlet extends HttpServlet { + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + String formulaParam = request.getParameter("formula"); + if (StringUtils.isBlank(formulaParam)) { + return; + } + + Integer fontSize = WebUtil.readIntParam(request, "fontSize", true); + if (fontSize == null) { + fontSize = 20; + } + + TeXFormula formula = new TeXFormula(formulaParam); + TeXIcon icon = formula.new TeXIconBuilder().setStyle(TeXConstants.STYLE_DISPLAY) + .setSize(fontSize) + .setWidth(TeXConstants.UNIT_PIXEL, 256f, TeXConstants.ALIGN_CENTER) + .setIsMaxWidth(true).setInterLineSpacing(TeXConstants.UNIT_PIXEL, 20f) + .build(); + +// TeXFormula fomule = new TeXFormula(formula); +// TeXIcon ti = fomule.createTeXIcon(TeXConstants.STYLE_DISPLAY, 40); + BufferedImage b = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB); +// Color transparent = new Color(0, true); +// ((Graphics2D)b.getGraphics()).setBackground(transparent); +// b.getGraphics().clearRect(0, 0, icon.getIconWidth(), icon.getIconHeight()); + + ((Graphics2D)b.getGraphics()).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5F)); + icon.paintIcon(new JLabel(), b.getGraphics(), 0, 0); + + response.setContentType("image/png"); + OutputStream out = response.getOutputStream(); + ImageIO.write(b, "png", out); + out.close(); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, + IOException { + doGet(request, response); + } +} Index: lams_central/web/ckeditor/ckeditor.js =================================================================== diff -u -rc0707cde344f1b78772d8cffe3283c3bd678f587 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf --- lams_central/web/ckeditor/ckeditor.js (.../ckeditor.js) (revision c0707cde344f1b78772d8cffe3283c3bd678f587) +++ lams_central/web/ckeditor/ckeditor.js (.../ckeditor.js) (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -734,7 +734,7 @@ focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:j.baseProto.focus.call(this)},detach:function(){var a=this.editor,d=a.document,a=a.window.getFrame();j.baseProto.detach.call(this);this.clearCustomData();d.getDocumentElement().clearCustomData();/*LAMS*/if(a){a.clearCustomData()};CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);/*LAMS*/if(a){(d=a.removeCustomData("onResize"))&&d.removeListener();a.remove()}}}})})();CKEDITOR.config.disableObjectResizing=!1;CKEDITOR.config.disableNativeTableHandles=!0; CKEDITOR.config.disableNativeSpellChecker=!0;CKEDITOR.config.contentsCss=CKEDITOR.getUrl("contents.css");(function(){function e(b,a){a||(a=b.getSelection().getSelectedElement());if(a&&a.is("img")&&!a.data("cke-realelement")&&!a.isReadOnly())return a}function f(b){var a=b.getStyle("float");if("inherit"==a||"none"==a)a=0;a||(a=b.getAttribute("align"));return a}CKEDITOR.plugins.add("image",{requires:"dialog",init:function(b){if(!b.plugins.image2){CKEDITOR.dialog.add("image",this.path+"dialogs/image.js");var a="img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}"; CKEDITOR.dialog.isTabEnabled(b,"image","advanced")&&(a="img[alt,dir,id,lang,longdesc,!src,title]{*}(*)");b.addCommand("image",new CKEDITOR.dialogCommand("image",{allowedContent:a,requiredContent:"img[alt,src]",contentTransformations:[["img{width}: sizeToStyle","img[width]: sizeToAttribute"],["img{float}: alignmentToStyle","img[align]: alignmentToAttribute"]]}));b.ui.addButton&&b.ui.addButton("Image",{label:b.lang.common.image,command:"image",toolbar:"insert,10"});b.on("doubleclick",function(b){var a= -b.data.element;a.is("img")&&(!a.data("cke-realelement")&&!a.isReadOnly())&&(b.data.dialog="image")});b.addMenuItems&&b.addMenuItems({image:{label:b.lang.image.menu,command:"image",group:"image"}});b.contextMenu&&b.contextMenu.addListener(function(a){if(e(b,a))return{image:CKEDITOR.TRISTATE_OFF}})}},afterInit:function(b){function a(a){var d=b.getCommand("justify"+a);if(d){if("left"==a||"right"==a)d.on("exec",function(d){var c=e(b),g;c&&(g=f(c),g==a?(c.removeStyle("float"),a==f(c)&&c.removeAttribute("align")): +b.data.element;a.is("img")&&!a.data("jlatexmath")&&(!a.data("cke-realelement")&&!a.isReadOnly())&&(b.data.dialog="image")});b.addMenuItems&&b.addMenuItems({image:{label:b.lang.image.menu,command:"image",group:"image"}});b.contextMenu&&b.contextMenu.addListener(function(a){if(e(b,a))return{image:CKEDITOR.TRISTATE_OFF}})}},afterInit:function(b){function a(a){var d=b.getCommand("justify"+a);if(d){if("left"==a||"right"==a)d.on("exec",function(d){var c=e(b),g;c&&(g=f(c),g==a?(c.removeStyle("float"),a==f(c)&&c.removeAttribute("align")): c.setStyle("float",a),d.cancel())});d.on("refresh",function(d){var c=e(b);c&&(c=f(c),this.setState(c==a?CKEDITOR.TRISTATE_ON:"right"==a||"left"==a?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),d.cancel())})}}b.plugins.image2||(a("left"),a("right"),a("center"),a("block"))}})})();CKEDITOR.config.image_removeLinkByEmptyURL=!0;(function(){function k(a,b){var e,f;b.on("refresh",function(a){var b=[i],c;for(c in a.data.states)b.push(a.data.states[c]);this.setState(CKEDITOR.tools.search(b,m)?m:i)},b,null,100);b.on("exec",function(b){e=a.getSelection();f=e.createBookmarks(1);b.data||(b.data={});b.data.done=!1},b,null,0);b.on("exec",function(){a.forceNextSelectionCheck();e.selectBookmarks(f)},b,null,100)}var i=CKEDITOR.TRISTATE_DISABLED,m=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(a){var b=CKEDITOR.plugins.indent.genericDefinition; k(a,a.addCommand("indent",new b(!0)));k(a,a.addCommand("outdent",new b));a.ui.addButton&&(a.ui.addButton("Indent",{label:a.lang.indent.indent,command:"indent",directional:!0,toolbar:"indent,20"}),a.ui.addButton("Outdent",{label:a.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));a.on("dirChanged",function(b){var f=a.createRange(),j=b.data.node;f.setStartBefore(j);f.setEndAfter(j);for(var l=new CKEDITOR.dom.walker(f),c;c=l.next();)if(c.type==CKEDITOR.NODE_ELEMENT)if(!c.equals(j)&& c.getDirection()){f.setStartAfter(c);l=new CKEDITOR.dom.walker(f)}else{var d=a.config.indentClasses;if(d)for(var g=b.data.dir=="ltr"?["_rtl",""]:["","_rtl"],h=0;h + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-core" prefix="c"%> + +<%=Configuration.get(ConfigurationKeys.SERVER_URL_CONTEXT_PATH)%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + +
+ +
+ + + Index: lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js =================================================================== diff -u --- lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js (revision 0) +++ lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -0,0 +1,13 @@ +CKEDITOR.plugins.setLang( 'jlatexmath', 'en', { + // Toolbar button + JlatexmathBtn : 'JLaTeXMath', + JlatexmathTooltip : 'Insert/Edit Latex formulas', + + // Dialog + DlgJlatexmathTitle : 'JLaTeXMath', + JlatexmathFontSize : 'Font Size', + JlatexmathLatexFormula : 'Please, enter latex formula:', + + // Dialog errors + JlatexmathNoFormula : 'Please, enter a latex formula.' +}); Index: lams_central/web/ckeditor/plugins/jlatexmath/plugin.js =================================================================== diff -u --- lams_central/web/ckeditor/plugins/jlatexmath/plugin.js (revision 0) +++ lams_central/web/ckeditor/plugins/jlatexmath/plugin.js (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -0,0 +1,59 @@ +/* + * CKEditior plugin.js for JLaTeXMath. + * ------------ + */ +CKEDITOR.plugins.add('jlatexmath', { + requires : ['iframedialog'], + lang : [ 'en' ], + init : function(editor) { + var pluginPath = CKEDITOR.plugins.getPath('jlatexmath'); + + editor.ui.addButton( + 'Jlatexmath', + { + label : editor.lang.jlatexmath.JlatexmathBtn, + command : 'Jlatexmath', + icon : pluginPath + 'icons/mathjax.png', + title : editor.lang.jlatexmath.JlatexmathTooltip + } + ); + + editor.addCommand( + 'Jlatexmath', + { + exec : function(editor){ + editor.openDialog('Jlatexmath'); + } + } + ); + + CKEDITOR.dialog.addIframe( + 'Jlatexmath', + editor.lang.jlatexmath.DlgJlatexmathTitle, + pluginPath + 'jlatexmath.jsp', + 450, + 260 + ); + + editor.on( + 'doubleclick', + function(evt) { + var element = evt.data.element; + if (element && element.is('img')) { + + var sName = element.getAttribute('src').match( /jlatexmath\?formula(.*)/ ); + if (sName!=null) { + evt.data.dialog = 'Jlatexmath'; + + evt.cancelBubble = true; + evt.returnValue = false; + } + } + }, + null, + null, + 1 + ); + + } +}); \ No newline at end of file Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/lineutils/plugin.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/dialogs/mathjax.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/ckeditor/plugins/mathjax/icons/hidpi/mathjax.png =================================================================== diff -u -r7cb2670e5527930c6c50678be8770e6946ee7916 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf Binary files differ Index: lams_central/web/ckeditor/plugins/mathjax/icons/mathjax.png =================================================================== diff -u -r7cb2670e5527930c6c50678be8770e6946ee7916 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf Binary files differ Index: lams_central/web/ckeditor/plugins/mathjax/images/loader.gif =================================================================== diff -u -r7cb2670e5527930c6c50678be8770e6946ee7916 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf Binary files differ Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/af.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/ar.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/ca.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/cs.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/cy.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/da.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/de.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/el.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/en-gb.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/en.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/eo.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/es.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/fa.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/fi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/fr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/gl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/he.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/hr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/hu.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/it.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/ja.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/km.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/ku.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/lt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/nb.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/nl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/no.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/pl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/pt-br.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/pt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/ro.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/ru.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/sk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/sl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/sq.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/sv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/tr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/tt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/uk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/vi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/zh-cn.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/lang/zh.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/mathjax/plugin.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/ckeditor/plugins/widget/images/handle.png =================================================================== diff -u -r7cb2670e5527930c6c50678be8770e6946ee7916 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf Binary files differ Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/af.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/ar.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/ca.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/cs.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/cy.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/da.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/de.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/el.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/en-gb.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/en.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/eo.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/es.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/fa.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/fi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/fr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/gl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/he.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/hr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/hu.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/it.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/ja.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/km.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/ko.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/ku.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/nb.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/nl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/no.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/pl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/pt-br.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/pt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/ru.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/sk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/sl.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/sq.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/sv.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/tr.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/tt.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/uk.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/vi.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/zh-cn.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/lang/zh.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf refers to a dead (removed) revision in file `lams_central/web/ckeditor/plugins/widget/plugin.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/ckconfig_custom.js =================================================================== diff -u -r7cb2670e5527930c6c50678be8770e6946ee7916 -r3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf --- lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision 7cb2670e5527930c6c50678be8770e6946ee7916) +++ lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision 3b2ee7c25ecf993b0ec1b05d5b2333165db03ccf) @@ -1,7 +1,7 @@ CKEDITOR.config.toolbar_Default = [ - ['Source','-','Maximize', 'Preview','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Mathjax','-'], + ['Source','-','Maximize', 'Preview','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath','-'], ['Paint_Button','MoviePlayer','Kaltura','Image','Link','Iframe','Table','HorizontalRule','Smiley','SpecialChar','Templates','Format','Font','FontSize','About'] -] ; +]; // removing Video Recorder from default tool bar LDEV-2961 // To include it back, just add 'VideoRecorder' in between the MoviePlayer and Kaltura @@ -11,23 +11,23 @@ ['Bold','Italic','Underline', '-','Subscript','Superscript'], ['NumberedList','BulletedList','-','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['Mathjax','About'], + ['Jlatexmath','About'], ['TextColor','BGColor'], ['Image','Table','HorizontalRule','Smiley','SpecialChar'], ['Format','Font','FontSize'] -] ; +]; CKEDITOR.config.toolbar_DefaultMonitor = [ ['Preview','PasteFromWord'], ['Undo','Redo'], ['Bold','Italic','Underline', '-','Subscript','Superscript'], ['NumberedList','BulletedList','-','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], - ['Mathjax','About'], + ['Jlatexmath','About'], ['TextColor','BGColor'], ['Table','HorizontalRule','Smiley','SpecialChar'], ['Format','Font','FontSize'] -] ; +]; CKEDITOR.config.toolbar_CustomWiki = [ ['Source','-','Preview','PasteFromWord'], @@ -36,16 +36,16 @@ ['NumberedList','BulletedList','-','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['wikilink','Link','Image'], - ['Mathjax','About'], + ['Jlatexmath','About'], ['TextColor','BGColor'], ['Table','HorizontalRule','Smiley','SpecialChar'], ['Format','Font','FontSize'] -] ; +]; CKEDITOR.config.toolbar_CustomPedplanner = [ - ['Source','-','Maximize','Preview','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Mathjax'], + ['Source','-','Maximize','Preview','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], ['Image','Link','Iframe','Table','Smiley','Font','FontSize'] -] ; +]; CKEDITOR.config.toolbar_LessonDescription = [ ['Bold','Italic','Underline', '-','Subscript','Superscript'], @@ -54,7 +54,7 @@ ['TextColor','BGColor'], ['Table','HorizontalRule','Smiley','SpecialChar'], ['Format','Font','FontSize'] -] ; +]; CKEDITOR.config.contentsCss = CKEDITOR.basePath + '../css/defaultHTML_learner.css'; @@ -65,7 +65,7 @@ CKEDITOR.config.format_tags = 'div;h1;h2;h3;h4;h5;h6;pre;address;p' ; CKEDITOR.config.enterMode = 'div'; CKEDITOR.plugins.addExternal('wikilink', CKEDITOR.basePath + '../tool/lawiki10/wikilink/', 'plugin.js'); -CKEDITOR.config.extraPlugins = 'kaltura,lineutils,widget,wikilink,mathjax,paint,movieplayer,iframe'; +CKEDITOR.config.extraPlugins = 'kaltura,wikilink,jlatexmath,paint,movieplayer,iframe'; CKEDITOR.config.enterMode = CKEDITOR.ENTER_DIV; CKEDITOR.config.removePlugins = 'elementspath'; CKEDITOR.config.allowedContent = true;