Fisheye on lams/lams_tool_scribe/web/common

lams (lams2_head_wildfly): LDEV-3694: Update scribe learner for bootstrap

Ernie Ghiglione — Fri, 26 Feb 2016 16:44:21 +0100

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20160226154421 on branch lams2_head_wildfly in lams

LDEV-3694: Update scribe learner for bootstrap

· /lams_tool_scribe/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(-7, +15)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/WEB-INF/tags/Page.tag	(-0, +34)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(-0, +8)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/common/learnerheader.jsp	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/defineLater.jsp	(-5, +6)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/instructions.jsp	(-26, +48)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/learning.jsp	(-37, +47)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/notebook.jsp	(-13, +15)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/report.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/scribe.jsp	(-81, +95)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/waitForScribe.jsp	(-9, +13)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/learning/parts/reportBody.jsp	(-81, +94)	\| History	\| Source	\| Diff
· /lams_tool_scribe/web/pages/parts/voteDisplay.jsp	(-17, +13)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2577...

Marcin Cieslak — Wed, 06 Oct 2010 12:09:17 +0200

Marcin Cieslak committed MAIN:marcin:20101006100917 on branch MAIN in lams

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

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.

· /lams_admin/conf/xdoclet/servlet-mappings.xml

(-1, +1)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/taglibs.xml

(-8, +0)

| History

| Source

| Diff

· /lams_admin/web/loginmaintain.jsp

(-16, +5)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/lams.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld

(-129, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/CKEditor.tag

(-0, +54)

| History

| Source

· /lams_admin/web/WEB-INF/tags/FCKEditor.tag

(-54, +0)

| History

| Source

| Diff

· /lams_build/3rdParty.userlibraries

(-1, +1)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-1, +1)

| History

| Source

| Diff

· /lams_build/lib/fckeditor/FCKeditor-2.4.1.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar

(binary)

| History

| Source

· /lams_central/build.xml

(-2, +2)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/filter-mappings.xml

(-3, +3)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/taglib-tag.xml

(-2, +2)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/taglibs.xml

(-4, +0)

| History

| Source

| Diff

… 1082 more files in changeset.

lams (MAIN): LDEV-2387 simplified rendering of FCKEditor...

Andrey Balan — Tue, 28 Jul 2009 16:19:45 +0200

Andrey Balan committed MAIN:andreyb:20090728141945 on branch MAIN in lams

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

· /lams_admin/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/headItems.tag

(-6, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/common/fckeditorheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/authoring.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/definelater.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag

(-23, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/headItems.tag

(binary)

| History

| Source

| Diff

… 83 more files in changeset.

lams (MAIN): LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across ...

fmalikoff — Fri, 08 Jun 2007 03:33:32 +0200

fmalikoff committed MAIN:fmalikoff:20070608013332 on branch MAIN in lams

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

· /lams_admin/web/WEB-INF/tags/headItems.tag

(-2, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/headItems.tag

(-2, +0)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/headItems.tag

(-2, +0)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/headItems.tag

(-2, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/web.xml

(-0, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/Head.tag

(-0, +41)

| History

| Source

· /lams_tool_chat/web/WEB-INF/tags/headItems.tag

(binary)

| History

| Source

| Diff

· /lams_tool_chat/web/common/header.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_chat/web/common/learnerheader.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/export/exportPortfolio.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/tags/Head.tag

(-0, +41)

| History

| Source

· /lams_tool_forum/web/WEB-INF/tags/headItems.tag

(-2, +0)

| History

| Source

| Diff

· /lams_tool_forum/web/common/header.jsp

(-10, +0)

| History

| Source

| Diff

… 159 more files in changeset.

lams (MAIN): RTL changes

mseaton — Fri, 17 Nov 2006 08:28:29 +0100

mseaton committed MAIN:mseaton:20061117072829 on branch MAIN in lams

RTL changes

· /lams_learning/web/exportWaitingPage.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/main.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/main.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/notSupported.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/exportPortfolio/notebook.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_learning/web/layout/gateLayout.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/layout/groupWaitLayout.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/layout/layout.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/notebook/viewall.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/notebook/viewalljournals.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/previewdeleted.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/grouping/chosenGrouping.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/template/finishbutton.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/template/template.jsp

(-2, +2)

| History

| Source

| Diff

… 60 more files in changeset.

lams (MAIN): Added "copy-tags" to the build to make it easier to update the tags....

fmalikoff — Fri, 29 Sep 2006 04:44:37 +0200

fmalikoff committed MAIN:fmalikoff:20060929024437 on branch MAIN in lams

Added "copy-tags" to the build to make it easier to update the tags.

Updated the jsp pages to support stripes and the separate learner stylesheet.

· /lams_tool_scribe/web/error.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/lams.tld

(-1, +29)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/struts/struts-config.xml

(-0, +10)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/struts/tiles-defs.xml

(-5, +4)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/Date.tag

(-1, +16)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/Passon.tag

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/Tab.tag

(-40, +59)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/TabBody.tag

(-30, +30)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/Tabs.tag

(-32, +30)

| History

| Source

| Diff

· /lams_tool_scribe/web/WEB-INF/tags/headItems.tag

(-29, +30)

| History

| Source

| Diff

· /lams_tool_scribe/web/common/learnerheader.jsp

(-0, +27)

| History

| Source

· /lams_tool_scribe/web/layouts/blankLayout.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scribe/web/layouts/learningLayout.jsp

(-4, +1)

| History

| Source

| Diff

… 5 more files in changeset.

lams (MAIN): Added Scribe tool.

asukkar — Fri, 15 Sep 2006 05:09:52 +0200

asukkar committed MAIN:asukkar:20060915030952 on branch MAIN in lams

Added Scribe tool.

· /lams_tool_scribe/.classpath

(-0, +12)

| History

| Source

· /lams_tool_scribe/.mymetadata

(-0, +12)

| History

| Source

· /lams_tool_scribe/.project

(-0, +49)

| History

| Source

· /lams_tool_scribe/build.properties

(-0, +9)

| History

| Source

· /lams_tool_scribe/build.xml

(-0, +460)

| History

| Source

· /lams_tool_scribe/.settings/com.genuitec.eclipse.j2eedt.core.prefs

(-0, +3)

| History

| Source

· /lams_tool_scribe/.settings/org.eclipse.core.resources.prefs

(-0, +4)

| History

| Source

· /lams_tool_scribe/.settings/org.eclipse.jdt.core.prefs

(-0, +12)

| History

| Source

· /lams_tool_scribe/.settings/org.eclipse.jdt.ui.prefs

(-0, +3)

| History

| Source

· /lams_tool_scribe/conf/hibernate/mappings/hibernate.properties

(-0, +7)

| History

| Source

· /lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml

(-0, +206)

| History

| Source

· /lams_tool_scribe/conf/hibernate/mappings/org/.../lams/tool/scribe/model/ScribeAttachment.hbm.xml

(-0, +93)

| History

| Source

· /lams_tool_scribe/conf/hibernate/mappings/org/.../lams/tool/scribe/model/ScribeSession.hbm.xml

(-0, +111)

| History

| Source

· /lams_tool_scribe/conf/hibernate/mappings/org/.../lams/tool/scribe/model/ScribeUser.hbm.xml

(-0, +93)

| History

| Source

· /lams_tool_scribe/conf/jar/META-INF/MANIFEST.MF

(-0, +3)

| History

| Source

… 120 more files in changeset.