Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.76 -r1.77
--- lams_central/conf/language/lams/ApplicationResources.properties 27 Apr 2009 19:37:17 -0000 1.76
+++ lams_central/conf/language/lams/ApplicationResources.properties 19 Jun 2009 10:54:17 -0000 1.77
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Apr 22 17:46:43 CST 2009
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 11 01:00:44 CST 2009
#=================== labels for LAMS Central =================#
@@ -210,6 +210,7 @@
error.user.not.found =Unable to find the username in LAMS. Please check your username and try again.
error.support.email.not.set =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your System Administrator.
error.password.request.expired =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request.
+label.required =Required
label.forgot.password.instructions.1 =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.
label.forgot.password.instructions.2 =If you do not know your email address in LAMS, please contact your System Administrator.
label.forgot.password.email =Check Email
@@ -235,9 +236,44 @@
index.coursegradebook.tooltip =Open course-wide Gradebook monitoring page
index.coursegradebook.learner =My Grades
index.coursegradebookmonitor =Mark
+label.timezone.title =Time Zone
+label.timezone.0 =(GMT -12:00) Eniwetok, Kwajalein
+label.timezone.1 =(GMT -11:00) Midway Island, Samoa
+label.timezone.2 =(GMT -10:00) Hawaii
+label.timezone.3 =(GMT -9:00) Alaska
+label.timezone.4 =(GMT -8:00) Pacific Time (US & Canada)
+label.timezone.5 =(GMT -7:00) Mountain Time (US & Canada)
+label.timezone.6 =(GMT -6:00) Central Time (US & Canada), Mexico City
+label.timezone.7 =(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima
+label.timezone.8 =(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz
+label.timezone.9 =(GMT -3:30) Newfoundland
+label.timezone.10 =(GMT -3:00) Brazil, Buenos Aires, Georgetown
+label.timezone.11 =(GMT -2:00) Mid-Atlantic
+label.timezone.12 =(GMT -1:00 hour) Azores, Cape Verde Islands
+label.timezone.13 =(GMT) Western Europe Time, London, Lisbon, Casablanca
+label.timezone.14 =(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris
+label.timezone.15 =(GMT +2:00) Kaliningrad, South Africa
+label.timezone.16 =(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg
+label.timezone.17 =(GMT +3:30) Tehran
+label.timezone.18 =(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi
+label.timezone.19 =(GMT +4:30) Kabul
+label.timezone.20 =(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent
+label.timezone.21 =(GMT +5:30) Bombay, Calcutta, Madras, New Delhi
+label.timezone.22 =(GMT +5:45) Kathmandu
+label.timezone.23 =(GMT +6:00) Almaty, Dhaka, Colombo
+label.timezone.24 =(GMT +7:00) Bangkok, Hanoi, Jakarta
+label.timezone.25 =(GMT +8:00) Beijing, Perth, Singapore, Hong Kong
+label.timezone.26 =(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk
+label.timezone.27 =(GMT +9:30) Adelaide, Darwin
+label.timezone.28 =(GMT +10:00) Eastern Australia, Guam, Vladivostok
+label.timezone.29 =(GMT +11:00) Magadan, Solomon Islands, New Caledonia
+label.timezone.30 =(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka
+title.import.lamscommunity =Import from lamscommunity.org
+label.lamscommunity.notRegistered.1 =Your server is not registered with the LAMS Community so you can not seamlessly import sequences directly into your LAMS server from the community. Ask your system administrator to enable this feature.
+label.lamscommunity.notRegistered.2 =However, you can download and import the sequences manually from the LAMS Community website:
+label.lamscommunity.info =The LAMS Community is a global online community for all teachers, administrators and developers that use LAMS. Within the various sub-communities, you can access the latest news about LAMS, many different discussion forums, and a repository of shared LAMS sequences.
-
-
+# planner stuff
index.planner =Planner
planner.title =Pedagogical Planner
label.description =Description
@@ -321,36 +357,11 @@
label.planner.export.sequence=Export sequence
error.planner.export.template=There was an error while exporting the template.
-label.timezone.title=Time Zone
-label.timezone.0=(GMT -12:00) Eniwetok, Kwajalein
-label.timezone.1=(GMT -11:00) Midway Island, Samoa
-label.timezone.2=(GMT -10:00) Hawaii
-label.timezone.3=(GMT -9:00) Alaska
-label.timezone.4=(GMT -8:00) Pacific Time (US & Canada)
-label.timezone.5=(GMT -7:00) Mountain Time (US & Canada)
-label.timezone.6=(GMT -6:00) Central Time (US & Canada), Mexico City
-label.timezone.7=(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima
-label.timezone.8=(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz
-label.timezone.9=(GMT -3:30) Newfoundland
-label.timezone.10=(GMT -3:00) Brazil, Buenos Aires, Georgetown
-label.timezone.11=(GMT -2:00) Mid-Atlantic
-label.timezone.12=(GMT -1:00 hour) Azores, Cape Verde Islands
-label.timezone.13=(GMT) Western Europe Time, London, Lisbon, Casablanca
-label.timezone.14=(GMT +1:00 hour) Brussels, Copenhagen, Madrid, Paris
-label.timezone.15=(GMT +2:00) Kaliningrad, South Africa
-label.timezone.16=(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg
-label.timezone.17=(GMT +3:30) Tehran
-label.timezone.18=(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi
-label.timezone.19=(GMT +4:30) Kabul
-label.timezone.20=(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent
-label.timezone.21=(GMT +5:30) Bombay, Calcutta, Madras, New Delhi
-label.timezone.22=(GMT +5:45) Kathmandu
-label.timezone.23=(GMT +6:00) Almaty, Dhaka, Colombo
-label.timezone.24=(GMT +7:00) Bangkok, Hanoi, Jakarta
-label.timezone.25=(GMT +8:00) Beijing, Perth, Singapore, Hong Kong
-label.timezone.26=(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk
-label.timezone.27=(GMT +9:30) Adelaide, Darwin
-label.timezone.28=(GMT +10:00) Eastern Australia, Guam, Vladivostok
-label.timezone.29=(GMT +11:00) Magadan, Solomon Islands, New Caledonia
-label.timezone.30=(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka
-#======= End labels: Exported 229 labels for en AU =====
+label.planner.tutorial.video=Introduction to Pedagogical Planner
+label.tutorial.video.never.show.again=Do not show this again
+
+label.planner.tutorial.video.show=Show tutorial video: Introduction to Pedagogical Planner
+label.tutorial.enabled=Automatically open help assistants. If this option is No, then no online help assistants will be opened.
+label.tutorial.disable.single=You have chosen not to show this video again. You can always play it using the video icon in the right upper corner of the page.
+label.tutorial.disable.all=Welcome to LAMS! As a new user, you might want to spend a few minutes looking at the new online assistant animations and videos to help you get the most out of LAMS. You can turn this option off if you are an experience LAMS user. If you are new to LAMS, we recommend that you leave this on to get contextual help. Do you want to to leave this option on?
+#======= End labels: Exported 266 labels for en AU =====
Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-forms.xml,v
diff -u -r1.9 -r1.10
--- lams_central/conf/xdoclet/struts-forms.xml 27 Apr 2009 19:37:17 -0000 1.9
+++ lams_central/conf/xdoclet/struts-forms.xml 19 Jun 2009 10:54:17 -0000 1.10
@@ -37,6 +37,7 @@
+
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.49 -r1.50
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 26 Feb 2009 19:20:10 -0000 1.49
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 19 Jun 2009 10:54:17 -0000 1.50
@@ -28,6 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -41,10 +42,13 @@
import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
import org.lamsfoundation.lams.usermanagement.Role;
import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
import org.lamsfoundation.lams.util.Configuration;
import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -92,6 +96,19 @@
setHeaderLinks(request);
setAdminLinks(request);
+ // check if this is user's first login; some action (like displaying a dialog for disabling tutorials) can be
+ // taken based on that parameter; immediatelly, the value in DB is updated
+ HttpSession ss = SessionManager.getSession();
+ UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ if (userDTO.isFirstLogin()) {
+ request.setAttribute("firstLogin", true);
+ User user = getUserManagementService().getUserByLogin(userDTO.getLogin());
+ user.setFirstLogin(false);
+ getUserManagementService().save(user);
+ ss.removeAttribute(AttributeNames.USER);
+ ss.setAttribute(AttributeNames.USER, user.getUserDTO());
+ }
+
// check if user is flagged as needing to change their password
User loggedInUser = getUserManagementService().getUserByLogin(request.getRemoteUser());
if (loggedInUser.getChangePassword() != null) {
@@ -118,6 +135,9 @@
} else if (StringUtils.equals(tab, "lessons")) {
return mapping.findForward("lessons");
} else if (StringUtils.equals(tab, "community")) {
+
+ String comLoginUrl = Configuration.get(ConfigurationKeys.SERVER_URL) + "/lamsCommunityLogin.do";
+ request.setAttribute("comLoginUrl", comLoginUrl);
request.setAttribute("tab", tab);
return mapping.findForward("community");
}
@@ -153,7 +173,8 @@
}
headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?tab=profile"));
- if (Configuration.getAsBoolean(ConfigurationKeys.LAMS_COMMUNITY_ENABLE)) {
+ Registration reg = Configuration.getRegistration();
+ if (reg != null) {
if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN)
|| request.isUserInRole(Role.GROUP_MANAGER) || request.isUserInRole(Role.AUTHOR)
|| request.isUserInRole(Role.AUTHOR_ADMIN) || request.isUserInRole(Role.MONITOR)) {
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java,v
diff -u -r1.18 -r1.19
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 25 Mar 2009 20:35:03 -0000 1.18
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 19 Jun 2009 10:54:18 -0000 1.19
@@ -220,6 +220,9 @@
private static final Map filterLanguageMap = new TreeMap();
private static final Map filterStopWordsMap = new TreeMap();
+ // Tutorial video page string for recognising which page the video was started from
+ private static final String PAGE_STRING_START_PLANNER = "StPed";
+
static {
PedagogicalPlannerAction.filterLanguageMap.put("en", "English");
PedagogicalPlannerAction.filterLanguageMap.put("nl", "Dutch");
@@ -246,6 +249,19 @@
*/
public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws Exception {
+
+ // First we check if a tutorial video should be displayed
+ HttpSession session = SessionManager.getSession();
+ UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+
+ boolean doNotShowAgain = userDto.getPagesWithDisabledTutorials() != null
+ && userDto.getPagesWithDisabledTutorials().contains(PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
+ boolean showTutorial = !(userDto.getTutorialsDisabled() || doNotShowAgain);
+
+ request.setAttribute(AttributeNames.ATTR_PAGE_STR, PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
+ request.setAttribute(AttributeNames.ATTR_SHOW_TUTORIAL, showTutorial);
+ request.setAttribute(AttributeNames.ATTR_DO_NOT_SHOW_AGAIN, doNotShowAgain);
+
return openSequenceNode(mapping, form, request, response);
}
@@ -561,7 +577,8 @@
getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID());
String newPath = mapping.findForward(PedagogicalPlannerAction.FORWARD_PREVIEW).getPath();
newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID
- + PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId();
+ + PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId() + PedagogicalPlannerAction.CHAR_AMPERSAND
+ + AttributeNames.PARAM_MODE + PedagogicalPlannerAction.CHAR_EQUALS + "preview";
return new ActionForward(newPath, true);
}
Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u -r1.15 -r1.16
--- lams_central/web/editprofile.jsp 27 Apr 2009 19:37:17 -0000 1.15
+++ lams_central/web/editprofile.jsp 19 Jun 2009 10:54:17 -0000 1.16
@@ -139,6 +139,20 @@
+
+
:
+
+
+
+
+
+
+
+
+
@@ -269,6 +283,18 @@
+
+
:
+
+
+
+
+
+
+
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.40 -r1.41
--- lams_central/web/main.jsp 31 Mar 2009 03:18:12 -0000 1.40
+++ lams_central/web/main.jsp 19 Jun 2009 10:54:17 -0000 1.41
@@ -34,7 +34,7 @@
-
+
@@ -49,6 +49,15 @@
initLoadGroup(this, 13, display);
});
+ <%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
+
+
+
+
+ if (!confirm("")){
+ $.get("${disableAllTutorialVideosUrl}");
+ }
+
});
function getEnableSortingText() {
Index: lams_central/web/css/pedagogicalPlanner.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/pedagogicalPlanner.css,v
diff -u -r1.10 -r1.11
--- lams_central/web/css/pedagogicalPlanner.css 29 Mar 2009 23:58:15 -0000 1.10
+++ lams_central/web/css/pedagogicalPlanner.css 19 Jun 2009 10:54:17 -0000 1.11
@@ -170,3 +170,19 @@
border-bottom: 0px;
}
+a#tutorialVideoHref {
+ margin: 5px;
+ border: none;
+ color: inherit;
+ float: right;
+}
+
+a#tutorialVideoHref:hover {
+ border: none;
+ color: inherit;
+ cursor: pointer;
+}
+
+img#tutorialVideoImg {
+ border: none;
+}
\ No newline at end of file
Index: lams_central/web/includes/javascript/thickbox.patched.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/thickbox.patched.js,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_central/web/includes/javascript/thickbox.patched.js 19 Jun 2009 10:54:17 -0000 1.1
@@ -0,0 +1,342 @@
+/*
+ * Thickbox 3.1 - One Box To Rule Them All.
+ * By Cody Lindley (http://www.codylindley.com)
+ * Copyright (c) 2007 cody lindley
+ * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+var tb_pathToImage = pathToImageFolder + "loadingAnimation.gif";
+
+// fixed according to: http://jamazon.co.uk/web/2008/03/14/jquerybrowserversion-doesnt-recognise-ie7/
+$.browser.msie6 =
+$.browser.msie
+&& /MSIE 6\.0/i.test(window.navigator.userAgent)
+&& !/MSIE 7\.0/i.test(window.navigator.userAgent)
+&& !/MSIE 8\.0/i.test(window.navigator.userAgent);
+
+/*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
+
+//on page load call tb_init
+$(document).ready(function(){
+ tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
+ imgLoader = new Image();// preload image
+ imgLoader.src = tb_pathToImage;
+});
+
+//add thickbox to href & area elements that have a class of .thickbox
+function tb_init(domChunk){
+ $(domChunk).click(function(){
+ var t = this.title || this.name || null;
+ var a = this.href || this.alt;
+ var g = this.rel || false;
+ tb_show(t,a,g);
+ this.blur();
+ return false;
+ });
+}
+
+function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
+
+ try {
+ if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
+ $("body","html").css({height: "100%", width: "100%"});
+ $("html").css("overflow","hidden");
+ if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
+ $("body").append("");
+ $("#TB_overlay").click(tb_remove);
+ }
+ }else{//all others
+ if(document.getElementById("TB_overlay") === null){
+ $("body").append("");
+ $("#TB_overlay").click(tb_remove);
+ }
+ }
+
+ if(tb_detectMacXFF()){
+ $("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash
+ }else{
+ $("#TB_overlay").addClass("TB_overlayBG");//use background and opacity
+ }
+
+ if(caption===null){caption="";}
+ $("body").append("