Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9 -rc7764a3661e8b15fcd6b917e0597109edcb195c7 --- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9) +++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c7764a3661e8b15fcd6b917e0597109edcb195c7) @@ -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 =================================================================== diff -u -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9 -rc7764a3661e8b15fcd6b917e0597109edcb195c7 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java (.../Constants.java) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java (.../Constants.java) (revision c7764a3661e8b15fcd6b917e0597109edcb195c7) @@ -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 =================================================================== diff -u -r2714c5d509bed30e460ccc453753e6504804d4a1 -rc7764a3661e8b15fcd6b917e0597109edcb195c7 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java (.../LearningAction.java) (revision 2714c5d509bed30e460ccc453753e6504804d4a1) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java (.../LearningAction.java) (revision c7764a3661e8b15fcd6b917e0597109edcb195c7) @@ -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 =================================================================== diff -u -rf273f605d3c64f4ce6a52818f3fb5268b5db4fc9 -rc7764a3661e8b15fcd6b917e0597109edcb195c7 --- lams_tool_dimdim/web/pages/learning/learning.jsp (.../learning.jsp) (revision f273f605d3c64f4ce6a52818f3fb5268b5db4fc9) +++ lams_tool_dimdim/web/pages/learning/learning.jsp (.../learning.jsp) (revision c7764a3661e8b15fcd6b917e0597109edcb195c7) @@ -48,12 +48,6 @@
${contentDTO.instructions}
- -
-
+
+