Index: lams_central/web/editprofile.jsp =================================================================== diff -u -r8352c20e7d6817587aa8717a065616e36f255082 -r171f124aefe163dee7e1d196a006ce11039631a6 --- lams_central/web/editprofile.jsp (.../editprofile.jsp) (revision 8352c20e7d6817587aa8717a065616e36f255082) +++ lams_central/web/editprofile.jsp (.../editprofile.jsp) (revision 171f124aefe163dee7e1d196a006ce11039631a6) @@ -1,323 +1,416 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" %> +<%@ page contentType="text/html; charset=utf-8" language="java"%> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> -<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" %> -<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page + import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" + import="org.lamsfoundation.lams.util.ConfigurationKeys"%> + + + - - - + + + - -

- + +

+ +

+ -<%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%> -<%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%> + <%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%> + <%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%> +
+
-
+
+
+
+
+
+ +
+
+
+
+ + + + <%=AuthenticationMethod.DB%> + + + + + + + -

+
+ > +
+
+ + +
-
+
+ + +
- +
+ + +
+ + + + +
+ + +
- -<%= AuthenticationMethod.DB %> - - - +
+ + +
+
+ + +
+
+ + +
- - - - - - - - - - - - - - - - - - <%-- - Disabled properties are not submitted, but first and last name are required. - These hidden fields deliver required data to ProfileSaveAction even if only Partial Profile Editing is available. - --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + + + + + + + + + - - - - - - - - - - - - - - - +
+ + + + ${theme.name} + + +
+ +
+ ${sharedSecret} +
+ + +
+ + + +
+ + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - -
:
:
*:
*:
*:
:
:
:
:
:
:
:
:
:
:
:
: - - - - - - - -
: - - - +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ > +
+ +
+ + + + + + + + +
+ +
+ + + + ${timezoneDto.timeZoneId} - ${timezoneDto.displayName} - - -
: - - - -
: - - - ${theme.name} - - -
: - ${sharedSecret} -
- - - - : - -
:
:
*:
*:
*:
:
:
:
:
:
:
:
:
:
:
:
: - - - ${theme.name} - - -
: - - - - - - -
: - - ${timeZone}" -
: - - - -
-
- - -
- - - - - -
+ + + + + + + + +
+ +
+ + +    + + + + + +
- \ No newline at end of file + + +
+ +
+
+
+ + + + Index: lams_central/web/lessons.jsp =================================================================== diff -u -rbcdeef3baa9554197ce15b4b7f0563cd34858e56 -r171f124aefe163dee7e1d196a006ce11039631a6 --- lams_central/web/lessons.jsp (.../lessons.jsp) (revision bcdeef3baa9554197ce15b4b7f0563cd34858e56) +++ lams_central/web/lessons.jsp (.../lessons.jsp) (revision 171f124aefe163dee7e1d196a006ce11039631a6) @@ -2,42 +2,64 @@ contentType="text/html;charset=utf-8"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-core" prefix="c"%> + -
+
+
+
+
+
+
+
+ +
+
+
+
+ + +
+

+ +

+ + + + + +

+ +

+ +
+
+ " + onclick="javascript:document.location='index.do?state=active&tab=profile'" /> +
-

-

- -
- - - -
-

- - - - - -

- - -
-" - onclick="javascript:document.location='index.do?state=active&tab=profile'" /> +
+
+
+
- -
Index: lams_central/web/passwordChangeContent.jsp =================================================================== diff -u -r3c6472ccf0dd4f38e288496a8eeee7442ea19502 -r171f124aefe163dee7e1d196a006ce11039631a6 --- lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision 3c6472ccf0dd4f38e288496a8eeee7442ea19502) +++ lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision 171f124aefe163dee7e1d196a006ce11039631a6) @@ -1,75 +1,94 @@ -<%@page import="org.lamsfoundation.lams.web.PasswordChangeActionForm" %> -<%@page import="org.apache.struts.action.ActionMessages" %> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@page import="org.lamsfoundation.lams.web.PasswordChangeActionForm"%> +<%@page import="org.apache.struts.action.ActionMessages"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> + + + + + + -
+
+
+
+
+
+
+
+ +
+
+ +

+ + +
+ +

+ +
+
+ +
+ + +
-

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

- -
- -

- - - - - - - - - - - - - - - - - - - - - - - - - -
- : - - - -
- : - - -
- : - - -
- : - - -
  - - -
+ +
+
+
+
+
- \ No newline at end of file + + + Index: lams_central/web/profile.jsp =================================================================== diff -u -r94a4ee377b6f565f4b5228bdfe4fcc4c1c4e5030 -r171f124aefe163dee7e1d196a006ce11039631a6 --- lams_central/web/profile.jsp (.../profile.jsp) (revision 94a4ee377b6f565f4b5228bdfe4fcc4c1c4e5030) +++ lams_central/web/profile.jsp (.../profile.jsp) (revision 171f124aefe163dee7e1d196a006ce11039631a6) @@ -5,73 +5,105 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-logic" prefix="logic"%> <%@ taglib uri="tags-core" prefix="c"%> -<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" - import="org.lamsfoundation.lams.util.Configuration" - import="org.lamsfoundation.lams.util.ConfigurationKeys" %> - +<%@ page + import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod" + import="org.lamsfoundation.lams.util.Configuration" + import="org.lamsfoundation.lams.util.ConfigurationKeys"%> + + + + + <%=Configuration.get(ConfigurationKeys.SHOW_ALL_MY_LESSON_LINK)%> - -
-

-
- - - - +
+
+
+
+
+
+ +
+
+
+
-
- - - - - - - - - -
: -
    -
    • + + +
    + "> + +
    - - <%= AuthenticationMethod.DB %> - -
    • -     +     + + " + src="/lams/download/?uuid=&preferDownload=false" /> + +     -
    • - - -
    • -     -
+

+ +
+ +

+ +
+ +
+    + + + + <%=AuthenticationMethod.DB%> + -
:
: - - - -
- User Portrait + + +    + + + +
- - - &preferDownload=false" /> - - -
+
+
+
+ - \ No newline at end of file + + + + + + + + + + + + + + + + +