From 7119cc4b469f1046deb470a8f34333f46d09992a Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Wed, 7 Sep 2016 04:10:14 +0300
Subject: [PATCH 01/21] hide export tab for not admins or owners

---
 apis/client/view/header/header.html |  6 +++++-
 apis/client/view/view.html          | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 4461924e7d..b85941f809 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -63,14 +63,18 @@ <h1 class="api-name">
               {{_ "viewApiBackendNavigationMenu_backlog" }}
             </a>
           </li>
+          {{ # if currentUser }}
+          {{ # if apiBackend.currentUserCanEdit }}
           <li>
             <a href="#api-backend-export" data-toggle="tab">
               <i class="fa fa-cloud-download"></i>
               {{_ "viewApiBackendNavigationMenu_export" }}
             </a>
           </li>
+          {{ / if }}
+          {{ / if }}
           {{ # if currentUser }}
-          {{# if apiBackend.currentUserCanEdit }}
+          {{ # if apiBackend.currentUserCanEdit }}
           <li>
             <a href="#api-backend-settings" data-toggle="tab">
               <i class="fa fa-cog"></i>
diff --git a/apis/client/view/view.html b/apis/client/view/view.html
index dd601b289a..07f3b5b186 100644
--- a/apis/client/view/view.html
+++ b/apis/client/view/view.html
@@ -19,9 +19,13 @@
         {{> feedbackList apiBackend=apiBackend }}
       </div> <!-- /api-backend-metadata -->
 
-      <div id="api-backend-export" class="tab-pane fade">
-        {{> viewApiBackendExport apiBackend=apiBackend }}
-      </div> <!-- /api-backend-export -->
+      {{ # if currentUser }}
+        {{# if apiBackend.currentUserCanEdit }}
+          <div id="api-backend-export" class="tab-pane fade">
+            {{> viewApiBackendExport apiBackend=apiBackend }}
+          </div> <!-- /api-backend-export -->
+        {{ / if }}
+      {{ / if }}
 
       <div id="api-backend-backlog" class="tab-pane fade">
         {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}

From c07c9194f5f30e1be6b67734cc2f71f00cffe817 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Fri, 9 Sep 2016 09:48:01 +0300
Subject: [PATCH 02/21] added missing if

---
 apis/client/view/header/header.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 7ec24f8384..d8501dabd1 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -88,6 +88,7 @@ <h1 class="api-name">
             </li>
             {{/ if }}
           {{ / if }}
+          {{ / if }}
         </ul>
       </div>
     </div>

From 639a17586c61e0013275c8444d9f081ab7c80ca1 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Fri, 9 Sep 2016 10:58:50 +0300
Subject: [PATCH 03/21] changed tab id

---
 apis/client/view/header/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 5d59abee49..76d8599d08 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -73,7 +73,7 @@ <h1 class="api-name">
           {{ # if currentUser }}
           {{ # if api.currentUserCanEdit }}
           <li>
-            <a href="#api-export" data-toggle="tab">
+            <a href="#api-backend-export" data-toggle="tab">
               <i class="fa fa-cloud-download"></i>
               {{_ "viewApiBackendNavigationMenu_export" }}
             </a>

From 815f1e6f3dc4ede088aabb21f147a241b735e6c2 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Fri, 9 Sep 2016 11:11:44 +0300
Subject: [PATCH 04/21] added button for proxy export; new layout

---
 apis/client/export/export.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index b09e613521..edcd2a7562 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -6,8 +6,15 @@ <h2 class="panel-title">
       </h2>
     </div>
     <div class="panel-body">
-      <a class="btn btn-lg btn-success" id="exportJSONConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
-      <a class="btn btn-lg btn-success" id="exportYAMLConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
+      <h3>Export API configuration</h3>
+      <p>Export API configuration</p>
+      <a class="btn btn-success" id="exportJSONConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
+      <a class="btn btn-success" id="exportYAMLConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
+      <hr class="panel-hr" />
+      <h3>Export proxy configuration</h3>
+      <p>Export proxy configuration</p>
+      <a class="btn btn-success" id="exportJSONProxyConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
+      <a class="btn btn-success" id="exportYAMLProxyConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
     </div>
   </div>
 </template>

From 0c5f1db2a42226b621723d3236936a61edf28f06 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 01:26:38 +0300
Subject: [PATCH 05/21] import; subscription to proxy settings

---
 apis/client/export/export.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apis/client/export/export.js b/apis/client/export/export.js
index cd86bea4f2..1449eae74c 100644
--- a/apis/client/export/export.js
+++ b/apis/client/export/export.js
@@ -1,5 +1,19 @@
+import { Template } from 'meteor/templating';
+import { ProxyBackends } from '/proxy_backends/collection';
+
 import jsyaml from 'js-yaml';
 
+Template.viewApiBackendExport.onCreated(function () {
+  // Get reference to template instance
+  const instance = this;
+
+  // Get the API Backend ID from the route
+  instance.apiId = Router.current().params._id;
+
+  // Subscribe to proxy settings for this API
+  instance.subscribe('apiProxySettings', instance.apiId);
+});
+
 Template.viewApiBackendExport.events({
   'click #exportJSONConfig': function (event, instance) {
     // Get API Backend from database collection

From 56d1be1c2ef732484da5dd8ccbe9f6b71dfabec6 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 01:26:57 +0300
Subject: [PATCH 06/21] helper to export proxy settings JSON

---
 apis/client/export/export.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/apis/client/export/export.js b/apis/client/export/export.js
index 1449eae74c..440128fd95 100644
--- a/apis/client/export/export.js
+++ b/apis/client/export/export.js
@@ -41,4 +41,19 @@ Template.viewApiBackendExport.events({
     // forces "save As" function allow user download file
     saveAs(file, 'apiConfig.yaml');
   },
+  'click #exportJSONProxyConfig': function (event, instance) {
+    // Get the API Backend ID from the route
+    const apiId = instance.apiId;
+
+    const proxy = ProxyBackends.findOne({ apiId });
+
+    // converts JSON object to JSON string and adds indentation
+    const json = JSON.stringify(proxy, null, '\t');
+
+    // creates file object with content type of JSON
+    const file = new Blob([json], { type: 'application/json;charset=utf-8' });
+
+    // forces "save As" function allow user download file
+    saveAs(file, 'apiProxyConfig.json');
+  },
 });

From 9e09d317f3cb5711a603563effa643d5bac7e648 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 01:28:10 +0300
Subject: [PATCH 07/21] helper to export proxy settings YAML

---
 apis/client/export/export.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/apis/client/export/export.js b/apis/client/export/export.js
index 440128fd95..8626824fca 100644
--- a/apis/client/export/export.js
+++ b/apis/client/export/export.js
@@ -56,4 +56,19 @@ Template.viewApiBackendExport.events({
     // forces "save As" function allow user download file
     saveAs(file, 'apiProxyConfig.json');
   },
+  'click #exportYAMLProxyConfig': function (event, instance) {
+    // Get the API Backend ID from the route
+    const apiId = instance.apiId;
+
+    const proxy = ProxyBackends.findOne({ apiId });
+
+    // converts from json to yaml
+    const yaml = jsyaml.safeDump(proxy);
+
+    // creates file object with content type of YAML
+    const file = new Blob([yaml], { type: 'application/x-yaml;charset=utf-8' });
+
+    // forces "save As" function allow user download file
+    saveAs(file, 'apiConfig.yaml');
+  },
 });

From 430655fab327d6a65c82db8c85f4f9a0513cbee8 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 01:29:20 +0300
Subject: [PATCH 08/21] comments

---
 apis/client/export/export.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apis/client/export/export.js b/apis/client/export/export.js
index 8626824fca..989a35d4e5 100644
--- a/apis/client/export/export.js
+++ b/apis/client/export/export.js
@@ -45,6 +45,7 @@ Template.viewApiBackendExport.events({
     // Get the API Backend ID from the route
     const apiId = instance.apiId;
 
+    // Find proxy backends by API id
     const proxy = ProxyBackends.findOne({ apiId });
 
     // converts JSON object to JSON string and adds indentation
@@ -60,6 +61,7 @@ Template.viewApiBackendExport.events({
     // Get the API Backend ID from the route
     const apiId = instance.apiId;
 
+    // Find proxy backends by API id
     const proxy = ProxyBackends.findOne({ apiId });
 
     // converts from json to yaml

From 279889f68b2cb156f57035f37b2b73420c233bcf Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 01:34:08 +0300
Subject: [PATCH 09/21] i18n strings

---
 apis/client/export/export.html | 8 ++++----
 core/lib/i18n/en.i18n.json     | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index edcd2a7562..c225d5f078 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -6,13 +6,13 @@ <h2 class="panel-title">
       </h2>
     </div>
     <div class="panel-body">
-      <h3>Export API configuration</h3>
-      <p>Export API configuration</p>
+      <h3>{{_ "view_ApiBackend_Export_API_Title"}}</h3>
+      <p>{{_ "view_ApiBackend_Export_API_Description"}}</p>
       <a class="btn btn-success" id="exportJSONConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
       <a class="btn btn-success" id="exportYAMLConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
       <hr class="panel-hr" />
-      <h3>Export proxy configuration</h3>
-      <p>Export proxy configuration</p>
+      <h3>{{_ "view_ApiBackend_Export_Proxy_Title"}}</h3>
+      <p>{{_ "view_ApiBackend_Export_Proxy_Description"}}</p>
       <a class="btn btn-success" id="exportJSONProxyConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
       <a class="btn btn-success" id="exportYAMLProxyConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
     </div>
diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 4d2d1d56b9..9d3fa1b094 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -522,6 +522,10 @@
   "view_ApiBackend_Details_Title": "Details",
   "view_ApiBackend_ExportJson": "Export .json",
   "view_ApiBackend_ExportYaml": "Export .yaml",
+  "view_ApiBackend_Export_API_Title": "Export API configuration",
+  "view_ApiBackend_Export_API_Description": "Export API configuration in JSON or YAML format",
+  "view_ApiBackend_Export_Proxy_Title": "Export proxy configuration",
+  "view_ApiBackend_Export_Proxy_Description": "Export proxy configuration in JSON or YAML format",
   "view_ApiBackend_Export_Title": "Export",
   "view_ApiBackend_Frontend": "Frontend",
   "view_ApiBackend_Frontend_Prefix": "Frontend prefix",

From 4efcf42de41a86691e8de3e37ee073ab7e9a158e Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 11:13:48 +0300
Subject: [PATCH 10/21] updated i18n strings

---
 apis/client/export/export.html | 18 +++++++++---------
 core/lib/i18n/en.i18n.json     | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index c225d5f078..55e9fa6ba2 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -2,19 +2,19 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        {{_ "view_ApiBackend_Export_Title"}}
+        {{_ "view_ApiBackendExport_title"}}
       </h2>
     </div>
     <div class="panel-body">
-      <h3>{{_ "view_ApiBackend_Export_API_Title"}}</h3>
-      <p>{{_ "view_ApiBackend_Export_API_Description"}}</p>
-      <a class="btn btn-success" id="exportJSONConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
-      <a class="btn btn-success" id="exportYAMLConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
+      <h3>{{_ "view_ApiBackendExport_api_title"}}</h3>
+      <p>{{_ "view_ApiBackendExport_api_description"}}</p>
+      <a class="btn btn-success" id="exportJSONConfig">{{_ "view_ApiBackendExport_json_button"}}</a>
+      <a class="btn btn-success" id="exportYAMLConfig">{{_ "view_ApiBackendExport_yaml_button"}}</a>
       <hr class="panel-hr" />
-      <h3>{{_ "view_ApiBackend_Export_Proxy_Title"}}</h3>
-      <p>{{_ "view_ApiBackend_Export_Proxy_Description"}}</p>
-      <a class="btn btn-success" id="exportJSONProxyConfig">{{_ "view_ApiBackend_ExportJson"}}</a>
-      <a class="btn btn-success" id="exportYAMLProxyConfig">{{_ "view_ApiBackend_ExportYaml"}}</a>
+      <h3>{{_ "view_ApiBackendExport_proxy_title"}}</h3>
+      <p>{{_ "view_ApiBackendExport_proxy_description"}}</p>
+      <a class="btn btn-success" id="exportJSONProxyConfig">{{_ "view_ApiBackendExport_json_button"}}</a>
+      <a class="btn btn-success" id="exportYAMLProxyConfig">{{_ "view_ApiBackendExport_yaml_button"}}</a>
     </div>
   </div>
 </template>
diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 9d3fa1b094..6ff98807fb 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -520,13 +520,13 @@
   "view_ApiBackend_Backend": "Backend",
   "view_ApiBackend_Backend_Prefix": "Backend prefix",
   "view_ApiBackend_Details_Title": "Details",
-  "view_ApiBackend_ExportJson": "Export .json",
-  "view_ApiBackend_ExportYaml": "Export .yaml",
-  "view_ApiBackend_Export_API_Title": "Export API configuration",
-  "view_ApiBackend_Export_API_Description": "Export API configuration in JSON or YAML format",
-  "view_ApiBackend_Export_Proxy_Title": "Export proxy configuration",
-  "view_ApiBackend_Export_Proxy_Description": "Export proxy configuration in JSON or YAML format",
-  "view_ApiBackend_Export_Title": "Export",
+  "view_ApiBackendExport_json_button": "Export .json",
+  "view_ApiBackendExport_yaml_button": "Export .yaml",
+  "view_ApiBackendExport_api_title": "Export API configuration",
+  "view_ApiBackendExport_api_description": "Export API configuration in JSON or YAML format",
+  "view_ApiBackendExport_proxy_title": "Export proxy configuration",
+  "view_ApiBackendExport_proxy_description": "Export proxy configuration in JSON or YAML format",
+  "view_ApiBackendExport_title": "Export",
   "view_ApiBackend_Frontend": "Frontend",
   "view_ApiBackend_Frontend_Prefix": "Frontend prefix",
   "view_ApiBackend_Matchers": "URL Matchers",

From 316ddb44cb10743c0d5077aca646a939c042819f Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 11:34:57 +0300
Subject: [PATCH 11/21] Proper nesting; to improve readability

---
 apis/client/export/export.html | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index 55e9fa6ba2..e30fa7538a 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -6,15 +6,31 @@ <h2 class="panel-title">
       </h2>
     </div>
     <div class="panel-body">
-      <h3>{{_ "view_ApiBackendExport_api_title"}}</h3>
-      <p>{{_ "view_ApiBackendExport_api_description"}}</p>
-      <a class="btn btn-success" id="exportJSONConfig">{{_ "view_ApiBackendExport_json_button"}}</a>
-      <a class="btn btn-success" id="exportYAMLConfig">{{_ "view_ApiBackendExport_yaml_button"}}</a>
+      <h3>
+        {{_ "view_ApiBackendExport_api_title"}}
+      </h3>
+      <p>
+        {{_ "view_ApiBackendExport_api_description"}}
+      </p>
+      <a class="btn btn-success" id="exportJSONConfig">
+        {{_ "view_ApiBackendExport_json_button"}}
+      </a>
+      <a class="btn btn-success" id="exportYAMLConfig">
+        {{_ "view_ApiBackendExport_yaml_button"}}
+      </a>
       <hr class="panel-hr" />
-      <h3>{{_ "view_ApiBackendExport_proxy_title"}}</h3>
-      <p>{{_ "view_ApiBackendExport_proxy_description"}}</p>
-      <a class="btn btn-success" id="exportJSONProxyConfig">{{_ "view_ApiBackendExport_json_button"}}</a>
-      <a class="btn btn-success" id="exportYAMLProxyConfig">{{_ "view_ApiBackendExport_yaml_button"}}</a>
+      <h3>
+        {{_ "view_ApiBackendExport_proxy_title"}}
+      </h3>
+      <p>
+        {{_ "view_ApiBackendExport_proxy_description"}}
+      </p>
+      <a class="btn btn-success" id="exportJSONProxyConfig">
+        {{_ "view_ApiBackendExport_json_button"}}
+      </a>
+      <a class="btn btn-success" id="exportYAMLProxyConfig">
+        {{_ "view_ApiBackendExport_yaml_button"}}
+      </a>
     </div>
   </div>
 </template>

From acfa75b40bada29e3e4164e2214bd56ad3c581a4 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 11:40:20 +0300
Subject: [PATCH 12/21] i18n strings changes

---
 apis/client/export/export.html | 18 +++++++++---------
 core/lib/i18n/en.i18n.json     | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index e30fa7538a..d88d6c46d2 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -2,34 +2,34 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        {{_ "view_ApiBackendExport_title"}}
+        {{_ "viewApiBackendExport_title"}}
       </h2>
     </div>
     <div class="panel-body">
       <h3>
-        {{_ "view_ApiBackendExport_api_title"}}
+        {{_ "viewApiBackendExport_api_title"}}
       </h3>
       <p>
-        {{_ "view_ApiBackendExport_api_description"}}
+        {{_ "viewApiBackendExport_api_description"}}
       </p>
       <a class="btn btn-success" id="exportJSONConfig">
-        {{_ "view_ApiBackendExport_json_button"}}
+        {{_ "viewApiBackendExport_json_button"}}
       </a>
       <a class="btn btn-success" id="exportYAMLConfig">
-        {{_ "view_ApiBackendExport_yaml_button"}}
+        {{_ "viewApiBackendExport_yaml_button"}}
       </a>
       <hr class="panel-hr" />
       <h3>
-        {{_ "view_ApiBackendExport_proxy_title"}}
+        {{_ "viewApiBackendExport_proxy_title"}}
       </h3>
       <p>
-        {{_ "view_ApiBackendExport_proxy_description"}}
+        {{_ "viewApiBackendExport_proxy_description"}}
       </p>
       <a class="btn btn-success" id="exportJSONProxyConfig">
-        {{_ "view_ApiBackendExport_json_button"}}
+        {{_ "viewApiBackendExport_json_button"}}
       </a>
       <a class="btn btn-success" id="exportYAMLProxyConfig">
-        {{_ "view_ApiBackendExport_yaml_button"}}
+        {{_ "viewApiBackendExport_yaml_button"}}
       </a>
     </div>
   </div>
diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 6ff98807fb..d96aefc841 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -520,13 +520,13 @@
   "view_ApiBackend_Backend": "Backend",
   "view_ApiBackend_Backend_Prefix": "Backend prefix",
   "view_ApiBackend_Details_Title": "Details",
-  "view_ApiBackendExport_json_button": "Export .json",
-  "view_ApiBackendExport_yaml_button": "Export .yaml",
-  "view_ApiBackendExport_api_title": "Export API configuration",
-  "view_ApiBackendExport_api_description": "Export API configuration in JSON or YAML format",
-  "view_ApiBackendExport_proxy_title": "Export proxy configuration",
-  "view_ApiBackendExport_proxy_description": "Export proxy configuration in JSON or YAML format",
-  "view_ApiBackendExport_title": "Export",
+  "viewApiBackendExport_json_button": "Export .json",
+  "viewApiBackendExport_yaml_button": "Export .yaml",
+  "viewApiBackendExport_api_title": "Export API configuration",
+  "viewApiBackendExport_api_description": "Export API configuration in JSON or YAML format",
+  "viewApiBackendExport_proxy_title": "Export proxy configuration",
+  "viewApiBackendExport_proxy_description": "Export proxy configuration in JSON or YAML format",
+  "viewApiBackendExport_title": "Export",
   "view_ApiBackend_Frontend": "Frontend",
   "view_ApiBackend_Frontend_Prefix": "Frontend prefix",
   "view_ApiBackend_Matchers": "URL Matchers",

From dbc860c7703c0f4bb6f16074e5e8dfe0f851b077 Mon Sep 17 00:00:00 2001
From: illya <in11092008@gmail.com>
Date: Thu, 15 Sep 2016 11:43:17 +0300
Subject: [PATCH 13/21] getting API id from ID from data context

---
 apis/client/export/export.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apis/client/export/export.js b/apis/client/export/export.js
index 989a35d4e5..075ba47ea4 100644
--- a/apis/client/export/export.js
+++ b/apis/client/export/export.js
@@ -7,11 +7,11 @@ Template.viewApiBackendExport.onCreated(function () {
   // Get reference to template instance
   const instance = this;
 
-  // Get the API Backend ID from the route
-  instance.apiId = Router.current().params._id;
+  // Get the API Backend ID from data context
+  const apiId = instance.data.api._id;
 
   // Subscribe to proxy settings for this API
-  instance.subscribe('apiProxySettings', instance.apiId);
+  instance.subscribe('apiProxySettings', apiId);
 });
 
 Template.viewApiBackendExport.events({
@@ -42,8 +42,8 @@ Template.viewApiBackendExport.events({
     saveAs(file, 'apiConfig.yaml');
   },
   'click #exportJSONProxyConfig': function (event, instance) {
-    // Get the API Backend ID from the route
-    const apiId = instance.apiId;
+    // Get the API Backend ID from data context
+    const apiId = instance.data.api._id;
 
     // Find proxy backends by API id
     const proxy = ProxyBackends.findOne({ apiId });
@@ -58,8 +58,8 @@ Template.viewApiBackendExport.events({
     saveAs(file, 'apiProxyConfig.json');
   },
   'click #exportYAMLProxyConfig': function (event, instance) {
-    // Get the API Backend ID from the route
-    const apiId = instance.apiId;
+    // Get the API Backend ID from data context
+    const apiId = instance.data.api._id;
 
     // Find proxy backends by API id
     const proxy = ProxyBackends.findOne({ apiId });

From ae387ba351de90db2bc8d7a1cf757b2a4d3abc67 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 13:39:10 +0300
Subject: [PATCH 14/21] Normalize api template/i18n usage

---
 apis/client/export/export.html                | 20 ++---
 apis/client/export/export.js                  |  4 +-
 apis/client/lib/router.js                     |  2 +-
 apis/client/view/details/details.html         |  6 +-
 apis/client/view/details/details.js           |  4 +-
 apis/client/view/header/header.html           | 20 ++---
 apis/client/view/settings/settings.html       | 18 ++--
 apis/client/view/settings/settings.js         |  4 +-
 apis/client/view/status/status.html           |  2 +-
 apis/client/view/status/status.js             | 18 ++--
 apis/client/view/view.html                    | 26 +++---
 apis/client/view/view.js                      |  4 +-
 catalogue/client/grid/grid.html               |  2 +-
 catalogue/client/table/table.html             |  2 +-
 core/client/lib/router.js                     |  2 +-
 core/lib/i18n/en.i18n.json                    | 84 +++++++++----------
 .../filtering/selectpicker/selectpicker.html  |  6 +-
 documentation/client/view/documentation.html  | 20 ++---
 metadata/client/view/metadata.html            |  2 +-
 metadata/client/view/metadata.js              |  4 +-
 20 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index d88d6c46d2..08b2bcd04f 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -1,35 +1,35 @@
-<template name="viewApiBackendExport">
+<template name="apiExport">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        {{_ "viewApiBackendExport_title"}}
+        {{_ "apiExport_title"}}
       </h2>
     </div>
     <div class="panel-body">
       <h3>
-        {{_ "viewApiBackendExport_api_title"}}
+        {{_ "apiExport_api_title"}}
       </h3>
       <p>
-        {{_ "viewApiBackendExport_api_description"}}
+        {{_ "apiExport_api_description"}}
       </p>
       <a class="btn btn-success" id="exportJSONConfig">
-        {{_ "viewApiBackendExport_json_button"}}
+        {{_ "apiExport_json_button"}}
       </a>
       <a class="btn btn-success" id="exportYAMLConfig">
-        {{_ "viewApiBackendExport_yaml_button"}}
+        {{_ "apiExport_yaml_button"}}
       </a>
       <hr class="panel-hr" />
       <h3>
-        {{_ "viewApiBackendExport_proxy_title"}}
+        {{_ "apiExport_proxy_title"}}
       </h3>
       <p>
-        {{_ "viewApiBackendExport_proxy_description"}}
+        {{_ "apiExport_proxy_description"}}
       </p>
       <a class="btn btn-success" id="exportJSONProxyConfig">
-        {{_ "viewApiBackendExport_json_button"}}
+        {{_ "apiExport_json_button"}}
       </a>
       <a class="btn btn-success" id="exportYAMLProxyConfig">
-        {{_ "viewApiBackendExport_yaml_button"}}
+        {{_ "apiExport_yaml_button"}}
       </a>
     </div>
   </div>
diff --git a/apis/client/export/export.js b/apis/client/export/export.js
index 075ba47ea4..f8caf265f2 100644
--- a/apis/client/export/export.js
+++ b/apis/client/export/export.js
@@ -3,7 +3,7 @@ import { ProxyBackends } from '/proxy_backends/collection';
 
 import jsyaml from 'js-yaml';
 
-Template.viewApiBackendExport.onCreated(function () {
+Template.apiExport.onCreated(function () {
   // Get reference to template instance
   const instance = this;
 
@@ -14,7 +14,7 @@ Template.viewApiBackendExport.onCreated(function () {
   instance.subscribe('apiProxySettings', apiId);
 });
 
-Template.viewApiBackendExport.events({
+Template.apiExport.events({
   'click #exportJSONConfig': function (event, instance) {
     // Get API Backend from database collection
     const api = instance.data.api;
diff --git a/apis/client/lib/router.js b/apis/client/lib/router.js
index 3b27dbec0b..e820e5b987 100644
--- a/apis/client/lib/router.js
+++ b/apis/client/lib/router.js
@@ -22,7 +22,7 @@ Router.route('/api/:_id/', function () {
   // Ensure current user is authorized to view backend
   Meteor.call('currentUserCanViewApi', apiBackendId, function (error, userIsAuthorized) {
     if (userIsAuthorized) {
-      route.render('viewApiBackend');
+      route.render('viewApi');
       route.layout('masterLayout');
     } else {
       Router.go('notAuthorized');
diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index 791a3365d7..8daab496a2 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -1,4 +1,4 @@
-<template name="viewApiBackendDetails">
+<template name="apiDetails">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title clearfix">
@@ -10,7 +10,7 @@ <h2 class="panel-title clearfix">
         <div class="col-lg-12 api-details-block">
           {{ # if api.description }}
           <h3>
-            {{_ "viewApiBackendDetails_description_headingText" }}
+            {{_ "apiDetails_description_headingText" }}
           </h3>
           <p>
             {{ api.description }}
@@ -20,7 +20,7 @@ <h3>
 
           {{# if url }}
           <h3>
-            {{_ "viewApiBackendDetails_baseUrl_headingText" }}
+            {{_ "apiDetails_baseUrl_headingText" }}
           </h3>
           <div class="input-group">
             <input
diff --git a/apis/client/view/details/details.js b/apis/client/view/details/details.js
index 9c601f1c0e..b9b71f98b9 100644
--- a/apis/client/view/details/details.js
+++ b/apis/client/view/details/details.js
@@ -1,6 +1,6 @@
 import Clipboard from 'clipboard';
 
-Template.viewApiBackendDetails.onRendered(function () {
+Template.apiDetails.onRendered(function () {
   // Initialize Clipboard copy button
   const copyButton = new Clipboard('#copyApiUrl');
 
@@ -18,7 +18,7 @@ Template.viewApiBackendDetails.onRendered(function () {
   });
 });
 
-Template.viewApiBackendDetails.helpers({
+Template.apiDetails.helpers({
   url () {
     // Get reference to template instance
     const instance = Template.instance();
diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 65ee87a1ce..b3f1085b9e 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -1,4 +1,4 @@
-<template name="viewApiBackendPageHeader">
+<template name="viewApiPageHeader">
   <div class="page-head-topblock">
     <div class="container">
       <!-- Header -->
@@ -7,7 +7,7 @@
           {{> viewApiLogo }}
           <h1 class="api-name">
             {{ api.name }}
-            {{> viewApiBackendStatus api=api width="0.4" }}
+            {{> viewApiStatus api=api width="0.4" }}
           </h1>
           <ul class="list-inline view-api-meta-details">
             <li>
@@ -45,31 +45,31 @@ <h1 class="api-name">
           <li class="active">
             <a href="#api-details" data-toggle="tab">
               <i class="fa fa-info-circle"></i>
-              {{_ "viewApiBackendNavigationMenu_details" }}
+              {{_ "viewApiNavigationMenu_details" }}
             </a>
           </li>
           <li>
             <a href="#api-documentation" data-toggle="tab">
               <i class="fa fa-file-text"></i>
-              {{_ "viewApiBackendNavigationMenu_documentation" }}
+              {{_ "viewApiNavigationMenu_documentation" }}
             </a>
           </li>
           <li>
             <a href="#api-metadata" data-toggle="tab">
               <i class="fa fa-book"></i>
-              {{_ "viewApiBackendNavigationMenu_metadata" }}
+              {{_ "viewApiNavigationMenu_metadata" }}
             </a>
           </li>
           <li>
             <a href="#api-feedback" data-toggle="tab">
               <i class="fa fa-comments-o"></i>
-              {{_ "viewApiBackendNavigationMenu_feedback" }}
+              {{_ "viewApiNavigationMenu_feedback" }}
             </a>
           </li>
           <li>
             <a href="#api-backlog" data-toggle="tab">
               <i class="fa fa-check-square-o"></i>
-              {{_ "viewApiBackendNavigationMenu_backlog" }}
+              {{_ "viewApiNavigationMenu_backlog" }}
             </a>
           </li>
           {{ # if currentUser }}
@@ -77,14 +77,14 @@ <h1 class="api-name">
           <li>
             <a href="#api-backend-export" data-toggle="tab">
               <i class="fa fa-cloud-download"></i>
-              {{_ "viewApiBackendNavigationMenu_export" }}
+              {{_ "viewApiNavigationMenu_export" }}
             </a>
           </li>
 
             <li>
               <a href="#api-settings" data-toggle="tab">
                 <i class="fa fa-cog"></i>
-                {{_ "viewApiBackendNavigationMenu_settings" }}
+                {{_ "viewApiNavigationMenu_settings" }}
               </a>
             </li>
 
@@ -92,7 +92,7 @@ <h1 class="api-name">
             <li>
               <a href="#api-proxy" data-toggle="tab">
                 <i class="fa fa-sitemap"></i>
-                {{_ "viewApiBackendNavigationMenu_proxy" }}
+                {{_ "viewApiNavigationMenu_proxy" }}
               </a>
             </li>
             {{/ if }}
diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index 3aa7867f17..b44e0b914d 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -1,16 +1,16 @@
-<template name="viewApiBackendSettings">
+<template name="apiSettings">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        {{_ "viewApiBackendSettings_panelTitleAbout" }}
+        {{_ "apiSettings_panelTitleAbout" }}
       </h2>
     </div>
     <div class="panel-body">
       <h3>
-        {{_ "viewApiBackendSettings_uploadLogo_heading" }}
+        {{_ "apiSettings_uploadLogo_heading" }}
       </h3>
       <p>
-        {{_ "viewApiBackendSettings_uploadLogoText" }}
+        {{_ "apiSettings_uploadLogoText" }}
       </p>
       {{> uploadApiLogo api=api }}
       <hr class="panel-hr" />
@@ -20,7 +20,7 @@ <h3>
       {{> afQuickField name='url'}}
       <div id="form-buttons">
         <button type="submit" class="btn btn-success" id="save-settings">
-          {{_ "viewApiBackendSettigs_saveButton_text" }}
+          {{_ "viewApiSettigs_saveButton_text" }}
         </button>
       </div>
       {{/autoForm}}
@@ -29,19 +29,19 @@ <h3>
   <div class="panel panel-danger">
     <div class="panel-heading">
       <h2 class="panel-title">
-        {{_ "viewApiBackendSettings_panelTitleManage" }}
+        {{_ "apiSettings_panelTitleManage" }}
       </h2>
     </div>
     <div class="panel-body">
-      <h3>{{_ "viewApiBackendSettings_deleteApiTitle" }}</h3>
+      <h3>{{_ "apiSettings_deleteApiTitle" }}</h3>
       <p>
-        {{_ "viewApiBackendSettings_deleteApiText" }}
+        {{_ "apiSettings_deleteApiText" }}
       </p>
       <a
          href="#"
          class="btn btn-danger"
          id="deleteModal">
-        {{_ "viewApiBackendDetails_deleteButton"}}
+        {{_ "apiDetails_deleteButton"}}
       </a>
     </div>
   </div>
diff --git a/apis/client/view/settings/settings.js b/apis/client/view/settings/settings.js
index 31d2c958c4..84fdc74491 100644
--- a/apis/client/view/settings/settings.js
+++ b/apis/client/view/settings/settings.js
@@ -1,6 +1,6 @@
 import { Apis } from '/apis/collection';
 
-Template.viewApiBackendSettings.events({
+Template.apiSettings.events({
   // event handler to execute when delete API button is clicked
   'click #deleteModal': function () {
     const apiId = this.api._id;
@@ -13,7 +13,7 @@ Template.viewApiBackendSettings.events({
   },
 });
 
-Template.viewApiBackendSettings.helpers({
+Template.apiSettings.helpers({
   formCollection () {
     return Apis;
   },
diff --git a/apis/client/view/status/status.html b/apis/client/view/status/status.html
index 2f6e736f64..7cffd31f1b 100644
--- a/apis/client/view/status/status.html
+++ b/apis/client/view/status/status.html
@@ -1,4 +1,4 @@
-<template name="viewApiBackendStatus" >
+<template name="viewApiStatus" >
   <div
     class="api-status-indicator-{{api._id}} api-status-color"
     data-toggle="tooltip"
diff --git a/apis/client/view/status/status.js b/apis/client/view/status/status.js
index 5a13915687..d4f7517a12 100644
--- a/apis/client/view/status/status.js
+++ b/apis/client/view/status/status.js
@@ -1,7 +1,7 @@
 // Meteor imports
 import { Template } from 'meteor/templating';
 
-Template.viewApiBackendStatus.onCreated(function () {
+Template.viewApiStatus.onCreated(function () {
   // Create reference to instance
   const instance = this;
 
@@ -35,28 +35,28 @@ Template.viewApiBackendStatus.onCreated(function () {
       if (success.test(status.code)) {
         className = 'status-success';
         statusText = `
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_Success')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_Success')}
           `;
       } else if (redirect.test(status.code)) {
         className = 'status-success';
         statusText = `
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_ErrorCodeText')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_ErrorCodeText')}
           ${status.code}.
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_RedirectError')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_RedirectError')}
         `;
       } else if (clientErr.test(status.code)) {
         className = 'status-warning';
         statusText = `
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_ErrorCodeText')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_ErrorCodeText')}
           ${status.code}.
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_ClientError')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_ClientError')}
         `;
       } else if (serverErr.test(status.code)) {
         className = 'alert-danger';
         statusText = `
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_ErrorCodeText')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_ErrorCodeText')}
           ${status.code}.
-          ${TAPi18n.__('viewApiBackendStatus_statusMessage_ServerError')}
+          ${TAPi18n.__('viewApiStatus_statusMessage_ServerError')}
         `;
       }
 
@@ -67,7 +67,7 @@ Template.viewApiBackendStatus.onCreated(function () {
   };
 });
 
-Template.viewApiBackendStatus.onRendered(function () {
+Template.viewApiStatus.onRendered(function () {
   // Get reference to template instance
   const instance = this;
 
diff --git a/apis/client/view/view.html b/apis/client/view/view.html
index 8c640199fb..8d17a34639 100644
--- a/apis/client/view/view.html
+++ b/apis/client/view/view.html
@@ -1,35 +1,35 @@
-<template name="viewApiBackend">
+<template name="viewApi">
   {{#if Template.subscriptionsReady }}
-  {{> viewApiBackendPageHeader api=api proxyIsConfigured=proxyIsConfigured proxyBackend=proxyBackend }}
+  {{> viewApiPageHeader api=api proxyIsConfigured=proxyIsConfigured proxyBackend=proxyBackend }}
   <div class="container">
     <div class="tab-content">
       <div id="api-details" class="tab-pane fade in active">
-        {{> viewApiBackendDetails api=api proxyBackend=proxyBackend }}
+        {{> apiDetails api=api proxyBackend=proxyBackend }}
       </div> <!-- /api-backend-details -->
 
       <div id="api-documentation" class="tab-pane fade">
-        {{> documentation api=api }}
-      </div> <!-- /api-backend-documentation -->
+        {{> apiDocumentation api=api }}
+      </div> <!-- /api-documentation -->
 
       <div id="api-metadata" class="tab-pane fade">
-        {{> viewApiBackendMetadata api=api }}
-      </div> <!-- /api-backend-metadata -->
+        {{> viewApiMetadata api=api }}
+      </div> <!-- /api-metadata -->
 
       <div id="api-feedback" class="tab-pane fade">
         {{> feedbackList api=api }}
-      </div> <!-- /api-backend-feedback -->
+      </div> <!-- /api-feedback -->
 
       {{ # if currentUser }}
         {{# if api.currentUserCanEdit }}
           <div id="api-backend-export" class="tab-pane fade">
-            {{> viewApiBackendExport api=api }}
-          </div> <!-- /api-backend-export -->
+            {{> apiExport api=api }}
+          </div> <!-- /api-export -->
         {{ / if }}
       {{ / if }}
 
       <div id="api-backlog" class="tab-pane fade">
         {{> apiBacklog api=api backlogItems=backlogItems }}
-      </div> <!-- /api-backend-backlog -->
+      </div> <!-- /api-backlog -->
 
       {{ # if currentUser }}
         {{# if api.currentUserCanEdit }}
@@ -37,11 +37,11 @@
           {{# if proxyIsConfigured }}
           <div id="api-proxy" class="tab-pane fade">
             {{> apiProxy api=api }}
-          </div> <!-- /api-backend-proxy -->
+          </div> <!-- /api-proxy -->
           {{/ if }}
 
           <div id="api-settings" class="tab-pane fade">
-            {{> viewApiBackendSettings api=api }}
+            {{> apiSettings api=api }}
           </div>
         {{ / if }}
       {{ / if }}
diff --git a/apis/client/view/view.js b/apis/client/view/view.js
index 1db1680258..b484a4b1ff 100644
--- a/apis/client/view/view.js
+++ b/apis/client/view/view.js
@@ -5,7 +5,7 @@ import { ApiBacklogItems } from '/backlog/collection';
 import { Proxies } from '/proxies/collection';
 import { ProxyBackends } from '/proxy_backends/collection';
 
-Template.viewApiBackend.onCreated(function () {
+Template.viewApi.onCreated(function () {
   // Get reference to template instance
   const instance = this;
 
@@ -25,7 +25,7 @@ Template.viewApiBackend.onCreated(function () {
   instance.subscribe('apiProxySettings', instance.apiId);
 });
 
-Template.viewApiBackend.helpers({
+Template.viewApi.helpers({
   api () {
     // Get reference to template instance
     const instance = Template.instance();
diff --git a/catalogue/client/grid/grid.html b/catalogue/client/grid/grid.html
index ec7f1e25c2..f7a1adb4dd 100644
--- a/catalogue/client/grid/grid.html
+++ b/catalogue/client/grid/grid.html
@@ -7,7 +7,7 @@
           <div class="api-card-logo">
             {{> viewApiLogo api=api }}
           </div>
-          {{> viewApiBackendStatus api=api width="0.6" }}
+          {{> viewApiStatus api=api width="0.6" }}
           <div class="api-card-info">
             <a href="/api/{{api._id}}"
                class="api-card-name">
diff --git a/catalogue/client/table/table.html b/catalogue/client/table/table.html
index 4c399b59df..9130f33f19 100644
--- a/catalogue/client/table/table.html
+++ b/catalogue/client/table/table.html
@@ -6,7 +6,7 @@
         {{#if api.currentUserCanView }}
         <tr>
           <td class="col-sm-1">
-            {{> viewApiBackendStatus api=api width="0.6" }}
+            {{> viewApiStatus api=api width="0.6" }}
             <div class="api-catalogue-table-logo center-block">
               {{> viewApiLogo api=api }}
             </div>
diff --git a/core/client/lib/router.js b/core/client/lib/router.js
index 21089e201d..817bd5bb48 100755
--- a/core/client/lib/router.js
+++ b/core/client/lib/router.js
@@ -34,7 +34,7 @@ var redirectToDashboard = function () {
 };
 
 // Router.onBeforeAction(redirectToSignIn, {
-//   except: ['home', 'atSignUp', 'forgotPwd', 'atSignOut', 'catalogue', 'viewApiBackend', 'search']
+//   except: ['home', 'atSignUp', 'forgotPwd', 'atSignOut', 'catalogue', 'viewApi', 'search']
 // });
 
 Router.onBeforeAction(redirectToDashboard, {only: ['forgotPwd', 'signOut']});
diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index d96aefc841..48b7387faa 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -124,18 +124,18 @@
   "deleteBacklogItem_confirmation_text": "Are you sure you want to delete this backlog item?",
   "deleteBacklogItem_cancelButton_text": "Cancel",
   "deleteBacklogItem_deleteButton_text": "Delete backlog item",
-  "documentation_APICall_Warning_Message": "API calls (PUT, POST, or DELETE) from Swagger are real calls.",
-  "documentation_APICall_Warning_Title": "Warning!",
-  "documentation_Link_Title": "Link",
-  "documentation_manageDocumentation_buttonText": "Manage",
-  "documentation_No_Link_Manager_Message": "You can add one using Manage API feature.",
-  "documentation_No_Link_Message": "No documentation link is available.",
-  "documentation_No_Swagger_Manager_Message": "You can add one using Manage API feature.",
-  "documentation_No_Swagger_Message": "No swagger document is available.",
-  "documentation_Title": "Documentation",
-  "documentation_Viewer_Title": "Viewer",
-  "documentation_sdkGenerateButton": "SDK Generate",
-  "documentation_tooltipSDKGeneratorButton": "With a valid swagger file, you can download an SDK of your preferred language using this wizard",
+  "apiDocumentation_APICall_Warning_Message": "API calls (PUT, POST, or DELETE) from Swagger are real calls.",
+  "apiDocumentation_APICall_Warning_Title": "Warning!",
+  "apiDocumentation_Link_Title": "Link",
+  "apiDocumentation_manageDocumentation_buttonText": "Manage",
+  "apiDocumentation_No_Link_Manager_Message": "You can add one using Manage API feature.",
+  "apiDocumentation_No_Link_Message": "No documentation link is available.",
+  "apiDocumentation_No_Swagger_Manager_Message": "You can add one using Manage API feature.",
+  "apiDocumentation_No_Swagger_Message": "No swagger document is available.",
+  "apiDocumentation_Title": "Documentation",
+  "apiDocumentation_Viewer_Title": "Viewer",
+  "apiDocumentation_sdkGenerateButton": "SDK Generate",
+  "apiDocumentation_tooltipSDKGeneratorButton": "With a valid swagger file, you can download an SDK of your preferred language using this wizard",
   "editBacklogItem_modalTitle": "Edit backlog item",
   "editBacklogItem_submit_buttonText": "Save",
   "esData_notFound": "There are no API usage statistics available.",
@@ -494,39 +494,39 @@
   "userMenu_profile": "Profile",
   "userMenu_settings": "Settings",
   "userMenu_signout": "Sign out",
-  "viewApiBackendDetails_deleteButton": "Delete",
-  "viewApiBackendDetails_baseUrl_headingText": "Base URL",
-  "viewApiBackendDetails_description_headingText": "Description",
-  "viewApiBackendNavigationMenu_backlog": "Backlog",
-  "viewApiBackendNavigationMenu_details": "Details",
-  "viewApiBackendNavigationMenu_documentation": "Documentation",
-  "viewApiBackendNavigationMenu_export": "Export",
-  "viewApiBackendNavigationMenu_feedback": "Feedback",
-  "viewApiBackendNavigationMenu_metadata": "Metadata",
-  "viewApiBackendNavigationMenu_proxy": "Proxy",
-  "viewApiBackendNavigationMenu_settings": "Settings",
-  "viewApiBackendSettings_panelTitleAbout": "About",
-  "viewApiBackendSettings_panelTitleManage": "Manage",
-  "viewApiBackendSettigs_saveButton_text": "Save",
-  "viewApiBackendSettings_deleteApiText": "This action cannot be undone. The API Backend and all its related information, i.e. metadata, documentation, API backlog items and feedback will be removed.",
-  "viewApiBackendSettings_deleteApiTitle": "Delete the API",
-  "viewApiBackendSettings_uploadLogo_heading": "Upload logo",
-  "viewApiBackendSettings_uploadLogoText": "You can upload a logo for your API. The logo will appear in the catalogue and on the single API page.",
-  "viewApiBackendStatus_statusMessage_ClientError": "Client error.",
-  "viewApiBackendStatus_statusMessage_ErrorCodeText": "Status code:",
-  "viewApiBackendStatus_statusMessage_RedirectError": "Redirection.",
-  "viewApiBackendStatus_statusMessage_ServerError": "Server error.",
-  "viewApiBackendStatus_statusMessage_Success": "API is operating normally.",
+  "apiDetails_deleteButton": "Delete",
+  "apiDetails_baseUrl_headingText": "Base URL",
+  "apiDetails_description_headingText": "Description",
+  "viewApiNavigationMenu_backlog": "Backlog",
+  "viewApiNavigationMenu_details": "Details",
+  "viewApiNavigationMenu_documentation": "Documentation",
+  "viewApiNavigationMenu_export": "Export",
+  "viewApiNavigationMenu_feedback": "Feedback",
+  "viewApiNavigationMenu_metadata": "Metadata",
+  "viewApiNavigationMenu_proxy": "Proxy",
+  "viewApiNavigationMenu_settings": "Settings",
+  "apiSettings_panelTitleAbout": "About",
+  "apiSettings_panelTitleManage": "Manage",
+  "viewApiSettigs_saveButton_text": "Save",
+  "apiSettings_deleteApiText": "This action cannot be undone. The API Backend and all its related information, i.e. metadata, documentation, API backlog items and feedback will be removed.",
+  "apiSettings_deleteApiTitle": "Delete the API",
+  "apiSettings_uploadLogo_heading": "Upload logo",
+  "apiSettings_uploadLogoText": "You can upload a logo for your API. The logo will appear in the catalogue and on the single API page.",
+  "viewApiStatus_statusMessage_ClientError": "Client error.",
+  "viewApiStatus_statusMessage_ErrorCodeText": "Status code:",
+  "viewApiStatus_statusMessage_RedirectError": "Redirection.",
+  "viewApiStatus_statusMessage_ServerError": "Server error.",
+  "viewApiStatus_statusMessage_Success": "API is operating normally.",
   "view_ApiBackend_Backend": "Backend",
   "view_ApiBackend_Backend_Prefix": "Backend prefix",
   "view_ApiBackend_Details_Title": "Details",
-  "viewApiBackendExport_json_button": "Export .json",
-  "viewApiBackendExport_yaml_button": "Export .yaml",
-  "viewApiBackendExport_api_title": "Export API configuration",
-  "viewApiBackendExport_api_description": "Export API configuration in JSON or YAML format",
-  "viewApiBackendExport_proxy_title": "Export proxy configuration",
-  "viewApiBackendExport_proxy_description": "Export proxy configuration in JSON or YAML format",
-  "viewApiBackendExport_title": "Export",
+  "apiExport_json_button": "Export .json",
+  "apiExport_yaml_button": "Export .yaml",
+  "apiExport_api_title": "Export API configuration",
+  "apiExport_api_description": "Export API configuration in JSON or YAML format",
+  "apiExport_proxy_title": "Export proxy configuration",
+  "apiExport_proxy_description": "Export proxy configuration in JSON or YAML format",
+  "apiExport_title": "Export",
   "view_ApiBackend_Frontend": "Frontend",
   "view_ApiBackend_Frontend_Prefix": "Frontend prefix",
   "view_ApiBackend_Matchers": "URL Matchers",
diff --git a/dashboard/client/charts/filtering/selectpicker/selectpicker.html b/dashboard/client/charts/filtering/selectpicker/selectpicker.html
index 11d323b9fc..f2defeed6c 100644
--- a/dashboard/client/charts/filtering/selectpicker/selectpicker.html
+++ b/dashboard/client/charts/filtering/selectpicker/selectpicker.html
@@ -12,7 +12,7 @@
       <optgroup label="My APIs" >
         {{ # each api in myApis }}
           <option value="{{ api.url_matches.[0].frontend_prefix }}" >
-            {{ > viewApiBackendStatus apiBackend=api width="0.5" }}
+            {{ > viewApiStatus apiBackend=api width="0.5" }}
             &nbsp;
             {{ api.name }}</option>
         {{ / each }}
@@ -20,7 +20,7 @@
       <optgroup label="Other APIs" >
         {{ # each api in otherApis }}
           <option value="{{ api.url_matches.[0].frontend_prefix }}" >
-            {{ > viewApiBackendStatus apiBackend=api width="0.5" }}
+            {{ > viewApiStatus apiBackend=api width="0.5" }}
             &nbsp;
             {{ api.name }}</option>
         {{ / each }}
@@ -28,7 +28,7 @@
     {{ else }}
       {{ # each api in otherApis }}
         <option value="{{ api.url_matches.[0].frontend_prefix }}" >
-          {{ > viewApiBackendStatus apiBackend=api width="0.5" }}
+          {{ > viewApiStatus apiBackend=api width="0.5" }}
           &nbsp;
           {{ api.name }}</option>
       {{ / each }}
diff --git a/documentation/client/view/documentation.html b/documentation/client/view/documentation.html
index b8bccbc15d..3ac949fd33 100644
--- a/documentation/client/view/documentation.html
+++ b/documentation/client/view/documentation.html
@@ -1,4 +1,4 @@
-<template name="documentation">
+<template name="apiDocumentation">
   <div class="panel panel-default">
     <div class="panel-heading">
       {{#if api.currentUserCanEdit }}
@@ -6,7 +6,7 @@
             id="manage-api-documentation"
             class="btn btn-xs btn-info pull-right">
             <i class="fa fa-pencil"></i>&nbsp;
-              {{_ "documentation_manageDocumentation_buttonText" }}
+              {{_ "apiDocumentation_manageDocumentation_buttonText" }}
           </button>
         {{/if}}
 
@@ -18,19 +18,19 @@
               class="btn btn-info btn-xs pull-right"
               data-toggle="tooltip"
               title="{{_ 'documentation_tooltipSDKGeneratorButton'}}">
-                {{_ "documentation_sdkGenerateButton" }}
+                {{_ "apiDocumentation_sdkGenerateButton" }}
             </button>
           {{/ if }} <!-- /if documentation exists -->
         {{/if}}<!-- /if codegen server exists -->
       {{/if}}<!-- /if template subscriptions ready -->
       <h2 class="panel-title clearfix">
-        {{_ "documentation_Title" }}
+        {{_ "apiDocumentation_Title" }}
       </h2>
     </div>
     <div class="panel-body">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h2 class="panel-title">{{_ "documentation_Link_Title" }}</h2>
+          <h2 class="panel-title">{{_ "apiDocumentation_Link_Title" }}</h2>
         </div>
         <div class="panel-body">
           {{#if documentationLink }}
@@ -40,9 +40,9 @@ <h2 class="panel-title">{{_ "documentation_Link_Title" }}</h2>
             </div>
           {{else}}
           <i>
-            {{_ "documentation_No_Link_Message" }}
+            {{_ "apiDocumentation_No_Link_Message" }}
             {{#if api.currentUserCanEdit }}
-            {{_ "documentation_No_Link_Manager_Message" }}
+            {{_ "apiDocumentation_No_Link_Manager_Message" }}
             {{/if}}
           </i>
           {{/if}}
@@ -61,7 +61,7 @@ <h2 class="panel-title">{{_ "documentation_Link_Title" }}</h2>
              data-content="{{_ 'documentation_APICall_Warning_Message' }}">
             <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
           </a>
-          <h2 class="panel-title">{{_ "documentation_Viewer_Title" }}</h2>
+          <h2 class="panel-title">{{_ "apiDocumentation_Viewer_Title" }}</h2>
         </div>
         <div class="panel-body">
           {{#if Template.subscriptionsReady }}
@@ -69,9 +69,9 @@ <h2 class="panel-title">{{_ "documentation_Viewer_Title" }}</h2>
               {{> swaggerUi apiDoc=uploadedDocumentationLink api=api}}
             {{ else }}
             <i>
-              {{_ "documentation_No_Swagger_Message" }}
+              {{_ "apiDocumentation_No_Swagger_Message" }}
               {{#if api.currentUserCanEdit }}
-              {{_ "documentation_No_Swagger_Manager_Message" }}
+              {{_ "apiDocumentation_No_Swagger_Manager_Message" }}
               {{/if}}
             </i>
             {{/if}}
diff --git a/metadata/client/view/metadata.html b/metadata/client/view/metadata.html
index 39524d362a..e63dfb7d1b 100644
--- a/metadata/client/view/metadata.html
+++ b/metadata/client/view/metadata.html
@@ -1,4 +1,4 @@
-<template name="viewApiBackendMetadata">
+<template name="viewApiMetadata">
   <div class="panel panel-default">
     <div class="panel-heading">
       {{#if api.currentUserCanEdit }}
diff --git a/metadata/client/view/metadata.js b/metadata/client/view/metadata.js
index 12a85ac0ce..d64ea26cfb 100644
--- a/metadata/client/view/metadata.js
+++ b/metadata/client/view/metadata.js
@@ -1,6 +1,6 @@
 import { ApiMetadata } from '../../collection';
 
-Template.viewApiBackendMetadata.onCreated(function () {
+Template.viewApiMetadata.onCreated(function () {
   // Get reference to template instance
   const instance = this;
 
@@ -8,7 +8,7 @@ Template.viewApiBackendMetadata.onCreated(function () {
   instance.subscribe('apiMetadata', instance.data.api._id);
 });
 
-Template.viewApiBackendMetadata.helpers({
+Template.viewApiMetadata.helpers({
   metadata () {
     // Get reference to template instance
     const instance = Template.instance();

From 80a2585f14f131f4f3f4d69080258856bcc3d80e Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 13:47:53 +0300
Subject: [PATCH 15/21] Rename apiDocumentation template

---
 documentation/client/view/documentation.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/client/view/documentation.js b/documentation/client/view/documentation.js
index ab42f21881..e55cdd6913 100644
--- a/documentation/client/view/documentation.js
+++ b/documentation/client/view/documentation.js
@@ -1,7 +1,7 @@
 import { DocumentationFiles } from '/documentation/collection/collection';
 import { Settings } from '/settings/collection';
 
-Template.documentation.onCreated(function () {
+Template.apiDocumentation.onCreated(function () {
   const instance = this;
 
   // Run subscription in autorun
@@ -19,11 +19,11 @@ Template.documentation.onCreated(function () {
   instance.subscribe('singleSetting', 'sdkCodeGenerator');
 });
 
-Template.documentation.onRendered(function () {
+Template.apiDocumentation.onRendered(function () {
   $('[data-toggle="popover"]').popover();
 });
 
-Template.documentation.helpers({
+Template.apiDocumentation.helpers({
   uploadedDocumentationLink () {
     const documentationFileId = this.api.documentationFileId;
 
@@ -77,7 +77,7 @@ Template.documentation.helpers({
 
 });
 
-Template.documentation.events({
+Template.apiDocumentation.events({
   'click #manage-api-documentation': function (event, instance) {
     // Get reference to API backend
     const api = instance.data.api;

From 7bb82328f80c7ada030cb8a1dd24123a50e99bf3 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 13:53:35 +0300
Subject: [PATCH 16/21] Add editMetadataForm button text; fix class

---
 core/lib/i18n/en.i18n.json     | 1 +
 metadata/client/edit/edit.html | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 48b7387faa..ac2d1842e7 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -136,6 +136,7 @@
   "apiDocumentation_Viewer_Title": "Viewer",
   "apiDocumentation_sdkGenerateButton": "SDK Generate",
   "apiDocumentation_tooltipSDKGeneratorButton": "With a valid swagger file, you can download an SDK of your preferred language using this wizard",
+  "editApiMetadata_editButton": "Edit metadata",
   "editBacklogItem_modalTitle": "Edit backlog item",
   "editBacklogItem_submit_buttonText": "Save",
   "esData_notFound": "There are no API usage statistics available.",
diff --git a/metadata/client/edit/edit.html b/metadata/client/edit/edit.html
index 53aabbd1ec..4532ee23f6 100644
--- a/metadata/client/edit/edit.html
+++ b/metadata/client/edit/edit.html
@@ -6,19 +6,19 @@
     data-backdrop="static"
     data-keyboard="false">
       <i class="fa fa-book"></i>&nbsp;
-      {{_ "editApiMetadata_editApiMetadataForm_button"}}
+      {{_ "editApiMetadata_editButton" }}
   </button>
   <div class="modal fade"
     id="apiMetadataModal"
     tabindex="-1"
     role="dialog"
-    aria-labelledby="feedbackFormLabel">
+    aria-labelledby="editMetadataFormLabel">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span></button>
-          <h4 class="modal-title" id="feedbackFormLabel">
+          <h4 class="modal-title" id="editMetadataFormLabel">
             <i class="fa fa-book"></i>&nbsp;
             {{_ "editApiMetadata_editApiMetadataForm_title"}}
           </h4>

From 5ded85aa4fff19675041aab842cbe06f271c775c Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 13:54:48 +0300
Subject: [PATCH 17/21] Alphabetize apiDocumentation keys

---
 core/lib/i18n/en.i18n.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index ac2d1842e7..e9ebf23688 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -43,6 +43,18 @@
   "apiBackendSelectPicker_selectAPI": "Select API",
   "apiDocumentationEditor_notAvailable": "API documentation editor is not available.",
   "apiDocumentationSelect_noApiDocumentation": "No API documentations found.",
+  "apiDocumentation_APICall_Warning_Message": "API calls (PUT, POST, or DELETE) from Swagger are real calls.",
+  "apiDocumentation_APICall_Warning_Title": "Warning!",
+  "apiDocumentation_Link_Title": "Link",
+  "apiDocumentation_manageDocumentation_buttonText": "Manage",
+  "apiDocumentation_No_Link_Manager_Message": "You can add one using Manage API feature.",
+  "apiDocumentation_No_Link_Message": "No documentation link is available.",
+  "apiDocumentation_No_Swagger_Manager_Message": "You can add one using Manage API feature.",
+  "apiDocumentation_No_Swagger_Message": "No swagger document is available.",
+  "apiDocumentation_Title": "Documentation",
+  "apiDocumentation_Viewer_Title": "Viewer",
+  "apiDocumentation_sdkGenerateButton": "SDK Generate",
+  "apiDocumentation_tooltipSDKGeneratorButton": "With a valid swagger file, you can download an SDK of your preferred language using this wizard",
   "apiLogo_resumable_acceptedExtensions": "Only .jpg, .jpeg, .png, .gif are accepted.",
   "apiLogo_resumable_successfully_uploaded": "Logo successfully uploaded!",
   "api_backend_rating_anonymous": "Please log in to vote.",
@@ -124,18 +136,6 @@
   "deleteBacklogItem_confirmation_text": "Are you sure you want to delete this backlog item?",
   "deleteBacklogItem_cancelButton_text": "Cancel",
   "deleteBacklogItem_deleteButton_text": "Delete backlog item",
-  "apiDocumentation_APICall_Warning_Message": "API calls (PUT, POST, or DELETE) from Swagger are real calls.",
-  "apiDocumentation_APICall_Warning_Title": "Warning!",
-  "apiDocumentation_Link_Title": "Link",
-  "apiDocumentation_manageDocumentation_buttonText": "Manage",
-  "apiDocumentation_No_Link_Manager_Message": "You can add one using Manage API feature.",
-  "apiDocumentation_No_Link_Message": "No documentation link is available.",
-  "apiDocumentation_No_Swagger_Manager_Message": "You can add one using Manage API feature.",
-  "apiDocumentation_No_Swagger_Message": "No swagger document is available.",
-  "apiDocumentation_Title": "Documentation",
-  "apiDocumentation_Viewer_Title": "Viewer",
-  "apiDocumentation_sdkGenerateButton": "SDK Generate",
-  "apiDocumentation_tooltipSDKGeneratorButton": "With a valid swagger file, you can download an SDK of your preferred language using this wizard",
   "editApiMetadata_editButton": "Edit metadata",
   "editBacklogItem_modalTitle": "Edit backlog item",
   "editBacklogItem_submit_buttonText": "Save",

From c5fa52365e72974f4c8aeb3ae30874daccd44c8c Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 13:57:19 +0300
Subject: [PATCH 18/21] Rename 'view_ApiBackend' to 'viewApi'

---
 apis/client/view/details/details.html |  2 +-
 core/lib/i18n/en.i18n.json            | 36 ++++++++++-----------
 core/lib/i18n/fi.i18n.json            | 46 +++++++++++++--------------
 metadata/client/view/metadata.html    | 20 ++++++------
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index 8daab496a2..22ac0a6985 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -2,7 +2,7 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title clearfix">
-        {{_ "view_ApiBackend_Details_Title"}}
+        {{_ "viewApi_Details_Title"}}
       </h2>
     </div>
     <div class="panel-body">
diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index e9ebf23688..11aab46ab1 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -518,9 +518,9 @@
   "viewApiStatus_statusMessage_RedirectError": "Redirection.",
   "viewApiStatus_statusMessage_ServerError": "Server error.",
   "viewApiStatus_statusMessage_Success": "API is operating normally.",
-  "view_ApiBackend_Backend": "Backend",
-  "view_ApiBackend_Backend_Prefix": "Backend prefix",
-  "view_ApiBackend_Details_Title": "Details",
+  "viewApi_Backend": "Backend",
+  "viewApi_Backend_Prefix": "Backend prefix",
+  "viewApi_Details_Title": "Details",
   "apiExport_json_button": "Export .json",
   "apiExport_yaml_button": "Export .yaml",
   "apiExport_api_title": "Export API configuration",
@@ -528,21 +528,21 @@
   "apiExport_proxy_title": "Export proxy configuration",
   "apiExport_proxy_description": "Export proxy configuration in JSON or YAML format",
   "apiExport_title": "Export",
-  "view_ApiBackend_Frontend": "Frontend",
-  "view_ApiBackend_Frontend_Prefix": "Frontend prefix",
-  "view_ApiBackend_Matchers": "URL Matchers",
-  "view_ApiBackend_Metadata_Contact_email": "email",
-  "view_ApiBackend_Metadata_Contact_phone": "Phone",
-  "view_ApiBackend_Metadata_Contact_title": "Contact",
-  "view_ApiBackend_Metadata_NotFound": "No metadata found.",
-  "view_ApiBackend_Metadata_Organization_title": "Organization",
-  "view_ApiBackend_Metadata_Service_serviceLevelAgreement": "Service level agreement",
-  "view_ApiBackend_Metadata_Service_title": "Service",
-  "view_ApiBackend_Metadata_Service_validSince": "Valid since",
-  "view_ApiBackend_Metadata_Service_validUntil": "Valid until",
-  "view_ApiBackend_Metadata_Title": "Metadata",
-  "view_ApiBackend_Servers": "Servers",
-  "view_ApiBackend_Title": "View API backend",
+  "viewApi_Frontend": "Frontend",
+  "viewApi_Frontend_Prefix": "Frontend prefix",
+  "viewApi_Matchers": "URL Matchers",
+  "viewApi_Metadata_Contact_email": "email",
+  "viewApi_Metadata_Contact_phone": "Phone",
+  "viewApi_Metadata_Contact_title": "Contact",
+  "viewApi_Metadata_NotFound": "No metadata found.",
+  "viewApi_Metadata_Organization_title": "Organization",
+  "viewApi_Metadata_Service_serviceLevelAgreement": "Service level agreement",
+  "viewApi_Metadata_Service_title": "Service",
+  "viewApi_Metadata_Service_validSince": "Valid since",
+  "viewApi_Metadata_Service_validUntil": "Valid until",
+  "viewApi_Metadata_Title": "Metadata",
+  "viewApi_Servers": "Servers",
+  "viewApi_Title": "View API backend",
   "tickButtons_hour": "Hour",
   "tickButtons_day": "Day",
   "tickButtons_week": "Week",
diff --git a/core/lib/i18n/fi.i18n.json b/core/lib/i18n/fi.i18n.json
index 3cc3755582..a1b770848d 100644
--- a/core/lib/i18n/fi.i18n.json
+++ b/core/lib/i18n/fi.i18n.json
@@ -79,26 +79,26 @@
   "apiBackend_Status_Title": "Tila",
   "apiBackend_Status_Updated": "Päivitetty:",
   "apiBackend_Status_Checking": "API:n tilaa tarkistetaan. Odota hetki...",
-  "view_ApiBackend_Title": "Api back-end",
-  "view_ApiBackend_Servers": "Palvelimet",
-  "view_ApiBackend_Backend": "Taustajärjestelmä",
-  "view_ApiBackend_Frontend": "Frontend",
-  "view_ApiBackend_Matchers": "URL vastaparit",
-  "view_ApiBackend_Backend_Prefix": "Backend prefix",
-  "view_ApiBackend_Frontend_Prefix": "Frontend prefix",
-  "view_ApiBackend_Export_Title": "Vie rajapinnan asetukset",
-  "view_ApiBackend_ExportJson": "Vie json-tiedosto",
-  "view_ApiBackend_ExportYaml": "Vie yaml-tiedosto",
-  "view_ApiBackend_Metadata_Title": "Metadata",
-  "view_ApiBackend_Metadata_NotFound": "Ei löydetty metadataa.",
-  "view_ApiBackend_Metadata_Organization_title": "Organization",
-  "view_ApiBackend_Metadata_Contact_title": "Contact",
-  "view_ApiBackend_Metadata_Contact_phone": "Phone",
-  "view_ApiBackend_Metadata_Contact_email": "email",
-  "view_ApiBackend_Metadata_Service_title": "Service",
-  "view_ApiBackend_Metadata_Service_validSince": "Valid since",
-  "view_ApiBackend_Metadata_Service_validUntil": "Valid until",
-  "view_ApiBackend_Metadata_Service_serviceLevelAgreement": "Service level agreement",
+  "viewApi_Title": "Api back-end",
+  "viewApi_Servers": "Palvelimet",
+  "viewApi_Backend": "Taustajärjestelmä",
+  "viewApi_Frontend": "Frontend",
+  "viewApi_Matchers": "URL vastaparit",
+  "viewApi_Backend_Prefix": "Backend prefix",
+  "viewApi_Frontend_Prefix": "Frontend prefix",
+  "viewApi_Export_Title": "Vie rajapinnan asetukset",
+  "viewApi_ExportJson": "Vie json-tiedosto",
+  "viewApi_ExportYaml": "Vie yaml-tiedosto",
+  "viewApi_Metadata_Title": "Metadata",
+  "viewApi_Metadata_NotFound": "Ei löydetty metadataa.",
+  "viewApi_Metadata_Organization_title": "Organization",
+  "viewApi_Metadata_Contact_title": "Contact",
+  "viewApi_Metadata_Contact_phone": "Phone",
+  "viewApi_Metadata_Contact_email": "email",
+  "viewApi_Metadata_Service_title": "Service",
+  "viewApi_Metadata_Service_validSince": "Valid since",
+  "viewApi_Metadata_Service_validUntil": "Valid until",
+  "viewApi_Metadata_Service_serviceLevelAgreement": "Service level agreement",
   "apiBackends_Add_API_Title": "Lisää rajapinta",
   "apiBackends_Edit_API_Title": "Muokkaa rajapintaa",
   "apiBackends_Title_Help": "Rajapinnan nimi",
@@ -173,9 +173,9 @@
   "dataTable_RequestIP": "Pyynnön IP",
   "dataTable_RequestPath": "Pyynnön polku",
   "dataTable_ResponseTime": "Vasteaika",
-  "view_ApiBackend_Details_Title": "Tiedot",
-  "view_ApiBackend_Details_editButtonText": "Muokkaa rajapinnan asetuksia",
-  "view_ApiBackend_Export_Title": "Vie",
+  "viewApi_Details_Title": "Tiedot",
+  "viewApi_Details_editButtonText": "Muokkaa rajapinnan asetuksia",
+  "viewApi_Export_Title": "Vie",
   "apiBacklog_mainTitle": "Tehtävälista",
   "apiBacklogForm_addBacklogItem_button": "Lisää uusi tehtävä",
   "apiBacklogList_noApiBacklogItemsFound": "Ei löydetty tehtäviä tälle rajapinnalle.",
diff --git a/metadata/client/view/metadata.html b/metadata/client/view/metadata.html
index e63dfb7d1b..bd32d2ac7e 100644
--- a/metadata/client/view/metadata.html
+++ b/metadata/client/view/metadata.html
@@ -5,7 +5,7 @@
         {{> editApiMetadata metadata=metadata }}
       {{/if}}
       <h2 class="panel-title clearfix">
-        {{_ "view_ApiBackend_Metadata_Title"}}
+        {{_ "viewApi_Metadata_Title"}}
       </h2>
     </div>
     <div class="panel-body">
@@ -16,7 +16,7 @@ <h2 class="panel-title clearfix">
         <div class="col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h2 class="panel-title">{{_ "view_ApiBackend_Metadata_Organization_title" }}</h2>
+              <h2 class="panel-title">{{_ "viewApi_Metadata_Organization_title" }}</h2>
             </div>
             <div class="panel-body">
               {{# if organization.name }}
@@ -33,17 +33,17 @@ <h3>{{ organization.name }}</h3>
         <div class="col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h2 class="panel-title">{{_ "view_ApiBackend_Metadata_Contact_title" }}</h2>
+              <h2 class="panel-title">{{_ "viewApi_Metadata_Contact_title" }}</h2>
             </div>
             <div class="panel-body">
               {{# if contact.name }}
                <h3>{{ contact.name }}</h3>
               {{/ if }}
               {{# if contact.phone }}
-               <p><b>{{_ "view_ApiBackend_Metadata_Contact_phone" }}:</b> {{ contact.phone }}</p>
+               <p><b>{{_ "viewApi_Metadata_Contact_phone" }}:</b> {{ contact.phone }}</p>
               {{/ if }}
               {{# if contact.email }}
-               <p><b>{{_ "view_ApiBackend_Metadata_Contact_email" }}:</b> {{ contact.email }}</p>
+               <p><b>{{_ "viewApi_Metadata_Contact_email" }}:</b> {{ contact.email }}</p>
               {{/ if }}
             </div>
           </div>
@@ -53,7 +53,7 @@ <h3>{{ contact.name }}</h3>
         <div class="col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h2 class="panel-title">{{_ "view_ApiBackend_Metadata_Service_title" }}</h2>
+              <h2 class="panel-title">{{_ "viewApi_Metadata_Service_title" }}</h2>
             </div>
             <div class="panel-body">
               {{# if service.name }}
@@ -63,13 +63,13 @@ <h3>{{ service.name }}</h3>
                 <p>{{ service.description }}</p>
               {{/ if }}
               {{# if service.validSince }}
-                <p><b>{{_ "view_ApiBackend_Metadata_Service_validSince" }}:</b> {{ service.validSince }}</p>
+                <p><b>{{_ "viewApi_Metadata_Service_validSince" }}:</b> {{ service.validSince }}</p>
               {{/ if }}
               {{# if service.validUntil }}
-                <p><b>{{_ "view_ApiBackend_Metadata_Service_validUntil" }}:</b> {{ service.validUntil }}</p>
+                <p><b>{{_ "viewApi_Metadata_Service_validUntil" }}:</b> {{ service.validUntil }}</p>
               {{/ if }}
               {{# if service.serviceLevelAgreement }}
-                <p><b>{{_ "view_ApiBackend_Metadata_Service_serviceLevelAgreement" }}:</b> {{ service.serviceLevelAgreement }}</p>
+                <p><b>{{_ "viewApi_Metadata_Service_serviceLevelAgreement" }}:</b> {{ service.serviceLevelAgreement }}</p>
               {{/ if }}
             </div>
           </div>
@@ -78,7 +78,7 @@ <h3>{{ service.name }}</h3>
       </div>
       {{/ with }}
       {{ else }}
-      <i>{{_ "view_ApiBackend_Metadata_NotFound"}}</i>
+      <i>{{_ "viewApi_Metadata_NotFound"}}</i>
       {{/ if }}
     </div>
   </div>

From 93a005f27d9cd2fd9f2ecbf75a0f1c4c2e0c1f18 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 14:00:16 +0300
Subject: [PATCH 19/21] Cleaner nesting

---
 metadata/client/view/metadata.html | 77 ++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/metadata/client/view/metadata.html b/metadata/client/view/metadata.html
index bd32d2ac7e..436b14e129 100644
--- a/metadata/client/view/metadata.html
+++ b/metadata/client/view/metadata.html
@@ -16,14 +16,20 @@ <h2 class="panel-title clearfix">
         <div class="col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h2 class="panel-title">{{_ "viewApi_Metadata_Organization_title" }}</h2>
+              <h2 class="panel-title">
+                {{_ "viewApi_Metadata_Organization_title" }}
+              </h2>
             </div>
             <div class="panel-body">
               {{# if organization.name }}
-                <h3>{{ organization.name }}</h3>
+                <h3>
+                  {{ organization.name }}
+                </h3>
               {{/ if }}
               {{# if organization.name }}
-                <p>{{ organization.description }}</p>
+                <p>
+                  {{ organization.description }}
+                </p>
               {{/ if }}
             </div>
           </div>
@@ -33,17 +39,33 @@ <h3>{{ organization.name }}</h3>
         <div class="col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h2 class="panel-title">{{_ "viewApi_Metadata_Contact_title" }}</h2>
+              <h2 class="panel-title">
+                {{_ "viewApi_Metadata_Contact_title" }}
+              </h2>
             </div>
             <div class="panel-body">
               {{# if contact.name }}
-               <h3>{{ contact.name }}</h3>
+               <h3>
+                 {{ contact.name }}
+               </h3>
               {{/ if }}
               {{# if contact.phone }}
-               <p><b>{{_ "viewApi_Metadata_Contact_phone" }}:</b> {{ contact.phone }}</p>
+               <p>
+                 <b>
+                   {{_ "viewApi_Metadata_Contact_phone" }}:
+                 </b>
+                 &nbsp;
+                  {{ contact.phone }}
+                </p>
               {{/ if }}
               {{# if contact.email }}
-               <p><b>{{_ "viewApi_Metadata_Contact_email" }}:</b> {{ contact.email }}</p>
+               <p>
+                 <b>
+                   {{_ "viewApi_Metadata_Contact_email" }}:
+                 </b>
+                 &nbsp;
+                 {{ contact.email }}
+               </p>
               {{/ if }}
             </div>
           </div>
@@ -53,23 +75,47 @@ <h3>{{ contact.name }}</h3>
         <div class="col-md-4">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h2 class="panel-title">{{_ "viewApi_Metadata_Service_title" }}</h2>
+              <h2 class="panel-title">
+                {{_ "viewApi_Metadata_Service_title" }}
+              </h2>
             </div>
             <div class="panel-body">
               {{# if service.name }}
-                <h3>{{ service.name }}</h3>
+                <h3>
+                  {{ service.name }}
+                </h3>
               {{/ if }}
               {{# if service.description }}
-                <p>{{ service.description }}</p>
+                <p>
+                  {{ service.description }}
+                </p>
               {{/ if }}
               {{# if service.validSince }}
-                <p><b>{{_ "viewApi_Metadata_Service_validSince" }}:</b> {{ service.validSince }}</p>
+                <p>
+                  <b>
+                    {{_ "viewApi_Metadata_Service_validSince" }}:
+                  </b>
+                  &nbsp;
+                  {{ service.validSince }}
+                </p>
               {{/ if }}
               {{# if service.validUntil }}
-                <p><b>{{_ "viewApi_Metadata_Service_validUntil" }}:</b> {{ service.validUntil }}</p>
+                <p>
+                  <b>
+                    {{_ "viewApi_Metadata_Service_validUntil" }}:
+                  </b>
+                  &nbsp;
+                  {{ service.validUntil }}
+                </p>
               {{/ if }}
               {{# if service.serviceLevelAgreement }}
-                <p><b>{{_ "viewApi_Metadata_Service_serviceLevelAgreement" }}:</b> {{ service.serviceLevelAgreement }}</p>
+                <p>
+                  <b>
+                    {{_ "viewApi_Metadata_Service_serviceLevelAgreement" }}:
+                  </b>
+                  &nbsp;
+                  {{ service.serviceLevelAgreement }}
+                </p>
               {{/ if }}
             </div>
           </div>
@@ -78,9 +124,10 @@ <h3>{{ service.name }}</h3>
       </div>
       {{/ with }}
       {{ else }}
-      <i>{{_ "viewApi_Metadata_NotFound"}}</i>
+      <i>
+        {{_ "viewApi_Metadata_NotFound"}}
+      </i>
       {{/ if }}
     </div>
   </div>
-  <p></p>
 </template>

From b581e8628d3811a0ee29f6c0e2533c2035cea322 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 14:02:49 +0300
Subject: [PATCH 20/21] Alphabetize apiExport keys

---
 core/lib/i18n/en.i18n.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 11aab46ab1..17a8ab3e6c 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -55,6 +55,13 @@
   "apiDocumentation_Viewer_Title": "Viewer",
   "apiDocumentation_sdkGenerateButton": "SDK Generate",
   "apiDocumentation_tooltipSDKGeneratorButton": "With a valid swagger file, you can download an SDK of your preferred language using this wizard",
+  "apiExport_json_button": "Export .json",
+  "apiExport_yaml_button": "Export .yaml",
+  "apiExport_api_title": "Export API configuration",
+  "apiExport_api_description": "Export API configuration in JSON or YAML format",
+  "apiExport_proxy_title": "Export proxy configuration",
+  "apiExport_proxy_description": "Export proxy configuration in JSON or YAML format",
+  "apiExport_title": "Export",
   "apiLogo_resumable_acceptedExtensions": "Only .jpg, .jpeg, .png, .gif are accepted.",
   "apiLogo_resumable_successfully_uploaded": "Logo successfully uploaded!",
   "api_backend_rating_anonymous": "Please log in to vote.",
@@ -521,13 +528,6 @@
   "viewApi_Backend": "Backend",
   "viewApi_Backend_Prefix": "Backend prefix",
   "viewApi_Details_Title": "Details",
-  "apiExport_json_button": "Export .json",
-  "apiExport_yaml_button": "Export .yaml",
-  "apiExport_api_title": "Export API configuration",
-  "apiExport_api_description": "Export API configuration in JSON or YAML format",
-  "apiExport_proxy_title": "Export proxy configuration",
-  "apiExport_proxy_description": "Export proxy configuration in JSON or YAML format",
-  "apiExport_title": "Export",
   "viewApi_Frontend": "Frontend",
   "viewApi_Frontend_Prefix": "Frontend prefix",
   "viewApi_Matchers": "URL Matchers",

From 8e810a6f9be1acebd7daf8356cb5e9f8c195a201 Mon Sep 17 00:00:00 2001
From: Brylie Christopher Oxley <brylie@gnumedia.org>
Date: Thu, 15 Sep 2016 14:04:19 +0300
Subject: [PATCH 21/21] Add editApiMetadata submit button text

---
 core/lib/i18n/en.i18n.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/lib/i18n/en.i18n.json b/core/lib/i18n/en.i18n.json
index 17a8ab3e6c..c0e0679394 100644
--- a/core/lib/i18n/en.i18n.json
+++ b/core/lib/i18n/en.i18n.json
@@ -144,6 +144,7 @@
   "deleteBacklogItem_cancelButton_text": "Cancel",
   "deleteBacklogItem_deleteButton_text": "Delete backlog item",
   "editApiMetadata_editButton": "Edit metadata",
+  "editApiMetadata_submitButtonText": "Save metadata",
   "editBacklogItem_modalTitle": "Edit backlog item",
   "editBacklogItem_submit_buttonText": "Save",
   "esData_notFound": "There are no API usage statistics available.",