diff --git a/scripts/langindex.json b/scripts/langindex.json
index 2ad44374bec..ed3b5aa1636 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1631,7 +1631,6 @@
"core.course.warningmanualcompletionmodified": "local_moodlemobileapp",
"core.course.warningofflinemanualcompletiondeleted": "local_moodlemobileapp",
"core.course.youmust": "completion",
- "core.coursedetails": "moodle",
"core.coursenogroups": "local_moodlemobileapp",
"core.courses.addtofavourites": "block_myoverview",
"core.courses.aria:coursecategory": "course",
diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss
index cf9c7a7dfd3..d94845afb36 100644
--- a/src/core/components/user-avatar/user-avatar.scss
+++ b/src/core/components/user-avatar/user-avatar.scss
@@ -4,6 +4,9 @@
position: relative;
width: var(--core-avatar-size);
height: var(--core-avatar-size);
+ --contact-status-size: 14px;
+ --margin-end-on-item: 8px;
+ --margin-vertical-on-item: 8px;
img {
border-radius: var(--core-avatar-radius);
@@ -53,8 +56,8 @@
position: absolute;
right: 0;
bottom: 0;
- width: 14px;
- height: 14px;
+ width: var(--contact-status-size);
+ height: var(--contact-status-size);
border-radius: 50%;
&.online {
border: 1px solid white;
@@ -92,7 +95,7 @@
}
:host-context(ion-item) {
- @include margin(6px, 8px, 6px, 0px);
+ @include margin(var(--margin-vertical-on-item), var(--margin-end-on-item), var(--margin-vertical-on-item), 0px);
img {
min-width: var(--core-avatar-size);
min-height: var(--core-avatar-size);
diff --git a/src/core/features/login/tests/behat/signup.feature b/src/core/features/login/tests/behat/signup.feature
index 6518f37702d..26288011628 100755
--- a/src/core/features/login/tests/behat/signup.feature
+++ b/src/core/features/login/tests/behat/signup.feature
@@ -75,7 +75,8 @@ Feature: Test signup in app
When I press the user menu button in the app
And I press "User Test" in the app
- Then I should find "Barcelona, Spain" in the app
+ Then I should find "Barcelona" in the app
+ Then I should find "Spain" in the app
And I should find "u1@u1.com" in the app
@lms_from3.10
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index 38fd5d14a30..128d010ad8c 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -14,7 +14,7 @@
{{ 'core.user.profile' | translate }}
-
+
@@ -23,8 +23,14 @@ {{ 'core.user.profile' | translate }}
{{ user.fullname }}
-
- {{ user.address }}
+
+
+
+
+
+
+
+
@@ -32,7 +38,7 @@ {{ user.fullname }}
- {{ 'core.user.contact' | translate}}
+ {{ 'core.user.contact' | translate}}
@@ -43,6 +49,24 @@ {{ user.fullname }}
+
+
+ {{ 'core.user.country' | translate}}
+ {{ user.country }}
+
+
+
+
+ {{ 'core.user.city' | translate}}
+ {{ user.city }}
+
+
+
+
+ {{ 'core.timezone' | translate}}
+ {{ user.timezone }}
+
+
{{ 'core.user.phone1' | translate}}
@@ -59,31 +83,9 @@ {{ user.fullname }}
-
-
- {{ 'core.user.city' | translate}}
- {{ user.city }}
-
-
-
-
- {{ 'core.user.country' | translate}}
- {{ user.country }}
-
-
-
-
- {{ 'core.timezone' | translate}}
- {{ user.timezone }}
-
-
+
+
-
-
- {{ 'core.user.idnumber' | translate }}
- {{ user.idnumber }}
-
-
{{ 'core.user.institution' | translate }}
@@ -96,12 +98,18 @@ {{ user.fullname }}
{{ user.department }}
+
+
+ {{ 'core.user.idnumber' | translate }}
+ {{ user.idnumber }}
+
+
- {{ 'core.userdetails' | translate}}
+ {{ 'core.userdetails' | translate}}
@@ -124,21 +132,6 @@ {{ user.fullname }}
[contextInstanceId]="courseId" [courseId]="courseId">
-
-
-
- {{ 'core.user.description' | translate}}
-
-
-
-
-
-
-
-
-
-
-
+
@@ -14,11 +14,11 @@ {{ user?.fullname }}
-
-
+
+
- {{ user.fullname }}
+ {{ user.fullname }}
{{ user.address }}
diff --git a/src/core/features/user/pages/profile/profile.scss b/src/core/features/user/pages/profile/profile.scss
index 0265d7694e7..f5b734a20c2 100644
--- a/src/core/features/user/pages/profile/profile.scss
+++ b/src/core/features/user/pages/profile/profile.scss
@@ -1,29 +1,10 @@
:host {
-
- .core-user-profile-maininfo::part(native) {
- flex-direction: column;
- }
- ::ng-deep {
- core-user-avatar {
- display: block;
- --core-avatar-size: var(--core-large-avatar-size);
- height: calc(var(--core-avatar-size) + 16px);
-
- img {
- margin: 8px auto;
- }
-
- .contact-status {
- width: 24px !important;
- height: 24px !important;
- right: calc(50% - 12px - var(--core-avatar-size) / 2) !important;
- }
+ core-user-avatar {
+ --core-avatar-size: var(--core-large-avatar-size);
+ --contact-status-size: 24px;
+ --margin-end-on-item: 16px;
+ .contact-status {
+ right: calc(50% - 12px - var(--core-avatar-size) / 2) !important;
}
}
-
-}
-
-:host-context([dir="rtl"]) ::ng-deep core-user-avatar .edit-avatar {
- left: -24px;
- right: unset;
}
diff --git a/src/core/features/user/pages/profile/profile.ts b/src/core/features/user/pages/profile/profile.ts
index 58bea8d9f20..103306b53ab 100644
--- a/src/core/features/user/pages/profile/profile.ts
+++ b/src/core/features/user/pages/profile/profile.ts
@@ -74,7 +74,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
}
this.user.email = data.user.email;
- this.user.address = CoreUserHelper.formatAddress('', data.user.city, data.user.country);
}, CoreSites.getCurrentSiteId());
this.logView = CoreTime.once(async (user) => {
@@ -151,7 +150,6 @@ export class CoreUserProfilePage implements OnInit, OnDestroy {
try {
const user = await CoreUser.getProfile(this.userId, this.courseId);
- user.address = CoreUserHelper.formatAddress('', user.city, user.country);
this.rolesFormatted = 'roles' in user ? CoreUserHelper.formatRoleList(user.roles) : '';
this.user = user;
diff --git a/src/core/features/user/services/user-helper.ts b/src/core/features/user/services/user-helper.ts
index 788d35d63be..42dc7f60a1a 100644
--- a/src/core/features/user/services/user-helper.ts
+++ b/src/core/features/user/services/user-helper.ts
@@ -89,6 +89,7 @@ export class CoreUserHelperProvider {
* @param city City.
* @param country Country.
* @returns Formatted address.
+ * @deprecated since 4.3 Not used anymore.
*/
formatAddress(address?: string, city?: string, country?: string): string {
const separator = Translate.instant('core.listsep');
diff --git a/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png b/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png
index 6d985586d2a..1fb33217410 100644
Binary files a/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png and b/src/core/features/user/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png differ
diff --git a/src/core/lang.json b/src/core/lang.json
index 6741912c734..f917f292935 100644
--- a/src/core/lang.json
+++ b/src/core/lang.json
@@ -61,7 +61,6 @@
"copiedtoclipboard": "Text copied to clipboard",
"copytoclipboard": "Copy to clipboard",
"course": "Course",
- "coursedetails": "Course details",
"coursenogroups": "You are not a member of any group of this course.",
"currentdevice": "Current device",
"custom": "Custom",