Index: lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -23,6 +23,8 @@ button.basic =Basic button.advanced =Advanced button.upload =Upload +button.continue =Continue +button.edit =Edit label.authoring.basic.title =Title: label.authoring.basic.content =Content: label.authoring.basic.wikipagevisible =Make Wiki page editable @@ -31,6 +33,7 @@ advanced.allowLearnerInsertLinks =Allow learners to insert external links into Wiki advanced.allowLearnerAttachImages =Allow learners to attach images to Wiki advanced.reflectOnActivity =Add Notebook at end of Wiki with the following instructions: +message.no.reflection.available =No notebook available advanced.editingLimits =Editing Limits advanced.editingLimits.prompt =Number of times a learner can edit a page advanced.editingLimits.minimum =Minimum: @@ -132,11 +135,12 @@ label.on =On label.off =Off monitor.summary.th.advancedSettings =Advanced Settings -monitor.th.sessions =Sessions +monitor.th.sessions =Wiki Sessions monitor.th.numlearners =Number of Learners monitor.summary.td.addNotebook =Add Notebook at end of Wiki monitor.summary.td.notebookInstructions =Notebook instructions +monitor.nosessions =There are no sessions running yet for this Wiki. +monitor.notebooks =Notebook Reflections - #======= End labels: Exported 81 labels for en AU ===== Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java (.../WikiSessionDTO.java) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java (.../WikiSessionDTO.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -42,7 +42,9 @@ int numberOfLearners; - int numberOfFinishedLearners;; + int numberOfFinishedLearners; + + boolean reflectOnActivity; public WikiSessionDTO(WikiSession session) { this.sessionID = session.getSessionId(); @@ -59,6 +61,8 @@ } numberOfLearners = userDTOs.size(); + + reflectOnActivity = session.getWiki().isReflectOnActivity(); } @@ -114,4 +118,12 @@ public void setNumberOfFinishedLearners(int numberOfFinishedLearners) { this.numberOfFinishedLearners = numberOfFinishedLearners; } + + public boolean isReflectOnActivity() { + return reflectOnActivity; + } + + public void setReflectOnActivity(boolean reflectOnActivity) { + this.reflectOnActivity = reflectOnActivity; + } } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiUserDTO.java =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiUserDTO.java (.../WikiUserDTO.java) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiUserDTO.java (.../WikiUserDTO.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -31,6 +31,8 @@ public class WikiUserDTO implements Comparable { public Long uid; + + private Long userId; public String loginName; @@ -40,27 +42,18 @@ public boolean finishedActivity; - public NotebookEntryDTO entryDTO; + public String notebookEntry; public Long entryUID; - public WikiUserDTO(WikiUser user, NotebookEntry entry) { - this.uid = user.getUid(); - this.loginName = user.getLoginName(); - this.firstName = user.getFirstName(); - this.lastName = user.getLastName(); - this.finishedActivity = user.isFinishedActivity(); - this.entryUID = user.getEntryUID(); - this.entryDTO = new NotebookEntryDTO(entry); - } - public WikiUserDTO(WikiUser user) { this.uid = user.getUid(); this.loginName = user.getLoginName(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.finishedActivity = user.isFinishedActivity(); this.entryUID = user.getEntryUID(); + this.userId = user.getUserId(); } public int compareTo(Object o) { @@ -104,13 +97,13 @@ public void setUid(Long uid) { this.uid = uid; } - - public NotebookEntryDTO getEntryDTO() { - return entryDTO; + + public Long getUserId() { + return userId; } - public void setEntryDTO(NotebookEntryDTO entryDTO) { - this.entryDTO = entryDTO; + public void setUserId(Long userId) { + this.userId = userId; } public Long getEntryUID() { @@ -128,4 +121,13 @@ public void setFinishedActivity(boolean finishedActivity) { this.finishedActivity = finishedActivity; } + + public String getNotebookEntry() { + return notebookEntry; + } + + public void setNotebookEntry(String notebookEntry) { + this.notebookEntry = notebookEntry; + } + } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java (.../IWikiService.java) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java (.../IWikiService.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -200,31 +200,28 @@ public WikiUser createWikiUser(UserDTO user, WikiSession wikiSession); /** + * Creates a core notebook entry * * @param id * @param idType * @param signature * @param userID - * @param title * @param entry * @return */ Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry); /** + * Gets the entry from the database * - * @param uid - * @return */ - NotebookEntry getEntry(Long uid); + NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID); /** + * Updates an existing notebook entry * - * @param uid - * @param title - * @param entry */ - void updateEntry(Long uid, String entry); + void updateEntry(NotebookEntry notebookEntry); /** * Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -379,16 +379,25 @@ /* ********** IWikiService Methods ********************************* */ + public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); } - - public NotebookEntry getEntry(Long uid) { - return coreNotebookService.getEntry(uid); + + public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID){ + List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); + if (list == null || list.isEmpty()) { + return null; + } else { + return list.get(0); + } } - - public void updateEntry(Long uid, String entry) { - coreNotebookService.updateEntry(uid, "", entry); + + /** + * @param notebookEntry + */ + public void updateEntry(NotebookEntry notebookEntry) { + coreNotebookService.updateEntry(notebookEntry); } public String comparePages(String old, String current) { Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -42,6 +42,7 @@ // Attribute names public static final String ATTR_WIKI_DTO = "wikiDTO"; + public static final String ATTR_USER_DTO = "userDTO"; public static final String ATTR_SESSION_DTO = "sessionDTO"; public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID"; public static final String ATTR_MODE = "mode"; Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.wiki.web.actions; import java.io.IOException; +import java.util.Date; import java.util.SortedSet; import java.util.TreeSet; @@ -73,6 +74,7 @@ * @struts.action-forward name="compareWiki" path="/pages/wiki/compare.jsp" * @struts.action-forward name="viewWiki" path="/pages/wiki/viewWiki.jsp" * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater" + * @struts.action-forward name="notebook" path="tiles:/learning/notebook" */ public class LearningAction extends WikiPageAction { @@ -139,6 +141,18 @@ wikiUser = getCurrentUser(toolSessionID); } + WikiUserDTO wikiUserDTO = new WikiUserDTO(wikiUser); + if (wikiUser.isFinishedActivity()) { + // get the notebook entry. + NotebookEntry notebookEntry = wikiService.getEntry(toolSessionID, + CoreNotebookConstants.NOTEBOOK_TOOL, + WikiConstants.TOOL_SIGNATURE, wikiUser.getUserId().intValue()); + if (notebookEntry != null) { + wikiUserDTO.setNotebookEntry(notebookEntry.getEntry()); + } + } + request.setAttribute(WikiConstants.ATTR_USER_DTO, wikiUserDTO); + // Set whether user has reached maximum edits int maxEdits = wiki.getMaximumEdits(); Boolean maxEditsReached = (maxEdits != 0 && wikiUser.getWikiEdits() >= maxEdits); @@ -228,7 +242,7 @@ LearningForm learningForm = (LearningForm) form; // TODO fix idType to use real value not 999 - + /* if (wikiUser.getEntryUID() == null) { wikiUser.setEntryUID(wikiService.createNotebookEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, WikiConstants.TOOL_SIGNATURE, wikiUser.getUserId() @@ -237,6 +251,7 @@ // update existing entry. wikiService.updateEntry(wikiUser.getEntryUID(), learningForm.getEntryText()); } + */ wikiUser.setFinishedActivity(true); wikiService.saveOrUpdateWikiUser(wikiUser); @@ -261,4 +276,56 @@ return null; // TODO need to return proper page. } + + public ActionForward openNotebook(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) { + + LearningForm lrnForm = (LearningForm) form; + + // set the finished flag + WikiUser wikiUser = this.getCurrentUser(lrnForm.getToolSessionID()); + WikiDTO wikiDTO = new WikiDTO(wikiUser.getWikiSession().getWiki()); + + request.setAttribute("wikiDTO", wikiDTO); + + NotebookEntry notebookEntry = wikiService.getEntry(wikiUser.getWikiSession().getSessionId(), + CoreNotebookConstants.NOTEBOOK_TOOL, + WikiConstants.TOOL_SIGNATURE, wikiUser.getUserId().intValue()); + + if (notebookEntry != null) { + lrnForm.setEntryText(notebookEntry.getEntry()); + } + + return mapping.findForward("notebook"); + } + + public ActionForward submitReflection(ActionMapping mapping, + ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + + // save the reflection entry and call the notebook. + + LearningForm lrnForm = (LearningForm) form; + + WikiUser wikiUser = this.getCurrentUser(lrnForm.getToolSessionID()); + Long toolSessionID = wikiUser.getWikiSession().getSessionId(); + Integer userID = wikiUser.getUserId().intValue(); + + // check for existing notebook entry + NotebookEntry entry = wikiService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, + WikiConstants.TOOL_SIGNATURE, userID); + + if (entry == null) { + // create new entry + wikiService.createNotebookEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, + WikiConstants.TOOL_SIGNATURE, userID, lrnForm.getEntryText()); + } else { + // update existing entry + entry.setEntry(lrnForm.getEntryText()); + entry.setLastModified(new Date()); + wikiService.updateEntry(entry); + } + + return finishActivity(mapping, form, request, response); + } } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -34,10 +34,13 @@ import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.wiki.dto.WikiDTO; import org.lamsfoundation.lams.tool.wiki.dto.WikiPageContentDTO; import org.lamsfoundation.lams.tool.wiki.dto.WikiPageDTO; import org.lamsfoundation.lams.tool.wiki.dto.WikiSessionDTO; +import org.lamsfoundation.lams.tool.wiki.dto.WikiUserDTO; import org.lamsfoundation.lams.tool.wiki.model.Wiki; import org.lamsfoundation.lams.tool.wiki.model.WikiPage; import org.lamsfoundation.lams.tool.wiki.model.WikiPageContent; @@ -47,7 +50,6 @@ import org.lamsfoundation.lams.tool.wiki.service.WikiServiceProxy; import org.lamsfoundation.lams.tool.wiki.util.WikiConstants; import org.lamsfoundation.lams.tool.wiki.util.WikiException; -import org.lamsfoundation.lams.tool.wiki.web.forms.AuthoringForm; import org.lamsfoundation.lams.tool.wiki.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; @@ -126,40 +128,39 @@ public ActionForward showWiki(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); - + if (wikiService == null) { wikiService = WikiServiceProxy.getWikiService(this.getServlet().getServletContext()); } - + WikiSession wikiSession = wikiService.getSessionBySessionId(toolSessionId); WikiSessionDTO sessionDTO = new WikiSessionDTO(wikiSession); - + + // Add all the user notebook entries to the session dto + for (WikiUserDTO userDTO : sessionDTO.getUserDTOs()) { + NotebookEntry notebookEntry = wikiService.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL, + WikiConstants.TOOL_SIGNATURE, userDTO.getUserId().intValue()); + userDTO.setNotebookEntry(notebookEntry.getEntry()); + sessionDTO.getUserDTOs().add(userDTO); + } request.setAttribute(WikiConstants.ATTR_SESSION_DTO, sessionDTO); - - + // Set up the authForm. MonitoringForm monForm = (MonitoringForm) form; Long currentPageUid = monForm.getCurrentWikiPageId(); - + // Get the wikipages from the session and the main page SortedSet wikiPageDTOs = new TreeSet(); - //WikiPage mainPage = null; for (WikiPage wikiPage : wikiSession.getWikiPages()) { WikiPageDTO pageDTO = new WikiPageDTO(wikiPage); wikiPageDTOs.add(pageDTO); - - // Set the main page - //if (wikiPage.getTitle().equals(wikiSession.getWiki().getMainPage().getTitle())) { - //mainPage = wikiPage; - //} } request.setAttribute(WikiConstants.ATTR_WIKI_PAGES, wikiPageDTOs); request.setAttribute(WikiConstants.ATTR_MAIN_WIKI_PAGE, new WikiPageDTO(wikiSession.getMainPage())); - + // Set the current wiki page, if there is none, set to the main page WikiPage currentWikiPage = null; if (currentPageUid != null) { @@ -168,31 +169,18 @@ currentWikiPage = wikiSession.getMainPage(); } request.setAttribute(WikiConstants.ATTR_CURRENT_WIKI, new WikiPageDTO(currentWikiPage)); - + // Reset the isEditable and newPageIdEditable field for the form monForm.setIsEditable(currentWikiPage.getEditable()); monForm.setNewPageIsEditable(true); - + // Set the current wiki history SortedSet currentWikiPageHistoryDTOs = new TreeSet(); for (WikiPageContent wikiPageContentHistoryItem : currentWikiPage.getWikiContentVersions()) { currentWikiPageHistoryDTOs.add(new WikiPageContentDTO(wikiPageContentHistoryItem)); } request.setAttribute(WikiConstants.ATTR_WIKI_PAGE_CONTENT_HISTORY, currentWikiPageHistoryDTOs); - - /* - Long uid = new Long(WebUtil.readLongParam(request, "userUID")); - - WikiUser user = wikiService.getUserByUID(uid); - NotebookEntry entry = wikiService.getEntry(user.getEntryUID()); - - WikiUserDTO userDTO = new WikiUserDTO(user, entry); - - request.setAttribute("userDTO", userDTO); - - */ - return mapping.findForward("wiki_display"); } } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -128,7 +128,7 @@ WikiUser wikiUser = wikiService.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()), toolSessionID); - NotebookEntry wikiEntry = wikiService.getEntry(wikiUser.getEntryUID()); + //NotebookEntry wikiEntry = wikiService.getEntry(wikiUser.getEntryUID()); // construct dto's WikiDTO wikiDTO = new WikiDTO(); @@ -140,9 +140,9 @@ sessionDTO.setSessionID(wikiSession.getSessionId()); // If the user hasn't put in their entry yet, wikiEntry will be null; - WikiUserDTO userDTO = wikiEntry != null ? new WikiUserDTO(wikiUser, wikiEntry) : new WikiUserDTO(wikiUser); + //WikiUserDTO userDTO = wikiEntry != null ? new WikiUserDTO(wikiUser, wikiEntry) : new WikiUserDTO(wikiUser); - sessionDTO.getUserDTOs().add(userDTO); + //sessionDTO.getUserDTOs().add(userDTO); wikiDTO.getSessionDTOs().add(sessionDTO); request.getSession().setAttribute("wikiDTO", wikiDTO); @@ -166,6 +166,7 @@ // add the wikiEntry for each user in each session + /* for (WikiSessionDTO session : wikiDTO.getSessionDTOs()) { for (WikiUserDTO user : session.getUserDTOs()) { NotebookEntry entry = wikiService.getEntry(user.getEntryUID()); @@ -175,6 +176,7 @@ } } } + */ request.getSession().setAttribute("wikiDTO", wikiDTO); } Index: lams_tool_wiki/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -94,6 +94,10 @@ + + + + Index: lams_tool_wiki/web/common/taglibs.jsp =================================================================== diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/web/common/taglibs.jsp (.../taglibs.jsp) (revision 1082bdcc357c105126a5641cecc68acfa645b66b) +++ lams_tool_wiki/web/common/taglibs.jsp (.../taglibs.jsp) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -5,6 +5,7 @@ <%@ taglib uri="tags-tiles" prefix="tiles"%> <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-function" prefix="fn" %> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="fck-editor" prefix="fck"%> Index: lams_tool_wiki/web/pages/learning/notebook.jsp =================================================================== diff -u --- lams_tool_wiki/web/pages/learning/notebook.jsp (revision 0) +++ lams_tool_wiki/web/pages/learning/notebook.jsp (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -0,0 +1,33 @@ +<%@ include file="/common/taglibs.jsp"%> + + + +
+

