Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r49e26f9cd287f22068c3dc02ee2d25258ad64f80 -rdf0635da539415b89e42b4ce83da50f8fe3b272e --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 49e26f9cd287f22068c3dc02ee2d25258ad64f80) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision df0635da539415b89e42b4ce83da50f8fe3b272e) @@ -516,5 +516,7 @@ label.delete.portrait =Delete portrait sysadmin.maintain.session.delete =Delete +config.display.portrait =Display learner's portrait in a progress bar + #======= End labels: Exported 509 labels for en AU ===== Index: lams_admin/web/config/items.jsp =================================================================== diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -rdf0635da539415b89e42b4ce83da50f8fe3b272e --- lams_admin/web/config/items.jsp (.../items.jsp) (revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9) +++ lams_admin/web/config/items.jsp (.../items.jsp) (revision df0635da539415b89e42b4ce83da50f8fe3b272e) @@ -1,35 +1,36 @@ <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %> <%@ include file="/taglibs.jsp"%> - -
-
-
-
+ +
+
+
+
+ - - - - - - + + + + + +
- -   * - - - <%= ConfigurationItem.BOOLEAN_FORMAT %> - - - - true - false   - - - - - - -
+ +   * + + + <%= ConfigurationItem.BOOLEAN_FORMAT %> + + + + true + false   + + + + + + +
-
-
+
+
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171115.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171115.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171115.sql (revision df0635da539415b89e42b4ce83da50f8fe3b272e) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4436 Ability to change portrait in learner +INSERT INTO lams_configuration (config_key, config_value, description_key, header_name, format, required) +VALUES ('DisplayPortrait','true', 'config.display.portrait', 'config.header.look.feel', 'BOOLEAN', 0); + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -r3f99af7413ffdfdf7f69c54fd2a773f9443ac899 -rdf0635da539415b89e42b4ce83da50f8fe3b272e --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 3f99af7413ffdfdf7f69c54fd2a773f9443ac899) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision df0635da539415b89e42b4ce83da50f8fe3b272e) @@ -116,6 +116,8 @@ public static String ALLOW_EDIT_ON_FLY = "AllowLiveEdit"; public static String ALLOW_KUMALIVE = "AllowKumalive"; + + public static String DISPLAY_PORTRAIT = "DisplayPortrait"; public static String SHOW_ALL_MY_LESSON_LINK = "ShowAllMyLessonLink";