lams / lams_tool_laqa / web

authoring

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 12
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 1,153
Net change in LoC this week: 0

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
Monday 28 Feb 2011
1:21 pm

Andrey Balan

LDEV-2649 Q&A option to rate other student's responses

*merge from lams2_3_release

Options
    • -4
    • +33
    ./AdvancedContent.jsp
    • -9
    • +0
    ./AuthoringTabsHolder.jsp
  3. … 41 more files in changeset.
Thursday 24 Feb 2011
3:22 pm

Andrey Balan

LDEV-2649 Q&A option to rate other student's responses

Options
    • -4
    • +33
    ./AdvancedContent.jsp
    • -9
    • +0
    ./AuthoringTabsHolder.jsp
  3. … 41 more files in changeset.
Saturday 12 Feb 2011
7:53 pm

Marcin Cieslak

LDEV-2642, LDEV-2616:

Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex.

Move Editing Advice content from Online Instructions in activities to the metadata table.

Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely).

While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design.

Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

Options
    • -1
    • +1
    ./pedagogicalPlannerForm.jsp
  2. … 25 more files in changeset.
Sunday 12 Dec 2010
3:43 pm

Marcin Cieslak

LDEV-2577: Fixed a bug - the response after ajaxSubmit was trimmed improperly, leaving unnecessary code on the top.

Also added missing label.

Options
    • -1
    • +4
    ./pedagogicalPlannerForm.jsp
  2. … 8 more files in changeset.
Tuesday 02 Nov 2010
1:26 pm

Andrey Balan

LDEV-2524 fixed jsps from HEAD branch

*it also includes fix for expanding window on adding new questions.

which is caused by CKEditor and this fix should be removed once CKeditor will start working correct

Options
    • -1
    • +1
    ./BasicContent.jsp
    • -9
    • +0
    ./editQuestionBox.jsp
    • -18
    • +2
    ./newQuestionBox.jsp
Monday 01 Nov 2010
1:20 pm

fmalikoff

Merging changes from 2.3 release branch for LDEV-2524.

Options
    • -0
    • +18
    ./editQuestionBox.jsp
    • -0
    • +25
    ./newQuestionBox.jsp
  3. … 28 more files in changeset.
11:07 am

fmalikoff

LDEV-2524 Implementing the compulsory question option - adding the checkbox.

Options
    • -0
    • +9
    ./editQuestionBox.jsp
    • -0
    • +9
    ./newQuestionBox.jsp
  3. … 2 more files in changeset.
Wednesday 06 Oct 2010
12:09 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
    • +2
    ./editQuestionBox.jsp
    • -3
    • +3
    ./newQuestionBox.jsp
    • -6
    • +6
    ./pedagogicalPlannerForm.jsp
  5. … 1093 more files in changeset.
Thursday 10 Jun 2010
2:44 am

lfoxton

LDEV-2552 MErging changes with head

Options
    • -2
    • +1
    ./BasicContent.jsp
    • -1
    • +1
    ./newQuestionBox.jsp
2:42 am

lfoxton

LDEV-2552 Fixing a cognitive skills wizard bug that resizes the new question iframe when it shouldnt be resized

Options
    • -2
    • +1
    ./BasicContent.jsp
    • -1
    • +1
    ./newQuestionBox.jsp
Wednesday 20 Jan 2010
3:15 pm

Andrey Balan

LDEV-2498 merge from HEAD to lams2_3_release branch

Options
    • -1
    • +1
    ./BasicContent.jsp
3:00 pm

Andrey Balan

LDEV-2498 Increased the width for Q&A iframe

Options
    • -1
    • +1
    ./BasicContent.jsp
Monday 16 Nov 2009
3:25 am

jliew

LDEV-2459 LDEV-2462 surround i18n messages with double quotes when outputting to html or javascript

Options
    • -1
    • +1
    ./newQuestionBox.jsp
  2. … 45 more files in changeset.
Friday 13 Nov 2009
4:13 am

jliew

LDEV-2459 use double quotes when enclosing i18n text in javascript

Options
    • -1
    • +1
    ./newQuestionBox.jsp
  2. … 47 more files in changeset.
Thursday 02 Jul 2009
10:18 am

jliew

Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

Options
    • -1
    • +8
    ./AdvancedContent.jsp
    • -2
    • +2
    ./addCondition.jsp
    • -189
    • +189
    ./newQuestionBox.jsp
  4. … 212 more files in changeset.
