Display gateway stats when redirect is disabled

Implements #51
ipfs · Jan 28, 2016 · 5d85024 · 5d85024
1 parent f6c7d33
commit 5d85024
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 21 deletions.
diff --git a/data/panel.html b/data/panel.html
@@ -18,6 +18,10 @@
   li {
     padding: 0.5rem;
     cursor: default;
+    display:block;
+    max-height:2rem;
+    text-overflow: ellipsis;
+    overflow: auto;
   }
   li.header {
     font-weight: bold;
@@ -70,6 +74,12 @@
 <body>
   <img src="icon-off-64.png" id="icon"/>
   <ul id="gateway-status">
+    <li id="gateway-redirect"><span data-l10n-id="panel_status-gateway-redirect"></span>
+      <span>
+        <span id="redirect-enabled" data-l10n-id="panel_status-gateway-redirect-enabled"></span>
+        <span id="redirect-disabled" data-l10n-id="panel_status-gateway-redirect-disabled"></span>
+      </span>
+    </li>
     <li id="gateway-address"><span data-l10n-id="panel_status-gateway-address"></span><span id="gateway-address-val">⋯</span></li>
     <li id="gateway-version"><span data-l10n-id="panel_status-gateway-version"></span><span id="gateway-version-val">⋯</span></li>
     <li id="swarm-peers"><span data-l10n-id="panel_status-swarm-peers"></span><span id="swarm-peers-val">⋯</span></li>

diff --git a/data/panel.js b/data/panel.js
@@ -1,21 +1,18 @@
 /* global self */
+
 function getById (id) {
   return document.getElementById(id)
 }
 
 function renderGatewayAddress (prefs) {
-  if (prefs.useCustomGateway) {
-    return prefs.customGatewayHost + ':' + prefs.customGatewayPort
-  } else {
-    return 'OFF'
-  }
+  return prefs.customGatewayHost + ':' + prefs.customGatewayPort
 }
 
-function showIf(id, condition) {
+function showIf (id, condition) {
   getById(id).style.display = condition ? 'block' : 'none'
 }
 
-function setIconState(enable) {
+function setIconState (enable) {
   getById('icon').src = enable ? 'icon-on-64.png' : 'icon-off-64.png'
 }
 
@@ -32,12 +29,14 @@ self.port.on('show', function (context) {
   showIf('ipfs-resource-actions', context.isPinnable)
 
   // if custom gateway is used
+  showIf('redirect-enabled', prefs.useCustomGateway)
+  showIf('redirect-disabled', !prefs.useCustomGateway)
   showIf('enable-gateway-redirect', !prefs.useCustomGateway)
   showIf('disable-gateway-redirect', prefs.useCustomGateway)
   showIf('open-webui', prefs.useCustomGateway)
   showIf('open-webui', prefs.useCustomGateway)
-  showIf('gateway-version', prefs.useCustomGateway)
-  showIf('swarm-peers', prefs.useCustomGateway)
+  // showIf('gateway-version', prefs.useCustomGateway)
+  // showIf('swarm-peers', prefs.useCustomGateway)
   showIf('pin-current-ipfs-address', prefs.useCustomGateway)
 
   // resize panel to match size of rendered items

diff --git a/lib/gui.js b/lib/gui.js
@@ -119,16 +119,14 @@ panel.on('show', function () {
   // trigger panel init/refresh
   panel.port.emit('show', context)
 
-  if (prefs.useCustomGateway) {
-    // async update of version info
-    api.getVersion((data) => {
-      panel.port.emit('version', data)
-    })
-    // async update peer info
-    api.getSwarmPeers((data) => {
-      panel.port.emit('swarm-peers', data)
-    })
-  }
+  // async update of version info
+  api.getVersion((data) => {
+    panel.port.emit('version', data)
+  })
+  // async update peer info
+  api.getSwarmPeers((data) => {
+    panel.port.emit('swarm-peers', data)
+  })
 })
 
 /*

diff --git a/locale/en-US.properties b/locale/en-US.properties
@@ -19,7 +19,10 @@ customApiPort_description=Used for pinning (on the Gateway host)
 linkify_title=Extended IPFS Link Support
 linkify_description=(EXPERIMENTAL) Rewrite links to /ip(f|n)s/* paths on every page to point to IPFS gateway. Make plaintext IPFS links clickable.
 
-panel_status-gateway-address=Gateway Redirect
+panel_status-gateway-redirect=Redirect
+panel_status-gateway-redirect-enabled=enabled
+panel_status-gateway-redirect-disabled=disabled
+panel_status-gateway-address=Gateway
 panel_status-gateway-version=Version
 panel_status-swarm-peers=Swarm Peers
 

diff --git a/locale/pl-PL.properties b/locale/pl-PL.properties
@@ -19,7 +19,10 @@ customApiPort_description=Używany do przypinania (na hoście Bramy)
 linkify_title=Rozszerzone wsparcie linków IPFS
 linkify_description=(EKSPERYMENT) Przepisuje linki do zasobów /ip(f|n)s/* na każdej stronie tak, aby wskazywały na Bramę. Dodatkowo sprawia, że czysto-tekstowe adresy IPFS są klikalne.
 
-panel_status-gateway-address=Przekierowanie do bramy
+panel_status-gateway-redirect=Przekierowanie
+panel_status-gateway-redirect-enabled=włączone
+panel_status-gateway-redirect-disabled=wyłączone
+panel_status-gateway-address=Brama
 panel_status-gateway-version=Wersja
 panel_status-swarm-peers=Połączenia