lams-github / lams_tool_lamc / web / authoring

BasicContent.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit: 25 Feb 22
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

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

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

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

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

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

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -7
    • +10
    ./BasicContent.jsp
  2. … 54 more files in changeset.
Thursday 30 May 2019
2:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -29
    • +0
    ./BasicContent.jsp
  2. … 12 more files in changeset.
Tuesday 14 May 2019
11:23 pm

Andrey Balan

LDEV-4818 Add title property to MCQ questions

Options
    • -0
    • +5
    ./BasicContent.jsp
  2. … 35 more files in changeset.
Tuesday 26 Feb 2019
8:56 pm

Andrey Balan

LDEV-4777 Search QB interface is now available in MCQ tool

* Further development of QB search feature

Options
    • -3
    • +3
    ./BasicContent.jsp
  2. … 8 more files in changeset.
Thursday 14 Feb 2019
11:27 pm

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

Options
    • -10
    • +19
    ./BasicContent.jsp
  2. … 13 more files in changeset.
11:27 pm

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

Options
    • -10
    • +19
    ./BasicContent.jsp
  2. … 13 more files in changeset.
Tuesday 18 Sep 2018
2:41 am

Andrey Balan

LDEV-4440 Fix importQTI feature

Options
    • -1
    • +1
    ./BasicContent.jsp
Thursday 09 Aug 2018
6:36 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 New paths at learning

Options
    • -2
    • +2
    ./BasicContent.jsp
  2. … 5 more files in changeset.
Wednesday 08 Aug 2018
2:10 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 lamc update

Options
    • -4
    • +4
    ./BasicContent.jsp
  2. … 6 more files in changeset.
11:41 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 js changes at jsp files

Options
    • -4
    • +4
    ./BasicContent.jsp
  2. … 2 more files in changeset.
Thursday 02 Aug 2018
6:04 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of Multiple Choice in progress

Options
    • -5
    • +5
    ./BasicContent.jsp
  2. … 21 more files in changeset.
Friday 27 Jul 2018
2:55 pm

Marcin Cieslak

Merge Asia's Image Gallery

Options
    • -7
    • +6
    ./BasicContent.jsp
  2. … 76 more files in changeset.
Wednesday 25 Jul 2018
9:07 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of Multiple Choices

Options
    • -7
    • +6
    ./BasicContent.jsp
  2. … 52 more files in changeset.
Friday 26 May 2017
9:36 pm

Andrey Balan

LDEV-2866 Authoring code refactoring

Options
    • -5
    • +12
    ./BasicContent.jsp
  2. … 56 more files in changeset.
Saturday 20 May 2017
1:54 am

Andrey Balan

LDEV-2866 Code refactoring

Options
    • -22
    • +12
    ./BasicContent.jsp
  2. … 47 more files in changeset.
Wednesday 01 Mar 2017
1:36 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4237: Include label informing the max size file LDEV-4241: File upload validation LDEV-4240: Consistent upload widget QTI Import window (in lams_central) was updated to use new code and the window needed to be enlarged.

Options
    • -1
    • +1
    ./BasicContent.jsp
  2. … 9 more files in changeset.
Friday 11 Nov 2016
4:52 pm

Andrey Balan

LDEV-4036 Readjust thickbox so it doesn't have extra scrolls * Also made Thickbox to always use default values for width:90% and height:100%. In case when these values should be different, one can provide width and height values as parameters

Options
    • -19
    • +1
    ./BasicContent.jsp
  2. … 41 more files in changeset.
Thursday 10 Nov 2016
1:42 am

erniegx <ernieg@gmail.com>

LDEV-3813: small adjustments to import/export qti buttons

Options
    • -8
    • +1
    ./BasicContent.jsp
  2. … 1 more file in changeset.
Wednesday 15 Jun 2016
9:22 am

Andrey Balan

LDEV-3827 Remove JQM mobile interface

Options
    • -1
    • +0
    ./BasicContent.jsp
  2. … 51 more files in changeset.
Tuesday 24 May 2016
3:45 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3813: Bootstrap authoring and monitoring

Options
    • -29
    • +18
    ./BasicContent.jsp
  2. … 51 more files in changeset.
Saturday 13 Sep 2014
12:43 am

Andrey Balan

LDEV-2866 * Got rid of duplicative jsp parts in Ozgur's tools * Some initial refactoring of the code

Options
    • -1
    • +1
    ./BasicContent.jsp
  2. … 107 more files in changeset.
Tuesday 09 Sep 2014
6:45 pm

Andrey Balan

LDEV-2866 * Got rid of duplicative jsp parts in Ozgur's tools * Some initial refactoring of the code

Options
    • -1
    • +1
    ./BasicContent.jsp
  2. … 106 more files in changeset.
Saturday 17 May 2014
9:54 pm

Andrey Balan

LDEV-3228 Ability to change, add, remove MCQ questions even after student have reached it

Options
    • -35
    • +24
    ./BasicContent.jsp
  2. … 69 more files in changeset.
Tuesday 25 Mar 2014
4:13 pm

Marcin Cieslak

LDEV-3194: Central QTI export modules and support for Multiple Choice tool.

Options
    • -15
    • +15
    ./BasicContent.jsp
  2. … 12 more files in changeset.
Wednesday 24 Jul 2013
8:29 pm

Andrey Balan

LDEV-3079 * use thickbox pages and ajax calls * Use CKEditors as MCQ answers tags

Options
    • -89
    • +49
    ./BasicContent.jsp
  2. … 18 more files in changeset.
Wednesday 20 Mar 2013
2:44 pm

Marcin Cieslak

LDEV-3000: Fix importing of large number of questions. Fix Essay question type detection.

Options
    • -4
    • +20
    ./BasicContent.jsp
  2. … 8 more files in changeset.
Tuesday 12 Feb 2013
5:42 pm

Marcin Cieslak

LDEV-3000: Add support for Assessment Tool. Add question type and title.

Options
    • -1
    • +1
    ./BasicContent.jsp
  2. … 16 more files in changeset.
Wednesday 06 Feb 2013
4:08 pm

Marcin Cieslak

LDEV-3000: Add centralised interface for IMS QTI package processing. Add support for MCQ tool.

Options
    • -0
    • +12
    ./BasicContent.jsp
  2. … 12 more files in changeset.
Wednesday 04 Jan 2012
3:12 pm

erniegx <ernieg@gmail.com>

LDEV-2764: fixing messageArea frame with CKEditor

Options
    • -2
    • +7
    ./BasicContent.jsp
  2. … 2 more files in changeset.
Wednesday 06 Oct 2010
12:18 pm

Marcin Cieslak

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.

Options
    • -2
    • +2
    ./BasicContent.jsp
  2. … 1096 more files in changeset.