lams / lams_tool_notebook / web

pages

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 11
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 1,374
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
Tuesday 17 May 2011
12:35 pm

Ernie Ghiglione

LDEV-2657 Date restrictions for Notebook (merge to HEAD)

Options
    • -0
    • +8
    ./learning/notebook.jsp
    • -4
    • +15
    ./learning/runOffline.jsp
    • -0
    • +43
    ./monitoring/daterestriction.jsp
    • -6
    • +86
    ./monitoring/summary.jsp
  5. … 8 more files in changeset.
Tuesday 10 May 2011
1:24 pm

Ernie Ghiglione

LDEV-2657: Date and time restrictions for Notebook

Options
    • -0
    • +8
    ./learning/notebook.jsp
    • -4
    • +15
    ./learning/runOffline.jsp
    • -0
    • +43
    ./monitoring/daterestriction.jsp
    • -6
    • +86
    ./monitoring/summary.jsp
  5. … 9 more files in changeset.
1:24 pm

Ernie Ghiglione

file daterestriction.jsp was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./monitoring/daterestriction.jsp
Sunday 13 Feb 2011
2:53 am

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
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 25 more files in changeset.
Wednesday 08 Dec 2010
2:44 am

Andrey Balan

LDEV-2617 Displaying user's response in monitor

*merge from lams2_3_release

Options
    • -34
    • +62
    ./monitoring/notebookDisplay.jsp
    • -3
    • +10
    ./monitoring/summary.jsp
  3. … 3 more files in changeset.
2:36 am

Andrey Balan

LDEV-2617 Displaying user's response in monitor

Options
    • -34
    • +62
    ./monitoring/notebookDisplay.jsp
    • -3
    • +10
    ./monitoring/summary.jsp
  3. … 3 more files in changeset.
Wednesday 06 Oct 2010
6: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
    ./authoring/basic.jsp
    • -6
    • +6
    ./authoring/pedagogicalPlannerForm.jsp
    • -3
    • +3
    ./learning/notebook.jsp
  4. … 1094 more files in changeset.
Monday 14 Sep 2009
3:08 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./learning/notebook.jsp
    • -1
    • +1
    ./learning/runOffline.jsp
  3. … 9 more files in changeset.
3:07 pm

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./learning/notebook.jsp
    • -1
    • +1
    ./learning/runOffline.jsp
  3. … 9 more files in changeset.
Thursday 02 Jul 2009
4:18 pm

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
    • -2
    • +2
    ./authoring/addCondition.jsp
  2. … 214 more files in changeset.
Friday 08 May 2009
6: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
    ./authoring/addCondition.jsp
  2. … 4 more files in changeset.
Sunday 01 Mar 2009
9:40 am

Ernie Ghiglione

LDEV-2152: includes next activity icon

Options
    • -5
    • +8
    ./learning/notebook.jsp
    • -4
    • +8
    ./learning/runOffline.jsp
  3. … 31 more files in changeset.
Tuesday 24 Feb 2009
4:33 am

Marcin Cieslak

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

Options
    • -2
    • +2
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 13 more files in changeset.
Thursday 05 Feb 2009
4:43 am

Marcin Cieslak

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

Options
    • -3
    • +3
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 20 more files in changeset.
Wednesday 04 Feb 2009
10:18 am

Ernie Ghiglione

changing the default settings for the FCKEditor

Options
    • -2
    • +3
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 2 more files in changeset.
Friday 30 Jan 2009
5:54 am

Marcin Cieslak

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

Options
    • -31
    • +16
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 45 more files in changeset.
Thursday 29 Jan 2009
12:49 am

Marcin Cieslak

LDEV-1998: Changed tooltip library to clueTip.

Options
    • -7
    • +21
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 7 more files in changeset.
Wednesday 28 Jan 2009
3:57 am

Marcin Cieslak

LDEV-1998: Modified some jTip parameters for evaluation purposes.

Options
    • -2
    • +5
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 2 more files in changeset.
Tuesday 27 Jan 2009
2:31 am

Marcin Cieslak

LDEV-1998: Additions:

- Central: added some files that were not committed earlier and prevented Planner from opening in a pop up window.

- Q&A: fixed minor bug with question indexing.

- Chat: Planner now strips Instructions from HTML tags.

- Notebook: Planner now strips Instructions from HTML tags; fixed bug that set Online Instructions = Offline Instructions (!); Added tooltip with editing advice; adjusted planner form size.

Options
    • -2
    • +15
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 17 more files in changeset.
Tuesday 06 Jan 2009
11:03 am

asukkar

LDEV-1730

Modified monitoring to only show session name when activity is grouped.

Options
    • -9
    • +5
    ./monitoring/summary.jsp
  2. … 1 more file in changeset.
Tuesday 09 Dec 2008
1:38 pm

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
    • +20
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 111 more files in changeset.
Saturday 04 Oct 2008
10:47 am

Marcin Cieslak

LDEV-1926: Added most of the logic for text based conditions.

Options
    • -0
    • +45
    ./authoring/addCondition.jsp
    • -0
    • +3
    ./authoring/authoring.jsp
    • -0
    • +91
    ./authoring/conditionList.jsp
    • -0
    • +110
    ./authoring/conditions.jsp
    • -4
    • +5
    ./authoring/headItems.jsp
  6. … 33 more files in changeset.
Friday 25 Jul 2008
1:18 pm

Andrey Balan

LDEV-1662 wrong closure of the script tab solved in all tools

Options
    • -1
    • +1
    ./monitoring/summary.jsp
  2. … 11 more files in changeset.
Monday 21 Jul 2008
2:15 pm

lfoxton

LDEV-1662 Putting in advanced options summary into monitoring summary page for every tool.

notebook

Options
    • -0
    • +61
    ./monitoring/summary.jsp
Tuesday 06 May 2008
12:18 pm

Andrey Balan

LDEV-1663 Rearranged "Instructions" Tab in Monitor

getting rid of redundant ":"

Options
    • -2
    • +2
    ./monitoring/instructions.jsp
  2. … 15 more files in changeset.
Friday 02 May 2008
3:45 pm

fmalikoff

LDEV-1677: Changing the tools so that clicking Close on the authoring confirmation window will both refresh the tool's monitoring window AND take the user back to the current tab on the monitoring window (ie the same tab it was on before it was refreshed). Normally this will be the edit activity tab.

Options
    • -0
    • +3
    ./monitoring/monitoring.jsp
  2. … 2 more files in changeset.
3:00 pm

asukkar

LDEV-1685

Added info messages to warn learners when lockOnFinish is enabled.

Options
    • -30
    • +46
    ./learning/notebook.jsp
  2. … 4 more files in changeset.
11:52 am

Andrey Balan

LDEV-1663 Rearranged "Instructions" Tab in Monitor (Notebook)

Options
    • -2
    • +2
    ./authoring/instructions.jsp
    • -75
    • +82
    ./monitoring/instructions.jsp
Friday 04 Jan 2008
9:42 am

Ernie Ghiglione

LDEV-1206: Remove the instructions label

Options
    • -4
    • +0
    ./learning/runOffline.jsp
Tuesday 09 Oct 2007
7:40 am

Ernie Ghiglione

LDEV-1362: Allows editing the activity even when users have already access the activity. Removes isContentInUse

Options
    • -17
    • +14
    ./monitoring/editActivity.jsp
  2. … 1 more file in changeset.