Activity lams/lams

5:55 pm

Marcin Cieslak

More
MAIN:marcin:20110306095541
changed 12 files
MAIN

LDEV-2642, LDEV-2646: Extend access control for Planner nodes.

Add a node's owner field.

Fix exporting/importing nodes.

Upgrade XStream from 1.1 to 1.1.3.

- -91
- +127
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
./java/org/.../PedagogicalPlannerAction.java
- -11
- +142
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
- History
- Source
- Diff
./java/.../PedagogicalPlannerSequenceNodeForm.java
… 10 more files in changeset.

6:33 pm

Andrey Balan

More
MAIN:andreyb:20110216103307
changed 9 files
MAIN

LDEV-2628 *introduced new class which maps lessons with integration server

*merge from lams2_3_release

- -0
- +3
./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
- History
- Source
- Diff
./java/org/.../xml/LessonManagerServlet.java
… 8 more files in changeset.

7:45 am

Marcin Cieslak

More
MAIN:marcin:20110213234523
changed 21 files
MAIN

LDEV-2646: Allow access control for viewing/editing a copy/original template in Planner nodes for Teachers.

Swap collapse/expand arrows - it seems more right now.

Some clean up - move PlannerActivityMetadata to a proper packet, change some labels etc.

- -26
- +47
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
./java/org/.../PedagogicalPlannerAction.java
- -1
- +19
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
- History
- Source
- Diff
./java/.../PedagogicalPlannerSequenceNodeForm.java
… 19 more files in changeset.

2:37 am

Marcin Cieslak

More
MAIN:marcin:20110212183740
changed 20 files
MAIN

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.

- -1
- +3
./java/org/lamsfoundation/lams/util/CentralConstants.java
- History
- Source
- Diff
./java/org/.../util/CentralConstants.java
- -199
- +218
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
./java/org/.../PedagogicalPlannerAction.java
- -1
- +14
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
- History
- Source
- Diff
./java/.../PedagogicalPlannerActivityForm.java
- -15
- +6
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
- History
- Source
- Diff
./java/.../PedagogicalPlannerSequenceNodeForm.java
… 16 more files in changeset.

6:09 am

Andrey Balan

LDEV-2628 *introduced new class which maps lessons with integration server

- -0
- +3
./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
- History
- Source
- Diff
./java/org/.../xml/LessonManagerServlet.java
… 8 more files in changeset.

1:55 am

Andrey Balan

More
MAIN:andreyb:20110207175541
changed 1 file
MAIN

LDEV-2637 Show public folder when creating a lesson

*merge from lams2_3_release

- -0
- +6
./java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
- History
- Source
- Diff
./java/.../LearningDesignRepositoryServlet.java

1:49 am

Andrey Balan

LDEV-2637 Show public folder when creating a lesson

- -0
- +6
./java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
- History
- Source
- Diff
./java/.../LearningDesignRepositoryServlet.java

7:29 pm

Andrey Balan

More
MAIN:andreyb:20110206112907
changed 1 file
MAIN

LDEV-2637 Show public folder when creating a lesson

*merge from lams2_3_release

- -0
- +7
./java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java
- History
- Source
- Diff
./java/.../LearningDesignRepositorySoapBindingImpl.java

7:12 pm

Andrey Balan

LDEV-2637 Show public folder when creating a lesson

- -0
- +7
./java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java
- History
- Source
- Diff
./java/.../LearningDesignRepositorySoapBindingImpl.java

10:15 pm

Marcin Cieslak

More
MAIN:marcin:20101212141505
changed 9 files
MAIN

LDEV-2614: Added expand activity button.

Collapse/expand activity state is now stored on "Save as Sequence" action.

- -1
- +3
./java/org/lamsfoundation/lams/util/CentralConstants.java
- History
- Source
- Diff
./java/org/.../util/CentralConstants.java
- -27
- +86
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
./java/org/.../PedagogicalPlannerAction.java
… 7 more files in changeset.

3:44 am

Marcin Cieslak

More
MAIN:marcin:20101205194427
changed 5 files
MAIN

LDEV-2615: Added button and code allowing editing a single activity in Full Author.

- -14
- +18
./java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
./java/org/.../PedagogicalPlannerAction.java
… 4 more files in changeset.

10:39 pm

Andrey Balan

LDEV-2599 fixing upload of files with UTF-8 filenames

- -2
- +1
./java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
- History
- Source
- Diff
./java/org/.../web/LAMSConnectorServlet.java

4:30 am

Andrey Balan

LDEV-2599 FCKEditor connector are being able to handle utf-8 filenames for uploads

- -0
- +7
./java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
- History
- Source
- Diff
./java/org/.../web/LAMSConnectorServlet.java
… 1 more file in changeset.

8:18 am

Andrey Balan

More
MAIN:andreyb:20101105001856
changed 8 files
MAIN

LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

- -4
- +6
./java/org/lamsfoundation/lams/web/DisplayGroupAction.java
- History
- Source
- Diff
./java/org/.../web/DisplayGroupAction.java
- -2
- +3
./java/org/lamsfoundation/lams/web/HomeAction.java
- History
- Source
- Diff
./java/org/.../web/HomeAction.java
… 6 more files in changeset.

1:04 am

Andrey Balan

LDEV-2548 Ability for a course manager to see *all* lessons...

- -4
- +6
./java/org/lamsfoundation/lams/web/DisplayGroupAction.java
- History
- Source
- Diff
./java/org/.../web/DisplayGroupAction.java
- -2
- +3
./java/org/lamsfoundation/lams/web/HomeAction.java
- History
- Source
- Diff
./java/org/.../web/HomeAction.java
… 8 more files in changeset.

11:10 pm

Andrey Balan

More
MAIN:andreyb:20101029151004
changed 1 file
MAIN

LDEV-2573 subFolders within the Public Folders are going to be public as well

*merge from lams2_3_release

- -14
- +12
./java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
- History
- Source
- Diff
./java/org/.../WorkspaceManagementService.java

12:20 am

Andrey Balan

LDEV-2573 subFolders within the Public Folders are going to be public as well

- -14
- +12
./java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
- History
- Source
- Diff
./java/org/.../WorkspaceManagementService.java

7:20 pm

Andrey Balan

LDEV-2089 Email messaging

*Merge from HEAD

- -108
- +0
./java/org/lamsfoundation/lams/util/Emailer.java
- History
- Source
- Diff
./java/org/.../util/Emailer.java
… 12 more files in changeset.

1:22 am

Andrey Balan

LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

*merge from HEAD

- -1
- +3
./java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
- History
- Source
- Diff
./java/org/.../web/ForgotPasswordServlet.java

1:03 am

Andrey Balan

LDEV-2509 Embedded SMTP server

*Merge from HEAD

- -4
- +19
./java/org/lamsfoundation/lams/util/Emailer.java
- History
- Source
- Diff
./java/org/.../util/Emailer.java
… 17 more files in changeset.

12:53 am

Andrey Balan

More
MAIN:andreyb:20101015165337
changed 1 file
MAIN

LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

- -1
- +3
./java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
- History
- Source
- Diff
./java/org/.../web/ForgotPasswordServlet.java

2:05 pm

Ernie Ghiglione

More
MAIN:ernieg:20101015060543
changed 1 file
MAIN

LDEV-2567: mergin to head

- -1
- +1
./java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
- History
- Source
- Diff
./java/.../LearningDesignRepositoryServlet.java

6:09 pm

Marcin Cieslak

More
MAIN:marcin:20101006100917
changed 1097 files
MAIN

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.