Fisheye on lams/lams_tool_pixlr/web/common

lams (lams2_head_wildfly): LDEV-3800 Update PixIr Author and Monitor to Bootstrap

Andrey Balan — Mon, 16 May 2016 12:16:33 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20160516101633 on branch lams2_head_wildfly in lams

LDEV-3800 Update PixIr Author and Monitor to Bootstrap

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

(-6, +6)

| History

| Source

| Diff

· /lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag

(-111, +109)

| History

| Source

| Diff

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

(-4, +12)

| History

| Source

| Diff

· /lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag

(-37, +37)

| History

| Source

| Diff

· /lams_tool_pixlr/web/WEB-INF/tags/Page.tag

(-7, +20)

| History

| Source

| Diff

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

(-12, +16)

| History

| Source

| Diff

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

(-14, +6)

| History

| Source

| Diff

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

(-32, +55)

| History

| Source

| Diff

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

(-2, +4)

| History

| Source

| Diff

· /lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld

(-5, +33)

| History

| Source

| Diff

· /lams_tool_pixlr/web/common/messages.jsp

(-16, +4)

| History

| Source

| Diff

· /lams_tool_pixlr/web/includes/javascript/common.js

(-3, +2)

| History

| Source

| Diff

· /lams_tool_pixlr/web/layouts/defaultLayout.jsp

(-10, +8)

| History

| Source

| Diff

· /lams_tool_pixlr/web/layouts/learningLayout.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/layouts/tabLayout.jsp

(-9, +8)

| History

| Source

| Diff

… 14 more files in changeset.

lams (lams2_head_wildfly): LDEV-3723 Update PixIr learner to Bootstrap

Andrey Balan — Fri, 11 Mar 2016 20:37:11 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20160311193711 on branch lams2_head_wildfly in lams

LDEV-3723 Update PixIr learner to Bootstrap

· /lams_tool_pixlr/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(-0, +352)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(-7, +15)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(-0, +36)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(-0, +194)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/WEB-INF/tags/TSTable.tag	(-0, +53)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(-0, +20)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/common/learnerheader.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/common/messages.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/defineLater.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/headItems.jsp	(-0, +0)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/image.jsp	(-7, +3)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/notebook.jsp	(-42, +35)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/pixlr.jsp	(-39, +101)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/success.jsp	(-22, +17)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/viewAll.jsp	(-75, +68)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp	(-89, +0)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2817: Remove references to nonexistent css files in tools

Ernie Ghiglione — Tue, 13 Nov 2012 04:26:07 +0100

Ernie Ghiglione committed MAIN:ernieg:20121113032607 on branch MAIN in lams

LDEV-2817: Remove references to nonexistent css files in tools

· /lams_tool_bbb/web/common/simpleHeader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_bbb/web/common/tabbedHeader.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/learning/notebook.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_gmap/web/pages/monitoring/notebook.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/authoring/addCondition.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/monitoring/notebookDisplay.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/common/header.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/pages/learning/notebook.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_pixlr/web/pages/learning/viewAll.jsp

(-1, +0)

| History

| Source

| Diff

… 4 more files in changeset.

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-2236 Removed unused css.

mseaton — Tue, 21 Apr 2009 03:36:15 +0200

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

LDEV-2236 Removed unused css.

· /lams_tool_pixlr/web/common/learnerheader.jsp

(-1, +0)

| History

| Source

| Diff

lams (MAIN): pixlr - fixing a bug in learner where image wouldnt resize to fit the scree because it took too long to load. Moving the...

lfoxton — Thu, 08 Jan 2009 23:32:54 +0100

lfoxton committed MAIN:lfoxton:20090108223254 on branch MAIN in lams

pixlr - fixing a bug in learner where image wouldnt resize to fit the scree because it took too long to load. Moving the javasctipt to the onload method fixed the problem

· /lams_tool_pixlr/web/WEB-INF/web.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/common/learnerheader.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/includes/javascript/learning.js	(-0, +39)	\| History	\| Source
· /lams_tool_pixlr/web/layouts/learningLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_pixlr/web/pages/learning/pixlr.jsp	(-40, +5)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2076 Sharing lams_tool_pixlr project

lfoxton — Wed, 07 Jan 2009 23:37:48 +0100

lfoxton committed MAIN:lfoxton:20090107223748 on branch MAIN in lams

LDEV-2076 Sharing lams_tool_pixlr project

· /lams_tool_pixlr/.classpath

(-0, +15)

| History

| Source

· /lams_tool_pixlr/.cvsignore

(-0, +5)

| History

| Source

· /lams_tool_pixlr/.myumldata

(-0, +2)

| History

| Source

· /lams_tool_pixlr/.project

(-0, +49)

| History

| Source

· /lams_tool_pixlr/build.properties

(-0, +20)

| History

| Source

· /lams_tool_pixlr/build.xml

(-0, +529)

| History

| Source

· /lams_tool_pixlr/conf/hibernate/mappings/hibernate.properties

(-0, +7)

| History

| Source

· /lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/Pixlr.hbm.xml

(-0, +232)

| History

| Source

· /lams_tool_pixlr/conf/hibernate/mappings/org/.../lams/tool/pixlr/model/PixlrAttachment.hbm.xml

(-0, +93)

| History

| Source

· /lams_tool_pixlr/conf/hibernate/mappings/org/.../lams/tool/pixlr/model/PixlrSession.hbm.xml

(-0, +111)

| History

| Source

· /lams_tool_pixlr/conf/hibernate/mappings/org/lamsfoundation/lams/tool/pixlr/model/PixlrUser.hbm.xml

(-0, +134)

| History

| Source

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

(-0, +3)

| History

| Source

· /lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

(-0, +118)

| History

| Source

· /lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties

(-0, +118)

| History

| Source

· /lams_tool_pixlr/conf/language/rams/ApplicationResources.properties

(-0, +118)

| History

| Source

… 140 more files in changeset.