About: Update footer and info page

Signed-off-by: Michael Mayer <michael@photoprism.app>
photoprism · Apr 29, 2023 · 6805aea · 6805aea
1 parent d0c400f
commit 6805aea
Show file tree

Hide file tree

Showing 52 changed files with 1,604 additions and 1,462 deletions.
diff --git a/frontend/src/common/config.js b/frontend/src/common/config.js
@@ -633,6 +633,16 @@ export default class Config {
     return this.getEdition() === "ce";
   }
 
+  getTier() {
+    const tier = this.get("tier");
+
+    if (!tier) {
+      return 0;
+    }
+
+    return tier;
+  }
+
   getMembership() {
     const s = this.get("membership");
 

diff --git a/frontend/src/component/footer.vue b/frontend/src/component/footer.vue
@@ -28,15 +28,13 @@ export default {
     const about = this.$config.getAbout();
     const membership = this.$config.getMembership();
     const customer = this.$config.getCustomer();
-    const evaluation = !customer;
 
     return {
       rtl: this.$rtl,
       build: build,
       about: about,
       membership: membership,
       customer: customer,
-      evaluation: evaluation,
       version: this.$config.getVersion(),
       isDemo: this.$config.isDemo(),
     };
@@ -47,18 +45,14 @@ export default {
         return " Demo";
       }
 
-      const m = this.$config.getMembership();
-      switch (m) {
-        case "":
-        case "ce":
-          return " CE";
-        case "cloud":
-          return " Cloud";
-        case "essentials":
-          return " Essentials";
-        default:
-          return " Plus";
+      const tier = this.$config.getTier();
+      if (tier < 4) {
+        return " CE";
+      } else if (tier === 4) {
+        return " Essentials";
       }
+
+      return "";
     },
   },
 };

diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue
@@ -493,7 +493,7 @@
               </v-list-tile-content>
             </v-list-tile>
 
-            <v-list-tile v-show="isSuperAdmin && !isPublic && !isDemo && featUpgrade" :to="{ name: 'upgrade' }" class="nav-upgrade" :exact="true" @click.stop="">
+            <v-list-tile v-show="featUpgrade" :to="{ name: 'upgrade' }" class="nav-upgrade" :exact="true" @click.stop="">
               <v-list-tile-content>
                 <v-list-tile-title :class="`menu-item ${rtl ? '--rtl' : ''}`">
                   <translate key="Upgrade">Upgrade</translate>
@@ -640,7 +640,7 @@
               <translate>Logs</translate>
             </router-link>
           </div>
-          <div v-if="!isPublic && !isSponsor && isAdmin" class="menu-action nav-membership">
+          <div v-if="featUpgrade" class="menu-action nav-membership">
             <router-link :to="{ name: 'upgrade' }">
               <v-icon>diamond</v-icon>
               <translate>Upgrade</translate>