Monday 25 May 2009
2:29 am

lfoxton

Fixing problem with qa coginitive skills wizard. New version of jquery was clashing with prototype, so used an older version

Options
    • -189
    • +189
    ./newQuestionBox.jsp
Monday 11 May 2009
6:40 am

lfoxton

LDEV-2253 Giving the option in qa for rich text editor in learner - updating the language key

Options
    • -1
    • +1
    ./AdvancedContent.jsp
  2. … 2 more files in changeset.
6:36 am

lfoxton

LDEV-2253 Giving the option in qa for rich text editor in learner

Options
    • -1
    • +8
    ./AdvancedContent.jsp
  2. … 13 more files in changeset.
Friday 08 May 2009
12:16 pm

Marcin Cieslak

LDEV-2326: Buttons in Condition form had argument href="#' which caused the page to reload. It was changed to href="javascript:;".

Options
    • -2
    • +2
    ./addCondition.jsp
  2. … 4 more files in changeset.
Wednesday 11 Mar 2009
3:29 pm

Marcin Cieslak

LDEV-1998: Added "Clear entry" icon in activities with collections of entries.

Options
    • -13
    • +38
    ./pedagogicalPlannerForm.jsp
  2. … 17 more files in changeset.
Monday 23 Feb 2009
9:33 pm

Marcin Cieslak

LDEV-1998: Adjusted layout of tools' PedPlanner form contents.

Options
    • -2
    • +2
    ./pedagogicalPlannerForm.jsp
  2. … 13 more files in changeset.
Friday 06 Feb 2009
1:43 pm

Marcin Cieslak

LDEV-1998: Made a break between branches/options. When adding multiple questions to Q&A, previous entries are also saved (same in MCQ, Vote and Forum). Added some code comments.

Options
    • -0
    • +1
    ./pedagogicalPlannerForm.jsp
  2. … 5 more files in changeset.
Wednesday 04 Feb 2009
9:43 pm

Marcin Cieslak

LDEV-1998: Added FCKeditors for several tools. Adjusted styles for IE.

Options
    • -3
    • +27
    ./pedagogicalPlannerForm.jsp
  2. … 20 more files in changeset.
Thursday 29 Jan 2009
10:54 pm

Marcin Cieslak

LDEV-1998: Added Editing advice for all tools. Added FCKEditor for Notebook, Chat and Submit Files.

Options
    • -1
    • +1
    ./pedagogicalPlannerForm.jsp
  2. … 45 more files in changeset.
Tuesday 09 Dec 2008
6:38 am

Marcin Cieslak

LDEV-1998: Committing Pedagogical Planner base files and support for chat, forum, multiple choice, Q&A, noticeboard, notebook and vote tools.

Options
    • -0
    • +48
    ./pedagogicalPlannerForm.jsp
  2. … 111 more files in changeset.
Monday 01 Dec 2008
12:56 am

lfoxton

LDEV-2047 - Cognitive skills wizard causes buttons to get cut off in new questions

Changed the method of resizing the iframe to detect the height of the qa wizard div

Options
    • -3
    • +8
    ./newQuestionBox.jsp
Wednesday 05 Nov 2008
12:47 am

lfoxton

Fixed a ifram resizing problem for the qa wizard, the new question ifram needed to be adjusted when the user expanded the qa wizard area

Options
    • -2
    • +1
    ./BasicContent.jsp
    • -1
    • +1
    ./newQuestionBox.jsp
12:38 am

lfoxton

Added some javascript for trhe qa wizard so it resizes the iframe when you expand the wizard area

Options
    • -1
    • +9
    ./BasicContent.jsp
    • -2
    • +4
    ./newQuestionBox.jsp
Tuesday 04 Nov 2008
1:41 am

lfoxton

LDEV-1964 Adding the question and answer wizard in as an option feature (set up in admin) the export/import feature is not implemented yet however

Options
    • -2
    • +131
    ./newQuestionBox.jsp
  2. … 30 more files in changeset.
Tuesday 30 Sep 2008
7:54 am

Marcin Cieslak

LDEV-1918: Added most of the code for Q&A text based conditions.

Options
    • -1
    • +5
    ./AuthoringTabsHolder.jsp
    • -0
    • +47
    ./addCondition.jsp
    • -0
    • +92
    ./conditionList.jsp
    • -0
    • +110
    ./conditions.jsp
  5. … 30 more files in changeset.