Index: lams_learning/web/mainflash.jsp =================================================================== diff -u -rb5f1c6147aeaaec0f5084813209fe0cf59a1c386 -rec61f5d738bce3513b4e5204e011a68476a9c165 --- lams_learning/web/mainflash.jsp (.../mainflash.jsp) (revision b5f1c6147aeaaec0f5084813209fe0cf59a1c386) +++ lams_learning/web/mainflash.jsp (.../mainflash.jsp) (revision ec61f5d738bce3513b4e5204e011a68476a9c165) @@ -18,41 +18,145 @@ http://www.gnu.org/licenses/gpl.txt --%> - + <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> - + + - + <fmt:message key="learner.title"/> + + + + + + + - - - - " name="contentFrame" scrolling="YES"> - &presenceUrl=&mode=" name="controlFrame" scrolling="NO"> - - - - - &presenceUrl=&mode=" name="controlFrame" scrolling="NO"> - " name="contentFrame" scrolling="YES"> - - - + - - <body> - <fmt:message key="message.activity.parallel.noFrames" /> - </body> - + <% + String clientVersion = Configuration.get(ConfigurationKeys.LEARNER_CLIENT_VERSION); + String serverLanguage = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); + String languageDate = Configuration.get(ConfigurationKeys.DICTIONARY_DATE_CREATED); + String jabberServer = Configuration.get(ConfigurationKeys.XMPP_DOMAIN); + %> + + ?userID=&firstName=&lastName=&serverURL=&presenceServerUrl=<%=jabberServer%>&build=<%=clientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&lessonID=&uniqueID=&mode= + lams_learner + lams_learner.swf + +
+ + + +
+ + + <%@ include file="/includes/presenceChat.jsp" %> + + + +