diff --git a/scripts/langindex.json b/scripts/langindex.json index c999b7a30..f70a5b11c 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1104,14 +1104,19 @@ "addon.report_insights.notapplicable": "analytics", "addon.report_insights.notuseful": "analytics", "addon.report_insights.useful": "analytics", + "addon.storagemanager.alldata": "tool_wp", + "addon.storagemanager.confirmdeleteallsitedata": "local_moodlemobileapp", + "addon.storagemanager.confirmdeletecourses": "local_moodlemobileapp", + "addon.storagemanager.confirmdeletedatafrom": "local_moodlemobileapp", "addon.storagemanager.coursedownloads": "local_moodlemobileapp", "addon.storagemanager.courseinfo": "local_moodlemobileapp", - "addon.storagemanager.coursesspaceusage": "local_moodlemobileapp", - "addon.storagemanager.deletecourse": "local_moodlemobileapp", + "addon.storagemanager.deleteallsitedata": "local_moodlemobileapp", + "addon.storagemanager.deleteallsitedatainfo": "local_moodlemobileapp", "addon.storagemanager.deletecourses": "local_moodlemobileapp", "addon.storagemanager.deletedata": "local_moodlemobileapp", "addon.storagemanager.deletedatafrom": "local_moodlemobileapp", "addon.storagemanager.downloadedcourses": "local_moodlemobileapp", + "addon.storagemanager.errordeletedownloadeddata": "local_moodlemobileapp", "addon.storagemanager.managedownloads": "local_moodlemobileapp", "addon.storagemanager.totaldownloads": "local_moodlemobileapp", "addon.storagemanager.totalspaceusage": "local_moodlemobileapp", @@ -1531,8 +1536,6 @@ "core.course.completion_setby:manual:done": "course", "core.course.completion_setby:manual:markdone": "course", "core.course.completionrequirements": "course", - "core.course.confirmdeletemodulefiles": "local_moodlemobileapp", - "core.course.confirmdeletestoreddata": "local_moodlemobileapp", "core.course.confirmdownload": "local_moodlemobileapp", "core.course.confirmdownloadunknownsize": "local_moodlemobileapp", "core.course.confirmdownloadzerosize": "local_moodlemobileapp", @@ -2161,8 +2164,6 @@ "core.settings.currentlanguage": "moodle", "core.settings.debugdisplay": "admin", "core.settings.debugdisplaydescription": "local_moodlemobileapp", - "core.settings.deletesitefiles": "local_moodlemobileapp", - "core.settings.deletesitefilestitle": "local_moodlemobileapp", "core.settings.developeroptions": "local_moodlemobileapp", "core.settings.deviceinfo": "local_moodlemobileapp", "core.settings.deviceos": "local_moodlemobileapp", @@ -2178,7 +2179,6 @@ "core.settings.enablerichtexteditordescription": "local_moodlemobileapp", "core.settings.enablesyncwifi": "local_moodlemobileapp", "core.settings.entriesincache": "local_moodlemobileapp", - "core.settings.errordeletesitefiles": "local_moodlemobileapp", "core.settings.errorsyncsite": "local_moodlemobileapp", "core.settings.estimatedfreespace": "local_moodlemobileapp", "core.settings.filesystemroot": "local_moodlemobileapp", @@ -2215,7 +2215,6 @@ "core.settings.siteplugins": "local_moodlemobileapp", "core.settings.sites": "moodle", "core.settings.spaceusage": "local_moodlemobileapp", - "core.settings.spaceusagehelp": "local_moodlemobileapp", "core.settings.synchronization": "local_moodlemobileapp", "core.settings.synchronizenow": "local_moodlemobileapp", "core.settings.synchronizenowhelp": "local_moodlemobileapp", @@ -2339,8 +2338,8 @@ "core.user.webpage": "moodle", "core.userdeleted": "moodle", "core.userdetails": "moodle", - "core.usernotfullysetup": "error", "core.usernologin": "local_moodlemobileapp", + "core.usernotfullysetup": "error", "core.users": "moodle", "core.usersuspended": "tool_reportbuilder", "core.view": "moodle", diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html index 50e95546f..44810d334 100644 --- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html +++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html @@ -4,7 +4,7 @@ - + {{ entry.name }} diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html index 14298293a..6d9bd7f36 100644 --- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html +++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html @@ -14,8 +14,7 @@
- + diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html index d8f6cb615..fd6746901 100644 --- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html +++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html @@ -114,8 +114,8 @@