@@ -701,6 +701,7 @@ export default {
     const isPublic = this.$config.get("public");
     const isReadOnly = this.$config.get("readonly");
     const isRestricted = this.$config.deny("photos", "access_library");
+    const isSuperAdmin = this.$session.isSuperAdmin();
 
     return {
       canSearchPlaces: this.$config.allow("places", "search"),
@@ -714,14 +715,14 @@ export default {
       appIcon: this.$config.getIcon(),
       indexing: false,
       drawer: null,
-      featUpgrade: this.$config.getMembership() === "ce",
+      featUpgrade: this.$config.getTier() < 8 && isSuperAdmin && !isPublic && !isDemo,
       isRestricted: isRestricted,
       isMini: localStorage.getItem('last_navigation_mode') !== 'false' || isRestricted,
       isDemo: isDemo,
       isPublic: isPublic,
       isReadOnly: isReadOnly,
       isAdmin: this.$session.isAdmin(),
-      isSuperAdmin: this.$session.isSuperAdmin(),
+      isSuperAdmin: isSuperAdmin,
       isSponsor: this.$config.isSponsor(),
       isTest: this.$config.test,
       session: this.$session,

diff --git a/frontend/src/locales/af.po b/frontend/src/locales/af.po
@@ -60,7 +60,7 @@ msgstr "'n Klik sal dit na jou knipbord kopieer."
 msgid "About"
 msgstr "Oor"
 
-#: src/component/navigation.vue:98 src/component/navigation.vue:1995
+#: src/component/navigation.vue:99 src/component/navigation.vue:1995
 #: src/dialog/share/upload.vue:108 src/model/service.js:98
 #: src/model/user.js:165 src/page/settings.vue:84
 #: src/page/settings/general.vue:473
@@ -91,11 +91,11 @@ msgstr "Aksie"
 msgid "Actions"
 msgstr "Aksies"
 
-#: src/page/connect.vue:92 src/page/connect.vue:97
+#: src/page/connect.vue:92 src/page/connect.vue:94
 msgid "Activate"
 msgstr "Aktiveer"
 
-#: src/page/connect.vue:388 src/page/connect.vue:422
+#: src/page/connect.vue:388 src/page/connect.vue:412
 msgid "Activation Code"
 msgstr "Aktiverings kode"
 
@@ -331,7 +331,7 @@ msgstr "Is jy seker?"
 msgid "Artist"
 msgstr "Kunstenaar"
 
-#: src/page/connect.vue:127
+#: src/page/connect.vue:124
 msgid "As this helps us provide more features to the public, we encourage all users to support our mission."
 msgstr "Aangesien dit ons help om meer kenmerke aan die publiek te verskaf, moedig ons alle gebruikers aan om ons missie te ondersteun."
 
@@ -406,7 +406,7 @@ msgstr "Fout verslag"
 msgid "Busy, please wait…"
 msgstr "Besig, wag asseblief…"
 
-#: src/page/connect.vue:107
+#: src/page/connect.vue:104
 msgid "By using the software and services we provide, you agree to our terms of service, privacy policy, and code of conduct."
 msgstr "Deur die sagteware en dienste wat ons verskaf te gebruik, stem jy in tot ons diensbepalings, privaatheidsbeleid en gedragskode."
 
@@ -446,8 +446,8 @@ msgstr "Kan nie meer items kies nie"
 #: src/dialog/photo/delete.vue:15 src/dialog/reload.vue:9
 #: src/dialog/service/add.vue:17 src/dialog/service/edit.vue:104
 #: src/dialog/service/remove.vue:15 src/dialog/share.vue:25
-#: src/dialog/share/upload.vue:29 src/page/library/import.vue:34
-#: src/page/library/index.vue:27
+#: src/dialog/share/upload.vue:29 src/page/connect.vue:41
+#: src/page/library/import.vue:34 src/page/library/index.vue:27
 msgid "Cancel"
 msgstr "Kanselleer"
 
@@ -521,7 +521,7 @@ msgstr "Kleur profiel"
 msgid "Colors"
 msgstr "Kleure"
 
-#: src/page/connect.vue:83 src/page/connect.vue:88
+#: src/page/connect.vue:83 src/page/connect.vue:85
 msgid "Compare Editions"
 msgstr "Vergelyk uitgawes"
 
@@ -542,7 +542,7 @@ msgstr "Koppel"
 msgid "Connect via WebDAV"
 msgstr "Koppel via WebDAV"
 
-#: src/page/connect.vue:62
+#: src/page/connect.vue:62 src/page/connect.vue:63
 msgid "Connected"
 msgstr "Gekoppel"
 
@@ -551,6 +551,7 @@ msgid "Contact Details"
 msgstr "Kontakbesonderhede"
 
 #: src/page/about/feedback.vue:4 src/page/connect.vue:47
+#: src/page/connect.vue:44
 msgid "Contact Us"
 msgstr "Kontak Ons"
 
@@ -1052,7 +1053,7 @@ msgstr "FPS"
 msgid "Frames"
 msgstr "Rame"
 
-#: src/page/connect.vue:112
+#: src/page/connect.vue:109
 msgid "Frequently Asked Questions"
 msgstr "Gereelde Vrae"
 
@@ -1240,15 +1241,16 @@ msgstr "Ongeldig"
 msgid "Invalid date"
 msgstr "Ongeldige datum"
 
-#: src/page/connect.vue:74 src/page/connect.vue:80
+#: src/page/connect.vue:74 src/page/connect.vue:80 src/page/connect.vue:75
+#: src/page/connect.vue:81
 msgid "Invalid parameters"
 msgstr "Ongeldige parameters"
 
 #: src/dialog/photo/edit.vue:119
 msgid "Invalid photo selected"
 msgstr "Ongeldige foto gekies"
 
-#: src/page/connect.vue:120
+#: src/page/connect.vue:117
 msgid "It is your decision whether you want to sign up to enjoy additional benefits."
 msgstr "Dit is jou besluit of jy wil inteken om bykomende voordele te geniet."
 
@@ -1317,7 +1319,8 @@ msgstr "LDAP/AD"
 
 #: src/page/connect.vue:130 src/dialog/sponsor.vue:37
 #: src/page/about/about.vue:39 src/page/about/about.vue:16
-#: src/page/about/about.vue:273 src/page/connect.vue:122
+#: src/page/about/about.vue:273 src/page/connect.vue:127
+#: src/page/connect.vue:112
 msgid "Learn more"
 msgstr "Leer meer"
 
@@ -1438,7 +1441,7 @@ msgid "Male"
 msgstr "Manlik"
 
 #: src/page/connect.vue:62 src/page/connect.vue:80 src/page/about/about.vue:54
-#: src/page/about/about.vue:9 src/page/connect.vue:85
+#: src/page/about/about.vue:9 src/page/connect.vue:59 src/page/connect.vue:82
 msgid "Manage Account"
 msgstr "Bestuur rekening"
 
@@ -1748,7 +1751,7 @@ msgstr "Ander"
 msgid "Our mission is to provide the most user- and privacy-friendly solution to keep your pictures organized and accessible."
 msgstr "Ons missie is om die mees gebruikers- en privaatheidsvriendelike oplossing te bied om jou foto's georganiseer en toeganklik te hou."
 
-#: src/page/connect.vue:126
+#: src/page/connect.vue:123
 msgid "Our team decides this on an ongoing basis depending on the support effort required, server and licensing costs, and whether the features are generally needed by everyone or mainly requested by organizations and advanced users."
 msgstr "Ons span besluit dit op 'n deurlopende basis, afhangende van die ondersteuningspoging wat benodig word, bediener- en lisensiëringskoste, en of die kenmerke oor die algemeen deur almal benodig word of hoofsaaklik deur organisasies en gevorderde gebruikers versoek word."
 
@@ -1806,7 +1809,7 @@ msgid "PhotoPrism has been updated…"
 msgstr "PhotoPrism is opgedateer …"
 
 #: src/page/about/about.vue:48 src/page/about/about.vue:3
-#: src/page/connect.vue:118
+#: src/page/connect.vue:115
 msgid "PhotoPrism is 100% self-funded and independent."
 msgstr "PhotoPrism is 100% selfbefonds en onafhanklik."
 
@@ -1851,7 +1854,7 @@ msgstr "Moet asseblief nie foto's oplaai wat aanstootlike inhoud bevat nie."
 msgid "Please note that changing your password will log you out on other devices and browsers."
 msgstr "Neem asseblief kennis dat die verandering van jou wagwoord jou op ander toestelle en blaaiers sal afmeld."
 
-#: src/page/connect.vue:56
+#: src/page/connect.vue:56 src/page/connect.vue:53
 msgid "Please restart your instance for the changes to take effect."
 msgstr "Herbegin asseblief jou instansie vir die veranderinge om in werking te tree."
 
@@ -1972,7 +1975,7 @@ msgstr "Herken gesigte sodat spesifieke mense gevind kan word."
 msgid "Red"
 msgstr "Rooi"
 
-#: src/page/connect.vue:87 src/page/connect.vue:92
+#: src/page/connect.vue:87 src/page/connect.vue:89
 msgid "Register"
 msgstr "Registreer"
 
@@ -1984,7 +1987,7 @@ msgstr "Registreer"
 msgid "Reload"
 msgstr "Herlaai"
 
-#: src/component/navigation.vue:129 src/dialog/reload.vue:26
+#: src/component/navigation.vue:130 src/dialog/reload.vue:26
 #: src/page/settings/general.vue:101 src/page/settings/library.vue:46
 msgid "Reloading…"
 msgstr "Herlaai tans …"
@@ -2028,7 +2031,8 @@ msgstr "Vereis"
 msgid "Resolution"
 msgstr "Resolusie"
 
-#: src/page/connect.vue:65 src/page/settings/advanced.vue:156
+#: src/page/connect.vue:65 src/page/connect.vue:62
+#: src/page/settings/advanced.vue:156
 msgid "Restart"
 msgstr "Begin oor"
 
@@ -2294,7 +2298,7 @@ msgstr "Strate"
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: src/page/connect.vue:11 src/page/connect.vue:20
+#: src/page/connect.vue:11
 msgid "Successfully Connected"
 msgstr "Suksesvol gekoppel"
 
@@ -2406,7 +2410,7 @@ msgstr "Titel / Posisie"
 msgid "Title too long"
 msgstr "Titel te lank"
 
-#: src/page/connect.vue:74 src/page/connect.vue:79
+#: src/page/connect.vue:74 src/page/connect.vue:76
 msgid "To upgrade, you can either enter an activation code or click \"Register\" to sign up on our website:"
 msgstr "Om op te gradeer, kan jy óf 'n aktiveringskode invoer óf \"Registreer\" klik om op ons webwerf aan te meld:"
 
@@ -2466,7 +2470,7 @@ msgid "Unknown"
 msgstr "Onbekend"
 
 #: src/page/settings/account.vue:38 src/page/settings/account.vue:46
-#: src/component/navigation.vue:87 src/page/settings/account.vue:35
+#: src/component/navigation.vue:88 src/page/settings/account.vue:35
 #: src/page/settings/account.vue:43
 msgid "Unregistered"
 msgstr "Ongeregistreer"
@@ -2515,7 +2519,7 @@ msgid "Upgrade"
 msgstr "Gradeer op"
 
 #: src/dialog/sponsor.vue:40 src/page/about/about.vue:32
-#: src/page/about/about.vue:9 src/page/connect.vue:69
+#: src/page/about/about.vue:9 src/page/connect.vue:66
 msgid "Upgrade Now"
 msgstr "Gradeer nou op"
 
@@ -2610,10 +2614,6 @@ msgstr "Vektor"
 msgid "Vectors"
 msgstr "Vektore"
 
-#: src/page/connect.vue:11
-msgid "Verified"
-msgstr "Geverifieer"
-
 #: src/component/photo/cards.vue:302 src/component/photo/cards.vue:479
 #: src/component/photo/list.vue:206 src/component/photo/mosaic.vue:222
 #: src/model/file.js:220 src/model/photo.js:828 src/model/photo.js:844
@@ -2651,7 +2651,7 @@ msgstr "Besoeker"
 msgid "Visual Similarity"
 msgstr "Visuele ooreenkoms"
 
-#: src/page/connect.vue:119
+#: src/page/connect.vue:116
 msgid "Voluntary donations do not cover the cost of a team working full time to provide you with updates, documentation, and support."
 msgstr "Vrywillige skenkings dek nie die koste van 'n span wat voltyds werk om jou van opdaterings, dokumentasie en ondersteuning te voorsien nie."
 
@@ -2693,15 +2693,15 @@ msgstr "WebDAV oplaai"
 msgid "Website"
 msgstr "Webwerf"
 
-#: src/page/connect.vue:123
+#: src/page/connect.vue:120
 msgid "What functionality is generally available?"
 msgstr "Watter funksionaliteit is algemeen beskikbaar?"
 
 #: src/options/options.js:424
 msgid "White"
 msgstr "Wit"
 
-#: src/page/connect.vue:115
+#: src/page/connect.vue:112
 msgid "Why are some features only available to sponsors?"
 msgstr "Waarom is sommige kenmerke slegs vir borge beskikbaar?"
 
@@ -2731,7 +2731,7 @@ msgid "Yes"
 msgstr "Ja"
 
 #: src/dialog/sponsor.vue:25 src/page/about/about.vue:50
-#: src/page/about/about.vue:5 src/page/connect.vue:106
+#: src/page/about/about.vue:5 src/page/connect.vue:103
 msgid "You are welcome to contact us at membership@photoprism.app for questions regarding your membership."
 msgstr "Jy is welkom om ons te kontak by membership@photoprism.app vir vrae oor jou lidmaatskap."
 
@@ -2752,7 +2752,7 @@ msgstr "Jy mag net een item kies"
 msgid "You may rescan your library to find additional faces."
 msgstr "Jy kan jou biblioteek herskandeer om bykomende gesigte te vind."
 
-#: src/page/connect.vue:54
+#: src/page/connect.vue:54 src/page/connect.vue:51
 msgid "Your account has been successfully connected."
 msgstr "Jou rekening is suksesvol gekoppel."
 
@@ -2769,6 +2769,9 @@ msgstr "Jou biblioteek word voortdurend ontleed om outomaties albums van spesial
 msgid "Zoom in/out"
 msgstr "Zoem in/uit"
 
+#~ msgid "Verified"
+#~ msgstr "Geverifieer"
+
 #~ msgid "Proceed"
 #~ msgstr "Voortgaan"