diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html index 7ce5ba25e..c8de82b17 100644 --- a/src/addon/calendar/pages/event/event.html +++ b/src/addon/calendar/pages/event/event.html @@ -55,7 +55,7 @@ {{ 'addon.calendar.notifications' | translate }} - + {{ 'core.defaultvalue' | translate :{$a: defaultTimeReadable} }} {{ 'core.settings.disabled' | translate }} {{ 600 | coreDuration }} diff --git a/src/addon/calendar/pages/settings/settings.html b/src/addon/calendar/pages/settings/settings.html index 87a7996da..095708be3 100644 --- a/src/addon/calendar/pages/settings/settings.html +++ b/src/addon/calendar/pages/settings/settings.html @@ -7,7 +7,7 @@ {{ 'addon.calendar.defaultnotificationtime' | translate }} - + {{ 'core.settings.disabled' | translate }} {{ 600 | coreDuration }} {{ 1800 | coreDuration }} diff --git a/src/addon/files/pages/list/list.html b/src/addon/files/pages/list/list.html index 1f2a23f71..360a36e70 100644 --- a/src/addon/files/pages/list/list.html +++ b/src/addon/files/pages/list/list.html @@ -10,7 +10,7 @@ -
+
{{ 'addon.files.privatefiles' | translate }} {{ 'addon.files.sitefiles' | translate }} diff --git a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html index adc60f8de..9d64740ec 100644 --- a/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html +++ b/src/addon/mod/assign/components/submission/addon-mod-assign-submission.html @@ -156,7 +156,7 @@

{{ 'addon.mod_assign.grade' | translate }}

- + {{grade.label}}
@@ -164,7 +164,7 @@

{{ outcome.name }}

- + {{grade.label}}

{{ outcome.selected }}

diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html index e44f6bcba..18ddc9354 100644 --- a/src/addon/mod/data/components/index/addon-mod-data-index.html +++ b/src/addon/mod/data/components/index/addon-mod-data-index.html @@ -29,7 +29,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html b/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html index 8006a3fdb..9c7932220 100644 --- a/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html +++ b/src/addon/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html @@ -1,6 +1,6 @@ - + {{option.key}} diff --git a/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html b/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html index 9a9357500..53dabd14c 100644 --- a/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html +++ b/src/addon/mod/data/fields/menu/component/addon-mod-data-field-menu.html @@ -1,6 +1,6 @@ - + {{ 'addon.mod_data.menuchoose' | translate }} {{option}} diff --git a/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html b/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html index e1d9081ba..8acf2c8c5 100644 --- a/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html +++ b/src/addon/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html @@ -1,6 +1,6 @@ - + {{option.key}} diff --git a/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html b/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html index 9a9357500..53dabd14c 100644 --- a/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html +++ b/src/addon/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html @@ -1,6 +1,6 @@ - + {{ 'addon.mod_data.menuchoose' | translate }} {{option}} diff --git a/src/addon/mod/data/pages/edit/edit.html b/src/addon/mod/data/pages/edit/edit.html index 2accfb5f3..7f34748e7 100644 --- a/src/addon/mod/data/pages/edit/edit.html +++ b/src/addon/mod/data/pages/edit/edit.html @@ -13,7 +13,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/data/pages/entry/entry.html b/src/addon/mod/data/pages/entry/entry.html index 8d1ee2a9e..a23353f2a 100644 --- a/src/addon/mod/data/pages/entry/entry.html +++ b/src/addon/mod/data/pages/entry/entry.html @@ -17,7 +17,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/data/pages/search/search.html b/src/addon/mod/data/pages/search/search.html index fcc6e1830..4af747ec6 100644 --- a/src/addon/mod/data/pages/search/search.html +++ b/src/addon/mod/data/pages/search/search.html @@ -20,7 +20,7 @@
{{ 'core.sortby' | translate }} - + {{field.name}} diff --git a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html index 544ba8255..152bc23c8 100644 --- a/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html +++ b/src/addon/mod/feedback/components/index/addon-mod-feedback-index.html @@ -47,7 +47,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/feedback/pages/form/form.html b/src/addon/mod/feedback/pages/form/form.html index 3d29e01bf..4a65c41c2 100644 --- a/src/addon/mod/feedback/pages/form/form.html +++ b/src/addon/mod/feedback/pages/form/form.html @@ -49,7 +49,7 @@ - + diff --git a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html index e269f5e31..12a3189ac 100644 --- a/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html +++ b/src/addon/mod/feedback/pages/nonrespondents/nonrespondents.html @@ -12,7 +12,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/feedback/pages/respondents/respondents.html b/src/addon/mod/feedback/pages/respondents/respondents.html index bee8066c9..115e9a13c 100644 --- a/src/addon/mod/feedback/pages/respondents/respondents.html +++ b/src/addon/mod/feedback/pages/respondents/respondents.html @@ -13,7 +13,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/forum/pages/new-discussion/new-discussion.html b/src/addon/mod/forum/pages/new-discussion/new-discussion.html index ab0e795c9..1003dd05a 100644 --- a/src/addon/mod/forum/pages/new-discussion/new-discussion.html +++ b/src/addon/mod/forum/pages/new-discussion/new-discussion.html @@ -23,7 +23,7 @@ {{ 'addon.mod_forum.group' | translate }} - + {{ group.name }} diff --git a/src/addon/mod/glossary/pages/edit/edit.html b/src/addon/mod/glossary/pages/edit/edit.html index af3412560..d76e0793b 100644 --- a/src/addon/mod/glossary/pages/edit/edit.html +++ b/src/addon/mod/glossary/pages/edit/edit.html @@ -19,7 +19,7 @@ {{ 'addon.mod_glossary.categories' | translate }} - + {{ category.name }} diff --git a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html index 2aca8f933..cc32f61e1 100644 --- a/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html +++ b/src/addon/mod/lesson/components/index/addon-mod-lesson-index.html @@ -110,7 +110,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/lesson/pages/player/player.html b/src/addon/mod/lesson/pages/player/player.html index a6a2c73c6..3bfc7dff9 100644 --- a/src/addon/mod/lesson/pages/player/player.html +++ b/src/addon/mod/lesson/pages/player/player.html @@ -97,7 +97,7 @@