{{ 'addon.competency.noactivities' | translate }}

- + diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.scss b/src/addons/mod/bigbluebuttonbn/components/index/index.scss index 66566a376..61fe68559 100644 --- a/src/addons/mod/bigbluebuttonbn/components/index/index.scss +++ b/src/addons/mod/bigbluebuttonbn/components/index/index.scss @@ -1,7 +1,3 @@ -@import "~theme/globals"; - -:host { - ion-item > p[slot="end"] { - font-size: 14px; - } +ion-item > p[slot="end"] { + font-size: 14px; } diff --git a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts index ee71b6308..2f543185a 100644 --- a/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts +++ b/src/addons/mod/bigbluebuttonbn/services/handlers/module.ts @@ -45,7 +45,7 @@ export class AddonModBBBModuleHandlerService extends CoreModuleHandlerBase imple [CoreConstants.FEATURE_GRADE_OUTCOMES]: true, [CoreConstants.FEATURE_BACKUP_MOODLE2]: true, [CoreConstants.FEATURE_SHOW_DESCRIPTION]: true, - [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_COMMUNICATION, + [CoreConstants.FEATURE_MOD_PURPOSE]: ModPurpose.MOD_PURPOSE_OTHER, }; /** diff --git a/src/addons/storagemanager/lang.json b/src/addons/storagemanager/lang.json index 1641c3b96..84988fe0d 100644 --- a/src/addons/storagemanager/lang.json +++ b/src/addons/storagemanager/lang.json @@ -1,13 +1,18 @@ { - "deletedata": "Delete offline data", - "deletecourse": "Delete offline data from this course", - "deletecourses": "Delete offline data from all courses", - "deletedatafrom": "Delete offline data from {{name}}", - "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.", - "managedownloads": "Manage downloads", + "alldata": "All data", + "confirmdeleteallsitedata": "Delete all site downloaded data?", + "confirmdeletecourses": "Delete downloaded data from all courses?", + "confirmdeletedatafrom": "Delete all downloaded data from '{{name}}'?", "coursedownloads": "Course downloads", + "courseinfo": "Download course content to work offline. Your activity will sync automatically when your device is back online.", + "deleteallsitedata": "Delete all site downloaded data", + "deleteallsitedatainfo": "This will delete all downloaded data from '{{name}}', including all downloaded courses and data that allows you to work offline.", + "deletecourses": "Delete downloaded data from all courses", + "deletedata": "Delete downloaded data", + "deletedatafrom": "Delete all downloaded data from '{{name}}'", + "downloadedcourses": "Downloaded courses", + "errordeletedownloadeddata": "Error deleting downloaded data.", + "managedownloads": "Manage downloads", "totaldownloads": "Total downloads", - "totalspaceusage": "Total space usage", - "coursesspaceusage": "Courses space usage", - "downloadedcourses": "Downloaded courses" + "totalspaceusage": "Total space used" } diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.html b/src/addons/storagemanager/pages/course-storage/course-storage.html index 07054abe7..bd058183d 100644 --- a/src/addons/storagemanager/pages/course-storage/course-storage.html +++ b/src/addons/storagemanager/pages/course-storage/course-storage.html @@ -20,7 +20,8 @@ {{ totalSize | coreBytesToSize }} - + diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts index fdfef8253..3dc5ae558 100644 --- a/src/addons/storagemanager/pages/course-storage/course-storage.ts +++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts @@ -282,7 +282,10 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy { */ async deleteForCourse(): Promise { try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.confirmdeletedatafrom', + { name: this.title }, + ); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; @@ -312,7 +315,10 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy { */ async deleteForSection(section: AddonStorageManagerCourseSection): Promise { try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.confirmdeletedatafrom', + { name: section.name }, + ); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; @@ -343,7 +349,10 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy { } try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.confirmdeletedatafrom', + { name: module.name }, + ); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; @@ -363,7 +372,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy { * @return Promise Once deleting has finished */ protected async deleteModules(modules: AddonStorageManagerModule[], section?: AddonStorageManagerCourseSection): Promise { - const modal = await CoreDomUtils.showModalLoading(); + const modal = await CoreDomUtils.showModalLoading('core.deleting', true); const promises: Promise[] = []; modules.forEach((module) => { diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.html b/src/addons/storagemanager/pages/courses-storage/courses-storage.html index 00d3893a6..cbd478a0d 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.html +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.html @@ -10,25 +10,30 @@ - +
+

{{ 'addon.storagemanager.alldata' | translate }}

+
- +

{{ 'addon.storagemanager.totalspaceusage' | translate }}

{{ spaceUsage.spaceUsage | coreBytesToSize }} -

- {{ 'core.settings.spaceusagehelp' | translate }} -

+ [attr.aria-label]="'addon.storagemanager.deleteallsitedata' | translate" fill="outline"> - + + +
+

{{ 'addon.storagemanager.downloadedcourses' | translate }}

+
+ + -

{{ 'addon.storagemanager.coursesspaceusage' | translate }}

+

{{ 'addon.storagemanager.totalspaceusage' | translate }}

{{ totalSize | coreBytesToSize }} - - -
-

{{ 'addon.storagemanager.downloadedcourses' | translate }}

-
- - - - - -

{{ course.title }}

-

- {{ 'core.downloading' | translate }} -

- - {{ course.totalSize | coreBytesToSize }} - - - - - - - - - + + +

{{ course.title }}

+

+ {{ 'core.downloading' | translate }} +

+ + {{ course.totalSize | coreBytesToSize }} + + + + + + + diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.scss b/src/addons/storagemanager/pages/courses-storage/courses-storage.scss index 18d5a6e54..854bb2af6 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.scss +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.scss @@ -1,10 +1,6 @@ -@import "~theme/globals"; - -:host { - ion-item.course { - .item-heading { - font-weight: bold; - } +ion-item.courses, +ion-item.total { + .item-heading { + font-weight: bold; } - } diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts index 0697c31aa..0f2e8a215 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts @@ -111,7 +111,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy event.stopPropagation(); try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletecourses'); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; @@ -120,7 +120,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy return; } - const modal = await CoreDomUtils.showModalLoading(); + const modal = await CoreDomUtils.showModalLoading('core.deleting', true); const deletedCourseIds = this.completelyDownloadedCourses.map((course) => course.id); try { @@ -145,7 +145,10 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy event.stopPropagation(); try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.confirmdeletedatafrom', + { name: course.title }, + ); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; @@ -154,7 +157,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy return; } - const modal = await CoreDomUtils.showModalLoading(); + const modal = await CoreDomUtils.showModalLoading('core.deleting', true); try { await CoreCourseHelper.deleteCourseFiles(course.id); diff --git a/src/assets/img/mod/bigbluebuttonbn.svg b/src/assets/img/mod/bigbluebuttonbn.svg index 57fcc9ecf..e5e0e91a6 100644 --- a/src/assets/img/mod/bigbluebuttonbn.svg +++ b/src/assets/img/mod/bigbluebuttonbn.svg @@ -1 +1 @@ - + diff --git a/src/core/components/iframe/iframe.scss b/src/core/components/iframe/iframe.scss index a0707c17e..23c1cfd68 100644 --- a/src/core/components/iframe/iframe.scss +++ b/src/core/components/iframe/iframe.scss @@ -1,5 +1,3 @@ -@import "~theme/globals"; - :host { > div { max-width: 100%; @@ -14,7 +12,10 @@ .core-loading-container { position: absolute; - @include position(0, 0, 0, 0); + top: 0; + bottom: 0; + left: 0; + right: 0; display: table; height: 100%; width: 100%; diff --git a/src/core/directives/collapsible-header.ts b/src/core/directives/collapsible-header.ts index 1981fd416..b80be74e7 100644 --- a/src/core/directives/collapsible-header.ts +++ b/src/core/directives/collapsible-header.ts @@ -211,6 +211,7 @@ export class CoreCollapsibleHeaderDirective implements OnDestroy { parseInt(getComputedStyle(this.contentH1.parentElement).marginTop || '0', 10)) + 'px', ); this.contentH1.style.setProperty('position', 'absolute'); + this.contentH1.parentElement.style.setProperty('position', 'relative'); this.setupContent(); } diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html index e20fbae5c..e1048efe5 100644 --- a/src/core/features/course/components/module/core-course-module.html +++ b/src/core/features/course/components/module/core-course-module.html @@ -3,7 +3,6 @@ @@ -16,6 +15,8 @@ +

@@ -31,7 +32,7 @@ - + {{ 'core.course.hiddenfromstudents' | translate }} @@ -60,7 +61,6 @@ diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss index f398ee1fa..da557da41 100644 --- a/src/core/features/course/components/module/module.scss +++ b/src/core/features/course/components/module/module.scss @@ -11,6 +11,10 @@ ion-item.core-module-main-item { --min-height: 52px; + .core-module-title .item-heading ion-icon { + @include margin-horizontal(8px, null); + } + .core-module-buttons, .buttons.core-module-buttons { margin: 0; @@ -39,6 +43,7 @@ .core-module-additional-info { display: flex; align-items: center; + flex-wrap: wrap; } } diff --git a/src/core/features/course/lang.json b/src/core/features/course/lang.json index b3b0f24be..4fddbfd81 100644 --- a/src/core/features/course/lang.json +++ b/src/core/features/course/lang.json @@ -19,8 +19,6 @@ "completion_setby:manual:done": "{{$a.activityname}} is marked by {{$a.setby}} as done. Press to undo.", "completion_setby:manual:markdone": "{{$a.activityname}} is marked by {{$a.setby}} as not done. Press to mark as done.", "completionrequirements": "Completion requirements for {{$a}}", - "confirmdeletemodulefiles": "Are you sure you want to delete these files?", - "confirmdeletestoreddata": "Are you sure you want to delete the stored data?", "confirmdownload": "You are about to download {{size}}.{{availableSpace}} Are you sure you want to continue?", "confirmdownloadunknownsize": "It was not possible to calculate the size of the download.{{availableSpace}} Are you sure you want to continue?", "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?", diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss index bd9456dc2..63efe0c1f 100644 --- a/src/core/features/course/pages/index/index.scss +++ b/src/core/features/course/pages/index/index.scss @@ -1,6 +1,10 @@ @import '~theme/globals.scss'; :host { + .core-format-progress-list { + width: 100%; + } + .core-course-thumb { height: var(--core-courseimage-on-course-size); min-height: var(--core-courseimage-on-course-size); @@ -9,9 +13,9 @@ --border-radius: var(--core-courseimage-radius); } - @if ($core-show-courseimage-on-course) { + @if ($core-hide-courseimage-on-course) { .core-course-thumb { - display: block; + display: none; } } diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts index 56dee5790..d0e16d0c2 100644 --- a/src/core/features/course/services/course-helper.ts +++ b/src/core/features/course/services/course-helper.ts @@ -499,7 +499,7 @@ export class CoreCourseHelperProvider { try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm('addon.storagemanager.confirmdeletedatafrom', { name: module.name }); modal = await CoreDomUtils.showModalLoading(); diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts index 5f8043b2c..3568f83d4 100644 --- a/src/core/features/courses/components/course-list-item/course-list-item.ts +++ b/src/core/features/courses/components/course-list-item/course-list-item.ts @@ -259,7 +259,10 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On */ async deleteCourseStoredData(): Promise { try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.confirmdeletedatafrom', + { name: this.course.displayname || this.course.fullname }, + ); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; diff --git a/src/core/features/courses/components/course-progress/course-progress.ts b/src/core/features/courses/components/course-progress/course-progress.ts index 9d295b906..d719ab2dc 100644 --- a/src/core/features/courses/components/course-progress/course-progress.ts +++ b/src/core/features/courses/components/course-progress/course-progress.ts @@ -175,7 +175,10 @@ export class CoreCoursesCourseProgressComponent implements OnInit, OnDestroy, On */ async deleteCourse(): Promise { try { - await CoreDomUtils.showDeleteConfirm('core.course.confirmdeletestoreddata'); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.confirmdeletedatafrom', + { name: this.course.displayname || this.course.fullname }, + ); } catch (error) { if (!CoreDomUtils.isCanceledError(error)) { throw error; diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss index 053125e44..6aeb84b40 100644 --- a/src/core/features/login/login.scss +++ b/src/core/features/login/login.scss @@ -77,11 +77,6 @@ } } - .core-login-reconnect-warning ion-item { - font-size: 0.9em; - --background: var(--core-login-input-background); - } - @if ($core-fixed-url) { .core-sitename, .core-siteurl { display: none; diff --git a/src/core/features/login/pages/reconnect/reconnect.html b/src/core/features/login/pages/reconnect/reconnect.html index e365d0e05..6d7ae2d7a 100644 --- a/src/core/features/login/pages/reconnect/reconnect.html +++ b/src/core/features/login/pages/reconnect/reconnect.html @@ -29,7 +29,9 @@
diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss index edb806fb5..32aeaef79 100644 --- a/src/core/features/mainmenu/pages/more/more.scss +++ b/src/core/features/mainmenu/pages/more/more.scss @@ -1,5 +1,3 @@ -@import "~theme/globals"; - ion-item { --border-color: var(--core-more-item-border, var(--ion-border-color)); diff --git a/src/core/features/settings/lang.json b/src/core/features/settings/lang.json index a7fe5e31f..92dd83bda 100644 --- a/src/core/features/settings/lang.json +++ b/src/core/features/settings/lang.json @@ -21,8 +21,6 @@ "currentlanguage": "Current language", "debugdisplay": "Display debug messages", "debugdisplaydescription": "If enabled, error modals will display more data about the error if possible.", - "deletesitefiles": "Are you sure that you want to delete the downloaded files and cached data from the site '{{sitename}}'? You won't be able to use the app in offline mode.", - "deletesitefilestitle": "Delete site files", "developeroptions": "Developer options", "deviceinfo": "Device info", "deviceos": "Device OS", @@ -38,7 +36,6 @@ "enablerichtexteditordescription": "If enabled, a text editor will be available when entering content.", "enablesyncwifi": "Allow sync only when on Wi-Fi", "entriesincache": "{{$a}} entries in cache", - "errordeletesitefiles": "Error deleting site files.", "errorsyncsite": "Error synchronising site data. Please check your Internet connection and try again.", "estimatedfreespace": "Estimated free space", "filesystemroot": "File system root", @@ -75,7 +72,6 @@ "siteplugins": "Site plugins", "sites": "Sites", "spaceusage": "Space usage", - "spaceusagehelp": "Deleting the stored information of the site will remove all the site offline data. This information allows you to use the app when offline. ", "synchronization": "Synchronisation", "synchronizenow": "Synchronise now", "synchronizenowhelp": "Synchronising a site will send pending changes and all offline activity stored in the device and will synchronise some data like messages and notifications.", diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html index 51bd07d89..57586ef86 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.html +++ b/src/core/features/settings/pages/space-usage/space-usage.html @@ -8,9 +8,6 @@ - - - @@ -28,14 +25,13 @@

{{ site.fullName }}

{{ site.siteUrlWithoutProtocol }}

+ {{ site.spaceUsage | coreBytesToSize }} -

- {{ site.spaceUsage | coreBytesToSize }} -

- + [hidden]="site.spaceUsage! + site.cacheEntries! <= 0"> + + diff --git a/src/core/features/settings/pages/space-usage/space-usage.ts b/src/core/features/settings/pages/space-usage/space-usage.ts index 5f0657705..e048d0a24 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.ts +++ b/src/core/features/settings/pages/space-usage/space-usage.ts @@ -16,8 +16,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { IonRefresher } from '@ionic/angular'; import { CoreSiteBasicInfo, CoreSites } from '@services/sites'; -import { CoreDomUtils } from '@services/utils/dom'; -import { Translate } from '@singletons'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreSettingsHelper, CoreSiteSpaceUsage } from '../../services/settings-helper'; @@ -129,16 +127,6 @@ export class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy { } } - /** - * Show information about space usage actions. - */ - showInfo(): void { - CoreDomUtils.showAlert( - Translate.instant('core.help'), - Translate.instant('core.settings.spaceusagehelp'), - ); - } - /** * Page destroyed. */ diff --git a/src/core/features/settings/services/settings-helper.ts b/src/core/features/settings/services/settings-helper.ts index 4dfc9eb3e..d8b845583 100644 --- a/src/core/features/settings/services/settings-helper.ts +++ b/src/core/features/settings/services/settings-helper.ts @@ -116,10 +116,13 @@ export class CoreSettingsHelperProvider { siteName = await CoreFilter.formatText(siteName, { clean: true, singleLine: true, filter: false }, [], siteId); - const title = Translate.instant('core.settings.deletesitefilestitle'); - const message = Translate.instant('core.settings.deletesitefiles', { sitename: siteName }); + const title = Translate.instant('addon.storagemanager.confirmdeleteallsitedata'); - await CoreDomUtils.showConfirm(message, title, Translate.instant('core.delete')); + await CoreDomUtils.showDeleteConfirm( + 'addon.storagemanager.deleteallsitedatainfo', + { name: siteName }, + { header: title }, + ); const site = await CoreSites.getSite(siteId); @@ -143,7 +146,7 @@ export class CoreSettingsHelperProvider { siteInfo.spaceUsage = 0; } else { // Error, recalculate the site usage. - CoreDomUtils.showErrorModal('core.settings.errordeletesitefiles', true); + CoreDomUtils.showErrorModal('addon.storagemanager.errordeletedownloadeddata', true); siteInfo.spaceUsage = await site.getSpaceUsage(); } diff --git a/src/core/features/tag/components/list/list.scss b/src/core/features/tag/components/list/list.scss index 27ddaad8b..1f8205861 100644 --- a/src/core/features/tag/components/list/list.scss +++ b/src/core/features/tag/components/list/list.scss @@ -5,6 +5,7 @@ ion-badge { cursor: pointer; - @include margin-horizontal(4px, 4px); + margin-left: 4px; + margin-right: 4px; } } diff --git a/src/core/features/user/pages/about/about.scss b/src/core/features/user/pages/about/about.scss index b3e2bb2ec..1ed9a0b9f 100644 --- a/src/core/features/user/pages/about/about.scss +++ b/src/core/features/user/pages/about/about.scss @@ -1,5 +1,3 @@ -@import "~theme/globals"; - :host { .core-user-profile-maininfo::part(native) { @@ -41,7 +39,8 @@ .core-user-profile-interests { ion-badge { cursor: pointer; - @include margin-horizontal(3px, 3px); + margin-left: 4px; + margin-right: 4px; } } diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index 0dbd3e638..9d2076256 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -1269,15 +1269,34 @@ export class CoreDomUtilsProvider { showDeleteConfirm( translateMessage: string = 'core.areyousure', translateArgs: Record = {}, - options?: AlertOptions, + options: AlertOptions = {}, ): Promise { - return this.showConfirm( - Translate.instant(translateMessage, translateArgs), - undefined, - Translate.instant('core.delete'), - undefined, - options, - ); + return new Promise((resolve, reject): void => { + options.message = Translate.instant(translateMessage, translateArgs); + + options.buttons = [ + { + text: Translate.instant('core.cancel'), + role: 'cancel', + handler: () => { + reject(new CoreCanceledError('')); + }, + }, + { + text: Translate.instant('core.delete'), + role: 'destructive', + handler: () => { + resolve(); + }, + }, + ]; + + if (!options.header) { + options.cssClass = (options.cssClass || '') + ' core-nohead'; + } + + this.showAlertWithOptions(options, 0); + }); } /** diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss index 1cfaad8c7..1aa0b8c1e 100644 --- a/src/theme/components/format-text.scss +++ b/src/theme/components/format-text.scss @@ -543,6 +543,7 @@ core-rich-text-editor .core-rte-editor { padding: .75rem 1.25rem; margin-bottom: 1rem; border: 0 solid transparent; + border-radius: .5rem; } // Headings for larger alerts diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss index 21fe2d0dd..5ab1d48fb 100644 --- a/src/theme/globals.variables.scss +++ b/src/theme/globals.variables.scss @@ -90,7 +90,7 @@ $core-dashboard-logo: false !default; $core-always-show-main-menu: false !default; $core-format-text-never-shorten: false !default; -$core-show-courseimage-on-course: false !default; +$core-hide-courseimage-on-course: false !default; $core-hide-progress-on-course: false !default; $core-hide-progress-on-section-selector: false !default; diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 6a48add42..e890184f2 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -414,9 +414,10 @@ ion-alert { overflow: auto; border-radius: var(--border-radius) !important; - button.alert-button { - color: var(--primary); + button.alert-button.alert-button-role-destructive { + color: var(--danger); } + } .alert-message { @@ -673,23 +674,37 @@ body.core-iframe-fullscreen ion-router-outlet { // Message cards. ion-card.core-#{$color-name}-card { - --color-base: var(--ion-color-#{$color-name}); + --color-tint: var(--ion-color-#{$color-name}-tint); + --color-shade: var(--ion-color-#{$color-name}-shade); + --border-width: 0; - border-bottom: 3px solid var(--color-base); + --border-color: var(--color-tint); + --background: var(--color-tint); + --color: var(--color-shade); ion-item { + --background: var(--color-tint); + --color: var(--color-shade); --inner-border-width: 0px; + --border-width: 0px; + + ion-label, ion-label > p { + --color: var(--color-shade); + } } + ion-label { white-space: normal !important; } ion-icon { - color: var(--color-base); + color: var(--color-shade); + @include margin-horizontal(null, 16px); } } .item.core-#{$color-name}-item { --color-base: var(--ion-color-#{$color-name}); + --color-shade: var(--ion-color-#{$color-name}-shade); --border-width: 0 0 3px 0; --border-color: var(--color-base); @@ -1260,7 +1275,6 @@ ion-item.item-input ion-input.has-focus { ion-item-divider.item, ion-item.item.divider { - --inner-padding-end: 8px; min-height: var(--min-height); border-bottom-width: var(--item-divider-border-width); --border-width: var(--item-divider-border-width); diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss index 9f06651c1..206f6e2d4 100644 --- a/src/theme/theme.dark.scss +++ b/src/theme/theme.dark.scss @@ -69,6 +69,7 @@ --core-header-toolbar-background: var(--gray-900); --core-header-toolbar-color: var(--white); + --core-header-toolbar-border-color: var(--stroke); --core-tabs-background: var(--gray-800); --core-tab-background: var(--core-tabs-background);