Merge branch 'hotfix/4.0.2' into 'master'

Hotfix/4.0.2

See merge request Apps/ILIAS-Pegasus!85

branding/brands/vanilla/build.json

@@ -7,8 +7,8 @@
       "packageType": "development"
     },
     "release": {
-      "codeSignIdentity": "iPhone Distribution",
-      "provisioningProfile": "3a547757-0a57-4b9a-9327-c255bcda2afb",
+      "codeSignIdentity": "Apple Distribution",
+      "provisioningProfile": "ed4887a0-77cc-41cf-b9e4-1c78e36155b9",
       "developmentTeam": "ZQ66BZ3DPL",
       "packageType": "app-store"
     }

branding/brands/vanilla/config.json

@@ -1,5 +1,5 @@
 {
-  "ilias_installation_ids": [1,2,3,4,5,6,12,22,7,23],
+  "ilias_installation_ids": [1,2,3,4,5,6,12,22,7,23,32,33],
   "projectConfig": {
     "id": "ch.studerraimann.ilias.offline",
 

branding/common/i18n/de.json

@@ -168,7 +168,9 @@
         "instructions":"Wähle deine Installation.",
         "login": "Anmelden",
         "offline_title": "Keine Internetverbindung",
-        "offline_content": "Die Anmeldung kann nur mit einer Internetverbindung durchgeführt werden."
+        "offline_content": "Die Anmeldung kann nur mit einer Internetverbindung durchgeführt werden.",
+        "ok": "Auswählen",
+        "dismiss": "Abbrechen"
     },
     "object_type": {
         "crs" : "Kurs",

branding/common/i18n/en.json

@@ -167,7 +167,9 @@
         "instructions2":"Choose your institution",
         "login": "Login",
         "offline_title": "No Internet connection",
-        "offline_content": "In order to login, your device needs to be connected to the Internet."
+        "offline_content": "In order to login, your device needs to be connected to the Internet.",
+        "ok": "Select",
+        "dismiss": "Cancel"
     },
     "object_type": {
         "crs" : "Course",

branding/common/i18n/it.json

@@ -153,7 +153,11 @@
         "hello":"Benvenuto/a in ILIAS Pegasus!",
         "instructions":"Scegli la tua organizzazione",
         "instructions2":"Scegli la tua organizzazione",
-        "login": "Login"
+        "login": "Login",
+        "offline_title": "Nessuna connessione a Internet",
+        "offline_content": "Per poter effettuare il login, il dispositivo deve essere collegato a Internet.",
+        "ok": "Selezionare",
+        "dismiss": "Annulla"
     },
     "object_type": {
         "crs" : "Corso",

build.json

@@ -7,8 +7,8 @@
       "packageType": "development"
     },
     "release": {
-      "codeSignIdentity": "iPhone Distribution",
-      "provisioningProfile": "3a547757-0a57-4b9a-9327-c255bcda2afb",
+      "codeSignIdentity": "Apple Distribution",
+      "provisioningProfile": "ed4887a0-77cc-41cf-b9e4-1c78e36155b9",
       "developmentTeam": "ZQ66BZ3DPL",
       "packageType": "app-store"
     }

src/app/pages/login/login.html

@@ -11,7 +11,7 @@ <h1 class=huge-login-header text-center>{{ 'login.hello' | translate:[]}}</h1>
         <ion-row padding justify-content-center align-items-end	 class=login-institution-row>
             <ion-item color="primary">
                 <ion-label position="stacked" text-center></ion-label>
-                <ion-select [(ngModel)]="installationId" interface="action-sheet" text-center placeholder="{{ 'login.instructions' | translate:[]}}" >
+                <ion-select [(ngModel)]="installationId" interface="alert" text-center placeholder="{{ 'login.instructions' | translate:[]}}" okText="{{ 'login.ok' | translate:[]}}" cancelText="{{ 'login.dismiss' | translate:[]}}">
                     <ion-select-option *ngFor="let installation of installations" [value]="installation.id">{{ installation.title }}</ion-select-option>
                 </ion-select>
             </ion-item>