lams-github

lams_tool_notebook

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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
Wednesday 08 Dec 2010
2:44 am

Andrey Balan

LDEV-2617 Displaying user's response in monitor

*merge from lams2_3_release

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
    • -27
    • +2
    ./web/WEB-INF/struts/tiles-defs.xml
    • -34
    • +62
    ./web/pages/monitoring/notebookDisplay.jsp
    • -3
    • +10
    ./web/pages/monitoring/summary.jsp
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/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/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/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/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/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/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/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/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/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
    • -1
    • +1
    ./conf/xdoclet/servlet-mappings.xml
    • -4
    • +0
    ./conf/xdoclet/taglibs.xml
    • -26
    • +28
    ./test/java/org/lamsfoundation/lams/tool/notebook/selenium/TestNotebook.java
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -36
    • +36
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -55
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
    • -6
    • +6
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
    • -3
    • +3
    ./web/pages/learning/notebook.jsp
  13. … 1085 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/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Monday 09 Nov 2009
2:48 pm

jliew

translation update

Options
    • -61
    • +61
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 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
    ./web/pages/learning/notebook.jsp
    • -1
    • +1
    ./web/pages/learning/runOffline.jsp
  3. … 6 more files in changeset.
Friday 28 Aug 2009
12:46 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 12 more files in changeset.
Tuesday 04 Aug 2009
8:16 pm

Andrey Balan

LDEV-2372 modifications to selenium tests (according to the last changes in selenium core classes)

Options
    • -12
    • +5
    ./test/java/org/lamsfoundation/lams/tool/notebook/selenium/TestNotebook.java
  2. … 3 more files in changeset.
Monday 03 Aug 2009
4:15 am

Marcin Cieslak

LDEV-2374: Added outputs for Data Flow for: * Image gallery (URL to the images uploaded by the students), * Forum (text for the postings for a student in the forum) * Chat (all text postings for a student in the chat) * Pixlr (URL to the image) * Share resources (URL to file/urls uploaded) * Notebook (Text entered by the student) * Submit Files (URL to files uploaded)

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -43
    • +59
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookOutputFactory.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java
  5. … 29 more files in changeset.
Friday 31 Jul 2009
2:23 am

Andrey Balan

LDEV-2372 modified ant builds to support Selenium tests also added selenium server port property to common.properties

Options
    • -2
    • +31
    ./build.xml
  2. … 4 more files in changeset.
Wednesday 29 Jul 2009
2:13 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -30
    • +30
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 22 more files in changeset.
Tuesday 28 Jul 2009
5:19 am

Andrey Balan

LDEV-2372 Testing framework * modifications to tool's Selenium tests due to the changes in core classes * Assessment and Notebook tools: tests moved to the new packages

Options
    • -0
    • +98
    ./test/java/org/lamsfoundation/lams/tool/notebook/selenium/TestNotebook.java
    • -72
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
  3. … 4 more files in changeset.
Monday 27 Jul 2009
6:21 am

Marcin Cieslak

LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
  2. … 49 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/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -4
    • +0
    ./web/common/learnerheader.jsp
  4. … 3 more files in changeset.
Monday 20 Jul 2009
10:00 pm

Andrey Balan

LDEV-2372 completely moving all Selenium classes to lams_common

Options
    • -9
    • +1
    ./.classpath
    • binary
    ./lib/flash-selenium.jar
    • binary
    ./lib/flex-ui-selenium-0.1.1.jar
    • binary
    ./lib/selenium-java-client-driver-sources.jar
    • binary
    ./lib/selenium-java-client-driver-test-sources.jar
    • binary
    ./lib/selenium-java-client-driver-tests.jar
    • binary
    ./lib/selenium-java-client-driver.jar
    • binary
    ./lib/selenium-server-sources.jar
    • binary
    ./lib/selenium-server.jar
    • -311
    • +0
    ./lib/user-extensions.js
    • -600
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/AbstractSeleniumTestCase.java
    • -182
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/DefaultSeleniumFlex.java
    • -46
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/TestFrameworkConstants.java
    • -68
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/TestFrameworkException.java
    • -88
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/testApplicationContext.xml
  16. … 1 more file in changeset.
9:48 pm

Andrey Balan

LDEV-2372 doing nothing except for updating formatting

Options
    • -35
    • +35
    ./test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
  2. … 2 more files in changeset.
Saturday 18 Jul 2009
5:11 am

Andrey Balan

LDEV-2372 testing framework * ability to run tests in IE (version 7) * changes to user-extensions * fixed test failures on the newly started JBoss server * added timeouts preventing Selenium from crashing

Options
    • -193
    • +118
    ./lib/user-extensions.js
    • -18
    • +23
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/AbstractSeleniumTestCase.java
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/TestFrameworkConstants.java
  4. … 1 more file in changeset.
Tuesday 14 Jul 2009
8:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
Friday 10 Jul 2009
6:34 am

Andrey Balan

LDEV-2372 testing framework * a lot of refactoring * constants moved to separate class * when we get verification error(s) Selenium server shuts down correctly now * fixed random assertion failures by setting minimum Selenium speed to 400ms (can't be decreased) * added assertions to the createNewLesson method * fixed problem with saving learning designs with the same name * receiving workspaceFolderID from DB now

Options
    • -115
    • +118
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/AbstractSeleniumTestCase.java
    • -162
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/SeleniumFlexTestCase.java
    • -0
    • +46
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/TestFrameworkConstants.java
    • -0
    • +68
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/TestFrameworkException.java
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
Thursday 09 Jul 2009
3:33 am

Andrey Balan

LDEV-2372 * just a fix to notebook test

Options
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
Wednesday 08 Jul 2009
4:08 am

Andrey Balan

LDEV-2372 * fixes to testing framework * example test for the assessment tool

Options
    • -10
    • +30
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/AbstractSeleniumTestCase.java
    • -368
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/core/NotebookDataAccessTestCase.java
    • -1
    • +1
    ./test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
    • -196
    • +0
    ./test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebookContentDAO.java
  5. … 2 more files in changeset.
Tuesday 07 Jul 2009
8:52 am

jliew

change to ascii

Options
    • -23
    • +23
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20081118_updateFrom22.sql
  3. … 48 more files in changeset.