From 62af2b50d315b2045b8f64585a586e71758195ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 8 Oct 2018 14:44:20 +0200 Subject: [PATCH 1/2] MOBILE-2658 login: Do site selector scalable --- scripts/langindex.json | 1 + src/assets/lang/en.json | 1 + src/core/login/lang/en.json | 1 + src/core/login/pages/site/site.html | 46 ++++++++++++++++------------- src/core/login/pages/site/site.scss | 8 +++++ src/core/login/pages/site/site.ts | 27 +++++++++++++++-- 6 files changed, 62 insertions(+), 22 deletions(-) diff --git a/scripts/langindex.json b/scripts/langindex.json index d7e8ba27e..7689c8fca 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1269,6 +1269,7 @@ "core.fileuploader.uploading": "local_moodlemobileapp", "core.fileuploader.uploadingperc": "local_moodlemobileapp", "core.fileuploader.video": "local_moodlemobileapp", + "core.login.findyoursite": "local_moodlemobileapp", "core.folder": "moodle", "core.forcepasswordchangenotice": "moodle", "core.fulllistofcourses": "moodle", diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index c9f27817a..a64f93c9d 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -1328,6 +1328,7 @@ "core.login.erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "core.login.errordeletesite": "An error occurred while deleting this site. Please try again.", "core.login.errorupdatesite": "An error occurred while updating the site's token.", + "core.login.findyoursite": "Find your site", "core.login.firsttime": "Is this your first time here?", "core.login.forgotten": "Forgotten your username or password?", "core.login.getanothercaptcha": "Get another CAPTCHA", diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json index ec2e9c845..a459f61b9 100644 --- a/src/core/login/lang/en.json +++ b/src/core/login/lang/en.json @@ -17,6 +17,7 @@ "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "errordeletesite": "An error occurred while deleting this site. Please try again.", "errorupdatesite": "An error occurred while updating the site's token.", + "findyoursite": "Find your site", "firsttime": "Is this your first time here?", "forgotten": "Forgotten your username or password?", "getanothercaptcha": "Get another CAPTCHA", diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index ff637b8a8..b96233d70 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -17,33 +17,39 @@
-
+ -
+

{{ 'core.login.newsitedescription' | translate }}

-
+ - -
- - - {{ 'core.login.selectsite' | translate }} - - {{site.name}} - - + + {{ 'core.login.selectsite' | translate }} + + {{site.name}} + + - -
-

{{ 'core.login.selectsite' | translate }}

- {{site.name}} -
-
- - +
+ + +

{{ 'core.login.selectsite' | translate }}

+ + + +

{{site.name}}

+

{{site.url}}

+ + + + +
+

{{ 'core.login.selectsite' | translate }}

+ {{site.name}} +
diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss index 100ae86c3..cf296f1a4 100644 --- a/src/core/login/pages/site/site.scss +++ b/src/core/login/pages/site/site.scss @@ -36,4 +36,12 @@ ion-app.app-root page-core-login-site { .item-input:last-child { margin-bottom: 20px; } + + .searchbar-ios { + background: transparent; + + .searchbar-input { + background-color: $searchbar-ios-toolbar-input-background + } + } } \ No newline at end of file diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index dcd6752fb..1bbdb8856 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -32,8 +32,10 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; export class CoreLoginSitePage { siteForm: FormGroup; fixedSites: any[]; - displayAsButtons = false; + filteredSites: any[]; + fixedDisplay = 'buttons'; showKeyboard = false; + filter = ''; constructor(navParams: NavParams, private navCtrl: NavController, fb: FormBuilder, private appProvider: CoreAppProvider, private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider, @@ -46,7 +48,12 @@ export class CoreLoginSitePage { // Load fixed sites if they're set. if (this.loginHelper.hasSeveralFixedSites()) { this.fixedSites = this.loginHelper.getFixedSites(); - this.displayAsButtons = CoreConfigConstants.multisitesdisplay == 'buttons'; + this.fixedDisplay = CoreConfigConstants.multisitesdisplay; + // Autoselect if not defined. + if (['list', 'select', 'buttons'].indexOf(this.fixedDisplay) < 0) { + this.fixedDisplay = this.fixedSites.length > 8 ? 'list' : (this.fixedSites.length > 3 ? 'select' : 'buttons'); + } + this.filteredSites = this.fixedSites; url = this.fixedSites[0].url; } @@ -113,6 +120,22 @@ export class CoreLoginSitePage { } } + /** + * The filter has changed. + * + * @param {any} Received Event. + */ + filterChanged(event: any): void { + const newValue = event.target.value && event.target.value.trim().toLowerCase(); + if (!newValue || !this.fixedSites) { + this.filteredSites = this.fixedSites; + } else { + this.filteredSites = this.fixedSites.filter((site) => { + return site.name.toLowerCase().indexOf(newValue) > -1 || site.url.toLowerCase().indexOf(newValue) > -1; + }); + } + } + /** * Show a help modal. */ From e98834471d99d913a23f29370d2670001403f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 8 Oct 2018 16:07:06 +0200 Subject: [PATCH 2/2] MOBILE-2658 lang: Fix some languages --- scripts/langindex.json | 2 +- src/addon/mod/workshop/lang/en.json | 4 ++-- src/assets/lang/en.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/langindex.json b/scripts/langindex.json index 7689c8fca..e8a39aa49 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1153,7 +1153,7 @@ "core.course.couldnotloadsectioncontent": "local_moodlemobileapp", "core.course.couldnotloadsections": "local_moodlemobileapp", "core.course.coursesummary": "moodle", - "core.course.downloadcourse": "local_moodlemobileapp", + "core.course.downloadcourse": "tool_mobile", "core.course.errordownloadingcourse": "local_moodlemobileapp", "core.course.errordownloadingsection": "local_moodlemobileapp", "core.course.errorgetmodule": "local_moodlemobileapp", diff --git a/src/addon/mod/workshop/lang/en.json b/src/addon/mod/workshop/lang/en.json index 72d1d6a0d..3f994a544 100644 --- a/src/addon/mod/workshop/lang/en.json +++ b/src/addon/mod/workshop/lang/en.json @@ -53,8 +53,8 @@ "switchphase50": "Close workshop", "userplan": "Workshop planner", "userplancurrentphase": "Current phase", - "warningassessmentmodified": "The submission was modified on the site.", - "warningsubmissionmodified": "The assessment was modified on the site.", + "warningassessmentmodified": "The assessment was modified on the site.", + "warningsubmissionmodified": "The submission was modified on the site.", "weightinfo": "Weight: {{$a}}", "yourassessment": "Your assessment", "yourassessmentfor": "Your assessment for {{$a}}", diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index a64f93c9d..ba1ffd309 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -752,8 +752,8 @@ "addon.mod_workshop.switchphase50": "Close workshop", "addon.mod_workshop.userplan": "Workshop planner", "addon.mod_workshop.userplancurrentphase": "Current phase", - "addon.mod_workshop.warningassessmentmodified": "The submission was modified on the site.", - "addon.mod_workshop.warningsubmissionmodified": "The assessment was modified on the site.", + "addon.mod_workshop.warningassessmentmodified": "The assessment was modified on the site.", + "addon.mod_workshop.warningsubmissionmodified": "The submission was modified on the site.", "addon.mod_workshop.weightinfo": "Weight: {{$a}}", "addon.mod_workshop.yourassessment": "Your assessment", "addon.mod_workshop.yourassessmentfor": "Your assessment for {{$a}}",