Index: lams_monitoring/web/addLesson.jsp
===================================================================
diff -u -r6302ea176d59ceb6316c0e707dafd5d715303c8b -rc558aa780212e4a232e59fc115e1ea5213a09b64
--- lams_monitoring/web/addLesson.jsp (.../addLesson.jsp) (revision 6302ea176d59ceb6316c0e707dafd5d715303c8b)
+++ lams_monitoring/web/addLesson.jsp (.../addLesson.jsp) (revision c558aa780212e4a232e59fc115e1ea5213a09b64)
@@ -1,4 +1,4 @@
-<%--
+ <%--
Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -18,113 +18,112 @@
http://www.gnu.org/licenses/gpl.txt
--%>
-
<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
-<%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-html" prefix="html" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-lams" prefix="lams" %>
-
+
+
+
-
-
-
-
-
+
+
- // Hook for Internet Explorer.
- if (navigator.appName && navigator.appName.indexOf("Microsoft") != -1 && navigator.userAgent.indexOf("Windows") != -1 && navigator.userAgent.indexOf("Windows 3.1") == -1) {
- document.write('\n');
- }
+
+
+
+<% String clientVersion = Configuration.get(ConfigurationKeys.MONITOR_CLIENT_VERSION); %>
- function closeWizard() {
- window.opener.location.reload();
- closeWindow();
- }
+ organisationID=&orgName=&serverUrl=&userID=&buildID=<%= clientVersion %>
+
+
-
-
-
-
-<%
-String clientVersion = Configuration.get(ConfigurationKeys.MONITOR_CLIENT_VERSION);
-String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE);
-String languageDate = Configuration.get(ConfigurationKeys.DICTIONARY_DATE_CREATED);
-String allowEditOnFly = Configuration.get(ConfigurationKeys.ALLOW_EDIT_ON_FLY);
-String jabberServer = Configuration.get(ConfigurationKeys.XMPP_DOMAIN);
-%>
-
- <%-- courseID and classID are passed in as request parameters by addLesson.jsp in lams_central. --%>
- ?loadFile=monitoring/lams_wizard.swf&loadLibrary=monitoring/lams_wizard_library.swf&userID=&serverURL=&presenceServerUrl=<%=jabberServer%>&build=<%=clientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&courseID=&classID=&editOnFly=<%=allowEditOnFly%>
- ../lams_preloader.swf
- ../lams_preloader
-
-
-
-
-
-
-
\ No newline at end of file
+ AC_FL_RunContent(
+ "src", "/includes/flash/playerProductInstall",
+ "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+ "width", "100%",
+ "height", "100%",
+ "align", "middle",
+ "id", "CloudWizard",
+ "quality", "high",
+ "bgcolor", "#ffffff",
+ "name", "CloudWizard",
+ "allowScriptAccess","sameDomain",
+ "type", "application/x-shockwave-flash",
+ "pluginspage", "http://www.adobe.com/go/getflashplayer"
+ );
+ } else if (hasRequestedVersion) {
+ // if we've detected an acceptable version
+ // embed the Flash Content SWF when all tests are passed
+ AC_FL_RunContent(
+ "src", "/monitoring/CloudWizard",
+ "FlashVars", ""+"",
+ "width", "100%",
+ "height", "100%",
+ "align", "middle",
+ "id", "CloudWizard",
+ "quality", "high",
+ "bgcolor", "#ffffff",
+ "name", "CloudWizard",
+ "allowScriptAccess","sameDomain",
+ "type", "application/x-shockwave-flash",
+ "pluginspage", "http://www.adobe.com/go/getflashplayer"
+ );
+ } else { // flash is too old or we can't detect the plugin
+ var alternateContent = 'Alternate HTML content should be placed here. '
+ + 'This content requires the Adobe Flash Player. '
+ + 'Get Flash';
+ document.write(alternateContent); // insert non-flash content
+ }
+ // -->
+
+
+
+