+ ${wikiDTO.title} +

+ + + + + +

+ +

+ + + +
+ + + button.finish + +
+ +
+ Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp =================================================================== diff -u --- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp (revision 0) +++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -0,0 +1,67 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + +
+

+ ${wikiDTO.reflectInstructions} +

+ +

+ + + + + + + + + +

+ + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + Index: lams_tool_wiki/web/pages/learning/wiki.jsp =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/web/pages/learning/wiki.jsp (.../wiki.jsp) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/web/pages/learning/wiki.jsp (.../wiki.jsp) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -270,6 +270,7 @@ +
@@ -302,6 +303,7 @@ +
@@ -326,16 +328,27 @@
+ + + + <%@ include file="parts/finishButton.jsp"%> + + @@ -177,24 +189,31 @@ - - - - - - - - - - - -
- - - -
- ${session.sessionName} - - ${session.numberOfLearners} -
+ + + + + + + + + + + + + +
+ + + +
+ ${session.sessionName} + + ${session.numberOfLearners} +
+ + + + + Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp =================================================================== diff -u -r16b67860ab51e6ba2a8f91220dda61d67334e1b0 -r23d3a9ebc582896d8379f662e312c6d3b383c226 --- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp (.../wikiDisplay.jsp) (revision 16b67860ab51e6ba2a8f91220dda61d67334e1b0) +++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp (.../wikiDisplay.jsp) (revision 23d3a9ebc582896d8379f662e312c6d3b383c226) @@ -1,242 +1,251 @@ <%@ include file="/common/taglibs.jsp"%> - - - - + + + + - + - - - - + + + +
-

- ${sessionDTO.sessionName} -

-
- - -
- - - - - - ')" class="button"> - - -
+

${sessionDTO.sessionName}

+
+ - + + +
+


- -
-

- ${currentWikiPage.title} -

-
- - - - - - - - + +
+

${currentWikiPage.title}

+
+ + + + + + + ${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName} - - - - - -
-
-
- ${currentWikiPage.currentWikiContentDTO.body} -
+ + + + + +
+
+
${currentWikiPage.currentWikiContentDTO.body}
+
- -