Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== diff -u -r3571f54be7238b122a1654d2793c8b0dca0bbf37 -r4926c338950b14089e996697df38ff481048da79 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 3571f54be7238b122a1654d2793c8b0dca0bbf37) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 4926c338950b14089e996697df38ff481048da79) @@ -377,9 +377,9 @@ private void sendUserImportPasswordChangeEmail(User user) { try { if (USER_IMPORT_PASSWORD_CHANGE_EMAIL_TEMPLATE_CONTENT == null) { - USER_IMPORT_PASSWORD_CHANGE_EMAIL_TEMPLATE_CONTENT = Files - .readString(Paths.get(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR), FileUtil.LAMS_WWW_DIR, - "userImportPasswordChangeEmailTemplate.html")); + USER_IMPORT_PASSWORD_CHANGE_EMAIL_TEMPLATE_CONTENT = Files.readString( + Paths.get(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR), FileUtil.LAMS_CENTRAL_WAR_DIR, + "templates", "userImportPasswordChangeEmailTemplate.html")); } String key = RandomPasswordGenerator.generateForgotPasswordKey(); Index: lams_central/web/templates/gradebookReleaseLessonMarksEmailTemplate.html =================================================================== diff -u --- lams_central/web/templates/gradebookReleaseLessonMarksEmailTemplate.html (revision 0) +++ lams_central/web/templates/gradebookReleaseLessonMarksEmailTemplate.html (revision 4926c338950b14089e996697df38ff481048da79) @@ -0,0 +1,887 @@ + + + + + + + +[PAGE_TITLE_PLACEHOLDER] + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [ACTIVITY_ROW_START] + + + + + + + + [ACTIVITY_ROW_END] + + + + + + + + + + + + + + + + + + + + +
+
+ + Index: lams_central/web/templates/userImportPasswordChangeEmailTemplate.html =================================================================== diff -u --- lams_central/web/templates/userImportPasswordChangeEmailTemplate.html (revision 0) +++ lams_central/web/templates/userImportPasswordChangeEmailTemplate.html (revision 4926c338950b14089e996697df38ff481048da79) @@ -0,0 +1,643 @@ + + + + + + + +[PAGE_TITLE_PLACEHOLDER] + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java =================================================================== diff -u -rb66f7e21a3e56f7a351182a497045bfe780ae969 -r4926c338950b14089e996697df38ff481048da79 --- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision b66f7e21a3e56f7a351182a497045bfe780ae969) +++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision 4926c338950b14089e996697df38ff481048da79) @@ -90,6 +90,7 @@ public static final String LAMS_WWW_SECURE_DIR = "secure"; public static final String LAMS_WWW_DIR = "lams-www.war"; + public static final String LAMS_CENTRAL_WAR_DIR = "lams-central.war"; public static final String LAMS_RUNTIME_CONTENT_DIR = "runtime"; private static final long numMilliSecondsInADay = 24 * 60 * 60 * 1000; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r3575c1543b82a29a6aeeb5c61ac0970a51bfd30b -r4926c338950b14089e996697df38ff481048da79 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 3575c1543b82a29a6aeeb5c61ac0970a51bfd30b) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 4926c338950b14089e996697df38ff481048da79) @@ -1086,9 +1086,9 @@ public String getReleaseMarksEmailContent(long lessonID, int userID) { if (RELEASE_MARKS_EMAIL_TEMPLATE_CONTENT == null) { try { - RELEASE_MARKS_EMAIL_TEMPLATE_CONTENT = Files - .readString(Paths.get(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR), FileUtil.LAMS_WWW_DIR, - "gradebookReleaseLessonMarksEmailTemplate.html")); + RELEASE_MARKS_EMAIL_TEMPLATE_CONTENT = Files.readString( + Paths.get(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR), FileUtil.LAMS_CENTRAL_WAR_DIR, + "templates", "gradebookReleaseLessonMarksEmailTemplate.html")); } catch (Exception e) { throw new RuntimeException("Can not read release marks email template", e); } Fisheye: Tag 4926c338950b14089e996697df38ff481048da79 refers to a dead (removed) revision in file `lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4926c338950b14089e996697df38ff481048da79 refers to a dead (removed) revision in file `lams_www/web/userImportPasswordChangeEmailTemplate.html'. Fisheye: No comparison available. Pass `N' to diff?