Index: lams_central/web/author.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/author.jsp,v
diff -u -r1.15 -r1.16
--- lams_central/web/author.jsp 23 Jun 2006 08:01:09 -0000 1.15
+++ lams_central/web/author.jsp 23 Jun 2006 08:26:08 -0000 1.16
@@ -6,8 +6,7 @@
<%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %>
-
-
+
<%
String protocol = request.getProtocol();
if(protocol.startsWith("HTTPS")){
@@ -23,7 +22,7 @@
String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage);
%>
-
+
+
+
Index: lams_central/web/includes/javascript/AC_RunActiveContent.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/AC_RunActiveContent.js,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_central/web/includes/javascript/AC_RunActiveContent.js 23 Jun 2006 08:26:28 -0000 1.1
@@ -0,0 +1,126 @@
+//v1.0
+//Copyright 2006 Adobe Systems, Inc. All rights reserved.
+function AC_AddExtension(src, ext)
+{
+ if (src.indexOf('?') != -1)
+ return src.replace(/\?/, ext+'?');
+ else
+ return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs)
+{
+ var str = '';
+
+ document.write(str);
+}
+
+function AC_FL_RunContent(){
+ var ret =
+ AC_GetArgs
+ ( arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+ , "application/x-shockwave-flash"
+ );
+ AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_SW_RunContent(){
+ var ret =
+ AC_GetArgs
+ ( arguments, ".dcr", "src", "clsid:166B1BCA-3F9C-11CF-8075-444553540000"
+ , null
+ );
+ AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+ var ret = new Object();
+ ret.embedAttrs = new Object();
+ ret.params = new Object();
+ ret.objAttrs = new Object();
+ for (var i=0; i < args.length; i=i+2){
+ var currArg = args[i].toLowerCase();
+
+ switch (currArg){
+ case "classid":
+ break;
+ case "pluginspage":
+ ret.embedAttrs[args[i]] = args[i+1];
+ break;
+ case "src":
+ case "movie":
+ args[i+1] = AC_AddExtension(args[i+1], ext);
+ ret.embedAttrs["src"] = args[i+1];
+ ret.params[srcParamName] = args[i+1];
+ break;
+ case "onafterupdate":
+ case "onbeforeupdate":
+ case "onblur":
+ case "oncellchange":
+ case "onclick":
+ case "ondblClick":
+ case "ondrag":
+ case "ondragend":
+ case "ondragenter":
+ case "ondragleave":
+ case "ondragover":
+ case "ondrop":
+ case "onfinish":
+ case "onfocus":
+ case "onhelp":
+ case "onmousedown":
+ case "onmouseup":
+ case "onmouseover":
+ case "onmousemove":
+ case "onmouseout":
+ case "onkeypress":
+ case "onkeydown":
+ case "onkeyup":
+ case "onload":
+ case "onlosecapture":
+ case "onpropertychange":
+ case "onreadystatechange":
+ case "onrowsdelete":
+ case "onrowenter":
+ case "onrowexit":
+ case "onrowsinserted":
+ case "onstart":
+ case "onscroll":
+ case "onbeforeeditfocus":
+ case "onactivate":
+ case "onbeforedeactivate":
+ case "ondeactivate":
+ case "type":
+ case "codebase":
+ ret.objAttrs[args[i]] = args[i+1];
+ break;
+ case "width":
+ case "height":
+ case "align":
+ case "vspace":
+ case "hspace":
+ case "class":
+ case "title":
+ case "accesskey":
+ case "name":
+ case "id":
+ case "tabindex":
+ ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+ break;
+ default:
+ ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+ }
+ }
+ ret.objAttrs["classid"] = classid;
+ if (mimeType) ret.embedAttrs["type"] = mimeType;
+ return ret;
+}
Index: lams_learning/web/controlFrame.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/controlFrame.jsp,v
diff -u -r1.13 -r1.14
--- lams_learning/web/controlFrame.jsp 19 Jun 2006 03:48:29 -0000 1.13
+++ lams_learning/web/controlFrame.jsp 23 Jun 2006 08:28:30 -0000 1.14
@@ -35,6 +35,7 @@
+
@@ -44,33 +45,41 @@
String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage);
%>
- lams_learner.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&lessonID=&uniqueID=
-
-
-
-
-
+ ?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&lessonID=&uniqueID=
+ lams_learner
+ lams_learner.swf
+
+
+
+
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.22 -r1.23
Binary files differ
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v
diff -u -r1.13 -r1.14
--- lams_learning/web/loadToolActivity.jsp 19 Jun 2006 03:48:29 -0000 1.13
+++ lams_learning/web/loadToolActivity.jsp 23 Jun 2006 08:28:30 -0000 1.14
@@ -37,7 +37,6 @@
String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../..";
%>
-
@@ -75,4 +74,3 @@
-
Index: lams_learning/web/passon.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/passon.swf,v
diff -u -r1.7 -r1.8
Binary files differ
Index: lams_learning/web/WEB-INF/tags/Passon.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Passon.tag,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_learning/web/layout/activityLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/Attic/activityLayout.jsp,v
diff -u -r1.10 -r1.11
--- lams_learning/web/layout/activityLayout.jsp 17 May 2006 07:25:02 -0000 1.10
+++ lams_learning/web/layout/activityLayout.jsp 23 Jun 2006 08:28:30 -0000 1.11
@@ -36,7 +36,8 @@
-
+
+
@@ -45,35 +46,43 @@
String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage);
%>
-<%-- courseID and classID are passed in as request parameters by addLesson.jsp in lams_central. --%>
-lams_wizard.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&courseID=&classID=
+ <%-- courseID and classID are passed in as request parameters by addLesson.jsp in lams_central. --%>
+ ?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&courseID=&classID=
+ lams_wizard.swf
+ lams_wizard
-
-
-
-
-
+
+
\ No newline at end of file
Index: lams_monitoring/web/monitorLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/monitorLesson.jsp,v
diff -u -r1.2 -r1.3
--- lams_monitoring/web/monitorLesson.jsp 14 Jun 2006 04:46:30 -0000 1.2
+++ lams_monitoring/web/monitorLesson.jsp 23 Jun 2006 08:30:04 -0000 1.3
@@ -35,6 +35,25 @@
+
+
@@ -45,35 +64,42 @@
String languageDate = Configuration.getDictionaryDateForLanguage(serverLanguage);
%>
-<%-- lessonID is passed in as request parameters by addLesson.jsp in lams_central. --%>
-lams_monitoring.swf?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&lessonID=
+ <%-- lessonID is passed in as request parameters by addLesson.jsp in lams_central. --%>
+ ?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&lessonID=
+ lams_monitoring
+ lams_monitoring.swf
-
-
-
-
-
+
\ No newline at end of file