Merge pull request #1821 from OpenBazaar/showServerVersion

Adds the server version number to the about modal.

Author: rmisio

js/languages/en-US.json

@@ -46,6 +46,7 @@
   "RemoveModerator": "Remove as Moderator",
   "About": "About",
   "Version": "Version %{version}",
+  "ServerVersion": "Server Version %{serverVersion}",
   "NoDescriptionAdded": "No description added",
   "NoListings": "No listings",
   "CoverPhoto": "Cover Photo",

js/templates/aboutModal.html

@@ -1,7 +1,8 @@
 <div class="modal-child modal-childMain custCol-primary">
   <div class="about-hero modal-hero-about color-secondary-darken custCol-secondary-darken">
     <div class="modal-hero-icon"></div>
-    <p class="width100 alignCenter custCol-text marginTop50 textOpacity75 fontSize14"><%= polyglot.t('Version', {version: ob.version}) %></p>
+    <p class="width100 alignCenter custCol-text marginTop50 row5 textOpacity75 fontSize14"><%= polyglot.t('Version', {version: ob.version}) %></p>
+    <p class="width100 alignCenter custCol-text marginTop10 textOpacity75 fontSize14"><%= polyglot.t('ServerVersion', {serverVersion: ob.serverVersion}) %></p>
   </div>
   <div class="aboutModal-accordion accordion">
     <div class="accordion-window">
@@ -49,4 +50,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

js/views/aboutModal.js

@@ -20,6 +20,10 @@ module.exports = baseModal.extend({
       throw new Error('Please provide a version.');
     }
 
+    if (!this.options.serverVersion) {
+      throw new Error('Please provide a server version.');
+    }
+
     this._tab = this.options.initialTab;
   },
 
@@ -47,6 +51,7 @@ module.exports = baseModal.extend({
     loadTemplate('./js/templates/aboutModal.html', (t) => {
       this.$el.html(t({
         version: this.options.version,
+        serverVersion: this.options.serverVersion,
         tab: this._tab
       }));
 

js/views/pageNavVw.js

@@ -394,7 +394,8 @@ module.exports = baseVw.extend({
 
       if (!self.aboutModal) {
         self.aboutModal = new AboutModal({
-          version: pjson.version
+          version: pjson.version,
+          serverVersion: self.model.get('version'),
         });
         self.aboutModal.render();
         self.registerChild(self.aboutModal);