Index: lams_tool_wookie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a) +++ lams_tool_wookie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -13,21 +13,20 @@ instructions.uploadOnlineInstr =Online Instructions File: instructions.offlineInstructions =Offline Instructions: instructions.onlineInstructions =Online Instructions: -activity.helptext =Edit images in Wookie image editor +activity.helptext =Create activities using Wookie Widgets message.contentInUseSet =Modification of content is not allowed since one or more students has attempted the activity. error.content.locked =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed. tool.display.name =Wookie -tool.description =Wookie Image Editing Tool +tool.description =Wookie Widget Tool activity.title =Wookie -activity.description =Wookie Image Editing Tool +activity.description =Wookie Widget Tool pageTitle.authoring =Wookie Authoring button.basic =Basic button.advanced =Advanced button.upload =Upload label.authoring.basic.title =Title: label.authoring.basic.content =Content: advanced.lockOnFinished =Lock when finished -advanced.allowViewOthersImages =Allow learners to view other learners images instructions.type.online =Online instructions.type.offline =Offline label.filename =Filename @@ -38,7 +37,7 @@ link.delete =Delete message.updateSuccess =Changes saved message.unsavedChanges =Page contains unsaved changes -pageTitle.learning =Wookie Image Editor +pageTitle.learning =Wookie Widget Tool message.defineLaterSet =Please wait for the teacher to complete the contents of this activity message.runOfflineSet =This activity is not being done on the computer. Please see your instructor for details. pageTitle.monitoring =Wookie Monitoring @@ -76,46 +75,28 @@ button.try.again =Try Again button.finish =Next Activity message.alertContentEdit =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information. -message.warnLockOnFinish =Note: After you click on "Next Activity" and you come back to this Wookie activity, you won't be able to continue editing your image. -message.warnLockOnFinishViewAll =Note: After you click on "View All Wookie Images" and you come back to this Wookie activity, you won't be able to continue editing your image. -message.activityLocked =The instructor has set this activity not to allow image edits after you have finished it. As you are returning to this activity, you are able to see your image but not edit it. +message.warnLockOnFinish =Note: After you click on "Next Activity" and you come back to this Wookie activity, you won't be able to editing this activity. +message.activityLocked =The instructor has set this activity to be locked after you have finished it. As you are returning to this activity, you cannot edit anymore. titleHeading.instructions =Instructions label.authoring.basic.instructions =Instructions: label.on =On label.off =Off monitor.summary.th.advancedSettings =Advanced Settings -label.authoring.basic.add.image =Add Image -error.resource.image.not.alowed.format =Allowed file formats: gif, png, jpg -error.resource.item.file.blank =File can not be blank. error.msg.upload.file.not.found =Could not find upload file {0}. -error.file.upload.failed =Image upload failed, please check your image file and try again. label.authoring.remove =Remove -learner.edit.image =Edit Image in Wookie -tooltip.openfullsize =Click to open full size button.continue =Continue button.edit =Edit -button.viewAll =View all learner images -learner.title.viewAll =View All Wookie Images button.redo =Redo Activity button.refresh =Refresh -message.imageListEmpty =No images to display as no learners have edited their images yet. -error.retreiving.image =There was an error retrieving the image from wookie.com, please contact the system administrator. -message.imageEdited =Image successfully edited. button.close =Close monitoring.th.learner =Learner -monitoring.th.image =Edited Image monitoring.th.reflection =Notebook Entry -monitoring.hideImage =Hide image from other learners -monitoring.showImage =Show image to other learners -message.imageHidden =Image hidden by teacher monitor.summary.td.notebookInstructions =Notebook instructions -advanced.reflectOnActivity =Add Notebook at end of Wookie with the following instructions: +advanced.reflectOnActivity =Add Notebook at end of Wookie activity with the following instructions: title.sessions =Sessions title.originalImage =Original Image -message.imageNotAvailable =Image not available, either it has not yet been edited or it has been deleted. authoring.msg.cancel.save =Do you want to close this window without saving? -message.learner.saveWhenFinished =When you have finished editing your image, click file/save to return to learner. -monitor.summary.td.addNotebook =Add Notebook at the end of Wookie Activity +monitor.summary.td.addNotebook =Add Notebook at the end of Wookie activity admin.wookie.apikey =Wookie API key admin.wookie.url =Wookie URL admin.formError =Please enter both a Wookie API key and your Wookie URL. Index: lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a) +++ lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -13,21 +13,20 @@ instructions.uploadOnlineInstr =Online Instructions File: instructions.offlineInstructions =Offline Instructions: instructions.onlineInstructions =Online Instructions: -activity.helptext =Edit images in Wookie image editor +activity.helptext =Create activities using Wookie Widgets message.contentInUseSet =Modification of content is not allowed since one or more students has attempted the activity. error.content.locked =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed. tool.display.name =Wookie -tool.description =Wookie Image Editing Tool +tool.description =Wookie Widget Tool activity.title =Wookie -activity.description =Wookie Image Editing Tool +activity.description =Wookie Widget Tool pageTitle.authoring =Wookie Authoring button.basic =Basic button.advanced =Advanced button.upload =Upload label.authoring.basic.title =Title: label.authoring.basic.content =Content: advanced.lockOnFinished =Lock when finished -advanced.allowViewOthersImages =Allow learners to view other learners images instructions.type.online =Online instructions.type.offline =Offline label.filename =Filename @@ -38,7 +37,7 @@ link.delete =Delete message.updateSuccess =Changes saved message.unsavedChanges =Page contains unsaved changes -pageTitle.learning =Wookie Image Editor +pageTitle.learning =Wookie Widget Tool message.defineLaterSet =Please wait for the teacher to complete the contents of this activity message.runOfflineSet =This activity is not being done on the computer. Please see your instructor for details. pageTitle.monitoring =Wookie Monitoring @@ -76,51 +75,33 @@ button.try.again =Try Again button.finish =Next Activity message.alertContentEdit =Warning: One of more students have accessed this activity. Changing this content will result in students getting different information. -message.warnLockOnFinish =Note: After you click on "Next Activity" and you come back to this Wookie activity, you won't be able to continue editing your image. -message.warnLockOnFinishViewAll =Note: After you click on "View All Wookie Images" and you come back to this Wookie activity, you won't be able to continue editing your image. -message.activityLocked =The instructor has set this activity not to allow image edits after you have finished it. As you are returning to this activity, you are able to see your image but not edit it. +message.warnLockOnFinish =Note: After you click on "Next Activity" and you come back to this Wookie activity, you won't be able to editing this activity. +message.activityLocked =The instructor has set this activity to be locked after you have finished it. As you are returning to this activity, you cannot edit anymore. titleHeading.instructions =Instructions label.authoring.basic.instructions =Instructions: label.on =On label.off =Off monitor.summary.th.advancedSettings =Advanced Settings -label.authoring.basic.add.image =Add Image -error.resource.image.not.alowed.format =Allowed file formats: gif, png, jpg -error.resource.item.file.blank =File can not be blank. error.msg.upload.file.not.found =Could not find upload file {0}. -error.file.upload.failed =Image upload failed, please check your image file and try again. label.authoring.remove =Remove -learner.edit.image =Edit Image in Wookie -tooltip.openfullsize =Click to open full size button.continue =Continue button.edit =Edit -button.viewAll =View all learner images -learner.title.viewAll =View All Wookie Images button.redo =Redo Activity button.refresh =Refresh -message.imageListEmpty =No images to display as no learners have edited their images yet. -error.retreiving.image =There was an error retrieving the image from wookie.com, please contact the system administrator. -message.imageEdited =Image successfully edited. button.close =Close monitoring.th.learner =Learner -monitoring.th.image =Edited Image monitoring.th.reflection =Notebook Entry -monitoring.hideImage =Hide image from other learners -monitoring.showImage =Show image to other learners -message.imageHidden =Image hidden by teacher monitor.summary.td.notebookInstructions =Notebook instructions -advanced.reflectOnActivity =Add Notebook at end of Wookie with the following instructions: +advanced.reflectOnActivity =Add Notebook at end of Wookie activity with the following instructions: title.sessions =Sessions title.originalImage =Original Image -message.imageNotAvailable =Image not available, either it has not yet been edited or it has been deleted. authoring.msg.cancel.save =Do you want to close this window without saving? -admin.success =Configuration successfully saved. -message.learner.saveWhenFinished =When you have finished editing your image, click file/save to return to learner. -monitor.summary.td.addNotebook =Add Notebook at the end of Wookie Activity +monitor.summary.td.addNotebook =Add Notebook at the end of Wookie activity admin.wookie.apikey =Wookie API key admin.wookie.url =Wookie URL admin.formError =Please enter both a Wookie API key and your Wookie URL. admin.page.title =Wookie Admin admin.return =Return to Maintain LAMS +admin.success =Configuration successfully saved. #======= End labels: Exported 114 labels for en AU ===== Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java =================================================================== diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java (.../WookieConstants.java) (revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/util/WookieConstants.java (.../WookieConstants.java) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -57,16 +57,7 @@ public static final String PARAM_PARENT_PAGE = "parentPage"; static final String FILTER_REPLACE_TEXT = "***"; - - public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; - public static final String DEFAULT_IMAGE_FILE_NAME = "blank.jpg"; - - // error message keys - public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format"; - public static final String ERROR_MSG_FILE_BLANK = "error.resource.item.file.blank"; - public static final String ERROR_MSG_FILE_UPLOAD = "error.file.upload.failed"; - public static final String LAMS_WWW_PIXLR_FOLDER_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/www/images/wookie/"; public static final String LAMS_PIXLR_BASE_DIR = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR + File.separator + "images" + File.separator + "wookie"; Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java =================================================================== diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -24,33 +24,26 @@ package org.lamsfoundation.lams.tool.wookie.web.actions; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileOutputStream; import java.util.Date; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Set; -import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.authoring.web.AuthoringConstants; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.wookie.dto.WidgetData; import org.lamsfoundation.lams.tool.wookie.dto.WidgetDefinition; import org.lamsfoundation.lams.tool.wookie.model.Wookie; import org.lamsfoundation.lams.tool.wookie.model.WookieAttachment; @@ -61,18 +54,13 @@ import org.lamsfoundation.lams.tool.wookie.util.WookieUtil; import org.lamsfoundation.lams.tool.wookie.web.forms.AuthoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; -import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; -import com.thoughtworks.xstream.XStream; - /** * @author * @version @@ -132,6 +120,7 @@ String wookieUrl = wookieService.getWookieURL(); if (wookieUrl == null) { // TODO: Forward to error, citing that wookie is not configured properly + } // Get the widget count @@ -148,8 +137,10 @@ request.setAttribute(WookieConstants.ATTR_WIDGET_PAGES, pages); } } catch (Exception e) { - log.error("Problem reading xml from wookie server.", e); + logger.error("Problem reading xml from wookie server.", e); + + // TODO: Handle failed call to wookie server throw new WookieException(e); @@ -230,7 +221,7 @@ return mapping.findForward("widgetList"); } catch (Exception e) { - log.error("Problem reading xml from wookie server.", e); + logger.error("Problem reading xml from wookie server.", e); throw new WookieException(e); } } Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java =================================================================== diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java (.../LearningAction.java) (revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java (.../LearningAction.java) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -74,9 +74,7 @@ * @struts.action-forward name="wookie" path="tiles:/learning/main" * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline" * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater" - * @struts.action-forward name="success" path="/pages/learning/success.jsp" * @struts.action-forward name="notebook" path="/pages/learning/notebook.jsp" - * @struts.action-forward name="viewAll" path="/pages/learning/viewAll.jsp" */ public class LearningAction extends LamsDispatchAction { Index: lams_tool_wookie/web/pages/authoring/advanced.jsp =================================================================== diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/web/pages/authoring/advanced.jsp (.../advanced.jsp) (revision 7c52d117dbe910bd67630b5506346429e25b99a9) +++ lams_tool_wookie/web/pages/authoring/advanced.jsp (.../advanced.jsp) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -10,14 +10,6 @@

-

- - -

-

Index: lams_tool_wookie/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 7c52d117dbe910bd67630b5506346429e25b99a9) +++ lams_tool_wookie/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -143,18 +143,8 @@

${userDTO.firstName} ${userDTO.lastName}

- - - - - -

- -

- - +

Index: lams_tool_wookie/web/pages/learning/parts/finishButton.jsp =================================================================== diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/web/pages/learning/parts/finishButton.jsp (.../finishButton.jsp) (revision 7c52d117dbe910bd67630b5506346429e25b99a9) +++ lams_tool_wookie/web/pages/learning/parts/finishButton.jsp (.../finishButton.jsp) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -46,27 +46,17 @@
- - - - + + + - - - - - - - - - - - - - + + + +
Fisheye: Tag efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/learning/success.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/learning/viewAll.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wookie/web/pages/learning/wookie.jsp =================================================================== diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e --- lams_tool_wookie/web/pages/learning/wookie.jsp (.../wookie.jsp) (revision 7c52d117dbe910bd67630b5506346429e25b99a9) +++ lams_tool_wookie/web/pages/learning/wookie.jsp (.../wookie.jsp) (revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e) @@ -3,16 +3,6 @@