diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html index 74bcc59ab..3a5789600 100644 --- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html @@ -61,7 +61,7 @@ - + {{'core.groupsseparate' | translate }} diff --git a/src/addons/mod/data/pages/index/index.html b/src/addons/mod/data/pages/index/index.html index cd9d63d28..d9d8edfcf 100644 --- a/src/addons/mod/data/pages/index/index.html +++ b/src/addons/mod/data/pages/index/index.html @@ -14,7 +14,7 @@ - + diff --git a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html index 0b14cbaa0..b2b61caa4 100644 --- a/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html +++ b/src/addons/mod/workshop/components/index/addon-mod-workshop-index.html @@ -33,7 +33,7 @@ (completionChanged)="onCompletionChange()"> - + {{ phases[workshop!.phase].title }} @@ -95,7 +95,7 @@ - + {{ 'addon.mod_workshop.yourgrades' | translate }} @@ -128,30 +128,26 @@ + + + + {{ 'addon.mod_workshop.yoursubmission' | translate }} + + + {{ 'addon.mod_workshop.yoursubmissionwithassessments' | translate }} + + + - {{ 'addon.mod_workshop.yoursubmission' | translate }} - {{ 'addon.mod_workshop.noyoursubmission' | translate }} + {{ 'addon.mod_workshop.noyoursubmission' | translate }} + + - - - - {{ 'addon.mod_workshop.yoursubmission' | translate }} - - {{ 'addon.mod_workshop.yoursubmissionwithassessments' | translate }} - - - - - - - - - - + @@ -164,10 +160,11 @@ - + + = PHASE_CLOSED"> - + {{ 'addon.mod_workshop.publishedsubmissions' | translate }} @@ -193,7 +190,7 @@ - + {{ 'addon.mod_workshop.assignedassessments' | translate }} @@ -210,7 +207,7 @@ - = PHASE_SUBMISSION && + = PHASE_SUBMISSION && ((grades && grades.length) || (groupInfo && (groupInfo.separateGroups || groupInfo.visibleGroups)))"> diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts index 4f3717f4a..d47607361 100644 --- a/src/addons/mod/workshop/components/index/index.ts +++ b/src/addons/mod/workshop/components/index/index.ts @@ -434,7 +434,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity this.phases![AddonModWorkshopPhase.PHASE_SUBMISSION].tasks, ); - this.showSubmit = this.workshop!.phase == AddonModWorkshopPhase.PHASE_SUBMISSION && this.canSubmit && + this.showSubmit = this.canSubmit && ((this.access!.creatingsubmissionallowed && !this.submission) || (this.access!.modifyingsubmissionallowed && !!this.submission)); diff --git a/src/addons/mod/workshop/pages/index/index.html b/src/addons/mod/workshop/pages/index/index.html index 4c9704015..fded8cdc1 100644 --- a/src/addons/mod/workshop/pages/index/index.html +++ b/src/addons/mod/workshop/pages/index/index.html @@ -13,7 +13,7 @@ - + diff --git a/src/core/features/mainmenu/pages/more/more.scss b/src/core/features/mainmenu/pages/more/more.scss new file mode 100644 index 000000000..ce358f133 --- /dev/null +++ b/src/core/features/mainmenu/pages/more/more.scss @@ -0,0 +1,17 @@ +ion-item { + --border-color: var(--core-more-item-border, + var(--ion-item-border-color, + var(--ion-border-color, + var(--ion-color-step-150, + rgba(0, 0, 0, 0.13))))); + + ion-icon { + color: var(--core-more-icon, rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.54)); + } +} + +:host-context(ion-app.ios) { + ion-item ion-icon { + color: var(--core-more-icon, inherit); + } +} diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts index 42dafbdfb..6eb72b24d 100644 --- a/src/core/features/mainmenu/pages/more/more.ts +++ b/src/core/features/mainmenu/pages/more/more.ts @@ -34,6 +34,7 @@ import { Translate } from '@singletons'; @Component({ selector: 'page-core-mainmenu-more', templateUrl: 'more.html', + styleUrls: ['more.scss'], }) export class CoreMainMenuMorePage implements OnInit, OnDestroy { diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss index deecb2f0a..d4d9c27fd 100644 --- a/src/theme/globals.variables.scss +++ b/src/theme/globals.variables.scss @@ -250,3 +250,6 @@ $addon-forum-highlight-color: $gray-lighter !default; $addon-forum-border-color-dark: $gray-darker !default; $addon-forum-highlight-color-dark: $gray-dark !default; + +$core-more-icon: null !default; +$core-more-item-border: null !default; diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss index 291a0a027..a691002fa 100644 --- a/src/theme/theme.light.scss +++ b/src/theme/theme.light.scss @@ -244,4 +244,11 @@ --core-dd-question-selected-shadow: 2px 2px 4px var(--gray-dark); + @if ($core-more-icon) { + --core-more-icon: #{$core-more-icon}; + } + + @if ($core-more-item-border) { + --core-more-item-border: #{$core-more-item-border}; + } }
{{ 'addon.mod_workshop.noyoursubmission' | translate }}