Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 Binary files differ Index: lams_build/lib/lams/lams-learning.jar =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java =================================================================== diff -u -rbdd916337e3a48589da367f4c8b7705fe3197af2 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java (.../LamsCommunityLoginAction.java) (revision bdd916337e3a48589da367f4c8b7705fe3197af2) +++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java (.../LamsCommunityLoginAction.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -82,7 +82,8 @@ private static final String ATTR_ERROR_MESSAGE = "errorMessage"; private static final String LC_METHOD_IMPORT = "import"; - private static final String LC_METHOD_SAVE = "import"; + private static final String LC_METHOD_NEWS = "news"; + private static final String LC_METHOD_SAVE = "save"; /** @@ -93,8 +94,23 @@ */ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - User user = getUser(request); + + + // Getting the destination of the lamscommunity call + String dest = WebUtil.readStrParam(request, LamsCommunityUtil.PARAM_DEST, true); + if (dest == null) { + dest = LC_METHOD_NEWS; + } + + // Checking the server is registered + Registration reg = Configuration.getRegistration(); + if (reg == null || reg.isEnableLamsCommunityIntegration() == false) { + request.setAttribute("registered", Boolean.FALSE); + } else { + request.setAttribute("registered", Boolean.TRUE); + } + if (user.getLamsCommunityToken() == null || user.getLamsCommunityToken().equals("")) { // Authenticate the user manually return mapping.findForward("lamsCommunityLogin"); @@ -241,21 +257,14 @@ HttpSession sharedsession = SessionManager.getSession(); sharedsession.setAttribute(AttributeNames.USER, userDTO); - String timestamp = "" + new Date().getTime(); String hash = LamsCommunityUtil.createAuthenticationHash(timestamp, user.getLamsCommunityUsername(), user.getLamsCommunityToken(), serverID, serverKey); // Redirect the user to the lamscommunity sso url String url = LamsCommunityUtil.LAMS_COMMUNITY_SSO_URL + "?"; - url = LamsCommunityUtil.appendAuthInfoToURL(url); + url = LamsCommunityUtil.appendAuthInfoToURL(url, user); - //String url = LamsCommunityUtil.LAMS_COMMUNITY_SSO_URL + "?"; - //url += LamsCommunityUtil.PARAM_LC_USERNAME + "=" + URLEncoder.encode(user.getLamsCommunityUsername(), "UTF8"); - //url += "&" + LamsCommunityUtil.PARAM_HASH + "=" + hash; - //url += "&" + LamsCommunityUtil.PARAM_SERVER_ID + "=" + serverID; - //url += "&" + LamsCommunityUtil.PARAM_TIMESTAMP + "=" + timestamp; - if (lamscommunityDest != null) { String customCSV = WebUtil.readStrParam(request, AttributeNames.PARAM_CUSTOM_CSV, true); @@ -266,13 +275,13 @@ response.sendRedirect(url); return null; - } + } private String appendReturnUrl(String url, String dest, String customCSV) throws Exception { url += "&" + LamsCommunityUtil.PARAM_DEST + "=" + URLEncoder.encode(dest, "UTF8"); if (dest != null && dest.equals(LC_METHOD_IMPORT)){ - String returnURL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/authoring/importToolContent?method=importLCFinish"; + String returnURL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/authoring/importToolContent.do?method=importLCFinish"; url += "&" + LamsCommunityUtil.PARAM_RETURN_URL + "=" + URLEncoder.encode(returnURL, "UTF8"); } Index: lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginForm.java =================================================================== diff -u -rbdd916337e3a48589da367f4c8b7705fe3197af2 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginForm.java (.../LamsCommunityLoginForm.java) (revision bdd916337e3a48589da367f4c8b7705fe3197af2) +++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginForm.java (.../LamsCommunityLoginForm.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -37,7 +37,7 @@ public String lcUserName; public String lcPassword; - public String lcDest; + public String dest; public String dispatch; public LamsCommunityLoginForm() {} @@ -66,12 +66,12 @@ this.dispatch = dispatch; } - public String getLcDest() { - return lcDest; + public String getDest() { + return dest; } - public void setLcDest(String lcDest) { - this.lcDest = lcDest; + public void setDest(String dest) { + this.dest = dest; } } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java =================================================================== diff -u -rbcc1d8b6c75c97a5a16fe50aeae14dc451b45da5 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java (.../LamsCommunityUtil.java) (revision bcc1d8b6c75c97a5a16fe50aeae14dc451b45da5) +++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityUtil.java (.../LamsCommunityUtil.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -30,8 +30,10 @@ import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; +import javax.servlet.http.HttpSession; import org.lamsfoundation.lams.config.Registration; +import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.HashUtil; @@ -109,7 +111,7 @@ * @return * @throws Exception */ - public static String appendAuthInfoToURL(String url) throws Exception { + public static String appendAuthInfoToURL(String url, User user) throws Exception { Registration reg = Configuration.getRegistration(); String serverID; String serverKey; @@ -120,13 +122,13 @@ throw new Exception("Attempt to authenticate in lams community without registration"); } - UserDTO userDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + String timestamp = "" + new Date().getTime(); - String hash = LamsCommunityUtil.createAuthenticationHash(timestamp, userDTO.getLamsCommunityUsername(), userDTO + String hash = LamsCommunityUtil.createAuthenticationHash(timestamp, user.getLamsCommunityUsername(), user .getLamsCommunityToken(), serverID, serverKey); url += "&" + PARAM_LC_USERNAME + "=" - + URLEncoder.encode(userDTO.getLamsCommunityUsername(), "UTF8"); + + URLEncoder.encode(user.getLamsCommunityUsername(), "UTF8"); url += "&" + PARAM_HASH + "=" + hash; url += "&" + PARAM_SERVER_ID + "=" + serverID; url += "&" + PARAM_TIMESTAMP + "=" + timestamp; @@ -158,5 +160,8 @@ ret.put(PARAM_TIMESTAMP, timestamp); return ret; } + + + } Index: lams_central/src/java/org/lamsfoundation/lams/webservice/PaintAction.java =================================================================== diff -u -r0bbad8932a51efb88ac79f78bf2c7d7396554fe9 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/src/java/org/lamsfoundation/lams/webservice/PaintAction.java (.../PaintAction.java) (revision 0bbad8932a51efb88ac79f78bf2c7d7396554fe9) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/PaintAction.java (.../PaintAction.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -48,11 +48,18 @@ * validate="false" * * ----------------XDoclet Tags-------------------- +* +* Currently this action class is unused, but we will retain it in the source for any future use +* with the Paint FCKEditor plugin. +* */ public class PaintAction extends LamsDispatchAction { private static Logger logger = Logger.getLogger(PresenceChatLoggerAction.class); + /** + * @deprecated + */ public ActionForward saveImage(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { Index: lams_central/web/fckeditor/editor/plugins/paint/content.jsp =================================================================== diff -u --- lams_central/web/fckeditor/editor/plugins/paint/content.jsp (revision 0) +++ lams_central/web/fckeditor/editor/plugins/paint/content.jsp (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -0,0 +1,57 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + +
+ + + Index: lams_central/web/fckeditor/editor/plugins/paint/lang/en.js =================================================================== diff -u -rbcd8fa50f3eba54b354ef803f82a71a68fa36f27 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/web/fckeditor/editor/plugins/paint/lang/en.js (.../en.js) (revision bcd8fa50f3eba54b354ef803f82a71a68fa36f27) +++ lams_central/web/fckeditor/editor/plugins/paint/lang/en.js (.../en.js) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -1,23 +1,23 @@ -FCKLang.Paint = new Object(); -FCKLang.Paint.DialogTitle = 'Create your own painting'; -FCKLang.Paint.DialogName = 'Paint dialog window'; -FCKLang.Paint.Button = 'Paint images'; - -FCKLang.Paint.Flash = new Object(); -FCKLang.Paint.Flash.reset = "Reset"; -FCKLang.Paint.Flash.reset_question = "Really clear the whole screen?"; -FCKLang.Paint.Flash.yes = "Yes"; -FCKLang.Paint.Flash.no = "No"; -FCKLang.Paint.Flash.done = "Done"; -FCKLang.Paint.Flash.lines = "Lines"; -FCKLang.Paint.Flash.shapes = "Shapes"; -FCKLang.Paint.Flash.paint = "Paint"; -FCKLang.Paint.Flash.text = "Text"; -FCKLang.Paint.Flash.line_options = "Line thickness and color"; -FCKLang.Paint.Flash.fill_options = "Fill color"; -FCKLang.Paint.Flash.perfect_shape_options = "Number of sides"; -FCKLang.Paint.Flash.brush_options_shape = "Brush shape"; -FCKLang.Paint.Flash.brush_options_size = "Brush size"; -FCKLang.Paint.Flash.words_options = "Text size and color"; -FCKLang.Paint.Flash.fill = "Use fill"; +FCKLang.Paint = new Object(); +FCKLang.Paint.DialogTitle = 'Create your own painting'; +FCKLang.Paint.DialogName = 'Paint dialog window'; +FCKLang.Paint.Button = 'Paint images'; + +FCKLang.Paint.Flash = new Object(); +FCKLang.Paint.Flash.reset = "Reset"; +FCKLang.Paint.Flash.reset_question = "Really clear the whole screen?"; +FCKLang.Paint.Flash.yes = "Yes"; +FCKLang.Paint.Flash.no = "No"; +FCKLang.Paint.Flash.done = "Done"; +FCKLang.Paint.Flash.lines = "Lines"; +FCKLang.Paint.Flash.shapes = "Shapes"; +FCKLang.Paint.Flash.paint = "Paint"; +FCKLang.Paint.Flash.text = "Text"; +FCKLang.Paint.Flash.line_options = "Line thickness and color"; +FCKLang.Paint.Flash.fill_options = "Fill color"; +FCKLang.Paint.Flash.perfect_shape_options = "Number of sides"; +FCKLang.Paint.Flash.brush_options_shape = "Brush shape"; +FCKLang.Paint.Flash.brush_options_size = "Brush size"; +FCKLang.Paint.Flash.words_options = "Text size and color"; +FCKLang.Paint.Flash.fill = "Use fill"; FCKLang.Paint.Flash.border = "Draw border"; \ No newline at end of file Index: lams_central/web/fckeditor/editor/plugins/paint/swfobject.js =================================================================== diff -u -rbcd8fa50f3eba54b354ef803f82a71a68fa36f27 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/web/fckeditor/editor/plugins/paint/swfobject.js (.../swfobject.js) (revision bcd8fa50f3eba54b354ef803f82a71a68fa36f27) +++ lams_central/web/fckeditor/editor/plugins/paint/swfobject.js (.../swfobject.js) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -1,5 +1,5 @@ -/* SWFObject v2.1 - Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis - This software is released under the MIT License -*/ +/* SWFObject v2.1 + Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis + This software is released under the MIT License +*/ var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write(" + + + Index: lams_central/web/lamscommunity/lamscommunityLogin.jsp =================================================================== diff -u -rbdd916337e3a48589da367f4c8b7705fe3197af2 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_central/web/lamscommunity/lamscommunityLogin.jsp (.../lamscommunityLogin.jsp) (revision bdd916337e3a48589da367f4c8b7705fe3197af2) +++ lams_central/web/lamscommunity/lamscommunityLogin.jsp (.../lamscommunityLogin.jsp) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -11,44 +11,81 @@ <fmt:message key="index.welcome" /> + + + - - -

- -

- - -

- -

- - - + + +

+ +

+ + +

+ +

+ + + +
+

+ +

+
+ + + - +

-   +  

-   +  

+ +

+ +

+ http://lamscommunity.org/lamscentral +

+ + +
Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml (.../beanRefContext.xml) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077) +++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml (.../beanRefContext.xml) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -79,6 +79,7 @@ /org/lamsfoundation/lams/web/webApplicationContext.xml /org/lamsfoundation/lams/integrationContext.xml /org/lamsfoundation/lams/usermanagement/ldapContext.xml + /org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql (.../patch0015_updateFrom22.sql) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -92,7 +92,7 @@ , activity_id BIGINT(20) NOT NULL , user_id BIGINT (20) NOT NULL , mark DOUBLE PRECISION - , marked_in_gradebook TINYINT(1) NOT NULL DEFAULT 0 + , marked_in_gradebook TINYINT(1) NOT NULL DEFAULT 0 , feedback TEXT , INDEX (activity_id, user_id) , CONSTRAINT FK_lams_gradebook_user_activity_1 FOREIGN KEY (activity_id) Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java =================================================================== diff -u -r8176135403562bdf207f9477805d0e092915312a -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision 8176135403562bdf207f9477805d0e092915312a) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -40,13 +40,16 @@ private User learner; private Double mark; private String feedback; + private Boolean markedInGradebook; public GradebookUserActivity() { + markedInGradebook = false; } public GradebookUserActivity(ToolActivity activity, User learner){ this.activity = activity; this.learner = learner; + markedInGradebook = false; } /** @@ -105,4 +108,17 @@ public void setFeedback(String feedback) { this.feedback = feedback; } + + /** + * @hibernate.property column="marked_in_gradebook" length="1" + */ + public Boolean getMarkedInGradebook() { + return markedInGradebook; + } + + public void setMarkedInGradebook(Boolean markedInGradebook) { + this.markedInGradebook = markedInGradebook; + } + + } Index: lams_gradebook/web/WEB-INF/applicationContext.xml =================================================================== diff -u --- lams_gradebook/web/WEB-INF/applicationContext.xml (revision 0) +++ lams_gradebook/web/WEB-INF/applicationContext.xml (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -0,0 +1,4 @@ + + + + Index: lams_gradebook/web/WEB-INF/web.xml =================================================================== diff -u -rcd5cef591859ae82025af74f79cf6bf6f9151568 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_gradebook/web/WEB-INF/web.xml (.../web.xml) (revision cd5cef591859ae82025af74f79cf6bf6f9151568) +++ lams_gradebook/web/WEB-INF/web.xml (.../web.xml) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -9,11 +9,6 @@ javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.gradebook.ApplicationResources - - - contextConfigLocation - classpath:/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml - locatorFactorySelector classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml Index: lams_monitoring/web/assets/styles/main.css =================================================================== diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_monitoring/web/assets/styles/main.css (.../main.css) (revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83) +++ lams_monitoring/web/assets/styles/main.css (.../main.css) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -1,35 +1,61 @@ +/* CSS file */ Application { - backgroundColor:#ECECEC; - backgroundGradientColors:#ECECEC,#ECECEC; + backgroundColor: #FFFFFF; + themeColor: #0087e5; + backgroundGradientAlphas: 1.0, 1.0; + backgroundGradientColors: #FFFFFF, #FFFFFF; } -Tile { - top: 10; - bottom: 10; - left: 10; - right: 10; +Alert { + backgroundColor: #FFFFFF; + color: #000000; } -Label { - color: #000000; - fontWeight: bold; - fontSize: 14; + +Panel { + borderColor: #45a6ed; + borderThicknessLeft: 1; + borderThicknessRight: 1; + borderThicknessBottom: 1; + borderAlpha: 1; + + paddingTop: 0; + paddingLeft: 0; + paddingRight: 0; + paddingBottom: 0; + + highlightAlphas: 0.67, 0; + headerColors: #45a6ed, #0087e5; + + titleStyleName: "myPanelStyle"; } -.box { - borderColor: #50B2CB; - cornerRadius: 10; - borderStyle: solid; - borderThickness: 1; - paddingBottom: 10; - paddingTop: 10; - paddingLeft: 10; - paddingRight: 10; - backgroundColor:#ffffff; - backgroundAlpha: 1; +Wizard { + horizontalAlign : center; } -Text { - fontSize: 12; - fontWeight: normal; -} \ No newline at end of file +.mainBody { + backgroundColor: #FFFFFF; + paddingTop: 20; + horizontalAlign : center; +} + +Form, Label, TextInput { + color: #000000; + font-weight: normal; +} + +FormItem, List { + font-weight: bold; + text-align: left; +} + +.myPanelStyle { + color: #FFFFFF; +} + +.panelText { + color: #000000; + font-weight: none; + text-align: left; +} Index: lams_monitoring/web/timeChart.jsp =================================================================== diff -u -r22e31f62c87ba5d9de07d7f9ed12e683572167ca -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_monitoring/web/timeChart.jsp (.../timeChart.jsp) (revision 22e31f62c87ba5d9de07d7f9ed12e683572167ca) +++ lams_monitoring/web/timeChart.jsp (.../timeChart.jsp) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -29,7 +29,7 @@ - <<fmt:message key="monitor.title"/> + <fmt:message key="monitor.title"/> Index: lams_tool_assessment/db/sql/activity_insert.sql =================================================================== diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_tool_assessment/db/sql/activity_insert.sql (.../activity_insert.sql) (revision c56857991e269aa7f5bd250a05b52c767a9957ad) +++ lams_tool_assessment/db/sql/activity_insert.sql (.../activity_insert.sql) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -67,7 +67,7 @@ , NULL , ${tool_id} , NULL -, 4 +, 3 , NULL , NULL , NULL Index: lams_tool_assessment/web/images/icon_assessment.swf =================================================================== diff -u -r53d6c80e06970c5da2ff45cb4fb72f16fcee110c -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 Binary files differ Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java =================================================================== diff -u -raf0f333826569e48655569fbf9c8b13decd475b0 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision af0f333826569e48655569fbf9c8b13decd475b0) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -109,10 +109,12 @@ PrintWriter out = response.getWriter(); if(!rUser.isSessionFinished()) { - out.println("window.parent.opener.checkNew();"); + out.println("window.parent.opener.checkNew(false);"); out.println("window.parent.opener=null;"); out.println("window.parent.close();"); } else { + out.println("window.parent.opener.checkNew(true);"); + out.println("window.parent.opener=null;"); out.println("window.parent.close();"); } Index: lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf =================================================================== diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 Binary files differ Index: lams_tool_videorecorder/web/pages/monitoring/videoRecorderOpenInstance.jsp =================================================================== diff -u --- lams_tool_videorecorder/web/pages/monitoring/videoRecorderOpenInstance.jsp (revision 0) +++ lams_tool_videorecorder/web/pages/monitoring/videoRecorderOpenInstance.jsp (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -0,0 +1,112 @@ + +<%@ include file="/common/taglibs.jsp"%> + + + + <c:out value="${videoRecorderDTO.title}" escapeXml="false" /> + + + + + +
+ + +
+ + \ No newline at end of file Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql =================================================================== diff -u -re3b4354d83bbeff0b953d1fce2bc3be6323c0b50 -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision e3b4354d83bbeff0b953d1fce2bc3be6323c0b50) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20090121_updateFrom22.sql (.../patch20090121_updateFrom22.sql) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) @@ -18,17 +18,17 @@ added_by bigint, wiki_session_uid bigint, primary key (uid), - unique key UK9406D87760B3B03B (wiki_uid, title, wiki_session_uid) + unique key wiki_unique_key (wiki_uid, title, wiki_session_uid) )TYPE=InnoDB; INSERT INTO tl_lawiki10_wiki_page_temp SELECT * from tl_lawiki10_wiki_page; drop table if exists tl_lawiki10_wiki_page; COMMIT; rename table tl_lawiki10_wiki_page_temp to tl_lawiki10_wiki_page; -alter table tl_lawiki10_wiki_page add index FK961AFFEAD111111 (wiki_session_uid), add constraint FK961AFFEAD8004954 foreign key (wiki_session_uid) references tl_lawiki10_session (uid); -alter table tl_lawiki10_wiki_page add index FK961AFFEA6111111 (wiki_uid), add constraint FK961AFFEA60B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid); -alter table tl_lawiki10_wiki_page add index FK961AFFEA3111111 (added_by), add constraint FK961AFFEA36CBA7DB foreign key (added_by) references tl_lawiki10_user (uid); -alter table tl_lawiki10_wiki_page add index FK961AFFEAE111111 (wiki_current_content), add constraint FK961AFFEAE48332B4 foreign key (wiki_current_content) references tl_lawiki10_wiki_page_content (uid); +alter table tl_lawiki10_wiki_page add index wiki_page_index_1 (wiki_session_uid), add constraint wiki_page_fk_1 foreign key (wiki_session_uid) references tl_lawiki10_session (uid); +alter table tl_lawiki10_wiki_page add index wiki_page_index_2 (wiki_uid), add constraint wiki_page_fk_2 foreign key (wiki_uid) references tl_lawiki10_wiki (uid); +alter table tl_lawiki10_wiki_page add index wiki_page_index_3 (added_by), add constraint wiki_page_fk_3 foreign key (added_by) references tl_lawiki10_user (uid); +alter table tl_lawiki10_wiki_page add index wiki_page_index_4 (wiki_current_content), add constraint wiki_page_fk_4 foreign key (wiki_current_content) references tl_lawiki10_wiki_page_content (uid); SET FOREIGN_KEY_CHECKS=1;