Index: lams_central/web/includes/javascript/addLesson.js =================================================================== diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rd0a8679bc756e47321aff67f3ed1eb737b8535ff --- lams_central/web/includes/javascript/addLesson.js (.../addLesson.js) (revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e) +++ lams_central/web/includes/javascript/addLesson.js (.../addLesson.js) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) @@ -27,9 +27,8 @@ tree.setDynamicLoad(function(node, callback){ // load subfolder contents $.ajax({ - url : LAMS_URL + 'home.do', + url : LAMS_URL + 'home/getFolderContents.do', data : { - 'method' : 'getFolderContents', 'folderID' : node.data.folderID }, cache : false, @@ -430,7 +429,7 @@ dataType : 'text', success : function() { // open preview pop up window - window.open(LAMS_URL + 'home.do?method=learner&mode=preview&lessonID='+lessonID,'Preview', + window.open(LAMS_URL + 'home/learner.do?mode=preview&lessonID='+lessonID,'Preview', 'width=' + popupWidth + ',height=' + popupHeight + ',resizable,status=yes'); previewButton.button('reset'); } @@ -446,11 +445,10 @@ $.ajax({ dataType : 'text', - url : LAMS_URL + 'home.do', + url : LAMS_URL + 'home/getLearningDesignThumbnail.do', async : false, cache : false, data : { - 'method' : 'getLearningDesignThumbnail', 'ldId' : ldId, '_t' : new Date().getTime() @@ -493,7 +491,7 @@ // load the image again, avoid caching loadLearningDesignSVG(ldId); }).attr('src', LAMS_URL - + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID=' + + 'authoring/generateSVG.do?selectable=false&learningDesignID=' + ldId); } }); Index: lams_central/web/includes/javascript/dialog.js =================================================================== diff -u -r75872587ba495ca0bf97cbfb2275fa0ff34a484c -rd0a8679bc756e47321aff67f3ed1eb737b8535ff --- lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision 75872587ba495ca0bf97cbfb2275fa0ff34a484c) +++ lams_central/web/includes/javascript/dialog.js (.../dialog.js) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) @@ -330,7 +330,7 @@ } }, 'open' : function() { - var url = LAMS_URL + 'authoring/author.do?method=openAuthoring'; + var url = LAMS_URL + 'authoring/openAuthoring.do'; if (learningDesignID) { url += '&learningDesignID=' + learningDesignID; @@ -404,7 +404,7 @@ 'open' : function() { var dialog = $(this); // load contents after opening the dialog - $('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=portrait&isReturnButtonHidden=true'); + $('iframe', dialog).attr('src', LAMS_URL + 'index.do?redirect=portrait&isReturnButtonHidden=true'); // in case of mobile devices allow iframe scrolling if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) { Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rd0a8679bc756e47321aff67f3ed1eb737b8535ff --- lams_central/web/includes/javascript/main.js (.../main.js) (revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) @@ -30,7 +30,7 @@ cssPageDisplay: '.pagedisplay', cssPageSize: '.pagesize', cssDisabled: 'disabled', - ajaxUrl : LAMS_URL + "/index.do?dispatch=getOrgs&page={page}&size={size}&{sortList:column}&{filterList:fcol}", + ajaxUrl : LAMS_URL + "/index/getOrgs.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}", ajaxProcessing: function (data, table) { if (data && data.hasOwnProperty('rows')) { var rows = [], @@ -121,9 +121,8 @@ //store last visited organisation $.ajax({ - url : "index.do", + url : "index/storeLastVisitedOrganisation.do", data : { - dispatch : "storeLastVisitedOrganisation", orgId : activeOrgId } }); @@ -156,9 +155,8 @@ function toggleFavoriteOrganisation(orgId) { $("#favorite-organisations-container").load( - "index.do", + "index/toggleFavoriteOrganisation.do", { - dispatch: "toggleFavoriteOrganisation", orgId : orgId, activeOrgId : activeOrgId }, @@ -182,7 +180,7 @@ 'open' : function() { var dialog = $(this); // load contents after opening the dialog - $('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=profile'); + $('iframe', dialog).attr('src', LAMS_URL + 'index.do?redirect=profile'); // in case of mobile devices allow iframe scrolling if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) { @@ -286,7 +284,7 @@ 'open' : function() { // load contents after opening the dialog $('iframe', this).attr('src', LAMS_URL - + 'home.do?method=monitorLesson&lessonID=' + + 'home/monitorLesson.do?lessonID=' + $(this).data('lessonID')); }, @@ -330,7 +328,7 @@ // load contents after opening the dialog $('iframe', dialog) .attr('src', LAMS_URL - + 'home.do?method=addLesson&organisationID=' + + 'home/addLesson.do?organisationID=' + dialog.data('orgID')); // in case of mobile devices allow iframe scrolling @@ -354,7 +352,7 @@ 'title' : LABELS.COURSE_GROUPS_TITLE, 'open' : function() { // load contents after opening the dialog - $('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID=' + orgID + $('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup/viewGroupings.do?organisationID=' + orgID + (activityID ? '&activityID=' + activityID : '')); } }, true); @@ -389,10 +387,9 @@ $.ajax({ async : false, cache : false, - url : LAMS_URL + "authoring/author.do", + url : LAMS_URL + "authoring/createToolContent.do", dataType : 'json', data : { - 'method' : 'createToolContent', 'toolID' : toolID }, success : function(response) { @@ -447,10 +444,9 @@ function refreshPrivateNotificationCount(){ $.ajax({ cache : false, - url : LAMS_URL + "notification.do", + url : LAMS_URL + "notification/getPendingNotificationCount.do", dataType : 'text', data : { - 'method' : 'getPendingNotificationCount' }, success : function(count) { $('#notificationsPendingCount').text(count == 0 ? '0' : count); @@ -494,7 +490,7 @@ var orgID = $(this).data('orgID'); // load contents after opening the dialog $('iframe', this).attr('src', LAMS_URL - + 'gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=' + orgID); + + 'gradebook/gradebookLearning/courseLearner.do?organisationID=' + orgID); } }, true); } @@ -530,7 +526,7 @@ var orgID = $(this).data('orgID'); // load contents after opening the dialog $('iframe', this).attr('src', LAMS_URL - + 'findUserLessons.do?dispatch=getResults&courseID=' + orgID); + + 'findUserLessons/getResults.do?courseID=' + orgID); } }, true); } @@ -547,7 +543,7 @@ 'open' : function() { var orgID = $(this).data('orgID'); // load contents after opening the dialog - $('iframe', this).attr('src', LAMS_URL + '/learning/kumalive.do?method=getRubrics&organisationID=' + orgID); + $('iframe', this).attr('src', LAMS_URL + 'learning/kumalive/getRubrics.do?organisationID=' + orgID); } }, false); } @@ -564,7 +560,7 @@ 'open' : function() { var orgID = $(this).data('orgID'); // load contents after opening the dialog - $('iframe', this).attr('src', LAMS_URL + '/learning/kumalive.do?method=getReport&organisationID=' + orgID); + $('iframe', this).attr('src', LAMS_URL + 'learning/kumalive/getReport.do?organisationID=' + orgID); } }, false); } @@ -579,10 +575,9 @@ $.ajax({ async : false, cache : false, - url : LAMS_URL + "authoring/author.do", + url : LAMS_URL + "authoring/createSingleActivityLesson.do", dataType : 'text', data : { - 'method' : 'createSingleActivityLesson', 'organisationID' : dialog.data('orgID'), 'toolID' : dialog.data('toolID'), 'toolContentID' : dialog.data('toolContentID'), @@ -609,7 +604,7 @@ closeDialog(id, true); }); // load svgGenerator.jsp to render LD SVG - frame.attr('src', LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID=' + frame.attr('src', LAMS_URL + 'authoring/generateSVG.do?selectable=false&learningDesignID=' + learningDesignID); } } Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r388b3abd9fd8b750b4fbb12028fa856a0a11249e -rd0a8679bc756e47321aff67f3ed1eb737b8535ff --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 388b3abd9fd8b750b4fbb12028fa856a0a11249e) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) @@ -61,32 +61,32 @@ } function returnToMonitorLessonIntegrated( lessonID ) { - window.location = 'home.do?method=monitorLesson&lessonID='+lessonID; + window.location = 'home/monitorLesson.do?lessonID='+lessonID; } function openMonitorLesson( lessonID ) { if (isMac) { if(belowMinRes) { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+ lessonID,'mWindow','width=' + monitor_width + monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); } else { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); } } else { if (monitorLessonWin && !monitorLessonWin.closed) { - monitorLessonWin.location = 'home.do?method=monitorLesson&lessonID='+lessonID; + monitorLessonWin.location = 'home/monitorLesson.do?lessonID='+lessonID; monitorLessonWin.focus(); } else { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,resizable,scrollbars' + getCenterParams(monitor_width, monitor_height)); } } } function openLearner( lessonId ) { - var learnerUrl = 'home.do?method=learner&lessonID=' + lessonId; + var learnerUrl = 'home/learner.do?lessonID=' + lessonId; if (isMac) { learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height @@ -126,15 +126,27 @@ */ function openLearnerShortenedUrl( lessonId ) { if (isMac) { +<<<<<<< HEAD + learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width +======= learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width=' + learner_width +>>>>>>> refs/remotes/asia/LDEV-4440 + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes' + getCenterParams(learner_width, learner_height)); } else { if (learnWin && !learnWin.closed ) { +<<<<<<< HEAD + learnWin.location = '../home/learner.do?lessonID='+lessonId; +======= learnWin.location = '../home/learner.do&lessonID='+lessonId; +>>>>>>> refs/remotes/asia/LDEV-4440 learnWin.focus(); } else { +<<<<<<< HEAD + learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' +======= learnWin = window.open('../home/learner.do&lessonID='+lessonId,'lWindow','width=' +>>>>>>> refs/remotes/asia/LDEV-4440 + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes' + getCenterParams(learner_width, learner_height)); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java =================================================================== diff -u -r3eb0caa98564b709116d6e84af92eb3f60c9ff3a -rd0a8679bc756e47321aff67f3ed1eb737b8535ff --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java (.../GroupingAJAXController.java) (revision 3eb0caa98564b709116d6e84af92eb3f60c9ff3a) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java (.../GroupingAJAXController.java) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) @@ -41,7 +41,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.learning.web.action.GroupingAction; +import org.lamsfoundation.lams.learning.web.controller.GroupingController; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.GroupComparator; @@ -175,7 +175,7 @@ group.setUsers(sortedUsers); } - request.setAttribute(GroupingAction.GROUPS, groups); + request.setAttribute(GroupingController.GROUPS, groups); // go to a view only screen for random grouping return "grouping/viewGroups"; } @@ -215,7 +215,7 @@ } } - request.setAttribute(GroupingAction.GROUPS, groups); + request.setAttribute(GroupingController.GROUPS, groups); request.setAttribute("isCourseGrouping", true); // flag to page it is a course grouping so use the field names for OrganisationGroup return "grouping/viewGroups"; } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java =================================================================== diff -u -r3850a2def809bcb85d27c5f796c5e28ac7d36f18 -rd0a8679bc756e47321aff67f3ed1eb737b8535ff --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision 3850a2def809bcb85d27c5f796c5e28ac7d36f18) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/PedagogicalPlannerController.java (.../PedagogicalPlannerController.java) (revision d0a8679bc756e47321aff67f3ed1eb737b8535ff) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.tool.wiki.service.IWikiService; import org.lamsfoundation.lams.tool.wiki.web.forms.WikiPedagogicalPlannerForm; import org.lamsfoundation.lams.util.WebUtil; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -54,7 +53,7 @@ @RequestMapping("/pedagogicalPlanner") public class PedagogicalPlannerController { - private static Logger logger = Logger.getLogger(PedagogicalPlannerAction.class); + private static Logger logger = Logger.getLogger(PedagogicalPlannerController.class); @Autowired @Qualifier("wikiService")