updatemarks.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 30 more files in changeset.
LDEV-5424 boostrap5 Forum's monitoring

  1. … 20 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 519 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

  1. … 41 more files in changeset.
LDEV-4932 Forum CSRF update marks in monitor

Add CSRF prevention on Forum update marks

  1. … 2 more files in changeset.
LDEV-4440 Clean up shared files

  1. … 206 more files in changeset.
LDEV-4440 Fixed authoring - changed way of setting content type, fixed monitoring - correct paths at update marks

  1. … 5 more files in changeset.
LDEV-4440 Marks at monitoring fixed

  1. … 1 more file in changeset.
LDEV-4440 monitoring migration in progress

  1. … 8 more files in changeset.
LDEV-4440 Migration of Forum started - controllers, no tiles and no struts

  1. … 85 more files in changeset.
LDEV-3999: replacing bitmap images with vector images (faicons)

  1. … 11 more files in changeset.
LDEV-3977:The link from mark post in monitor forum returns an exception

LDEV-3975: Change date to timeago

LDEV-3775: Bootstrap authoring and monitor. A couple of the secondary screens in monitor have been rationalised to reduce mouse clicks and to reuse existing screens.

  1. … 48 more files in changeset.
LDEV-3405 Forum monitor to implement paging

  1. … 29 more files in changeset.
LDEV-3405 * last message->last message date * date format * caching of all messages at monitor start (in order to prevent DB queries from tablesorter)

  1. … 6 more files in changeset.
LDEV-3405 add a column in between name and Number of post with 'latest posting'

  1. … 7 more files in changeset.
LDEV-3405 * added initial sorting and ability to sort by number of posts * slightly modified statistics design, and significantly - view marks and edit mark pages * removed obsolete viewAllMarks feature

  1. … 14 more files in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 7 more files in changeset.
LDEV-3076 added ability to upload images by learners using CKeditor

  1. … 30 more files in changeset.
LDEV-2839: Forum Tool clean up: remove duplicate taglibs file, update references.

  1. … 28 more files in changeset.
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.

  1. … 1096 more files in changeset.
LDEV-1707: Change marks to display 2 decimal places rather than 1.

  1. … 6 more files in changeset.
LDEV-1676: Refresh button no longer breaks the mark screen's automatic refresh - switched from using a form to a url, so that the url the mark screen gets is correct. Also tidied up some of the buttons so they are laid out better.

  1. … 2 more files in changeset.
LDEV-1707: I18N'd the output of the marks so that they are shown as 1,234.5 or 1 234,5 depending on the user's locale.

  1. … 4 more files in changeset.
LDEV-1676: Adding a new column in forun that shows if any of a learner's files have been marked.

Also fixed a problem with the view forum screen in teacher mode. When accessed from monitoring, the teacher was able to see and edit the learner's reflection. Now when the screen is accessed from the summary screen, the reflection cannot be seen (as this is primarily for marking). When the screen is accessed from the learner progress screen the reflection can be seen but not modified.

  1. … 18 more files in changeset.
Move mark button to view forum page.

  1. … 10 more files in changeset.
Updated authoring pages.

  1. … 7 more files in changeset.
Remove history.back() for update cancel.