Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2714 Pool of questions for assessment tool

*merge from lams2_3_release to HEAD

    • -0
    • +74
    ./authoring/importQuestions.jsp
    • -20
    • +104
    ./authoring/parts/questionlist.jsp
  1. … 17 more files in changeset.
LDEV-2683: Option for not displaying answers summary

    • -0
    • +64
    ./learning/parts/allquestions.jsp
  1. … 4 more files in changeset.
LDEV-2657 pull up JavaScript methods to monitorToolSummaryAdvanced.js

  1. … 7 more files in changeset.
LDEV-2657 Date and time restriction in Assessment

*merge from lams2_3_release

    • -0
    • +43
    ./monitoring/parts/dateRestriction.jsp
  1. … 9 more files in changeset.
LDEV-2648 Removed Finish button

  1. … 2 more files in changeset.
LDEV-2645 fixing status variables that got messed up

*merge from lams2_3_release

LDEV-1730 If Tool is not group do now show the group reference

  1. … 4 more files in changeset.
LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

    • -0
    • +1
    ./authoring/parts/overallfeedbacklist.jsp
LDEV-2623 fixing Poor work of assessment tool with new CKEditor

fixing 1-3 errors

    • -3
    • +1
    ./authoring/parts/addmatchingpairs.jsp
LDEV-2622 reinitializes thickbox after moving the questions

LDEV-2623 fixing Poor work of assessment tool with new CKEditor

fixing 1-3 errors

    • -2
    • +2
    ./authoring/parts/addmatchingpairs.jsp
    • -9
    • +9
    ./authoring/parts/addmultiplechoice.jsp
LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

    • -1
    • +1
    ./authoring/parts/addmatchingpairs.jsp
    • -1
    • +1
    ./authoring/parts/addmultiplechoice.jsp
LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

    • -2
    • +4
    ./monitoring/parts/masterDetailLoadUp.jsp
    • -7
    • +5
    ./monitoring/parts/questionsummary.jsp
  1. … 133 more files in changeset.
LDEV-2569 fixed problem with 2 ordering question on the same page

*merge from lams2_3_release

LDEV-2577 The new CKEditor does not have Java Integration library (yet). We have been using it to: a) get the tag library to create our own tag <lams:FCKeditor> But the new CKEditor uses AJAX to get the contents, so the library is not needed anymore. The references to it has been deleted from every tool. FCKEditor.tag has been rewritten to use the new syntax. b) get a FCKEditor internal file manager by a Connector from the jar The new CKEditor does not provide a file manager - the license became commercial and the whole thing became a separate project, CKFinder. There were alternatives suggested on the web: jasfinder - http://sourceforge.net/projects/jasfinder/support kcfinder - http://kcfinder.sunhater.com/ some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/ but we have already nicely integrated with the old file manager. This page: http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/ in polish says how to use the file manager from the old FCKEditor. The steps that have to be done: - download the new CKEditor - download the old FCKEditor - copy the filemanager to ckeditor directory - in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to: window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' ); - in the file browser/default/browser.html add in line 80: document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

    • -7
    • +7
    ./authoring/parts/addmatchingpairs.jsp
    • -17
    • +17
    ./authoring/parts/addmultiplechoice.jsp
    • -14
    • +14
    ./authoring/parts/addordering.jsp
    • -12
    • +12
    ./authoring/parts/addtruefalse.jsp
    • -2
    • +2
    ./authoring/parts/matchingpairoption.jsp
    • -2
    • +2
    ./authoring/parts/shortansweroption.jsp
  1. … 1083 more files in changeset.
LDEV-2516 Show wrong and right answers separately (merge from lams2_3_release branch to HEAD)

    • -13
    • +15
    ./learning/parts/multiplechoice.jsp
    • -2
    • +18
    ./monitoring/parts/advanceoptions.jsp
  1. … 7 more files in changeset.
LDEV-2500 Increased the size of the fckeditor area

    • -2
    • +2
    ./authoring/parts/addmatchingpairs.jsp
    • -6
    • +6
    ./authoring/parts/addmultiplechoice.jsp
    • -3
    • +3
    ./authoring/parts/matchingpairoption.jsp
    • -3
    • +3
    ./authoring/parts/shortansweroption.jsp
LDEV-2491: change color for individual color feedback

    • -1
    • +11
    ./learning/parts/multiplechoice.jsp
LDEV-2478 added Option to allow the student to have a rich text editor to answer

  1. … 7 more files in changeset.
LDEV-2459 use double quotes when enclosing i18n text in javascript

    • -3
    • +3
    ./monitoring/parts/questionsummary.jsp
  1. … 42 more files in changeset.
LDEV-2152: Changes to make it work with IE6

  1. … 13 more files in changeset.
LDEV-2394 solved the problem with getting flicked back up to the FCK editor for the question text

    • -2
    • +2
    ./authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./authoring/parts/addmultiplechoice.jsp
LDEV-2114 improving learning design (affects only IE)

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 96 more files in changeset.
LDEV-2392 Wrong work of thickbox in Assessment tool fixed

rolled back to the previous version of thickbox.js + jQuery.browser.version bug fixed

  1. … 3 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch). Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 16 more files in changeset.
LDEV-2152: next activity icon

LDEV-2195 No content editing after first learner used accessed activity

* also defineLater fixed

  1. … 5 more files in changeset.
LDEV-2104 Implement Assessment Tool

some small fixes:

* changed the grid theme to blue

* move the numbers to the top of the column rather than sitting in

the middle.... also put them in bold

* Summary and Report by question headings

  1. … 21 more files in changeset.
LDEV-2169 Monitoring

* "next activity" action modified

* refresh summary page only if teacher indeed made some modifications

* export in xls files

* changed the design of summary page

* applicationResources cleaned up

    • -2
    • +8
    ./monitoring/parts/questionsummary.jsp
  1. … 13 more files in changeset.