- + {{option.label}} diff --git a/src/addon/mod/lesson/pages/user-retake/user-retake.html b/src/addon/mod/lesson/pages/user-retake/user-retake.html index afe8b48cc..1f28b5e6d 100644 --- a/src/addon/mod/lesson/pages/user-retake/user-retake.html +++ b/src/addon/mod/lesson/pages/user-retake/user-retake.html @@ -20,7 +20,7 @@ {{ 'addon.mod_lesson.attemptheader' | translate }} - + {{retake.label}} diff --git a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html index 7f6dcdbc8..fdd0eee67 100644 --- a/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html +++ b/src/addon/mod/scorm/components/index/addon-mod-scorm-index.html @@ -81,7 +81,7 @@ {{ 'addon.mod_scorm.organizations' | translate }} - + {{ org.title }} diff --git a/src/addon/mod/survey/components/index/addon-mod-survey-index.html b/src/addon/mod/survey/components/index/addon-mod-survey-index.html index 094b44471..4ad777c3a 100644 --- a/src/addon/mod/survey/components/index/addon-mod-survey-index.html +++ b/src/addon/mod/survey/components/index/addon-mod-survey-index.html @@ -64,7 +64,7 @@ - + {{ 'core.choose' | translate }} {{option}} @@ -80,7 +80,7 @@ {{question.num}}. {{ question.text }} - + {{option}} diff --git a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html index 07e2967a8..80195fbb5 100644 --- a/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html +++ b/src/addon/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html @@ -6,7 +6,7 @@ {{ 'addon.mod_workshop_assessment_accumulative.dimensiongradefor' | translate : {'$a': field.dimtitle } }} - + {{grade.label}} diff --git a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html index fbefcc6b9..1ae7628aa 100644 --- a/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html +++ b/src/addon/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html @@ -23,7 +23,7 @@ [maxSubmissions]="workshop.overallfeedbackfiles" [component]="component" [componentId]="componentId" [allowOffline]="true"> {{ 'addon.mod_workshop.assessmentweight' | translate }} - + {{w}} diff --git a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html index 5ac411c4f..bce2d0cbc 100644 --- a/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html +++ b/src/addon/mod/workshop/components/index/addon-mod-workshop-index.html @@ -143,7 +143,7 @@ {{ 'core.groupsseparate' | translate }} {{ 'core.groupsvisible' | translate }} - + {{groupOpt.name}} diff --git a/src/addon/mod/workshop/pages/assessment/assessment.html b/src/addon/mod/workshop/pages/assessment/assessment.html index 88392540f..4834ab4ca 100644 --- a/src/addon/mod/workshop/pages/assessment/assessment.html +++ b/src/addon/mod/workshop/pages/assessment/assessment.html @@ -44,7 +44,7 @@ {{ 'addon.mod_workshop.assessmentweight' | translate }} - + {{ w }} @@ -54,7 +54,7 @@ {{ 'addon.mod_workshop.gradinggradeover' | translate }} - + {{grade.label}} diff --git a/src/addon/mod/workshop/pages/submission/submission.html b/src/addon/mod/workshop/pages/submission/submission.html index 79b103899..7a77c3f44 100644 --- a/src/addon/mod/workshop/pages/submission/submission.html +++ b/src/addon/mod/workshop/pages/submission/submission.html @@ -81,7 +81,7 @@ {{ 'addon.mod_workshop.gradeover' | translate }} - + {{grade.label}} diff --git a/src/addon/notifications/pages/settings/settings.html b/src/addon/notifications/pages/settings/settings.html index f5dd5cdb3..f6fea7a20 100644 --- a/src/addon/notifications/pages/settings/settings.html +++ b/src/addon/notifications/pages/settings/settings.html @@ -35,7 +35,7 @@
- + {{ processor.displayname }}
diff --git a/src/addon/qtype/calculated/component/addon-qtype-calculated.html b/src/addon/qtype/calculated/component/addon-qtype-calculated.html index db25e4f4b..144d02c03 100644 --- a/src/addon/qtype/calculated/component/addon-qtype-calculated.html +++ b/src/addon/qtype/calculated/component/addon-qtype-calculated.html @@ -40,7 +40,7 @@ - + {{option.label}} diff --git a/src/addon/qtype/match/component/addon-qtype-match.html b/src/addon/qtype/match/component/addon-qtype-match.html index cfa627279..b392ef3b4 100644 --- a/src/addon/qtype/match/component/addon-qtype-match.html +++ b/src/addon/qtype/match/component/addon-qtype-match.html @@ -10,7 +10,7 @@ - + {{option.label}} diff --git a/src/addon/remotethemes/providers/remotethemes.ts b/src/addon/remotethemes/providers/remotethemes.ts index ceebbf659..f0555d656 100644 --- a/src/addon/remotethemes/providers/remotethemes.ts +++ b/src/addon/remotethemes/providers/remotethemes.ts @@ -61,7 +61,9 @@ export class AddonRemoteThemesProvider { hash: '' }; - return this.load(siteId, true); + return this.load(siteId, true).catch((error) => { + this.logger.error('Error loading site after site init', error); + }); } /** diff --git a/src/addon/remotethemes/remotethemes.module.ts b/src/addon/remotethemes/remotethemes.module.ts index 72475434b..4330cc9a8 100644 --- a/src/addon/remotethemes/remotethemes.module.ts +++ b/src/addon/remotethemes/remotethemes.module.ts @@ -102,7 +102,9 @@ export class AddonRemoteThemesModule { // Load temporary styles when site config is checked in login. eventsProvider.on(CoreEventsProvider.LOGIN_SITE_CHECKED, (data) => { - remoteThemesProvider.loadTmpStyles(data.config.mobilecssurl); + remoteThemesProvider.loadTmpStyles(data.config.mobilecssurl).catch((error) => { + logger.error('Error loading tmp styles', error); + }); }); // Unload temporary styles when site config is "unchecked" in login. diff --git a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html index 351812d26..dcde5daa8 100644 --- a/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html +++ b/src/addon/userprofilefield/menu/component/addon-user-profile-field-menu.html @@ -6,7 +6,7 @@ {{ field.name }} - + {{ 'core.choosedots' | translate }} {{option}} diff --git a/src/app/app.md.scss b/src/app/app.md.scss index de8eefcf1..ef972d724 100644 --- a/src/app/app.md.scss +++ b/src/app/app.md.scss @@ -55,4 +55,29 @@ ion-app.app-root.md { .card-md.with-borders .item-md:last-child .item-inner { border-bottom: 0; } + + .action-sheet-md { + .action-sheet-title, + .action-sheet-container > .action-sheet-group:first-child { + box-shadow: 0 3px 5px $gray; + } + + .action-sheet-title { + padding-top: 0; + margin-top: $action-sheet-md-title-padding-top; + } + .action-sheet-cancel { + color: $red; + } + + .action-sheet-wrapper { + bottom: 0; + top: initial; + max-height: 50%; + height: 100%; + } + .action-sheet-selected { + color: $core-color; + } + } } \ No newline at end of file diff --git a/src/components/site-picker/core-site-picker.html b/src/components/site-picker/core-site-picker.html index c10dbe49f..9cae3ec3a 100644 --- a/src/components/site-picker/core-site-picker.html +++ b/src/components/site-picker/core-site-picker.html @@ -1,6 +1,6 @@ {{ 'core.site' | translate }} - + {{ site.fullNameAndSiteName }} diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index b96233d70..52a88d4bb 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -28,7 +28,7 @@ {{ 'core.login.selectsite' | translate }} - + {{site.name}} diff --git a/src/core/settings/pages/general/general.html b/src/core/settings/pages/general/general.html index d313a9d76..2358295de 100644 --- a/src/core/settings/pages/general/general.html +++ b/src/core/settings/pages/general/general.html @@ -6,7 +6,7 @@

{{ 'core.settings.language' | translate }}

- + {{ languages[code] }}
diff --git a/src/providers/file.ts b/src/providers/file.ts index 6b7469f32..00378507b 100644 --- a/src/providers/file.ts +++ b/src/providers/file.ts @@ -79,9 +79,9 @@ export class CoreFileProvider { return this.platform.ready().then(() => { if (this.platform.is('android')) { - this.basePath = this.file.externalApplicationStorageDirectory; + this.basePath = this.file.externalApplicationStorageDirectory || this.basePath; } else if (this.platform.is('ios')) { - this.basePath = this.file.documentsDirectory; + this.basePath = this.file.documentsDirectory || this.basePath; } else if (!this.isAvailable() || this.basePath === '') { this.logger.error('Error getting device OS.'); @@ -453,7 +453,7 @@ export class CoreFileProvider { }; setTimeout(() => { if (!hasStarted) { - reject(); + reject('Upload cannot start.'); } }, 3000); diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 988743546..787e6f854 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -113,6 +113,12 @@ $refresher-icon-color: $core-color !default; $core-online-color: #5cb85c; +$core-select-placeholder-color: $core-color !default; +$item-avatar-size: 54px !default; +$input-select-opacity: .5 !default; +$note-color: $gray-dark !default; +$popover-width: 280px !default; + // Moodle Mobile variables // -------------------------------------------------- @@ -137,14 +143,13 @@ $core-login-box-background-border: $gray !default; $core-login-box-text-color: $text-color !default; $core-login-button-outline: false !default; $core-login-loading-color: false !default; -$core-select-placeholder-color: $core-color; // App iOS Variables // -------------------------------------------------- // iOS only Sass variables can go here $text-input-ios-show-focus-highlight: false; -$item-ios-avatar-size: 54px; +$item-ios-avatar-size: $item-avatar-size; $loading-ios-spinner-color: $core-loading-spinner-color; $spinner-ios-ios-color: $core-spinner-color; $tabs-ios-tab-color-inactive: $tabs-tab-color-inactive; @@ -152,10 +157,11 @@ $button-ios-outline-background-color: $core-button-outline-background-color; $toolbar-ios-height: 44px + 8; // Avoid toolbar with different heights. $checkbox-ios-icon-border-radius: 0px !default; $select-ios-placeholder-color: $core-select-placeholder-color; -$radio-ios-disabled-opacity: .5 !default; -$checkbox-ios-disabled-opacity: .5 !default; -$toggle-ios-disabled-opacity: .5 !default; -$note-ios-color: $gray-dark; +$radio-ios-disabled-opacity: $input-select-opacity !default; +$checkbox-ios-disabled-opacity: $input-select-opacity !default; +$toggle-ios-disabled-opacity: $input-select-opacity !default; +$note-ios-color: $note-color; +$popover-ios-width: $popover-width; // App Material Design Variables // -------------------------------------------------- @@ -163,7 +169,7 @@ $note-ios-color: $gray-dark; $text-input-md-show-focus-highlight: true; $item-md-detail-push-show: true; -$item-md-avatar-size: 54px; +$item-md-avatar-size: $item-avatar-size; $loading-md-spinner-color: $core-loading-spinner-color; $spinner-md-crescent-color: $core-spinner-color; $tabs-md-tab-color-inactive: $tabs-tab-color-inactive; @@ -171,10 +177,12 @@ $button-md-outline-background-color: $core-button-outline-background-color; $font-family-md-base: "Roboto", "Noto Sans", "Helvetica Neue", sans-serif !default; $select-md-placeholder-color: $core-select-placeholder-color; $label-md-text-color: $text-color !default; -$radio-md-disabled-opacity: .5 !default; -$checkbox-md-disabled-opacity: .5 !default; -$toggle-md-disabled-opacity: .5 !default; -$note-md-color: $gray-dark; +$radio-md-disabled-opacity: $input-select-opacity !default; +$checkbox-md-disabled-opacity: $input-select-opacity !default; +$toggle-md-disabled-opacity: $input-select-opacity !default; +$note-md-color: $note-color; +$popover-md-width: $popover-width; +$action-sheet-md-title-color: $core-color; // App Windows Variables // -------------------------------------------------- @@ -182,17 +190,18 @@ $note-md-color: $gray-dark; $text-input-wp-show-focus-highlight: true; $item-wp-detail-push-show: true; -$item-wp-avatar-size: 54px; +$item-wp-avatar-size: $item-avatar-size; $loading-wp-spinner-color: $core-loading-spinner-color; $spinner-wp-circles-color: $core-spinner-color; $tabs-wp-tab-color-inactive: $tabs-tab-color-inactive; $button-wp-outline-background-color: $core-button-outline-background-color; $select-wp-placeholder-color: $core-select-placeholder-color; $label-wp-text-color: $text-color !default; -$radio-wp-disabled-opacity: .5 !default; -$checkbox-wp-disabled-opacity: .5 !default; -$toggle-wp-disabled-opacity: .5 !default; -$note-wp-color: $gray-dark; +$radio-wp-disabled-opacity: $input-select-opacity !default; +$checkbox-wp-disabled-opacity: $input-select-opacity !default; +$toggle-wp-disabled-opacity: $input-select-opacity !default; +$note-wp-color: $note-color; +$popover-wp-width: $popover-width; // App Theme // --------------------------------------------------