lams / lams_tool_scribe

web

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 13
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 18,472
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
Thursday 21 Oct 2010
8:50 pm

Marcin Cieslak

LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 25 more files in changeset.
Sunday 10 Oct 2010
1:46 pm

Marcin Cieslak

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 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
    ./WEB-INF/lams.tld
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -9
    • +33
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    ./common/taglibs.jsp
    • -2
    • +2
    ./pages/authoring/basic.jsp
    • -2
    • +2
    ./pages/authoring/headingForm.jsp
    • -6
    • +6
    ./pages/authoring/pedagogicalPlannerForm.jsp
  10. … 1088 more files in changeset.
Thursday 18 Mar 2010
1:58 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
1:13 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Monday 14 Sep 2009
7:15 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/parts/finishButton.jsp
  3. … 6 more files in changeset.
7:08 am

Ernie Ghiglione

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/parts/finishButton.jsp
  3. … 4 more files in changeset.
Tuesday 28 Jul 2009
4:19 pm

Andrey Balan

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

Options
    • -23
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./WEB-INF/tags/headItems.tag
    • -4
    • +0
    ./common/learnerheader.jsp
  4. … 95 more files in changeset.
Tuesday 21 Apr 2009
8:58 am

asukkar

Created separate pages for defineLater and waitForScribe.

LDEV-2161

Options
    • -0
    • +4
    ./WEB-INF/struts/tiles-defs.xml
    • -0
    • +15
    ./pages/learning/waitForScribe.jsp
  3. … 2 more files in changeset.
8:07 am

asukkar

file waitForScribe.jsp was added on branch lams2_3 on 2009-04-21 06:58:56 +0000

Options
    • -0
    • +0
    ./pages/learning/waitForScribe.jsp
8:07 am

asukkar

Created separate pages for defineLater and waitForScribe.

LDEV-2161

Options
    • -0
    • +4
    ./WEB-INF/struts/tiles-defs.xml
    • -0
    • +15
    ./pages/learning/waitForScribe.jsp
  3. … 2 more files in changeset.
Sunday 01 Mar 2009
2:40 am

Ernie Ghiglione

LDEV-2152: includes next activity icon

Options
    • -4
    • +8
    ./pages/learning/notebook.jsp
    • -4
    • +8
    ./pages/learning/parts/finishButton.jsp
  3. … 31 more files in changeset.
Thursday 26 Feb 2009
8:19 pm

Marcin Cieslak

LDEV-1998: Added Scribe tool and Parallel Activities support. Adjusted design for IE.

Options
    • -0
    • +80
    ./pages/authoring/pedagogicalPlannerForm.jsp
  2. … 17 more files in changeset.
4:16 am

Ernie Ghiglione

LDEV-2150: added icons to save/cancel buttons

Options
    • -2
    • +2
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 23 more files in changeset.
Friday 20 Feb 2009
4:04 am

Ernie Ghiglione

LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

Options
    • -0
    • +1
    ./WEB-INF/tags/FCKEditor.tag
  2. … 21 more files in changeset.
Friday 06 Feb 2009
3:36 am

mseaton

LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

Options
    • -1
    • +3
    ./WEB-INF/tags/FCKEditor.tag
  2. … 25 more files in changeset.
3:21 am

mseaton

LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

Options
    • -2
    • +12
    ./WEB-INF/web.xml
    • -198
    • +112
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -14
    • +14
    ./WEB-INF/tags/FCKEditor.tag
  4. … 42 more files in changeset.
Wednesday 04 Feb 2009
2:55 am

Ernie Ghiglione

LDEV-2113: Update FCKEditor.tag

Options
    • -1
    • +18
    ./WEB-INF/tags/FCKEditor.tag
  2. … 16 more files in changeset.
Tuesday 06 Jan 2009
4:44 am

asukkar

LDEV-1730

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

Options
    • -3
    • +6
    ./pages/monitoring/summary.jsp
  2. … 3 more files in changeset.
Monday 22 Sep 2008
7:29 am

jliew

LDEV-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).

Options
    • -10
    • +1
    ./WEB-INF/web.xml
  2. … 35 more files in changeset.
Friday 25 Jul 2008
9:49 am

Andrey Balan

LDEV-1811 lams.tld has been updated in all packages

Options
    • -0
    • +5
    ./WEB-INF/lams.tld
  2. … 19 more files in changeset.
7:18 am

Andrey Balan

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

Options
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  2. … 11 more files in changeset.
Monday 21 Jul 2008
8:12 am

lfoxton

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

scribe

Options
    • -0
    • +80
    ./pages/monitoring/summary.jsp
Thursday 22 May 2008
9:03 am

asukkar

LDEV-1747

Added confirm dialog box when a user clicks Force Complete.

Options
    • -2
    • +15
    ./pages/monitoring/summary.jsp
Tuesday 06 May 2008
6:18 am

Andrey Balan

LDEV-1663 Rearranged "Instructions" Tab in Monitor

getting rid of redundant ":"

Options
    • -2
    • +2
    ./pages/monitoring/instructions.jsp
  2. … 15 more files in changeset.
Monday 05 May 2008
12:12 pm

Andrey Balan

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

Options
    • -2
    • +2
    ./pages/authoring/instructions.jsp
    • -105
    • +83
    ./pages/monitoring/instructions.jsp
  3. … 1 more file in changeset.
Friday 02 May 2008
9:34 am

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
    • -2
    • +7
    ./includes/javascript/monitoring.js
    • -0
    • +1
    ./pages/monitoring/summary.jsp
  3. … 6 more files in changeset.
Tuesday 29 Apr 2008
6:57 am

asukkar

LDEV-1658

Added confirm dialog box when a user clicks Force Complete.

Options
    • -1
    • +10
    ./pages/learning/scribe.jsp
  2. … 1 more file in changeset.
2:52 am

asukkar

LDEV-1246

Renamed lams:out attribute escapeXml to escapeHtml

Options
    • -66
    • +66
    ./WEB-INF/lams.tld
  2. … 15 more files in changeset.
Monday 21 Apr 2008
8:24 am

fmalikoff

LDEV-1628: Updating version number to 2.1

Options
    • -1
    • +1
    ./META-INF/MANIFEST.MF
  2. … 42 more files in changeset.