Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/fckeditor/editor/plugins/kaltura/fckplugin.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/fckeditor/editor/plugins/kaltura/kaltura.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/fckeditor/editor/plugins/kaltura/kaltura.min.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/fckeditor/editor/plugins/kaltura/kalturagif.gif =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/kaltura/Attic/kalturagif.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/fckeditor/editor/plugins/kaltura/lang/en.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/fckeditor/editor/plugins/kaltura/swfobject/expressInstall.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/kaltura/swfobject/Attic/expressInstall.swf,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/fckeditor/editor/plugins/kaltura/swfobject/swfobject.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/fckconfig_custom.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/fckconfig_custom.js,v diff -u -r1.20.2.2.4.1 -r1.20.2.2.4.2 --- lams_central/web/includes/javascript/fckconfig_custom.js 31 Oct 2011 23:21:08 -0000 1.20.2.2.4.1 +++ lams_central/web/includes/javascript/fckconfig_custom.js 3 Jan 2012 21:02:16 -0000 1.20.2.2.4.2 @@ -1,6 +1,6 @@ FCKConfig.ToolbarSets["Default"] = [ ['Source','-','FitWindow', 'Preview','PasteWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','OrderedList','UnorderedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','TextColor','BGColor','Equation'], - ['Paint_Button','MoviePlayer','VideoRecorder','Image','Link','Table','Rule','Smiley','SpecialChar','Templates','FontFormat','FontName','FontSize','About'] + ['Paint_Button','MoviePlayer','VideoRecorder','Kaltura','Image','Link','Table','Rule','Smiley','SpecialChar','Templates','FontFormat','FontName','FontSize','About'] ] ; FCKConfig.ToolbarSets["Default-Learner"] = [ @@ -47,4 +47,5 @@ FCKConfig.Plugins.Add('equation', 'en'); FCKConfig.Plugins.Add('movieplayer', 'en'); FCKConfig.Plugins.Add('videorecorder', 'en'); +FCKConfig.Plugins.Add('kaltura', 'en'); FCKConfig.Plugins.Add('paint', 'en'); Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v diff -u -r1.43.2.4.2.8 -r1.43.2.4.2.9 --- lams_common/db/sql/insert_lams_unix_config_data.sql 1 Apr 2011 18:36:31 -0000 1.43.2.4.2.8 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 3 Jan 2012 21:02:05 -0000 1.43.2.4.2.9 @@ -264,3 +264,21 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaServer','', 'config.kaltura.server', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaPartnerId','', 'config.kaltura.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaSubPartnerId','', 'config.kaltura.sub.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaUserSecret','', 'config.kaltura.user.secret', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKCWUiConfId','', 'config.kaltura.kcw.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKDPUiConfId','', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v diff -u -r1.35.4.4.2.11 -r1.35.4.4.2.12 --- lams_common/db/sql/insert_lams_windows_config_data.sql 1 Apr 2011 18:36:31 -0000 1.35.4.4.2.11 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 3 Jan 2012 21:02:05 -0000 1.35.4.4.2.12 @@ -264,3 +264,21 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('Red5RecordingsUrl','', 'config.red5.recordings.url', 'config.header.red5', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaServer','', 'config.kaltura.server', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaPartnerId','', 'config.kaltura.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaSubPartnerId','', 'config.kaltura.sub.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaUserSecret','', 'config.kaltura.user.secret', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKCWUiConfId','', 'config.kaltura.kcw.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKDPUiConfId','', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); Index: lams_common/db/sql/insert_rams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_unix_config_data.sql,v diff -u -r1.20.6.1.4.1 -r1.20.6.1.4.2 --- lams_common/db/sql/insert_rams_unix_config_data.sql 15 Oct 2010 17:06:33 -0000 1.20.6.1.4.1 +++ lams_common/db/sql/insert_rams_unix_config_data.sql 3 Jan 2012 21:02:05 -0000 1.20.6.1.4.2 @@ -246,3 +246,21 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaServer','', 'config.kaltura.server', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaPartnerId','', 'config.kaltura.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaSubPartnerId','', 'config.kaltura.sub.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaUserSecret','', 'config.kaltura.user.secret', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKCWUiConfId','', 'config.kaltura.kcw.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKDPUiConfId','', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); Index: lams_common/db/sql/insert_rams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_windows_config_data.sql,v diff -u -r1.17.6.1.4.1 -r1.17.6.1.4.2 --- lams_common/db/sql/insert_rams_windows_config_data.sql 15 Oct 2010 17:06:33 -0000 1.17.6.1.4.1 +++ lams_common/db/sql/insert_rams_windows_config_data.sql 3 Jan 2012 21:02:05 -0000 1.17.6.1.4.2 @@ -245,4 +245,22 @@ values ('AdminScreenSize','1024x768', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0); \ No newline at end of file +values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaServer','', 'config.kaltura.server', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaPartnerId','', 'config.kaltura.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaSubPartnerId','', 'config.kaltura.sub.partner.id', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaUserSecret','', 'config.kaltura.user.secret', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKCWUiConfId','', 'config.kaltura.kcw.uiconfid', 'config.header.kaltura', 'STRING', 0); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('KalturaKDPUiConfId','', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030501.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch02030501.sql,v diff -u -r1.1.2.7 -r1.1.2.8 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030501.sql 5 Sep 2011 19:14:08 -0000 1.1.2.7 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030501.sql 3 Jan 2012 21:02:05 -0000 1.1.2.8 @@ -36,6 +36,19 @@ ALTER TABLE lams_lesson ADD COLUMN enable_lesson_notifications TINYINT(1) DEFAULT 0; ALTER TABLE lams_organisation ADD COLUMN enable_course_notifications TINYINT(1) NOT NULL DEFAULT 0; +-- LDEV-2757 Introducing Kaltura FCKEditor plugin +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('KalturaServer','', 'config.kaltura.server', 'config.header.kaltura', 'STRING', 0); +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('KalturaPartnerId','', 'config.kaltura.partner.id', 'config.header.kaltura', 'STRING', 0); +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('KalturaSubPartnerId','', 'config.kaltura.sub.partner.id', 'config.header.kaltura', 'STRING', 0); +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('KalturaUserSecret','', 'config.kaltura.user.secret', 'config.header.kaltura', 'STRING', 0); +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('KalturaKCWUiConfId','', 'config.kaltura.kcw.uiconfid', 'config.header.kaltura', 'STRING', 0); +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('KalturaKDPUiConfId','', 'config.kaltura.kdp.uiconfid', 'config.header.kaltura', 'STRING', 0); -- If there were no errors, commit and restore autocommit to on COMMIT; Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.40.8.3 -r1.40.8.4 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 2 Jul 2011 19:31:07 -0000 1.40.8.3 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 3 Jan 2012 21:02:04 -0000 1.40.8.4 @@ -258,5 +258,17 @@ public static String SMTP_AUTH_USER = "SMTPUser"; public static String SMTP_AUTH_PASSWORD = "SMTPPassword"; + + public static String KALTURA_SERVER = "KalturaServer"; + public static String KALTURA_PARTNER_ID = "KalturaPartnerId"; + + public static String KALTURA_SUB_PARTNER_ID = "KalturaSubPartnerId"; + + public static String KALTURA_USER_SECRET = "KalturaUserSecret"; + + public static String KALTURA_KCW_UI_CONF_ID = "KalturaKCWUiConfId"; + + public static String KALTURA_KDP_UI_CONF_ID = "KalturaKDPUiConfId"; + } \ No newline at end of file