Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r662e144da0df02dfacd0f157c29bc12012cab224 -rb3fa6a0350e2b024a94c20d83c7d242a54e6b10b
--- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 662e144da0df02dfacd0f157c29bc12012cab224)
+++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b3fa6a0350e2b024a94c20d83c7d242a54e6b10b)
@@ -652,14 +652,13 @@
authoring.fla.liveedit.readonly.remove.child.error =The activity can not be removed. It has read-only child activities.
authoring.fla.liveedit.readonly.remove.transition.error =The transition can not be removed. It is read-only.
+ckeditor.math.math =Math
+ckeditor.math.functions =Functions
ckeditor.math.greek =Greek
-ckeditor.math.uppercase =uppercase
-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.matrix =Matrix
+ckeditor.math.symbols =Symbols/relations
+ckeditor.math.arrows =Arrows
+ckeditor.math.accents =Accents
+ckeditor.math.formatting =Formatting
#======= End labels: Exported 438 labels for en AU =====
Index: lams_central/web/ckeditor/plugins/jlatexmath/buttons.css
===================================================================
diff -u -ra03658ad0a347b749a0f84ef831fab7cbcfd5746 -rb3fa6a0350e2b024a94c20d83c7d242a54e6b10b
--- lams_central/web/ckeditor/plugins/jlatexmath/buttons.css (.../buttons.css) (revision a03658ad0a347b749a0f84ef831fab7cbcfd5746)
+++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.css (.../buttons.css) (revision b3fa6a0350e2b024a94c20d83c7d242a54e6b10b)
@@ -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 -ra03658ad0a347b749a0f84ef831fab7cbcfd5746 -rb3fa6a0350e2b024a94c20d83c7d242a54e6b10b
--- lams_central/web/ckeditor/plugins/jlatexmath/buttons.js (.../buttons.js) (revision a03658ad0a347b749a0f84ef831fab7cbcfd5746)
+++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.js (.../buttons.js) (revision b3fa6a0350e2b024a94c20d83c7d242a54e6b10b)
@@ -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 -ra03658ad0a347b749a0f84ef831fab7cbcfd5746 -rb3fa6a0350e2b024a94c20d83c7d242a54e6b10b
--- lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp (.../buttons.jsp) (revision a03658ad0a347b749a0f84ef831fab7cbcfd5746)
+++ lams_central/web/ckeditor/plugins/jlatexmath/buttons.jsp (.../buttons.jsp) (revision b3fa6a0350e2b024a94c20d83c7d242a54e6b10b)
@@ -1,235 +1,329 @@
<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>