Merge pull request #2259 from crazyserver/MOBILE-3313

Mobile 3313

Author: jleyva

licenses.json

@@ -73,12 +73,6 @@
     "@ionic-native/zip": "^4.17.0",
     "@ngx-translate/core": "^8.0.0",
     "@ngx-translate/http-loader": "^2.0.1",
-    "@types/cordova": "^0.0.34",
-    "@types/cordova-plugin-file-transfer": "^0.0.3",
-    "@types/cordova-plugin-globalization": "^0.0.3",
-    "@types/cordova-plugin-network-information": "^0.0.3",
-    "@types/node": "^8.10.19",
-    "@types/promise.prototype.finally": "^2.0.2",
     "ajv": "^6.10.2",
     "chart.js": "^2.7.2",
     "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
@@ -127,6 +121,12 @@
   },
   "devDependencies": {
     "@ionic/app-scripts": "3.2.2",
+    "@types/cordova": "^0.0.34",
+    "@types/cordova-plugin-file-transfer": "^0.0.3",
+    "@types/cordova-plugin-globalization": "^0.0.3",
+    "@types/cordova-plugin-network-information": "^0.0.3",
+    "@types/node": "^8.10.19",
+    "@types/promise.prototype.finally": "^2.0.2",
     "electron-builder-lib": "^20.23.1",
     "electron-rebuild": "^1.8.1",
     "gulp": "4.0.2",

package-lock.json

@@ -19,6 +19,40 @@ if [ "$TRAVIS_BRANCH" == 'master' ] && [ ! -z $GIT_TOKEN ] && [ "$TRAVIS_REPO_SL
     git add */en.json
     git add src/config.json
     git commit -m 'Update lang files [ci skip]'
+
+    print_title "Update Licenses"
+    npm install -g license-checker
+
+    jq --version
+    license-checker --json --production --relativeLicensePath > licenses.json
+    jq 'del(.[].path)' licenses.json > licenses_old.json
+    mv licenses_old.json licenses.json
+    licenses=`jq -r 'keys[]' licenses.json`
+    echo "{" > licensesurl.json
+    first=1
+    for license in $licenses; do
+        obj=`jq --arg lic $license '.[$lic]' licenses.json`
+        licensePath=`echo $obj | jq -r '.licenseFile'`
+        file=""
+        if [[ ! -z "$licensePath" ]] || [[ "$licensePath" != "null" ]]; then
+            file=$(basename $licensePath)
+            if [ $first -eq 1 ] ; then
+                first=0
+                echo "\"$license\" : { \"licenseFile\" : \"$file\"}" >> licensesurl.json
+            else
+                echo ",\"$license\" : { \"licenseFile\" : \"$file\"}" >> licensesurl.json
+            fi
+        fi
+    done
+    echo "}" >> licensesurl.json
+
+    jq -s '.[0] * .[1]' licenses.json licensesurl.json > licenses_old.json
+    mv licenses_old.json licenses.json
+    rm licensesurl.json
+
+    git add licenses.json
+    git commit -m 'Update licenses [ci skip]'
+
     git push origin HEAD:$TRAVIS_BRANCH
 fi
 

package.json

@@ -1322,12 +1322,12 @@
   "core.all": "moodle",
   "core.allgroups": "moodle",
   "core.allparticipants": "moodle",
-  "core.android": "local_moodlemobileapp",
   "core.answer": "moodle",
   "core.answered": "quiz",
   "core.areyousure": "moodle",
   "core.back": "moodle",
   "core.block.blocks": "moodle",
+  "core.browser": "local_moodlemobileapp",
   "core.cancel": "moodle",
   "core.cannotconnect": "local_moodlemobileapp",
   "core.cannotdownloadfiles": "local_moodlemobileapp",
@@ -1465,6 +1465,7 @@
   "core.deleteduser": "bulkusers",
   "core.deleting": "local_moodlemobileapp",
   "core.description": "moodle",
+  "core.desktop": "local_moodlemobileapp",
   "core.dfdaymonthyear": "local_moodlemobileapp",
   "core.dfdayweekmonth": "local_moodlemobileapp",
   "core.dffulldate": "local_moodlemobileapp",
@@ -1651,7 +1652,6 @@
   "core.imageviewer": "local_moodlemobileapp",
   "core.info": "moodle",
   "core.invalidformdata": "error",
-  "core.ios": "local_moodlemobileapp",
   "core.labelsep": "langconfig",
   "core.lastaccess": "moodle",
   "core.lastdownloaded": "local_moodlemobileapp",
@@ -1890,14 +1890,15 @@
   "core.sending": "chat",
   "core.serverconnection": "error",
   "core.settings.about": "local_moodlemobileapp",
-  "core.settings.appready": "local_moodlemobileapp",
+  "core.settings.appversion": "local_moodlemobileapp",
   "core.settings.cannotsyncoffline": "local_moodlemobileapp",
   "core.settings.cannotsyncwithoutwifi": "local_moodlemobileapp",
   "core.settings.colorscheme": "local_moodlemobileapp",
   "core.settings.colorscheme-auto": "local_moodlemobileapp",
   "core.settings.colorscheme-dark": "local_moodlemobileapp",
   "core.settings.colorscheme-light": "local_moodlemobileapp",
   "core.settings.compilationinfo": "local_moodlemobileapp",
+  "core.settings.copyinfo": "local_moodlemobileapp",
   "core.settings.cordovadevicemodel": "local_moodlemobileapp",
   "core.settings.cordovadeviceosversion": "local_moodlemobileapp",
   "core.settings.cordovadeviceplatform": "local_moodlemobileapp",
@@ -1910,7 +1911,6 @@
   "core.settings.deletesitefilestitle": "local_moodlemobileapp",
   "core.settings.deviceinfo": "local_moodlemobileapp",
   "core.settings.deviceos": "local_moodlemobileapp",
-  "core.settings.devicewebworkers": "local_moodlemobileapp",
   "core.settings.disableall": "message",
   "core.settings.disabled": "lesson",
   "core.settings.displayformat": "local_moodlemobileapp",
@@ -1939,19 +1939,21 @@
   "core.settings.navigatorlanguage": "local_moodlemobileapp",
   "core.settings.navigatoruseragent": "local_moodlemobileapp",
   "core.settings.networkstatus": "local_moodlemobileapp",
+  "core.settings.opensourcelicenses": "local_moodlemobileapp",
   "core.settings.privacypolicy": "local_moodlemobileapp",
+  "core.settings.publisher": "local_moodlemobileapp",
   "core.settings.pushid": "local_moodlemobileapp",
   "core.settings.reportinbackground": "local_moodlemobileapp",
+  "core.settings.screen": "local_moodlemobileapp",
   "core.settings.settings": "moodle",
   "core.settings.showdownloadoptions": "local_moodlemobileapp",
+  "core.settings.siteinfo": "local_moodlemobileapp",
   "core.settings.sites": "moodle",
   "core.settings.spaceusage": "local_moodlemobileapp",
   "core.settings.synchronization": "local_moodlemobileapp",
   "core.settings.synchronizenow": "local_moodlemobileapp",
   "core.settings.syncsettings": "local_moodlemobileapp",
   "core.settings.total": "moodle",
-  "core.settings.versioncode": "local_moodlemobileapp",
-  "core.settings.versionname": "local_moodlemobileapp",
   "core.settings.wificonnection": "local_moodlemobileapp",
   "core.sharedfiles.chooseaccountstorefile": "local_moodlemobileapp",
   "core.sharedfiles.chooseactionrepeatedfile": "local_moodlemobileapp",
@@ -2069,7 +2071,6 @@
   "core.whoops": "local_moodlemobileapp",
   "core.whyisthishappening": "local_moodlemobileapp",
   "core.whyisthisrequired": "moodle",
-  "core.windowsphone": "local_moodlemobileapp",
   "core.wsfunctionnotavailable": "local_moodlemobileapp",
   "core.year": "moodle",
   "core.years": "moodle",

scripts/aot.sh

@@ -205,6 +205,10 @@ ion-app.app-root {
     background-color: $gray-light;
   }
 
+  ion-note.core-note-block {
+    display: block;
+  }
+
   // Form items
   // -------------------------
 

scripts/langindex.json

@@ -1322,12 +1322,12 @@
     "core.all": "All",
     "core.allgroups": "All groups",
     "core.allparticipants": "All participants",
-    "core.android": "Android",
     "core.answer": "Answer",
     "core.answered": "Answered",
     "core.areyousure": "Are you sure?",
     "core.back": "Back",
     "core.block.blocks": "Blocks",
+    "core.browser": "Browser",
     "core.cancel": "Cancel",
     "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.",
     "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
@@ -1465,6 +1465,7 @@
     "core.deleteduser": "Deleted user",
     "core.deleting": "Deleting",
     "core.description": "Description",
+    "core.desktop": "Desktop",
     "core.dfdaymonthyear": "MM-DD-YYYY",
     "core.dfdayweekmonth": "ddd, D MMM",
     "core.dffulldate": "dddd, D MMMM YYYY h[:]mm A",
@@ -1651,7 +1652,6 @@
     "core.imageviewer": "Image viewer",
     "core.info": "Information",
     "core.invalidformdata": "Incorrect form data",
-    "core.ios": "iOS",
     "core.labelsep": ":",
     "core.lastaccess": "Last access",
     "core.lastdownloaded": "Last downloaded",
@@ -1890,14 +1890,15 @@
     "core.sending": "Sending",
     "core.serverconnection": "Error connecting to the server",
     "core.settings.about": "About",
-    "core.settings.appready": "App ready",
+    "core.settings.appversion": "App version",
     "core.settings.cannotsyncoffline": "Cannot synchronise offline.",
     "core.settings.cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
     "core.settings.colorscheme": "Color Scheme",
     "core.settings.colorscheme-auto": "Auto (based on system settings)",
     "core.settings.colorscheme-dark": "Dark",
     "core.settings.colorscheme-light": "Light",
     "core.settings.compilationinfo": "Compilation info",
+    "core.settings.copyinfo": "Copy device info on the clipboard",
     "core.settings.cordovadevicemodel": "Cordova device model",
     "core.settings.cordovadeviceosversion": "Cordova device OS version",
     "core.settings.cordovadeviceplatform": "Cordova device platform",
@@ -1910,7 +1911,6 @@
     "core.settings.deletesitefilestitle": "Delete site files",
     "core.settings.deviceinfo": "Device info",
     "core.settings.deviceos": "Device OS",
-    "core.settings.devicewebworkers": "Device web workers supported",
     "core.settings.disableall": "Disable notifications",
     "core.settings.disabled": "Disabled",
     "core.settings.displayformat": "Display format",
@@ -1930,7 +1930,7 @@
     "core.settings.forcedsetting": "This setting has been forced by your site configuration.",
     "core.settings.general": "General",
     "core.settings.language": "Language",
-    "core.settings.license": "Licence",
+    "core.settings.license": "License",
     "core.settings.localnotifavailable": "Local notifications available",
     "core.settings.locationhref": "Web view URL",
     "core.settings.locked": "Locked",
@@ -1939,19 +1939,21 @@
     "core.settings.navigatorlanguage": "Navigator language",
     "core.settings.navigatoruseragent": "Navigator userAgent",
     "core.settings.networkstatus": "Internet connection status",
+    "core.settings.opensourcelicenses": "Open Source Licences",
     "core.settings.privacypolicy": "Privacy policy",
+    "core.settings.publisher": "Publisher",
     "core.settings.pushid": "Push notifications ID",
     "core.settings.reportinbackground": "Report errors automatically",
+    "core.settings.screen": "Screen information",
     "core.settings.settings": "Settings",
     "core.settings.showdownloadoptions": "Show download options",
+    "core.settings.siteinfo": "Site info",
     "core.settings.sites": "Sites",
     "core.settings.spaceusage": "Space usage",
     "core.settings.synchronization": "Synchronisation",
     "core.settings.synchronizenow": "Synchronise now",
     "core.settings.syncsettings": "Synchronisation settings",
     "core.settings.total": "Total",
-    "core.settings.versioncode": "Version code",
-    "core.settings.versionname": "Version name",
     "core.settings.wificonnection": "Wi-Fi connection",
     "core.sharedfiles.chooseaccountstorefile": "Choose an account to store the file in.",
     "core.sharedfiles.chooseactionrepeatedfile": "A file with this name already exists. Do you want to replace the existing file or rename it to \"{{$a}}\"?",
@@ -2069,7 +2071,6 @@
     "core.whoops": "Oops!",
     "core.whyisthishappening": "Why is this happening?",
     "core.whyisthisrequired": "Why is this required?",
-    "core.windowsphone": "Windows Phone",
     "core.wsfunctionnotavailable": "The web service function is not available.",
     "core.year": "year",
     "core.years": "years",

src/app/app.scss

@@ -8,8 +8,8 @@
         <a ion-item core-user-link [userId]="siteInfo.userid" text-wrap>
             <ion-avatar core-user-avatar [user]="siteInfo" item-start></ion-avatar>
             <h2>{{siteInfo.fullname}}</h2>
-            <ion-note><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true"></core-format-text></ion-note>
-            <ion-note>{{ siteUrl }}</ion-note>
+            <ion-note class="core-note-block"><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true"></core-format-text></ion-note>
+            <ion-note class="core-note-block">{{ siteUrl }}</ion-note>
         </a>
         <ion-item-divider></ion-item-divider>
         <ion-item text-center *ngIf="(!handlers || !handlers.length) && !handlersLoaded">

src/assets/lang/en.json

@@ -1,13 +1,14 @@
 {
     "about": "About",
-    "appready": "App ready",
+    "appversion": "App version",
     "cannotsyncoffline": "Cannot synchronise offline.",
     "cannotsyncwithoutwifi": "Cannot synchronise because the current settings only allow to synchronise when connected to Wi-Fi. Please connect to a Wi-Fi network.",
     "colorscheme": "Color Scheme",
     "colorscheme-auto": "Auto (based on system settings)",
     "colorscheme-dark": "Dark",
     "colorscheme-light": "Light",
     "compilationinfo": "Compilation info",
+    "copyinfo": "Copy device info on the clipboard",
     "cordovadevicemodel": "Cordova device model",
     "cordovadeviceosversion": "Cordova device OS version",
     "cordovadeviceplatform": "Cordova device platform",
@@ -20,7 +21,6 @@
     "deletesitefilestitle": "Delete site files",
     "deviceinfo": "Device info",
     "deviceos": "Device OS",
-    "devicewebworkers": "Device web workers supported",
     "disableall": "Disable notifications",
     "disabled": "Disabled",
     "displayformat": "Display format",
@@ -39,7 +39,8 @@
     "forcedsetting": "This setting has been forced by your site configuration.",
     "general": "General",
     "language": "Language",
-    "license": "Licence",
+    "license": "License",
+    "opensourcelicenses": "Open Source Licences",
     "localnotifavailable": "Local notifications available",
     "locationhref": "Web view URL",
     "locked": "Locked",
@@ -49,18 +50,19 @@
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Internet connection status",
     "privacypolicy": "Privacy policy",
+    "publisher": "Publisher",
     "pushid": "Push notifications ID",
     "reportinbackground": "Report errors automatically",
     "entriesincache": "{{$a}} entries in cache",
+    "screen": "Screen information",
     "settings": "Settings",
     "showdownloadoptions": "Show download options",
+    "siteinfo": "Site info",
     "sites": "Sites",
     "spaceusage": "Space usage",
     "synchronization": "Synchronisation",
     "synchronizenow": "Synchronise now",
     "syncsettings": "Synchronisation settings",
     "total": "Total",
-    "versioncode": "Version code",
-    "versionname": "Version name",
     "wificonnection": "Wi-Fi connection"
 }