Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -ra4cf9fbd9a4f01cabcc043000dc07c082df8a434 -r85fd5ab921ca670780b100ff491d5f08e536bf77 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -rdefc0de4bbc95b51da70e0ae1653b57d0eaddb87 -r85fd5ab921ca670780b100ff491d5f08e536bf77 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision defc0de4bbc95b51da70e0ae1653b57d0eaddb87) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 85fd5ab921ca670780b100ff491d5f08e536bf77) @@ -63,6 +63,9 @@ /** Help text for the activity*/ private String helpText; + /** Help URL for the activity */ + private String helpURL; + /** UI specific attribute indicating the * position of the activity*/ private Integer xCoord; @@ -909,6 +912,12 @@ public void setModerationURL(String moderationURL) { this.moderationURL = moderationURL; } + public String getHelpURL(){ + return helpURL; + } + public void setHelpURL(String helpURL) { + this.helpURL = helpURL; + } public String getToolSignature() { return toolSignature; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java =================================================================== diff -u -rcdf95bbd0cba419e84788d06369e02c4704283ab -r85fd5ab921ca670780b100ff491d5f08e536bf77 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision cdf95bbd0cba419e84788d06369e02c4704283ab) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 85fd5ab921ca670780b100ff491d5f08e536bf77) @@ -55,6 +55,7 @@ private String description; private String activityTitle; private String helpText; + private String helpURL; private Integer xCoord; private Integer yCoord; private String libraryActivityUIImage; @@ -175,6 +176,7 @@ this.supportsModeration = new Boolean(tool.getSupportsModeration()); this.supportsContribute = new Boolean(tool.getSupportsContribute()); this.authoringURL = tool.getAuthorUrl(); + this.helpURL = tool.getHelpUrl(); } } @@ -274,6 +276,13 @@ return helpText; } /** + * + * @return Return the helpURL + */ + public String getHelpURL() { + return helpURL; + } + /** * @return Returns the learningDesignID. */ public Long getLearningDesignID() { @@ -469,6 +478,14 @@ public void setHelpText(String helpText) { this.helpText = helpText; } + + /** + * Set the activity's help url + * @param helpURL + */ + public void setHelpURL(String helpURL) { + this.helpURL = helpURL; + } /** Set the activity's title */ public void setActivityTitle(String title) { Index: lams_common/src/java/org/lamsfoundation/lams/tool/dto/AuthoringToolDTO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r85fd5ab921ca670780b100ff491d5f08e536bf77 --- lams_common/src/java/org/lamsfoundation/lams/tool/dto/AuthoringToolDTO.java (.../AuthoringToolDTO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/AuthoringToolDTO.java (.../AuthoringToolDTO.java) (revision 85fd5ab921ca670780b100ff491d5f08e536bf77) @@ -45,12 +45,13 @@ private Boolean supportsModeration; private Boolean supportsContribute; private String authoringURL; + private String helpURL; public AuthoringToolDTO(Long toolID, Long toolContentID, String description, String toolDisplayName, Boolean supportsDefineLater, Boolean supportsRunOffline, Boolean supportsModeration, Boolean supportsContribute, - String authoringURL) { + String authoringURL, String helpURL) { super(); this.toolID = toolID; this.toolContentID = toolContentID; @@ -61,6 +62,7 @@ this.supportsModeration = supportsModeration; this.supportsContribute = supportsContribute; this.authoringURL = authoringURL; + this.helpURL = helpURL; } public AuthoringToolDTO(Tool tool){ this.toolID = tool.getToolId(); @@ -72,6 +74,7 @@ this.supportsModeration = new Boolean(tool.getSupportsModeration()); this.supportsContribute = new Boolean(tool.getSupportsContribute()); this.authoringURL = tool.getAuthorUrl(); + this.helpURL = tool.getHelpUrl(); } /** * @return Returns the authoringURL. @@ -80,6 +83,13 @@ return authoringURL; } /** + * + * @return Return the helpURL. + */ + public String getHelpURL() { + return helpURL; + } + /** * @return Returns the description. */ public String getDescription() {