Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/language/lams/ApplicationResources.properties,v diff -u -r1.4 -r1.5 --- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties 16 Sep 2008 00:11:05 -0000 1.4 +++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties 16 Sep 2008 01:55:38 -0000 1.5 @@ -101,6 +101,9 @@ label.monitoring.startConference = Start Conference label.learning.joinConference = Join Conference +label.learning.conferenceNotAvailable = The Dim Dim conference is not available. Please see your instructor for further details. +label.refresh = Refresh + export.toolExportNotSupported = This tool does not support export portfolio. #======= End labels: Exported 78 labels for en AU ===== Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/Constants.java,v diff -u -r1.3 -r1.4 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java 16 Sep 2008 00:11:05 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java 16 Sep 2008 01:55:38 -0000 1.4 @@ -51,6 +51,6 @@ // Parameter names public static final String PARAM_USER_UID = "userUID"; + public static final String ATTR_CONFERENCE_OPEN = "conferenceOpen"; - } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java,v diff -u -r1.3 -r1.4 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java 15 Sep 2008 11:06:40 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java 16 Sep 2008 01:55:38 -0000 1.4 @@ -208,11 +208,16 @@ matcher.find(); String connectURL = matcher.group(1); - - String s = new String(); - request.setAttribute(Constants.ATTR_CONFERENCE_URL, serverURL.getValue() + connectURL); + boolean conferenceOpen = connectURL.isEmpty() ? false : true; + request.setAttribute(Constants.ATTR_CONFERENCE_OPEN, conferenceOpen); + if (conferenceOpen) { + request.setAttribute(Constants.ATTR_CONFERENCE_URL, serverURL + .getValue() + + connectURL); + } + return mapping.findForward("dimdim"); } Index: lams_tool_dimdim/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/learning/Attic/learning.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_dimdim/web/pages/learning/learning.jsp 16 Sep 2008 00:11:05 -0000 1.3 +++ lams_tool_dimdim/web/pages/learning/learning.jsp 16 Sep 2008 01:55:38 -0000 1.4 @@ -48,12 +48,6 @@
${contentDTO.instructions}
- -
-
+
+