lams-github / lams_tool_notebook

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
Last Commit:
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
Sunday 13 Feb 2011
2:55 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
    ./pages/authoring/pedagogicalPlannerForm.jsp
  2. … 25 more files in changeset.
Sunday 12 Dec 2010
10:31 pm

Marcin Cieslak

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

Options
    • -7
    • +14
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 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
    • -27
    • +2
    ./WEB-INF/struts/tiles-defs.xml
    • -34
    • +62
    ./pages/monitoring/notebookDisplay.jsp
    • -3
    • +10
    ./pages/monitoring/summary.jsp
  4. … 2 more files in changeset.
Monday 06 Dec 2010
4:52 am

Marcin Cieslak

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Monday 22 Nov 2010
3:13 pm

Marcin Cieslak

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

Options
    • -0
    • +4
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Thursday 18 Nov 2010
6:44 am

Marcin Cieslak

LDEV-2601: An attempt to fix Chrome ignoring CSS width.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 1 more file in changeset.
6:28 am

Marcin Cieslak

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Friday 05 Nov 2010
4:24 am

Marcin Cieslak

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

Options
    • -17
    • +27
    ./WEB-INF/tags/CKEditor.tag
  2. … 28 more files in changeset.
Thursday 28 Oct 2010
2:00 am

Marcin Cieslak

LDEV-2595: An attempt to fix overflowing of viewable screen by CKEditor: reduced width of the initial textarea.

Options
    • -1
    • +1
    ./WEB-INF/tags/CKEditor.tag
Sunday 24 Oct 2010
9:39 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Friday 22 Oct 2010
2:57 am

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. … 24 more files in changeset.
Sunday 10 Oct 2010
7:48 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
6: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
    • -129
    • +0
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -2
    • +2
    ./WEB-INF/lams.tld
    • -36
    • +36
    ./WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./WEB-INF/tags/CKEditor.tag
    • -55
    • +0
    ./WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    ./common/taglibs.jsp
    • -2
    • +2
    ./pages/authoring/basic.jsp
    • -6
    • +6
    ./pages/authoring/pedagogicalPlannerForm.jsp
    • -3
    • +3
    ./pages/learning/notebook.jsp
  10. … 1088 more files in changeset.
Thursday 18 Mar 2010
8:59 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
3:12 pm

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -1
    • +1
    ./pages/learning/notebook.jsp
    • -1
    • +1
    ./pages/learning/runOffline.jsp
  3. … 6 more files in changeset.
Friday 24 Jul 2009
2:02 am

Andrey Balan

LDEV-2387 Changed rendering of FCKEditor in Assessment and Notebook tool

* removed commented script part from FCKEditor.tag

* removed all references to fckeditor.js, fckcontroller.js, fckeditor.css

Options
    • -23
    • +1
    ./WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./WEB-INF/tags/headItems.tag
    • -4
    • +0
    ./common/learnerheader.jsp
  4. … 3 more files in changeset.
Thursday 02 Jul 2009
4:19 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
    ./pages/authoring/addCondition.jsp
  2. … 167 more files in changeset.
Tuesday 07 Apr 2009
1:09 am

Marcin Cieslak

LDEV-2080: For all remaining tools - changed the way Hibernate properties are declared. Even for tools that did not need it the file was changed, so usage is the same everywhere.

Options
    • -10
    • +10
    ./WEB-INF/web.xml
  2. … 57 more files in changeset.
Sunday 01 Mar 2009
9:53 am

erniegx <ernieg@gmail.com>

LDEV-2152: includes next activity icon

Options
    • -5
    • +8
    ./pages/learning/notebook.jsp
    • -4
    • +8
    ./pages/learning/runOffline.jsp
  3. … 43 more files in changeset.
Thursday 26 Feb 2009
11:26 am

erniegx <ernieg@gmail.com>

LDEV-2150: added icons to save/cancel buttons

Options
    • -2
    • +2
    ./WEB-INF/tags/AuthoringButton.tag
  2. … 25 more files in changeset.
Tuesday 24 Feb 2009
4:35 am

Marcin Cieslak

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

Options
    • -2
    • +2
    ./pages/authoring/pedagogicalPlannerForm.jsp
  2. … 13 more files in changeset.
Friday 20 Feb 2009
11:11 am

erniegx <ernieg@gmail.com>

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
10:38 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.
10:27 am

mseaton

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

Options
    • -199
    • +113
    ./WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -14
    • +14
    ./WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    ./WEB-INF/web.xml
  4. … 83 more files in changeset.
Thursday 05 Feb 2009
4:52 am

Marcin Cieslak

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

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

erniegx <ernieg@gmail.com>

changing the default settings for the FCKEditor

Options
    • -2
    • +3
    ./pages/authoring/pedagogicalPlannerForm.jsp
  2. … 2 more files in changeset.
10:07 am

erniegx <ernieg@gmail.com>

LDEV-2113: Update FCKEditor.tag

Options
    • -1
    • +16
    ./WEB-INF/tags/FCKEditor.tag
  2. … 21 more files in changeset.
Friday 30 Jan 2009
6:02 am

Marcin Cieslak

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

Options
    • -0
    • +2
    ./WEB-INF/tags/FCKEditor.tag
    • -31
    • +16
    ./pages/authoring/pedagogicalPlannerForm.jsp
  3. … 44 more files in changeset.
Thursday 29 Jan 2009
12:49 am

Marcin Cieslak

LDEV-1998: Changed tooltip library to clueTip.

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

Marcin Cieslak

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

Options
    • -2
    • +5
    ./pages/authoring/pedagogicalPlannerForm.jsp
  2. … 2 more files in changeset.