Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle

This commit is contained in:
Damyon Wiese 2014-05-01 10:29:42 +08:00
commit 45b4f8734a
6 changed files with 11 additions and 6 deletions

View File

@ -32,7 +32,8 @@ $string['librarygroup3_desc'] = 'List of tex commands to list on the greek symbo
$string['librarygroup4'] = 'Advanced';
$string['librarygroup4_desc'] = 'List of tex commands to list on the advanced tab.';
$string['pluginname'] = 'Equation editor';
$string['preview'] = 'Equation preview (cursor position is indicated with a box)';
$string['preview'] = 'Equation preview';
$string['cursorinfo'] = 'An arrow indicates the position that new elements from the element library will be inserted.';
$string['saveequation'] = 'Save equation';
$string['settings'] = 'Equation editor settings';
$string['update'] = 'Update';

View File

@ -34,6 +34,7 @@ function atto_equation_strings_for_js() {
$PAGE->requires->strings_for_js(array('saveequation',
'editequation',
'preview',
'cursorinfo',
'update',
'librarygroup1',
'librarygroup2',

View File

@ -62,7 +62,8 @@ var COMPONENTNAME = 'atto_equation',
'<label for="{{elementid}}_{{CSS.EQUATION_TEXT}}">{{{get_string "editequation" component texdocsurl}}}</label>' +
'<textarea class="fullwidth {{CSS.EQUATION_TEXT}}" id="{{elementid}}_{{CSS.EQUATION_TEXT}}" rows="8"></textarea><br/>' +
'<label for="{{elementid}}_{{CSS.EQUATION_PREVIEW}}">{{get_string "preview" component}}</label>' +
'<div class="well well-small fullwidth {{CSS.EQUATION_PREVIEW}}" id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div describedby="{{elementid}}_cursorinfo" class="well well-small fullwidth {{CSS.EQUATION_PREVIEW}}" id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div id="{{elementid}}_cursorinfo">{{get_string "cursorinfo" component}}</div>' +
'<div class="mdl-align">' +
'<br/>' +
'<button class="{{CSS.SUBMIT}}">{{get_string "saveequation" component}}</button>' +

View File

@ -62,7 +62,8 @@ var COMPONENTNAME = 'atto_equation',
'<label for="{{elementid}}_{{CSS.EQUATION_TEXT}}">{{{get_string "editequation" component texdocsurl}}}</label>' +
'<textarea class="fullwidth {{CSS.EQUATION_TEXT}}" id="{{elementid}}_{{CSS.EQUATION_TEXT}}" rows="8"></textarea><br/>' +
'<label for="{{elementid}}_{{CSS.EQUATION_PREVIEW}}">{{get_string "preview" component}}</label>' +
'<div class="well well-small fullwidth {{CSS.EQUATION_PREVIEW}}" id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div describedby="{{elementid}}_cursorinfo" class="well well-small fullwidth {{CSS.EQUATION_PREVIEW}}" id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div id="{{elementid}}_cursorinfo">{{get_string "cursorinfo" component}}</div>' +
'<div class="mdl-align">' +
'<br/>' +
'<button class="{{CSS.SUBMIT}}">{{get_string "saveequation" component}}</button>' +

View File

@ -60,7 +60,8 @@ var COMPONENTNAME = 'atto_equation',
'<label for="{{elementid}}_{{CSS.EQUATION_TEXT}}">{{{get_string "editequation" component texdocsurl}}}</label>' +
'<textarea class="fullwidth {{CSS.EQUATION_TEXT}}" id="{{elementid}}_{{CSS.EQUATION_TEXT}}" rows="8"></textarea><br/>' +
'<label for="{{elementid}}_{{CSS.EQUATION_PREVIEW}}">{{get_string "preview" component}}</label>' +
'<div class="well well-small fullwidth {{CSS.EQUATION_PREVIEW}}" id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div describedby="{{elementid}}_cursorinfo" class="well well-small fullwidth {{CSS.EQUATION_PREVIEW}}" id="{{elementid}}_{{CSS.EQUATION_PREVIEW}}"></div>' +
'<div id="{{elementid}}_cursorinfo">{{get_string "cursorinfo" component}}</div>' +
'<div class="mdl-align">' +
'<br/>' +
'<button class="{{CSS.SUBMIT}}">{{get_string "saveequation" component}}</button>' +