Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rf65bf8d775c89d19993d672813a4af9f95266267 -r1c3bf44634db69a603b52728611da0cf922d0709 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f65bf8d775c89d19993d672813a4af9f95266267) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1c3bf44634db69a603b52728611da0cf922d0709) @@ -649,15 +649,15 @@ authoring.fla.page.svg.generator.title =SVG Generator authoring.fla.tool.groups.all =All +ckeditor.math.math =Math +ckeditor.math.functions =Functions ckeditor.math.greek =Greek -ckeditor.math.uppercase =uppercase +ckeditor.math.matrix =Matrix ckeditor.math.misc =misc -ckeditor.math.binary =binary -ckeditor.math.large =large -ckeditor.math.relations =relations -ckeditor.math.negatedrelations =negated
relations -ckeditor.math.arrows =arrows -ckeditor.math.combining =combining +ckeditor.math.symbols =Symbols/relations +ckeditor.math.arrows =Arrows +ckeditor.math.accents =Accents +ckeditor.math.formatting =Formatting heading.comments=Comments label.hidden=Comment Hidden Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.css =================================================================== diff -u -rc59697465dc217e22610e495a0f4696cf8352a52 -r1c3bf44634db69a603b52728611da0cf922d0709 --- lams_central/web/ckeditor/plugins/jlatexmath/buttons.css (.../buttons.css) (revision c59697465dc217e22610e495a0f4696cf8352a52) +++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.css (.../buttons.css) (revision 1c3bf44634db69a603b52728611da0cf922d0709) @@ -1,5 +1,5 @@ #formulaTabs { - height: 170px; + height: 270px; } #formulaTabs > div.ui-tabs-panel { @@ -21,18 +21,45 @@ font-weight: normal; } + #formulaTabs button:hover { background-color: #DDDDDD; } +#formulaTabs #formulaTabMath button { + width: 50px; + height: 70px; +} + +#formulaTabs #formulaTabFunctions button, #formulaTabs #formulaTabFormatting button { + width: auto; +} + +#formulaTabs #formulaTabMatrix button { + width: 120px; + height: 60px; +} + +#formulaTabs #formulaTabAccents button { + height: 30px; +} + #formulaTabs button span { - padding: 2px 3px 3px 3px !important; + padding: 2px 3px 0 3px !important; } +#formulaTabs #formulaTabFunctions button span { + padding: 0 7px 0 7px !important; +} + #formulaTabs button.formulaButtonShifted span { - padding-top: 0px !important; + padding-top: 0 !important; } +#formulaTabs button.formulaButtonLowered span { + padding-top: 3px !important; +} + img#preview { margin-top: 20px; } \ No newline at end of file Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.js =================================================================== diff -u -rc59697465dc217e22610e495a0f4696cf8352a52 -r1c3bf44634db69a603b52728611da0cf922d0709 --- lams_central/web/ckeditor/plugins/jlatexmath/buttons.js (.../buttons.js) (revision c59697465dc217e22610e495a0f4696cf8352a52) +++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.js (.../buttons.js) (revision 1c3bf44634db69a603b52728611da0cf922d0709) @@ -1,5 +1,6 @@ -function insertFormula(text) { - var textarea = $('#latex-formula').focus(), +function insertFormula() { + var text = $(this).attr('title') + ' ', + textarea = $('#latex-formula').focus(), cursorPos = textarea.prop('selectionStart'), v = textarea.val(), textBefore = v.substring(0, cursorPos), @@ -14,5 +15,5 @@ $(document).ready(function(){ $('#formulaTabs').tabs().removeClass('ui-widget-content'); $('#formulaTabs > ul').removeClass('ui-widget-header'); - $('#formulaTabs button').button(); + $('#formulaTabs button').click(insertFormula).button(); }); \ No newline at end of file Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp =================================================================== diff -u -rc59697465dc217e22610e495a0f4696cf8352a52 -r1c3bf44634db69a603b52728611da0cf922d0709 --- lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp (.../buttons.jsp) (revision c59697465dc217e22610e495a0f4696cf8352a52) +++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp (.../buttons.jsp) (revision 1c3bf44634db69a603b52728611da0cf922d0709) @@ -1,235 +1,329 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
-
- - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + +
-
- - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
-
- - - - - - - - - - - - - - - +
+ + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + + +
\ No newline at end of file Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents1.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents2.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents3.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents4.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents5.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents6.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents7.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents8.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/accents9.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math1.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math10.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math11.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math12.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math13.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math14.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math15.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math16.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math17.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math18.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math19.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math2.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math20.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math21.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math22.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math23.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math24.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math25.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math26.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math27.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math28.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math29.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math3.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math30.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math31.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math32.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math4.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math5.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math6.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math7.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math8.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/math9.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/matrix1.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/matrix2.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/matrix3.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/matrix4.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/matrix5.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/images/matrix6.png =================================================================== diff -u Binary files differ Index: lams_central/web/ckeditor/plugins/jlatexmath/plugin.js =================================================================== diff -u -rc59697465dc217e22610e495a0f4696cf8352a52 -r1c3bf44634db69a603b52728611da0cf922d0709 --- lams_central/web/ckeditor/plugins/jlatexmath/plugin.js (.../plugin.js) (revision c59697465dc217e22610e495a0f4696cf8352a52) +++ lams_central/web/ckeditor/plugins/jlatexmath/plugin.js (.../plugin.js) (revision 1c3bf44634db69a603b52728611da0cf922d0709) @@ -31,8 +31,8 @@ 'Jlatexmath', editor.lang.jlatexmath.DlgJlatexmathTitle, pluginPath + 'jlatexmath.jsp', - 930, - 400 + 950, + 530 ); editor.on(