Index: lams_central/web/author.jsp =================================================================== diff -u -r7a1f51f64555f4cd94274847196373c7f9f549f0 -rfdf1bec458e3ecbd8c76a098b865f7656d39bf5b --- lams_central/web/author.jsp (.../author.jsp) (revision 7a1f51f64555f4cd94274847196373c7f9f549f0) +++ lams_central/web/author.jsp (.../author.jsp) (revision fdf1bec458e3ecbd8c76a098b865f7656d39bf5b) @@ -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 =================================================================== diff -u --- lams_central/web/includes/javascript/AC_RunActiveContent.js (revision 0) +++ lams_central/web/includes/javascript/AC_RunActiveContent.js (revision fdf1bec458e3ecbd8c76a098b865f7656d39bf5b) @@ -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 = ' '; + str += ' - + + + - - - - - - - - - - - " - quality="high" - scale="noscale" - bgcolor="#FFFFFF" - width="1" - height="1" - swliveconnect=true - id="passon" - name="passon" - align="" - type="application/x-shockwave-flash" - pluginspage="http://www.macromedia.com/go/getflashplayer" /> - + + + \ No newline at end of file Index: lams_learning/web/controlFrame.jsp =================================================================== diff -u -rd52b0a9ea260d27335a647fc2fba615c8e2e228e -rfdf1bec458e3ecbd8c76a098b865f7656d39bf5b --- lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision d52b0a9ea260d27335a647fc2fba615c8e2e228e) +++ lams_learning/web/controlFrame.jsp (.../controlFrame.jsp) (revision fdf1bec458e3ecbd8c76a098b865f7656d39bf5b) @@ -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= - - - - - - - "/> - - - - " - quality="high" - scale="noscale" - bgcolor="#B3B7C8" - width="100%" - height="100%" - swliveconnect=true - id="authoring" - name="authoring" - align="" - type="application/x-shockwave-flash" - pluginspage="http://www.macromedia.com/go/getflashplayer" /> - - + ?userID=&serverURL=&build=<%=clientVersion%>&lang=&country=&theme=&lessonID=&uniqueID= + lams_learner + lams_learner.swf + + + + Index: lams_learning/web/lams_learner.swf =================================================================== diff -u -rd52b0a9ea260d27335a647fc2fba615c8e2e228e -rfdf1bec458e3ecbd8c76a098b865f7656d39bf5b Binary files differ Index: lams_learning/web/layout/activityLayout.jsp =================================================================== diff -u -r57e83f8443e586e862dae836429599459eade2c0 -rfdf1bec458e3ecbd8c76a098b865f7656d39bf5b --- lams_learning/web/layout/activityLayout.jsp (.../activityLayout.jsp) (revision 57e83f8443e586e862dae836429599459eade2c0) +++ lams_learning/web/layout/activityLayout.jsp (.../activityLayout.jsp) (revision fdf1bec458e3ecbd8c76a098b865f7656d39bf5b) @@ -36,7 +36,8 @@ <c:out value="${pageTitle}" /> - + - "/> - - - - " - quality="high" - scale="noscale" - bgcolor="#B3B7C8" - width="100%" - height="100%" - swliveconnect=true - id="wizard" - name="wizard" - align="" - type="application/x-shockwave-flash" - pluginspage="http://www.macromedia.com/go/getflashplayer" /> - - + + \ No newline at end of file Index: lams_monitoring/web/monitorLesson.jsp =================================================================== diff -u -r5d55cdceb46cb3488947516631babe794c86da7c -rfdf1bec458e3ecbd8c76a098b865f7656d39bf5b --- lams_monitoring/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision 5d55cdceb46cb3488947516631babe794c86da7c) +++ lams_monitoring/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision fdf1bec458e3ecbd8c76a098b865f7656d39bf5b) @@ -35,6 +35,25 @@ <fmt:message key="monitor.title"/> + + @@ -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 - - - - - + - "/> - - - - " - quality="high" - scale="noscale" - bgcolor="#B3B7C8" - width="100%" - height="100%" - swliveconnect=true - id="monitoring" - name="monitoring" - align="" - type="application/x-shockwave-flash" - pluginspage="http://www.macromedia.com/go/getflashplayer" /> - - + \ No newline at end of file