From 3fb34ab05ccff621e4d14dd2547129457ef7147f Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 15:51:23 +0300
Subject: [PATCH 01/58] changed navigation to tabs

---
 apis/client/view/navigation/navigation.html | 15 ++++----
 apis/client/view/view_api_backend.html      | 42 +++++++++++----------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/apis/client/view/navigation/navigation.html b/apis/client/view/navigation/navigation.html
index da5d07a61c..b3f8fb531b 100644
--- a/apis/client/view/navigation/navigation.html
+++ b/apis/client/view/navigation/navigation.html
@@ -1,43 +1,42 @@
 <template name="viewApiBackendNavigationMenu">
   <div class="col-xs-12">
-    <ul class="nav nav-pills">
+    <ul class="nav nav-tabs">
       <li class="active">
-        <a href="#api-backend-details" data-toggle="pill">
+        <a href="#api-backend-details" data-toggle="tab">
           <i class="fa fa-info-circle"></i>
           {{_ "viewApiBackendNavigationMenu_details" }}
         </a>
       </li>
       <li>
-        <a href="#api-backend-documentation" data-toggle="pill">
+        <a href="#api-backend-documentation" data-toggle="tab">
           <i class="fa fa-file-text"></i>
           {{_ "viewApiBackendNavigationMenu_documentation" }}
         </a>
       </li>
       <li>
-        <a href="#api-backend-metadata" data-toggle="pill">
+        <a href="#api-backend-metadata" data-toggle="tab">
           <i class="fa fa-book"></i>
           {{_ "viewApiBackendNavigationMenu_metadata" }}
         </a>
       </li>
       <li>
-        <a href="#api-backend-feedback" data-toggle="pill">
+        <a href="#api-backend-feedback" data-toggle="tab">
           <i class="fa fa-comments-o"></i>
           {{_ "viewApiBackendNavigationMenu_feedback" }}
         </a>
       </li>
       <li>
-        <a href="#api-backend-backlog" data-toggle="pill">
+        <a href="#api-backend-backlog" data-toggle="tab">
           <i class="fa fa-check-square-o"></i>
           {{_ "viewApiBackendNavigationMenu_backlog" }}
         </a>
       </li>
       <li>
-        <a href="#api-backend-export" data-toggle="pill">
+        <a href="#api-backend-export" data-toggle="tab">
           <i class="fa fa-cloud-download"></i>
           {{_ "viewApiBackendNavigationMenu_export" }}
         </a>
       </li>
     </ul>
-    <br /> <!-- TODO: add proper spacing to the pill navigarion -->
   </div>
 </template>
diff --git a/apis/client/view/view_api_backend.html b/apis/client/view/view_api_backend.html
index ca9d3d67cd..900d0fcf3e 100644
--- a/apis/client/view/view_api_backend.html
+++ b/apis/client/view/view_api_backend.html
@@ -5,32 +5,34 @@
     {{> viewApiBackendNavigationMenu apiBackend=apiBackend }}
   </div>
 
-  <div class="tab-content">
-    <div id="api-backend-details" class="tab-pane fade in active">
-      {{> viewApiBackendDetails apiBackend=apiBackend }}
-    </div> <!-- /api-backend-details -->
+  <div class="panel-body">
+    <div class="tab-content">
+      <div id="api-backend-details" class="tab-pane fade in active">
+        {{> viewApiBackendDetails apiBackend=apiBackend }}
+      </div> <!-- /api-backend-details -->
 
-    <div id="api-backend-documentation" class="tab-pane fade in">
-      {{> documentation apiBackend=apiBackend }}
-    </div> <!-- /api-backend-Documentation -->
+      <div id="api-backend-documentation" class="tab-pane fade">
+        {{> documentation apiBackend=apiBackend }}
+      </div> <!-- /api-backend-Documentation -->
 
-    <div id="api-backend-metadata" class="tab-pane fade in">
-      {{> viewApiBackendMetadata apiBackend=apiBackend }}
-    </div> <!-- /api-backend-metadata -->
+      <div id="api-backend-metadata" class="tab-pane fade">
+        {{> viewApiBackendMetadata apiBackend=apiBackend }}
+      </div> <!-- /api-backend-metadata -->
 
-    <div id="api-backend-feedback" class="tab-pane fade in">
-      {{> feedbackList apiBackend=apiBackend }}
-    </div> <!-- /api-backend-metadata -->
+      <div id="api-backend-feedback" class="tab-pane fade">
+        {{> feedbackList apiBackend=apiBackend }}
+      </div> <!-- /api-backend-metadata -->
 
-    <div id="api-backend-export" class="tab-pane fade in">
-      {{> viewApiBackendExport apiBackend=apiBackend }}
-    </div> <!-- /api-backend-export -->
+      <div id="api-backend-export" class="tab-pane fade">
+        {{> viewApiBackendExport apiBackend=apiBackend }}
+      </div> <!-- /api-backend-export -->
 
-    <div id="api-backend-backlog" class="tab-pane fade in">
-      {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}
-    </div> <!-- /api-backend-export -->
+      <div id="api-backend-backlog" class="tab-pane fade">
+        {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}
+      </div> <!-- /api-backend-export -->
 
-  </div> <!-- /tab-content -->
+    </div>
+  </div>
   {{ else }}
   {{> spinner }}
   {{/ if }}

From 46837d18001f903dbe4175c334e76cffc0f62db1 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:35:06 +0300
Subject: [PATCH 02/58] added container

---
 apis/client/add/wizard.html                   |  30 ++--
 apis/client/edit/form/editApiBackendForm.html | 134 +++++++++---------
 dashboard/client/dashboard.html               |  10 +-
 3 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/apis/client/add/wizard.html b/apis/client/add/wizard.html
index 7559c6a28f..1e3bd5f610 100644
--- a/apis/client/add/wizard.html
+++ b/apis/client/add/wizard.html
@@ -1,16 +1,18 @@
 <template name="addApiBackendWizard">
-  <h1>
-    {{_ "addApiBackendWizard_heading" }}
-  </h1>
-  {{> wizard
-    id="add-api-backend-wizard"
-    route="addApiBackend-wizard"
-    steps=steps
-    buttonClasses="btn btn-default"
-    stepsTemplate="steps_bootstrap3"
-    clearOnDestroy=true
-    backButton=backButtonText
-    nextButton=nextButtonText
-    confirmButton=confirmButtonText
-  }}
+  <div class="container">
+    <h1>
+      {{_ "addApiBackendWizard_heading" }}
+    </h1>
+    {{> wizard
+      id="add-api-backend-wizard"
+      route="addApiBackend-wizard"
+      steps=steps
+      buttonClasses="btn btn-default"
+      stepsTemplate="steps_bootstrap3"
+      clearOnDestroy=true
+      backButton=backButtonText
+      nextButton=nextButtonText
+      confirmButton=confirmButtonText
+    }}
+  </div>
 </template>
diff --git a/apis/client/edit/form/editApiBackendForm.html b/apis/client/edit/form/editApiBackendForm.html
index 9751e8c3a6..4de900313a 100644
--- a/apis/client/edit/form/editApiBackendForm.html
+++ b/apis/client/edit/form/editApiBackendForm.html
@@ -1,73 +1,75 @@
 <template name="editApiBackendForm">
-  <div class="api-backends-content">
-    <h1>{{_ "apiBackends_Edit_API_Title"}}</h1>
-    {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
-    {{>showHelp 'api_name'}}
-    {{> afQuickField name='name'}}
-    <span class="help-block">{{_ "apiBackends_Title_Help"}}</span>
-    {{> afQuickField name='description'}}
-    <legend>{{_ "editApiBackendForm-uploadLogo"}}</legend>
-    {{> uploadApiLogo apiBackend=apiBackend }}
-    <legend>{{_ "apiBackends_Backend_Title"}}</legend>
-    <span class="help-block">{{_ "apiBackends_Backend_Help"}}</span>
-    {{> afQuickField name='backend_protocol' options="allowed"}}
-    {{>showHelp 'servers'}}
-    {{> afQuickField name='servers'}}
-    <legend>{{_ "apiBackends_Host_Title"}}</legend>
-    <div class="row">
-      <div class="col-lg-4">
-        {{>showHelp 'frontend_host'}}
-        {{> afQuickField name='frontend_host'}}
+  <div class="container">
+    <div class="api-backends-content">
+      <h1>{{_ "apiBackends_Edit_API_Title"}}</h1>
+      {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
+      {{>showHelp 'api_name'}}
+      {{> afQuickField name='name'}}
+      <span class="help-block">{{_ "apiBackends_Title_Help"}}</span>
+      {{> afQuickField name='description'}}
+      <legend>{{_ "editApiBackendForm-uploadLogo"}}</legend>
+      {{> uploadApiLogo apiBackend=apiBackend }}
+      <legend>{{_ "apiBackends_Backend_Title"}}</legend>
+      <span class="help-block">{{_ "apiBackends_Backend_Help"}}</span>
+      {{> afQuickField name='backend_protocol' options="allowed"}}
+      {{>showHelp 'servers'}}
+      {{> afQuickField name='servers'}}
+      <legend>{{_ "apiBackends_Host_Title"}}</legend>
+      <div class="row">
+        <div class="col-lg-4">
+          {{>showHelp 'frontend_host'}}
+          {{> afQuickField name='frontend_host'}}
+        </div>
+        <div class="col-lg-4 arrow">
+          <i class="fa fa-arrow-right fa-2x"></i>
+          <div>{{_ "apiBackends_HostRewrite"}}</div>
+        </div>
+        <div class="col-lg-4">
+          {{>showHelp 'backend_host'}}
+          {{> afQuickField name='backend_host'}}
+        </div>
       </div>
-      <div class="col-lg-4 arrow">
-        <i class="fa fa-arrow-right fa-2x"></i>
-        <div>{{_ "apiBackends_HostRewrite"}}</div>
+      <legend>{{_ "apiBackends_Matching_Title"}}</legend>
+      <span class="help-block">{{_ "apiBackends_Matching_Title_Help"}}</span>
+      {{>showHelp 'url_matches'}}
+      {{> afQuickField name='url_matches'}}
+      <legend data-toggle="collapse" data-target="#global-request-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_GlobalRequestSettings_Title"}}</legend>
+      <div id="global-request-block" class="collapse in">
+        {{>showHelp 'append_query_string'}}
+        {{> afQuickField name='append_query_string'}}
+        {{>showHelp 'set_headers'}}
+        {{> afQuickField name='set_headers'}}
+        {{>showHelp 'http_basic_auth'}}
+        {{> afQuickField name='http_basic_auth'}}
+        {{>showHelp 'require_https'}}
+        {{> afQuickField name='require_https' options="allowed"}}
+        {{>showHelp 'api_key_verification_level'}}
+        {{> afQuickField name='api_key_verification_level' options="allowed"}}
+        {{> afQuickField name='required_roles'}}
+        {{> afQuickField name='pass_api_key_header'}}
+        {{> afQuickField name='pass_api_key_query_param'}}
+        {{> afQuickField name='rate_limit_mode' options="allowed"}}
+        {{#if afFieldValueIs name='rate_limit_mode' value="Custom rate limits"}}
+        {{> afQuickField name='custom_rate_limits'}}
+        {{/if}}
+        {{>showHelp 'settings'}}
+        {{> afQuickField name='settings'}}
       </div>
-      <div class="col-lg-4">
-        {{>showHelp 'backend_host'}}
-        {{> afQuickField name='backend_host'}}
+      <legend data-toggle="collapse" data-target="#advanced-rewriting-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedRequestsRewriting"}}</legend>
+      <div id="advanced-rewriting-block" class="collapse in">
+        <span class="help-block">{{_ "apiBackends_AdvancedRequestsRewriting_Help"}}</span>
+        {{> afQuickField name='rewrite'}}
       </div>
+      <legend data-toggle="collapse" data-target="#advanced-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedSettings"}}</legend>
+      <div id="advanced-block" class="collapse in">
+        {{>showHelp 'balance_algorithm'}}
+        {{> afQuickField name='balance_algorithm' options="allowed"}}
+        {{> afQuickField name='error_templates'}}
+      </div>
+      <div id="form-buttons">
+        <button type="submit" class="btn btn-lg btn-success" id="add-apibackends">{{_ "apiBackends_Submit"}}</button>
+      </div>
+      {{/autoForm}}
     </div>
-    <legend>{{_ "apiBackends_Matching_Title"}}</legend>
-    <span class="help-block">{{_ "apiBackends_Matching_Title_Help"}}</span>
-    {{>showHelp 'url_matches'}}
-    {{> afQuickField name='url_matches'}}
-    <legend data-toggle="collapse" data-target="#global-request-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_GlobalRequestSettings_Title"}}</legend>
-    <div id="global-request-block" class="collapse in">
-      {{>showHelp 'append_query_string'}}
-      {{> afQuickField name='append_query_string'}}
-      {{>showHelp 'set_headers'}}
-      {{> afQuickField name='set_headers'}}
-      {{>showHelp 'http_basic_auth'}}
-      {{> afQuickField name='http_basic_auth'}}
-      {{>showHelp 'require_https'}}
-      {{> afQuickField name='require_https' options="allowed"}}
-      {{>showHelp 'api_key_verification_level'}}
-      {{> afQuickField name='api_key_verification_level' options="allowed"}}
-      {{> afQuickField name='required_roles'}}
-      {{> afQuickField name='pass_api_key_header'}}
-      {{> afQuickField name='pass_api_key_query_param'}}
-      {{> afQuickField name='rate_limit_mode' options="allowed"}}
-      {{#if afFieldValueIs name='rate_limit_mode' value="Custom rate limits"}}
-      {{> afQuickField name='custom_rate_limits'}}
-      {{/if}}
-      {{>showHelp 'settings'}}
-      {{> afQuickField name='settings'}}
-    </div>
-    <legend data-toggle="collapse" data-target="#advanced-rewriting-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedRequestsRewriting"}}</legend>
-    <div id="advanced-rewriting-block" class="collapse in">
-      <span class="help-block">{{_ "apiBackends_AdvancedRequestsRewriting_Help"}}</span>
-      {{> afQuickField name='rewrite'}}
-    </div>
-    <legend data-toggle="collapse" data-target="#advanced-block" aria-expanded="false"><i class="fa fa-chevron-right"></i> {{_ "apiBackends_AdvancedSettings"}}</legend>
-    <div id="advanced-block" class="collapse in">
-      {{>showHelp 'balance_algorithm'}}
-      {{> afQuickField name='balance_algorithm' options="allowed"}}
-      {{> afQuickField name='error_templates'}}
-    </div>
-    <div id="form-buttons">
-      <button type="submit" class="btn btn-lg btn-success" id="add-apibackends">{{_ "apiBackends_Submit"}}</button>
-    </div>
-    {{/autoForm}}
   </div>
 </template>
diff --git a/dashboard/client/dashboard.html b/dashboard/client/dashboard.html
index 1f77fedd70..493deda564 100644
--- a/dashboard/client/dashboard.html
+++ b/dashboard/client/dashboard.html
@@ -1,5 +1,6 @@
 <template name="dashboard">
-  {{# if isInRole 'admin, manager' }}
+  <div class="container">
+    {{# if isInRole 'admin, manager' }}
     <div class="row">
       <div class="col-lg-12">
         <h1 class="dashboard-title">
@@ -8,8 +9,8 @@ <h1 class="dashboard-title">
       </div>
     </div>
     {{ > dashboardCharts chartData=chartData loadingState=loadingState }}
-  {{ else }}
-   <div class="row">
+    {{ else }}
+    <div class="row">
       <div class="col-lg-12">
         <h1 class="dashboard-no-apis">
           {{_ "dashboard_noApisTitle" }}
@@ -18,5 +19,6 @@ <h1 class="dashboard-no-apis">
         </h1>
       </div>
     </div>
-  {{ / if }}
+    {{ / if }}
+  </div>
 </template>

From 5a6a1ea1560a44189dbbc1a90f5b0f7fd5c64bf0 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:45:55 +0300
Subject: [PATCH 03/58] removed pills styles

---
 core/client/style/global.less | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/client/style/global.less b/core/client/style/global.less
index 48d915779f..5f93dff2b6 100644
--- a/core/client/style/global.less
+++ b/core/client/style/global.less
@@ -36,11 +36,6 @@ hr {
   margin-top: 0;
 }
 
-.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
-  color: #fff;
-  background-color: @nav-pills-active-link-hover-bg;
-}
-
 .no-margin-row {
   margin-left: 0;
   margin-right: 0;

From 80d576c81f2dc86fa8dc90bdb9ea8a69c92257fd Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:46:20 +0300
Subject: [PATCH 04/58] removed merging

---
 core/client/layouts/master_layout/navbar/navbar.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/client/layouts/master_layout/navbar/navbar.less b/core/client/layouts/master_layout/navbar/navbar.less
index 085b270b11..eacd587c65 100644
--- a/core/client/layouts/master_layout/navbar/navbar.less
+++ b/core/client/layouts/master_layout/navbar/navbar.less
@@ -12,7 +12,6 @@
     margin-bottom: 0;
     border: none;
     border-radius: 0;
-    margin-bottom: 2em;
 
     .navbar-header {
       padding-left: 0.9em;

From 998f0d129410ae4b39816c294503a96a0437a4aa Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:46:30 +0300
Subject: [PATCH 05/58] removed container

---
 core/client/layouts/master_layout/master_layout.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/client/layouts/master_layout/master_layout.html b/core/client/layouts/master_layout/master_layout.html
index abbe2914ac..83c7706ff1 100644
--- a/core/client/layouts/master_layout/master_layout.html
+++ b/core/client/layouts/master_layout/master_layout.html
@@ -2,10 +2,8 @@
   {{> languageBar }}
   <div class="master-layout">
     {{> navbar branding=branding }}
-    <div class="container">
-      {{> yield }}
-      {{> sAlert}}
-    </div>
+    {{> yield }}
+    {{> sAlert}}
     {{> autoformModals}}
   </div>
 </template>

From 86737b84191fed8fc320aa99382101011230670e Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:46:44 +0300
Subject: [PATCH 06/58] added container

---
 catalogue/client/catalogue.html | 234 ++++++++++++++++----------------
 1 file changed, 118 insertions(+), 116 deletions(-)

diff --git a/catalogue/client/catalogue.html b/catalogue/client/catalogue.html
index 7da979d365..06fc553694 100644
--- a/catalogue/client/catalogue.html
+++ b/catalogue/client/catalogue.html
@@ -1,136 +1,138 @@
 <template name="catalogue">
-  <h3 class="catalogue-main-title">{{_ "catalogue_Title"}}</h3>
-  <nav id="catalogue-toolbar" class="navbar navbar-default">
-    <div class="container-fluid">
-      <!-- Brand and toggle get grouped for better mobile display -->
-      <div class="navbar-header">
-        <button
-                type="button"
-                class="navbar-toggle collapsed"
-                data-toggle="collapse"
-                data-target="#bs-example-navbar-collapse-1"
-                aria-expanded="false">
-          <span class="sr-only">{{_ "catalogue_toolbar_toggleCollapse" }}</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-      </div>
+  <div class="container">
+    <h3 class="catalogue-main-title">{{_ "catalogue_Title"}}</h3>
+    <nav id="catalogue-toolbar" class="navbar navbar-default">
+      <div class="container-fluid">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+          <button
+                  type="button"
+                  class="navbar-toggle collapsed"
+                  data-toggle="collapse"
+                  data-target="#bs-example-navbar-collapse-1"
+                  aria-expanded="false">
+            <span class="sr-only">{{_ "catalogue_toolbar_toggleCollapse" }}</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+        </div>
 
-      <!-- Collect the nav links, forms, and other content for toggling -->
-      <div class="collapse navbar-collapse sort-filter-toolbar" id="bs-example-navbar-collapse-1">
-        <div class="nav navbar-nav">
-          <p class="navbar-text sort-filter-toolbar-title">
-            {{_ "catalogue_toolbar_sortBy_title" }}
-          </p>
-          <div class="form-group sort-options-form">
-            <form class="form navbar-form navbar-nav" id="sort-options-select">
-              <select name="sort-menu" class="form-control sort-options-select" id="sort-select">
-                <option value="name">
-                  {{_ "catalogue_toolbar_sortMenuOptions_name" }}
-                </option>
-                <option value="bookmarkCount">
-                  {{_ "catalogue_toolbar_sortMenuOptions_bookmarkCount" }}
-                </option>
-                <option value="averageRating">
-                  {{_ "catalogue_toolbar_sortMenuOptions_averageRating" }}
-                </option>
-                <option value="created_at">
-                  {{_ "catalogue_toolbar_sortMenuOptions_dateCreated" }}
-                </option>
-              </select>
-            </form>
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse sort-filter-toolbar" id="bs-example-navbar-collapse-1">
+          <div class="nav navbar-nav">
+            <p class="navbar-text sort-filter-toolbar-title">
+              {{_ "catalogue_toolbar_sortBy_title" }}
+            </p>
+            <div class="form-group sort-options-form">
+              <form class="form navbar-form navbar-nav" id="sort-options-select">
+                <select name="sort-menu" class="form-control sort-options-select" id="sort-select">
+                  <option value="name">
+                    {{_ "catalogue_toolbar_sortMenuOptions_name" }}
+                  </option>
+                  <option value="bookmarkCount">
+                    {{_ "catalogue_toolbar_sortMenuOptions_bookmarkCount" }}
+                  </option>
+                  <option value="averageRating">
+                    {{_ "catalogue_toolbar_sortMenuOptions_averageRating" }}
+                  </option>
+                  <option value="created_at">
+                    {{_ "catalogue_toolbar_sortMenuOptions_dateCreated" }}
+                  </option>
+                </select>
+              </form>
+            </div>
           </div>
-        </div>
-        <div class="nav navbar-nav">
-          <div class="btn-group navbar-btn" role="group" aria-label="Sort direction" data-toggle="buttons">
-            <label
-              class="btn btn-default toolbar-tooltip active"
-              title="{{_ 'catalogue_toolbar_sortMenuOptions_sortAscending' }}">
-              <input type="radio" name="sort-direction" id="sort-ascending" value="ascending">
-              <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-            </label>
-            <label
-              class="btn btn-default toolbar-tooltip"
-              title="{{_ 'catalogue_toolbar_sortMenuOptions_sortDescending' }}">
-              <input type="radio" name="sort-direction" id="sort-descending" value="descending">
-              <i class="fa fa-sort-amount-desc" aria-hidden="true"></i>
-            </label>
+          <div class="nav navbar-nav">
+            <div class="btn-group navbar-btn" role="group" aria-label="Sort direction" data-toggle="buttons">
+              <label
+                     class="btn btn-default toolbar-tooltip active"
+                     title="{{_ 'catalogue_toolbar_sortMenuOptions_sortAscending' }}">
+                <input type="radio" name="sort-direction" id="sort-ascending" value="ascending">
+                <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
+              </label>
+              <label
+                     class="btn btn-default toolbar-tooltip"
+                     title="{{_ 'catalogue_toolbar_sortMenuOptions_sortDescending' }}">
+                <input type="radio" name="sort-direction" id="sort-descending" value="descending">
+                <i class="fa fa-sort-amount-desc" aria-hidden="true"></i>
+              </label>
+            </div>
           </div>
-        </div>
-        {{# if currentUser }}
-        <div class="nav navbar-nav">
-          <div class="btn-group navbar-btn filter-options-menu" role="group" aria-label="Filter options" data-toggle="buttons">
-            <label class="btn btn-default active">
-              <input type="radio" name="filter-options" id="show-all" value="all">
-              {{_ "catalogue_toolbar_filterOptions_showAll" }}
-            </label>
-            <label class="btn btn-default">
-              <input type="radio" name="filter-options" id="my-apis" value="my-apis">
-              {{_ "catalogue_toolbar_filterOptions_myApis" }}
-            </label>
-            <label class="btn btn-default">
-              <input type="radio" name="filter-options" id="my-bookmarks" value="my-bookmarks">
-              {{_ "catalogue_toolbar_filterOptions_myBookmarks" }}
-            </label>
+          {{# if currentUser }}
+          <div class="nav navbar-nav">
+            <div class="btn-group navbar-btn filter-options-menu" role="group" aria-label="Filter options" data-toggle="buttons">
+              <label class="btn btn-default active">
+                <input type="radio" name="filter-options" id="show-all" value="all">
+                {{_ "catalogue_toolbar_filterOptions_showAll" }}
+              </label>
+              <label class="btn btn-default">
+                <input type="radio" name="filter-options" id="my-apis" value="my-apis">
+                {{_ "catalogue_toolbar_filterOptions_myApis" }}
+              </label>
+              <label class="btn btn-default">
+                <input type="radio" name="filter-options" id="my-bookmarks" value="my-bookmarks">
+                {{_ "catalogue_toolbar_filterOptions_myBookmarks" }}
+              </label>
+            </div>
           </div>
-        </div>
-        {{/if}}
-        <div class="nav navbar-nav navbar-right">
-          <div class="btn-group navbar-btn" role="group" aria-label="View mode" data-toggle="buttons">
-            <label
-              class="btn btn-default toolbar-tooltip active"
-              title="{{_ 'catalogue_toolbar_viewMode_grid' }}">
-              <input type="radio" name="view-mode" id="grid-mode" value="grid">
-              <i class="fa fa-th-large" aria-hidden="true"></i>
-            </label>
-            <label
-              class="btn btn-default toolbar-tooltip"
-              title="{{_ 'catalogue_toolbar_viewMode_table' }}">
-              <input type="radio" name="view-mode" id="table-mode" value="table">
-              <i class="fa fa-table" aria-hidden="true"></i>
-            </label>
+          {{/if}}
+          <div class="nav navbar-nav navbar-right">
+            <div class="btn-group navbar-btn" role="group" aria-label="View mode" data-toggle="buttons">
+              <label
+                     class="btn btn-default toolbar-tooltip active"
+                     title="{{_ 'catalogue_toolbar_viewMode_grid' }}">
+                <input type="radio" name="view-mode" id="grid-mode" value="grid">
+                <i class="fa fa-th-large" aria-hidden="true"></i>
+              </label>
+              <label
+                     class="btn btn-default toolbar-tooltip"
+                     title="{{_ 'catalogue_toolbar_viewMode_table' }}">
+                <input type="radio" name="view-mode" id="table-mode" value="table">
+                <i class="fa fa-table" aria-hidden="true"></i>
+              </label>
+            </div>
           </div>
-        </div>
-      </div><!-- /.navbar-collapse -->
-    </div><!-- /.container-fluid -->
-  </nav>
+        </div><!-- /.navbar-collapse -->
+      </div><!-- /.container-fluid -->
+    </nav>
 
-  <!-- if viewMode is table, show table -->
-  {{# if gridViewMode }}
+    <!-- if viewMode is table, show table -->
+    {{# if gridViewMode }}
     {{# if Template.subscriptionsReady }}
-      {{> catalogueGrid apiBackends=apiBackends }}
+    {{> catalogueGrid apiBackends=apiBackends }}
     {{else}}
-      {{> spinner }}
+    {{> spinner }}
     {{/if}}
-  {{/ if }}
+    {{/ if }}
 
-  <!-- if viewMode is table, show table -->
-  {{# if tableViewMode }}
+    <!-- if viewMode is table, show table -->
+    {{# if tableViewMode }}
     {{# if Template.subscriptionsReady }}
-      {{> catalogueTable apiBackends=apiBackends }}
+    {{> catalogueTable apiBackends=apiBackends }}
     {{else}}
-      {{> spinner }}
+    {{> spinner }}
     {{/if}}
-  {{/ if }}
+    {{/ if }}
 
-  <div class="text-center">
-    <ul class="pagination">
-      <li class="{{ prevButtonDisabledClass }}" >
-        <a href="#" aria-label="Previous" id="prev-page">
-          <span aria-hidden="true">{{_ "catalogue_paginationButtons_previous" }}</span>
-        </a>
-      </li>
-      {{ # each page in pageNumbers }}
+    <div class="text-center">
+      <ul class="pagination">
+        <li class="{{ prevButtonDisabledClass }}" >
+          <a href="#" aria-label="Previous" id="prev-page">
+            <span aria-hidden="true">{{_ "catalogue_paginationButtons_previous" }}</span>
+          </a>
+        </li>
+        {{ # each page in pageNumbers }}
         <li class="{{ pageIsActive page }}">
           <a href="#" class="change-page">{{ page }}</a>
         </li>
-      {{ / each }}
-      <li class="{{ nextButtonDisabledClass }}">
-        <a href="#" aria-label="Next" id="next-page">
-          <span aria-hidden="true">{{_ "catalogue_paginationButtons_next" }}</span>
-        </a>
-      </li>
-    </ul>
+        {{ / each }}
+        <li class="{{ nextButtonDisabledClass }}">
+          <a href="#" aria-label="Next" id="next-page">
+            <span aria-hidden="true">{{_ "catalogue_paginationButtons_next" }}</span>
+          </a>
+        </li>
+      </ul>
+    </div>
   </div>
 </template>

From 4baa2d76f582fab197ce2976151fe676cede4421 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:47:03 +0300
Subject: [PATCH 07/58] removed old header

---
 apis/client/view/view_api_backend.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apis/client/view/view_api_backend.html b/apis/client/view/view_api_backend.html
index 900d0fcf3e..23164f5263 100644
--- a/apis/client/view/view_api_backend.html
+++ b/apis/client/view/view_api_backend.html
@@ -1,11 +1,7 @@
 <template name="viewApiBackend">
   {{#if Template.subscriptionsReady }}
-  {{> viewApiBackendPageHeading apiBackend=apiBackend }}
-  <div class="row">
-    {{> viewApiBackendNavigationMenu apiBackend=apiBackend }}
-  </div>
-
-  <div class="panel-body">
+  {{> viewApiBackendPageHeader apiBackend=apiBackend }}
+  <div class="container">
     <div class="tab-content">
       <div id="api-backend-details" class="tab-pane fade in active">
         {{> viewApiBackendDetails apiBackend=apiBackend }}

From f0b0742be7b442683ed4562f8307544315201ce0 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:47:55 +0300
Subject: [PATCH 08/58] removed old navigation

---
 apis/client/view/navigation/navigation.html | 42 ---------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 apis/client/view/navigation/navigation.html

diff --git a/apis/client/view/navigation/navigation.html b/apis/client/view/navigation/navigation.html
deleted file mode 100644
index b3f8fb531b..0000000000
--- a/apis/client/view/navigation/navigation.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<template name="viewApiBackendNavigationMenu">
-  <div class="col-xs-12">
-    <ul class="nav nav-tabs">
-      <li class="active">
-        <a href="#api-backend-details" data-toggle="tab">
-          <i class="fa fa-info-circle"></i>
-          {{_ "viewApiBackendNavigationMenu_details" }}
-        </a>
-      </li>
-      <li>
-        <a href="#api-backend-documentation" data-toggle="tab">
-          <i class="fa fa-file-text"></i>
-          {{_ "viewApiBackendNavigationMenu_documentation" }}
-        </a>
-      </li>
-      <li>
-        <a href="#api-backend-metadata" data-toggle="tab">
-          <i class="fa fa-book"></i>
-          {{_ "viewApiBackendNavigationMenu_metadata" }}
-        </a>
-      </li>
-      <li>
-        <a href="#api-backend-feedback" data-toggle="tab">
-          <i class="fa fa-comments-o"></i>
-          {{_ "viewApiBackendNavigationMenu_feedback" }}
-        </a>
-      </li>
-      <li>
-        <a href="#api-backend-backlog" data-toggle="tab">
-          <i class="fa fa-check-square-o"></i>
-          {{_ "viewApiBackendNavigationMenu_backlog" }}
-        </a>
-      </li>
-      <li>
-        <a href="#api-backend-export" data-toggle="tab">
-          <i class="fa fa-cloud-download"></i>
-          {{_ "viewApiBackendNavigationMenu_export" }}
-        </a>
-      </li>
-    </ul>
-  </div>
-</template>

From 83056e95f580c1e6b7c80b1565bbbb795217d32e Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:48:09 +0300
Subject: [PATCH 09/58] moved and updated navigation

---
 apis/client/view/heading/heading.html | 47 +++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/apis/client/view/heading/heading.html b/apis/client/view/heading/heading.html
index 8f88942ef1..061a0f57d9 100644
--- a/apis/client/view/heading/heading.html
+++ b/apis/client/view/heading/heading.html
@@ -2,9 +2,9 @@
   <div class="page-heading">
     <div class="btn-group pull-right" role="group" aria-label="...">
       {{ # if currentUser }}
-        {{ # if isInRole 'admin' }}
-          {{> flagApiButton apiBackend=apiBackend }}
-        {{ / if }}
+      {{ # if isInRole 'admin' }}
+      {{> flagApiButton apiBackend=apiBackend }}
+      {{ / if }}
       {{ / if }}
       {{> apiBackendsUsageInstructionsButton }}
     </div>
@@ -14,5 +14,46 @@ <h1 class="page-title">
       {{> viewApiBackendStatus apiBackend=apiBackend width="0.4"  }}
     </h1>
     {{> apiBackendUsageInstructions }}
+
+    <div class="col-xs-12 view-api-navigation">
+      <ul class="nav nav-tabs">
+        <li class="active">
+          <a href="#api-backend-details" data-toggle="tab">
+            <i class="fa fa-info-circle"></i>
+            {{_ "viewApiBackendNavigationMenu_details" }}
+          </a>
+        </li>
+        <li>
+          <a href="#api-backend-documentation" data-toggle="tab">
+            <i class="fa fa-file-text"></i>
+            {{_ "viewApiBackendNavigationMenu_documentation" }}
+          </a>
+        </li>
+        <li>
+          <a href="#api-backend-metadata" data-toggle="tab">
+            <i class="fa fa-book"></i>
+            {{_ "viewApiBackendNavigationMenu_metadata" }}
+          </a>
+        </li>
+        <li>
+          <a href="#api-backend-feedback" data-toggle="tab">
+            <i class="fa fa-comments-o"></i>
+            {{_ "viewApiBackendNavigationMenu_feedback" }}
+          </a>
+        </li>
+        <li>
+          <a href="#api-backend-backlog" data-toggle="tab">
+            <i class="fa fa-check-square-o"></i>
+            {{_ "viewApiBackendNavigationMenu_backlog" }}
+          </a>
+        </li>
+        <li>
+          <a href="#api-backend-export" data-toggle="tab">
+            <i class="fa fa-cloud-download"></i>
+            {{_ "viewApiBackendNavigationMenu_export" }}
+          </a>
+        </li>
+      </ul>
+    </div>
   </div>
 </template>

From 3445f451e7eeb47ce3f6193e404e3e7f246e9f8b Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 17:48:18 +0300
Subject: [PATCH 10/58] new header and styles

---
 apis/client/view/header/header.html | 51 +++++++++++++++++++++++++++++
 apis/client/view/header/header.less | 50 ++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 apis/client/view/header/header.html
 create mode 100644 apis/client/view/header/header.less

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
new file mode 100644
index 0000000000..d3c2c06dcc
--- /dev/null
+++ b/apis/client/view/header/header.html
@@ -0,0 +1,51 @@
+<template name="viewApiBackendPageHeader">
+  <div class="page-top">
+    <div class="container">
+      <h1 class="page-title">
+        {{> viewApiLogo }}
+        {{ apiBackend.name }}
+        {{> viewApiBackendStatus apiBackend=apiBackend width="0.4"  }}
+      </h1>
+      <div class="view-api-navigation">
+        <ul class="nav nav-tabs">
+          <li class="active">
+            <a href="#api-backend-details" data-toggle="tab">
+              <i class="fa fa-info-circle"></i>
+              {{_ "viewApiBackendNavigationMenu_details" }}
+            </a>
+          </li>
+          <li>
+            <a href="#api-backend-documentation" data-toggle="tab">
+              <i class="fa fa-file-text"></i>
+              {{_ "viewApiBackendNavigationMenu_documentation" }}
+            </a>
+          </li>
+          <li>
+            <a href="#api-backend-metadata" data-toggle="tab">
+              <i class="fa fa-book"></i>
+              {{_ "viewApiBackendNavigationMenu_metadata" }}
+            </a>
+          </li>
+          <li>
+            <a href="#api-backend-feedback" data-toggle="tab">
+              <i class="fa fa-comments-o"></i>
+              {{_ "viewApiBackendNavigationMenu_feedback" }}
+            </a>
+          </li>
+          <li>
+            <a href="#api-backend-backlog" data-toggle="tab">
+              <i class="fa fa-check-square-o"></i>
+              {{_ "viewApiBackendNavigationMenu_backlog" }}
+            </a>
+          </li>
+          <li>
+            <a href="#api-backend-export" data-toggle="tab">
+              <i class="fa fa-cloud-download"></i>
+              {{_ "viewApiBackendNavigationMenu_export" }}
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
new file mode 100644
index 0000000000..9ed134b633
--- /dev/null
+++ b/apis/client/view/header/header.less
@@ -0,0 +1,50 @@
+/* Bootstrap */
+@import "/core/client/style/bootstrap-variables.less";
+
+.page-top {
+  padding-top: 20px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  color: #666;
+  background-color: #fafafa;
+  border-bottom: 1px solid #eee;
+}
+
+.view-api-navigation {
+  position: relative;
+  top: 1px;
+  margin-top: 10px;
+
+  .nav-tabs {
+    border-bottom: none;
+  }
+
+  .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
+    font-weight: bold;
+    color: #333;
+    background-color: #fff;
+    border-top-color: @brand-primary;
+    border-top-width: 3px;
+    border-top-right-radius: 3px;
+    border-top-left-radius: 3px;
+    border-right-color: #EEE;
+    border-left-color: #EEE;
+  }
+
+  .nav-tabs > li {
+    border: 0px solid transparent;
+    border-width: 3px 1px 1px;
+    border-radius: 3px 3px 0 0;
+  }
+
+  .nav-tabs > li > a {
+    color: #555;
+  }
+
+  .nav > li > a:hover, .nav > li > a:focus {
+    text-decoration: none;
+    background-color: transparent;
+    color: #333;
+    border-color: transparent;
+  }
+}

From 56ef56a63e3bb57ece004a05ea1f5ec670a4e07d Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 18:38:26 +0300
Subject: [PATCH 11/58] changed api name title

---
 apis/client/view/header/header.html |  8 ++++----
 apis/client/view/header/header.less | 15 +++++++++++++--
 apis/logo/view/client/view.css      |  3 ++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index d3c2c06dcc..b229f7496b 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -1,10 +1,10 @@
 <template name="viewApiBackendPageHeader">
-  <div class="page-top">
+  <div class="page-head-block">
     <div class="container">
-      <h1 class="page-title">
-        {{> viewApiLogo }}
+      {{> viewApiLogo }}
+      <h1 class="api-name">
         {{ apiBackend.name }}
-        {{> viewApiBackendStatus apiBackend=apiBackend width="0.4"  }}
+        {{> viewApiBackendStatus apiBackend=apiBackend width="0.4" }}
       </h1>
       <div class="view-api-navigation">
         <ul class="nav nav-tabs">
diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 9ed134b633..1fd065f961 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -1,19 +1,30 @@
 /* Bootstrap */
 @import "/core/client/style/bootstrap-variables.less";
 
-.page-top {
+.page-head-block {
   padding-top: 20px;
   padding-bottom: 0;
   margin-bottom: 20px;
   color: #666;
   background-color: #fafafa;
   border-bottom: 1px solid #eee;
+
+  .api-name {
+    font-size: 2em;
+    line-height: 0.4;
+    margin-left: 2em;
+  }
+
+  .api-author {
+    clear: both;
+  }
 }
 
 .view-api-navigation {
   position: relative;
   top: 1px;
-  margin-top: 10px;
+  margin-top: 2em;
+  clear: both;
 
   .nav-tabs {
     border-bottom: none;
diff --git a/apis/logo/view/client/view.css b/apis/logo/view/client/view.css
index 9a52aeba10..27d233cf81 100644
--- a/apis/logo/view/client/view.css
+++ b/apis/logo/view/client/view.css
@@ -1,5 +1,6 @@
 .view-api-logo {
   width: 50px;
   height: 50px;
-  border-radius: 50%;
+  border-radius: 3px;
+  float: left;
 }

From 1d4d155d0fb511cdf2029ac203c4db04c4001e08 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 27 Jul 2016 18:40:34 +0300
Subject: [PATCH 12/58] fixed tab name jump

---
 apis/client/view/header/header.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 1fd065f961..33e7d6c704 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -22,7 +22,7 @@
 
 .view-api-navigation {
   position: relative;
-  top: 1px;
+  top: 2px;
   margin-top: 2em;
   clear: both;
 
@@ -32,6 +32,7 @@
 
   .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
     font-weight: bold;
+    line-height: initial;
     color: #333;
     background-color: #fff;
     border-top-color: @brand-primary;

From 1cf866214eec79308178d4f8b52143cdd2a4faeb Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 14:46:05 +0300
Subject: [PATCH 13/58] removed icons from panel heading; changed buttons;
 cleaned up

---
 apis/client/export/export.html                  |  1 -
 apis/client/view/backlog/backlog.html           |  3 +--
 apis/client/view/details/details.html           |  1 -
 .../feedback/feedback_form/feedback_form.html   |  2 +-
 .../feedback/feedback_list/feedback_list.html   | 17 +++++++----------
 apis/client/view/header/header.html             |  6 ++++++
 apis/client/view/view_api_backend.html          |  4 ++++
 documentation/view/client/documentation.html    |  3 +--
 metadata/client/edit/edit.html                  |  2 +-
 metadata/client/view/metadata.html              |  3 +--
 10 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apis/client/export/export.html b/apis/client/export/export.html
index 132dd20f48..b09e613521 100644
--- a/apis/client/export/export.html
+++ b/apis/client/export/export.html
@@ -2,7 +2,6 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        <i class="fa fa-cloud-download"></i>
         {{_ "view_ApiBackend_Export_Title"}}
       </h2>
     </div>
diff --git a/apis/client/view/backlog/backlog.html b/apis/client/view/backlog/backlog.html
index af01489c38..177b92ae69 100644
--- a/apis/client/view/backlog/backlog.html
+++ b/apis/client/view/backlog/backlog.html
@@ -3,7 +3,7 @@
     <div class="panel-heading">
       {{#if currentUserCanEditBacklog }}
           <button type="button"
-                  class="btn btn-info btn-sm pull-right"
+                  class="btn btn-info btn-xs pull-right"
                   data-toggle="modal"
                   data-target="#apiBacklogFormModal"
                   data-backdrop="static"
@@ -13,7 +13,6 @@
           </button>
       {{/if}}
       <h2 class="panel-title clearfix">
-        <i class="fa fa-check-square-o"></i>
         {{_ "apiBacklog_mainTitle"}}
       </h2>
     </div>
diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index 91d15bca6b..4df5adc40b 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -18,7 +18,6 @@
       </div>
       {{/ if }}
       <h2 class="panel-title clearfix">
-        <i class="fa fa-info-circle"></i>
         {{_ "view_ApiBackend_Details_Title"}}
       </h2>
     </div>
diff --git a/apis/client/view/feedback/feedback_form/feedback_form.html b/apis/client/view/feedback/feedback_form/feedback_form.html
index 18ed61f56b..5815c78d97 100644
--- a/apis/client/view/feedback/feedback_form/feedback_form.html
+++ b/apis/client/view/feedback/feedback_form/feedback_form.html
@@ -1,5 +1,5 @@
 <template name="feedbackForm">
-  <button type="button" class="btn btn-info btn-sm pull-right feedback-form-button" data-toggle="modal" data-target="#feedbackForm" data-backdrop="static" data-keyboard="false"><i class="fa fa-comments-o"></i>&nbsp;{{_ "feedback_feedbackForm_button"}}</button>
+  <button type="button" class="btn btn-info btn-xs pull-right feedback-form-button" data-toggle="modal" data-target="#feedbackForm" data-backdrop="static" data-keyboard="false"><i class="fa fa-comments-o"></i>&nbsp;{{_ "feedback_feedbackForm_button"}}</button>
   <div class="modal fade" id="feedbackForm" tabindex="-1" role="dialog" aria-labelledby="feedbackFormLabel">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
diff --git a/apis/client/view/feedback/feedback_list/feedback_list.html b/apis/client/view/feedback/feedback_list/feedback_list.html
index 6d4b1208c6..5f231f439a 100644
--- a/apis/client/view/feedback/feedback_list/feedback_list.html
+++ b/apis/client/view/feedback/feedback_list/feedback_list.html
@@ -4,27 +4,24 @@
       {{#if currentUser}}
         {{> feedbackForm }}
       {{/ if }}
-      <h1 class="panel-title clearfix">
-        <i class="fa fa-comments-o"></i>
+      <h2 class="panel-title clearfix">
         {{_ "feedback_main_title"}}
-      </h1>
+      </h2>
     </div>
     <div class="panel-body">
-      <div class="row">
-        {{#if haveFeedback}}
+      {{#if haveFeedback}}
         <div class="tab-content">
           <div class="tab-pane fade in active" id="home">
             <div class="list-group">
               {{#each userFeedback}}
-              {{> singleFeedback }}
+                {{> singleFeedback }}
               {{/each}}
             </div>
           </div>
         </div>
-        {{else}}
-        <p>{{_ "feedback_no_feedback"}}</p>
-        {{/if}}
-      </div>
+      {{else}}
+        <i>{{_ "feedback_no_feedback"}}</i>
+      {{/if}}
     </div>
   </div>
 </template>
diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index b229f7496b..3675ddea96 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -44,6 +44,12 @@ <h1 class="api-name">
               {{_ "viewApiBackendNavigationMenu_export" }}
             </a>
           </li>
+          <li>
+            <a href="#api-backend-settings" data-toggle="tab">
+              <i class="fa fa-cog"></i>
+              Settings
+            </a>
+          </li>
         </ul>
       </div>
     </div>
diff --git a/apis/client/view/view_api_backend.html b/apis/client/view/view_api_backend.html
index 23164f5263..ccdd60a5eb 100644
--- a/apis/client/view/view_api_backend.html
+++ b/apis/client/view/view_api_backend.html
@@ -27,6 +27,10 @@
         {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}
       </div> <!-- /api-backend-export -->
 
+      <div id="api-backend-settings" class="tab-pane fade">
+       Settings
+      </div>
+
     </div>
   </div>
   {{ else }}
diff --git a/documentation/view/client/documentation.html b/documentation/view/client/documentation.html
index 7324f528e4..ab404a3898 100644
--- a/documentation/view/client/documentation.html
+++ b/documentation/view/client/documentation.html
@@ -4,13 +4,12 @@
       {{#if apiBackend.currentUserCanEdit }}
         <button
           id="manage-api-documentation"
-          class="btn btn-sm btn-info pull-right">
+          class="btn btn-xs btn-info pull-right">
           <i class="fa fa-pencil"></i>&nbsp;
           Manage
         </button>
       {{/if}}
       <h2 class="panel-title clearfix">
-        <i class="fa fa-file-text"></i>
         {{_ "documentation_Title" }}
       </h2>
     </div>
diff --git a/metadata/client/edit/edit.html b/metadata/client/edit/edit.html
index fedb98c70c..383c07cae3 100644
--- a/metadata/client/edit/edit.html
+++ b/metadata/client/edit/edit.html
@@ -1,6 +1,6 @@
 <template name="editApiMetadata">
   <button type="button"
-    class="btn btn-info btn-sm pull-right"
+    class="btn btn-info btn-xs pull-right"
     data-toggle="modal"
     data-target="#apiMetadataModal"
     data-backdrop="static"
diff --git a/metadata/client/view/metadata.html b/metadata/client/view/metadata.html
index 842fae5b18..ecc9d08a98 100644
--- a/metadata/client/view/metadata.html
+++ b/metadata/client/view/metadata.html
@@ -5,7 +5,6 @@
         {{> editApiMetadata metadata=metadata }}
       {{/if}}
       <h2 class="panel-title clearfix">
-        <i class="fa fa-book"></i>
         {{_ "view_ApiBackend_Metadata_Title"}}
       </h2>
     </div>
@@ -79,7 +78,7 @@ <h3>{{ service.name }}</h3>
       </div>
       {{/ with }}
       {{ else }}
-      <p>{{_ "view_ApiBackend_Metadata_NotFound"}}</p>
+      <i>{{_ "view_ApiBackend_Metadata_NotFound"}}</i>
       {{/ if }}
     </div>
   </div>

From 9a079c2e1f28c4c645aea8d518cd8d8fc4049d75 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 15:33:00 +0300
Subject: [PATCH 14/58] initial settings panels

---
 apis/client/view/settings/settings.html | 41 +++++++++++++++++++++++++
 apis/client/view/view_api_backend.html  |  3 +-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 apis/client/view/settings/settings.html

diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
new file mode 100644
index 0000000000..7e2894899b
--- /dev/null
+++ b/apis/client/view/settings/settings.html
@@ -0,0 +1,41 @@
+<template name="viewApiBackendSettings">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h2 class="panel-title clearfix">
+        Settings
+      </h2>
+    </div>
+    <div class="panel-body">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h2 class="panel-title">
+            About
+          </h2>
+        </div>
+        <div class="panel-body">
+          Name and Description
+        </div>
+      </div>
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h2 class="panel-title">
+            Edit
+          </h2>
+        </div>
+        <div class="panel-body">
+          Modify Schema
+        </div>
+      </div>
+      <div class="panel panel-danger">
+        <div class="panel-heading">
+          <h2 class="panel-title">
+            Manage
+          </h2>
+        </div>
+        <div class="panel-body">
+          Delete or Make Private
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/apis/client/view/view_api_backend.html b/apis/client/view/view_api_backend.html
index ccdd60a5eb..2c85ea3a8c 100644
--- a/apis/client/view/view_api_backend.html
+++ b/apis/client/view/view_api_backend.html
@@ -28,9 +28,8 @@
       </div> <!-- /api-backend-export -->
 
       <div id="api-backend-settings" class="tab-pane fade">
-       Settings
+       {{> viewApiBackendSettings }}
       </div>
-
     </div>
   </div>
   {{ else }}

From 9e3a22dfbabd516befb3baa5cc64dda878f4d16e Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 15:39:09 +0300
Subject: [PATCH 15/58] last panel margin fix

---
 core/client/style/global.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/client/style/global.less b/core/client/style/global.less
index 5f93dff2b6..18dcdf44a6 100644
--- a/core/client/style/global.less
+++ b/core/client/style/global.less
@@ -40,3 +40,7 @@ hr {
   margin-left: 0;
   margin-right: 0;
 }
+
+.panel:last-child {
+  margin-bottom: 0;
+}

From 0e7f0f7f2785914b6248b0dc1651963985032cb4 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 16:21:07 +0300
Subject: [PATCH 16/58] initial overridings for settings panels

---
 core/client/style/global.less | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/client/style/global.less b/core/client/style/global.less
index 18dcdf44a6..75a53d60d4 100644
--- a/core/client/style/global.less
+++ b/core/client/style/global.less
@@ -1,9 +1,6 @@
 /* Bootstrap */
 @import "/core/client/style/bootstrap-variables.less";
 
-/* Global variables */
-@font-family-default: 'Roboto', sans-serif;
-
 html, body, h1, h2, h3, h4, h5, h6, p {
   font-family: @font-family-default;
 }
@@ -44,3 +41,15 @@ hr {
 .panel:last-child {
   margin-bottom: 0;
 }
+
+.panel-body h3 {
+  font-size: 16px;
+  margin-top: 0px;
+  margin-bottom: 5px;
+  font-weight: 700;
+  color: @gray;
+}
+
+.panel-body p {
+  color: @gray;
+}

From 20e6643d05752eda95473d548a97ea41f5c4658a Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 16:21:17 +0300
Subject: [PATCH 17/58] moved font

---
 core/client/style/bootstrap-variables.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/client/style/bootstrap-variables.less b/core/client/style/bootstrap-variables.less
index 9b82f7745b..1b069dc879 100644
--- a/core/client/style/bootstrap-variables.less
+++ b/core/client/style/bootstrap-variables.less
@@ -48,6 +48,7 @@
 //
 //## Font, line-height, and color for body text, headings, and more.
 
+@font-family-default:     "Roboto", sans-serif;
 @font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.

From 838cee5bd718971116678c92b27967496434fc55 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 16:21:57 +0300
Subject: [PATCH 18/58] pass apiBackend

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

diff --git a/apis/client/view/view_api_backend.html b/apis/client/view/view_api_backend.html
index 2c85ea3a8c..632d7aa61b 100644
--- a/apis/client/view/view_api_backend.html
+++ b/apis/client/view/view_api_backend.html
@@ -28,7 +28,7 @@
       </div> <!-- /api-backend-export -->
 
       <div id="api-backend-settings" class="tab-pane fade">
-       {{> viewApiBackendSettings }}
+       {{> viewApiBackendSettings apiBackend=apiBackend }}
       </div>
     </div>
   </div>

From 182b16c95e00aef469ed5ab9326a3053c54e27fb Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 16:22:28 +0300
Subject: [PATCH 19/58] delete event moved

---
 apis/client/view/{details/details.js => settings/settings.js} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename apis/client/view/{details/details.js => settings/settings.js} (92%)

diff --git a/apis/client/view/details/details.js b/apis/client/view/settings/settings.js
similarity index 92%
rename from apis/client/view/details/details.js
rename to apis/client/view/settings/settings.js
index 144615bf3e..910f7b187a 100644
--- a/apis/client/view/details/details.js
+++ b/apis/client/view/settings/settings.js
@@ -1,6 +1,6 @@
 import { ApiBackends } from '/apis/collection/backend';
 
-Template.viewApiBackendDetails.events({
+Template.viewApiBackendSettings.events({
   // event handler to execute when delete API button is clicked
   "click #deleteModal": function() {
     var apiBackendId = this.apiBackend;

From fcfc7119a9db6b21267c25db639006b67cace9a3 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 16:22:49 +0300
Subject: [PATCH 20/58] moved buttons to settings tab

---
 apis/client/view/settings/settings.html | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index 7e2894899b..28646d95cd 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -23,7 +23,13 @@ <h2 class="panel-title">
           </h2>
         </div>
         <div class="panel-body">
-          Modify Schema
+          <h3>Modify the API settings</h3>
+          <p>Change settings by editing fields.</p>
+          <a
+             href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
+             class="btn btn-primary">
+            {{_ "view_ApiBackend_Details_editButtonText" }}
+          </a>
         </div>
       </div>
       <div class="panel panel-danger">
@@ -33,7 +39,14 @@ <h2 class="panel-title">
           </h2>
         </div>
         <div class="panel-body">
-          Delete or Make Private
+          <h3>Delete the API</h3>
+          <p>This can't be undo.</p>
+          <a
+             href="#"
+             class="btn btn-danger"
+             id="deleteModal">
+            {{_ "viewApiBackendDetails_deleteButton"}}
+          </a>
         </div>
       </div>
     </div>

From 5ec2d2414d9fce2422ddd2b51e7a1b726471564d Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 17:51:51 +0300
Subject: [PATCH 21/58] changed color

---
 core/client/style/global.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/client/style/global.less b/core/client/style/global.less
index 75a53d60d4..40c11276ca 100644
--- a/core/client/style/global.less
+++ b/core/client/style/global.less
@@ -47,7 +47,6 @@ hr {
   margin-top: 0px;
   margin-bottom: 5px;
   font-weight: 700;
-  color: @gray;
 }
 
 .panel-body p {

From d483172c0de95438b975ac63f28862b09ac671ab Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 17:52:20 +0300
Subject: [PATCH 22/58] margin for section

---
 apis/client/view/settings/settings.less | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 apis/client/view/settings/settings.less

diff --git a/apis/client/view/settings/settings.less b/apis/client/view/settings/settings.less
new file mode 100644
index 0000000000..603fa67cf3
--- /dev/null
+++ b/apis/client/view/settings/settings.less
@@ -0,0 +1,3 @@
+.panel-section {
+  margin-bottom: 15px;
+}

From 9122c555556b146df12055ae88f5f4983df15d96 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 17:52:45 +0300
Subject: [PATCH 23/58] moved fields for settings

---
 apis/client/view/settings/settings.html | 88 +++++++++++++------------
 apis/client/view/settings/settings.js   |  6 ++
 2 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index 28646d95cd..590575f594 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -1,54 +1,56 @@
 <template name="viewApiBackendSettings">
   <div class="panel panel-default">
     <div class="panel-heading">
-      <h2 class="panel-title clearfix">
-        Settings
+      <h2 class="panel-title">
+        About
       </h2>
     </div>
     <div class="panel-body">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h2 class="panel-title">
-            About
-          </h2>
-        </div>
-        <div class="panel-body">
-          Name and Description
-        </div>
-      </div>
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h2 class="panel-title">
-            Edit
-          </h2>
-        </div>
-        <div class="panel-body">
-          <h3>Modify the API settings</h3>
-          <p>Change settings by editing fields.</p>
-          <a
-             href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
-             class="btn btn-primary">
-            {{_ "view_ApiBackend_Details_editButtonText" }}
-          </a>
-        </div>
-      </div>
-      <div class="panel panel-danger">
-        <div class="panel-heading">
-          <h2 class="panel-title">
-            Manage
-          </h2>
-        </div>
-        <div class="panel-body">
-          <h3>Delete the API</h3>
-          <p>This can't be undo.</p>
-          <a
-             href="#"
-             class="btn btn-danger"
-             id="deleteModal">
-            {{_ "viewApiBackendDetails_deleteButton"}}
-          </a>
+      <div class="panel-section">
+        {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
+        {{> afQuickField name='name'}}
+        {{> afQuickField name='description'}}
+        <div id="form-buttons">
+          <button type="submit" class="btn btn-success" id="save-settings">Save</button>
         </div>
+        {{/autoForm}}
       </div>
+      <h3>{{_ "editApiBackendForm-uploadLogo" }}</h3>
+      <p>You can upload logo. It will appear in the catalogue and view an API page.</p>
+      {{> uploadApiLogo apiBackend=apiBackend }}
+    </div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h2 class="panel-title">
+        Edit
+      </h2>
+    </div>
+    <div class="panel-body">
+      <h3>Modify the API settings</h3>
+      <p>Change settings by editing fields.</p>
+      <a
+         href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
+         class="btn btn-primary">
+        {{_ "view_ApiBackend_Details_editButtonText" }}
+      </a>
+    </div>
+  </div>
+  <div class="panel panel-danger">
+    <div class="panel-heading">
+      <h2 class="panel-title">
+        Manage
+      </h2>
+    </div>
+    <div class="panel-body">
+      <h3>Delete the API</h3>
+      <p>This can't be undo.</p>
+      <a
+         href="#"
+         class="btn btn-danger"
+         id="deleteModal">
+        {{_ "viewApiBackendDetails_deleteButton"}}
+      </a>
     </div>
   </div>
 </template>
diff --git a/apis/client/view/settings/settings.js b/apis/client/view/settings/settings.js
index 910f7b187a..37d50fe824 100644
--- a/apis/client/view/settings/settings.js
+++ b/apis/client/view/settings/settings.js
@@ -12,3 +12,9 @@ Template.viewApiBackendSettings.events({
     });
   }
 });
+
+Template.viewApiBackendSettings.helpers({
+  formCollection() {
+    return ApiBackends;
+  }
+});

From 1b5e29ebd2f29904f03e2c0b7381203137ed8272 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 18:28:39 +0300
Subject: [PATCH 24/58] moved logo section

---
 apis/client/view/settings/settings.html | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index 590575f594..e360c70375 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -6,18 +6,16 @@ <h2 class="panel-title">
       </h2>
     </div>
     <div class="panel-body">
-      <div class="panel-section">
-        {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
-        {{> afQuickField name='name'}}
-        {{> afQuickField name='description'}}
-        <div id="form-buttons">
-          <button type="submit" class="btn btn-success" id="save-settings">Save</button>
-        </div>
-        {{/autoForm}}
-      </div>
       <h3>{{_ "editApiBackendForm-uploadLogo" }}</h3>
       <p>You can upload logo. It will appear in the catalogue and view an API page.</p>
       {{> uploadApiLogo apiBackend=apiBackend }}
+      {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
+      {{> afQuickField name='name'}}
+      {{> afQuickField name='description'}}
+      <div id="form-buttons">
+        <button type="submit" class="btn btn-success" id="save-settings">Save</button>
+      </div>
+      {{/autoForm}}
     </div>
   </div>
   <div class="panel panel-default">

From 1e98ae28f0556eb05817caa092b57a9941298a18 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 18:30:28 +0300
Subject: [PATCH 25/58] removed moved code

---
 apis/client/view/details/details.html | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index 4df5adc40b..2c5965c4c9 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -1,22 +1,6 @@
 <template name="viewApiBackendDetails">
   <div class="panel panel-default">
     <div class="panel-heading">
-      {{# if apiBackend.currentUserCanEdit }}
-      <div class="btn-group pull-right">
-        <a
-           href="#"
-           class="btn btn-danger"
-           id="deleteModal">
-          {{_ "viewApiBackendDetails_deleteButton"}}
-        </a>
-        <a
-           href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
-           class="btn btn-info">
-          <i class="fa fa-cog"></i>
-          {{_ "view_ApiBackend_Details_editButtonText" }}
-        </a>
-      </div>
-      {{/ if }}
       <h2 class="panel-title clearfix">
         {{_ "view_ApiBackend_Details_Title"}}
       </h2>

From 53ba974c5b26d41c30a4db3402c892d1d8fefc59 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Thu, 28 Jul 2016 18:51:13 +0300
Subject: [PATCH 26/58] added meta details block

---
 apis/client/view/header/header.html | 10 ++++++++++
 apis/client/view/header/header.less |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 3675ddea96..6fd10dc636 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -6,6 +6,16 @@ <h1 class="api-name">
         {{ apiBackend.name }}
         {{> viewApiBackendStatus apiBackend=apiBackend width="0.4" }}
       </h1>
+      <ul class="list-inline view-api-meta-details">
+        <li>
+          <i class="fa fa-user"></i>
+          {{ apiBackend.getApiManagersByName }}
+        </li>
+        <li>
+          <i class="fa fa-calendar"></i>
+          {{ apiBackend.relativeCreatedAt }}
+        </li>
+      </ul>
       <div class="view-api-navigation">
         <ul class="nav nav-tabs">
           <li class="active">
diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 33e7d6c704..1390e631eb 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -15,15 +15,16 @@
     margin-left: 2em;
   }
 
-  .api-author {
+  .view-api-meta-details {
     clear: both;
+    margin-top: 2.5em;
   }
 }
 
 .view-api-navigation {
   position: relative;
   top: 2px;
-  margin-top: 2em;
+  margin-top: 0.7em;
   clear: both;
 
   .nav-tabs {

From 15d18a94c056f8bf311af88430213b03251ca5e1 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 09:19:01 +0300
Subject: [PATCH 27/58] more styles

---
 apis/client/view/header/header.html | 34 +++++++++++++++--------------
 apis/client/view/header/header.less | 16 +++++++++-----
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 6fd10dc636..7f7e01e707 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -1,21 +1,23 @@
 <template name="viewApiBackendPageHeader">
-  <div class="page-head-block">
+  <div class="page-head-topblock">
     <div class="container">
-      {{> viewApiLogo }}
-      <h1 class="api-name">
-        {{ apiBackend.name }}
-        {{> viewApiBackendStatus apiBackend=apiBackend width="0.4" }}
-      </h1>
-      <ul class="list-inline view-api-meta-details">
-        <li>
-          <i class="fa fa-user"></i>
-          {{ apiBackend.getApiManagersByName }}
-        </li>
-        <li>
-          <i class="fa fa-calendar"></i>
-          {{ apiBackend.relativeCreatedAt }}
-        </li>
-      </ul>
+      <div class="page-head-infoblock">
+        {{> viewApiLogo }}
+        <h1 class="api-name">
+          {{ apiBackend.name }}
+          {{> viewApiBackendStatus apiBackend=apiBackend width="0.4" }}
+        </h1>
+        <ul class="list-inline view-api-meta-details">
+          <li>
+            <i class="fa fa-user"></i>
+            {{ apiBackend.getApiManagersByName }}
+          </li>
+          <li>
+            <i class="fa fa-calendar"></i>
+            {{ apiBackend.relativeCreatedAt }}
+          </li>
+        </ul>
+      </div>
       <div class="view-api-navigation">
         <ul class="nav nav-tabs">
           <li class="active">
diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 1390e631eb..a740a1114b 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -1,7 +1,7 @@
 /* Bootstrap */
 @import "/core/client/style/bootstrap-variables.less";
 
-.page-head-block {
+.page-head-topblock {
   padding-top: 20px;
   padding-bottom: 0;
   margin-bottom: 20px;
@@ -10,21 +10,25 @@
   border-bottom: 1px solid #eee;
 
   .api-name {
-    font-size: 2em;
-    line-height: 0.4;
+    font-size: 1.7em;
+    font-weight: 600;
+    padding-left: 0.5em;
     margin-left: 2em;
+    margin-bottom: 0;
+    margin-top: 0.4em;
   }
 
   .view-api-meta-details {
-    clear: both;
-    margin-top: 2.5em;
+    padding-left: 0.5em;
+    margin-left: 3.4em;
+    margin-top: 0.2em;
   }
 }
 
 .view-api-navigation {
   position: relative;
   top: 2px;
-  margin-top: 0.7em;
+  margin-top: 2em;
   clear: both;
 
   .nav-tabs {

From 26dc713420ceb855d20254dec02b6e81ef5610f7 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 09:27:32 +0300
Subject: [PATCH 28/58] updated logo

---
 public/img/placeholder-logo.jpg | Bin 3286 -> 17531 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/img/placeholder-logo.jpg b/public/img/placeholder-logo.jpg
index 86d8ed69772cff642a25baf8ecbaaa59674d93a3..d21f817e7aa3090b5be0e9fbd78860955513ece0 100644
GIT binary patch
literal 17531
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
Ke-=%bJp3OK{)Bk|

delta 2207
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
F{{<wYt2qDw


From 826a38a081e2d45048cfbff1b3b5c1be58dc70a4 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 10:02:16 +0300
Subject: [PATCH 29/58] added bookmarks and stars

---
 apis/client/view/header/header.html | 14 ++++++++++++++
 apis/client/view/header/header.less |  9 +++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 7f7e01e707..33f337d0d3 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -18,6 +18,20 @@ <h1 class="api-name">
           </li>
         </ul>
       </div>
+      <div class="page-head-stats pull-right">
+        {{# if currentUser }}
+        <span class="api-card-bookmark">
+          {{> favourite apiBackend=apiBackend }}
+          {{ apiBackend.bookmarkCount }}
+        </span>
+        {{else}}
+        <span class="api-card-bookmark">
+          <i class="fa fa-bookmark bookmark-default"></i>
+          {{ apiBackend.bookmarkCount }}
+        </span>
+        {{/if}}
+        {{> apiBackendRating apiBackend }}
+      </div>
       <div class="view-api-navigation">
         <ul class="nav nav-tabs">
           <li class="active">
diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index a740a1114b..e10789681a 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -15,7 +15,7 @@
     padding-left: 0.5em;
     margin-left: 2em;
     margin-bottom: 0;
-    margin-top: 0.4em;
+    margin-top: 0.1em;
   }
 
   .view-api-meta-details {
@@ -25,10 +25,15 @@
   }
 }
 
+.page-head-infoblock {
+  clear: both;
+  display: inline-block;
+}
+
 .view-api-navigation {
   position: relative;
   top: 2px;
-  margin-top: 2em;
+  margin-top: 0.6em;
   clear: both;
 
   .nav-tabs {

From d2e1f3f8a6c75b77cc95131f16175d8054979f0f Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 12:26:48 +0300
Subject: [PATCH 30/58] added hr; changed texts

---
 apis/client/view/settings/settings.html | 12 +++++++++---
 apis/client/view/settings/settings.less |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index e360c70375..f7fbebc34c 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -7,7 +7,9 @@ <h2 class="panel-title">
     </div>
     <div class="panel-body">
       <h3>{{_ "editApiBackendForm-uploadLogo" }}</h3>
-      <p>You can upload logo. It will appear in the catalogue and view an API page.</p>
+      <p>
+        You can upload logo. It will appear in the catalogue and view an API page.
+      </p>
       {{> uploadApiLogo apiBackend=apiBackend }}
       {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
       {{> afQuickField name='name'}}
@@ -26,7 +28,9 @@ <h2 class="panel-title">
     </div>
     <div class="panel-body">
       <h3>Modify the API settings</h3>
-      <p>Change settings by editing fields.</p>
+      <p>
+        Change settings by editing fields.
+      </p>
       <a
          href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
          class="btn btn-primary">
@@ -42,7 +46,9 @@ <h2 class="panel-title">
     </div>
     <div class="panel-body">
       <h3>Delete the API</h3>
-      <p>This can't be undo.</p>
+      <p>
+        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.
+      </p>
       <a
          href="#"
          class="btn btn-danger"
diff --git a/apis/client/view/settings/settings.less b/apis/client/view/settings/settings.less
index 603fa67cf3..c9621e3c00 100644
--- a/apis/client/view/settings/settings.less
+++ b/apis/client/view/settings/settings.less
@@ -1,3 +1,8 @@
 .panel-section {
   margin-bottom: 15px;
 }
+.settings-hr {
+  margin: 15px 0;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}

From 3d7993ff927836672e50227b22a712752d176425 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 15:43:26 +0300
Subject: [PATCH 31/58] removed rating; removed add date

---
 apis/client/view/header/header.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 33f337d0d3..49f9108b6a 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -12,10 +12,6 @@ <h1 class="api-name">
             <i class="fa fa-user"></i>
             {{ apiBackend.getApiManagersByName }}
           </li>
-          <li>
-            <i class="fa fa-calendar"></i>
-            {{ apiBackend.relativeCreatedAt }}
-          </li>
         </ul>
       </div>
       <div class="page-head-stats pull-right">
@@ -30,7 +26,6 @@ <h1 class="api-name">
           {{ apiBackend.bookmarkCount }}
         </span>
         {{/if}}
-        {{> apiBackendRating apiBackend }}
       </div>
       <div class="view-api-navigation">
         <ul class="nav nav-tabs">

From 3cd0f3c68c599a157f32d9f6987b74dff2b7d74a Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 17:19:23 +0300
Subject: [PATCH 32/58] renamed clas

---
 apis/client/view/settings/settings.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apis/client/view/settings/settings.less b/apis/client/view/settings/settings.less
index c9621e3c00..e49752942a 100644
--- a/apis/client/view/settings/settings.less
+++ b/apis/client/view/settings/settings.less
@@ -1,7 +1,8 @@
 .panel-section {
   margin-bottom: 15px;
 }
-.settings-hr {
+
+.panel-hr {
   margin: 15px 0;
   border: 0;
   border-bottom: 1px solid #ddd;

From 484d3d2a55dedf58bb0ff81a4b8b0e6946ece6c1 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 17:20:12 +0300
Subject: [PATCH 33/58] cleaned up instructions

---
 .../usageInstructions/usageInstructions.html  | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/apis/client/view/usageInstructions/usageInstructions.html b/apis/client/view/usageInstructions/usageInstructions.html
index 78c6b462a8..13122e1ab9 100644
--- a/apis/client/view/usageInstructions/usageInstructions.html
+++ b/apis/client/view/usageInstructions/usageInstructions.html
@@ -1,18 +1,12 @@
 <template name="apiBackendUsageInstructions">
-  <div id="usage-instructions" class="collapse alert alert-info">
-    <i class="fa fa-info-circle fa-5x pull-left"></i>
-      <p>
-        <h4>{{_ "apiBackend_Usage_Instructions_Headline"}}</h4>
-        <em>{{ apiUmbrellaBaseUrl }}</em>
-      </p>
-      {{#unless currentUser}}
-        <p>
-          <strong>
-              {{_ "apiBackend_Usage_Instructions_Note"}}
-          </strong>
-            {{_ "apiBackend_Usage_Instructions_Note_Text"}}
-            <a href="{{ pathFor route='profile' }}">{{_ "apiBackend_Usage_Instructions_Profile_Page_Link"}}</a>
-        </p>
-      {{/unless}}
-  </div>
+  {{ apiUmbrellaBaseUrl }}
+  {{#unless currentUser}}
+  <p>
+    <strong>
+      {{_ "apiBackend_Usage_Instructions_Note"}}
+    </strong>
+    {{_ "apiBackend_Usage_Instructions_Note_Text"}}
+    <a href="{{ pathFor route='profile' }}">{{_ "apiBackend_Usage_Instructions_Profile_Page_Link"}}</a>
+  </p>
+  {{/unless}}
 </template>

From 6bf14c3737e34d70fa219a15b2a614dcde4a4bb9 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Fri, 29 Jul 2016 17:20:26 +0300
Subject: [PATCH 34/58] initial details redesign

---
 apis/client/view/details/details.html   | 20 +++++++++++++++-----
 apis/client/view/settings/settings.html |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index 2c5965c4c9..e2915da685 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -7,11 +7,21 @@ <h2 class="panel-title clearfix">
     </div>
     <div class="panel-body">
       <div class="row">
-        <div class="col-md-6">
-          {{> viewApiBackendServers apiBackend=apiBackend }}
-        </div>
-        <div class="col-md-6">
-          {{> viewApiBackendUrlMatchers apiBackend=apiBackend }}
+        <div class="col-md-12 api-details-block">
+          <h3>Description</h3>
+          <p>
+            {{ apiBackend.description }}
+          </p>
+          <hr class="panel-hr" />
+          <h3>Base URL</h3>
+          <span class="text-primary">
+            {{> apiBackendUsageInstructions }}
+          </span>
+          <hr class="panel-hr" />
+          <h3>Example</h3>
+          <span class="text-primary">
+            {{> apiBackendUsageInstructions }}
+          </span>
         </div>
       </div>
     </div>
diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index f7fbebc34c..ceaa713248 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -11,6 +11,7 @@ <h3>{{_ "editApiBackendForm-uploadLogo" }}</h3>
         You can upload logo. It will appear in the catalogue and view an API page.
       </p>
       {{> uploadApiLogo apiBackend=apiBackend }}
+      <hr class="panel-hr" />
       {{#autoForm collection=formCollection doc=apiBackend id="apiBackendForm" type="update"}}
       {{> afQuickField name='name'}}
       {{> afQuickField name='description'}}

From 65e987bca76f7af4bc227c74a5ed6062856c096a Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 13:12:48 +0300
Subject: [PATCH 35/58] changed bookmark style

---
 bookmarks/client/favourite.html | 13 +++++++++++--
 bookmarks/client/favourite.less |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bookmarks/client/favourite.html b/bookmarks/client/favourite.html
index 7caa2513b6..ddf7d78834 100644
--- a/bookmarks/client/favourite.html
+++ b/bookmarks/client/favourite.html
@@ -1,7 +1,16 @@
 <template name="favourite">
   {{ # if isBookmarked }}
-    <i class="fa fa-bookmark bookmark bookmarked"></i>
+  <a href="#" class="star-button bookmark bookmarked">
+    <i class="fa fa-star"></i>
+    &nbsp;Unstar
+  </a>
   {{ else }}
-    <i class="fa fa-bookmark-o bookmark"></i>
+  <a href="#" class="star-button bookmark">
+    <i class="fa fa-star-o"></i>
+    &nbsp;Star
+  </a>
   {{ / if }}
+  <span class="star-counter">
+    {{ apiBackend.bookmarkCount }}
+  </span>
 </template>
diff --git a/bookmarks/client/favourite.less b/bookmarks/client/favourite.less
index 7c7e53ca1b..80b4e1f200 100644
--- a/bookmarks/client/favourite.less
+++ b/bookmarks/client/favourite.less
@@ -10,5 +10,5 @@
 
 .bookmarked {
   cursor: pointer;
-  color: @brand-primary;
+  color: @gray;
 }

From 0ee623af439a472c5776a6eeece5b3b3cd17d721 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 13:13:25 +0300
Subject: [PATCH 36/58] added star button

---
 apis/client/view/header/header.html |  9 +++----
 apis/client/view/header/header.less | 39 +++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 49f9108b6a..2df50c450e 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -14,17 +14,14 @@ <h1 class="api-name">
           </li>
         </ul>
       </div>
-      <div class="page-head-stats pull-right">
+      <div class="page-head-starsblock pull-right">
         {{# if currentUser }}
-        <span class="api-card-bookmark">
           {{> favourite apiBackend=apiBackend }}
-          {{ apiBackend.bookmarkCount }}
-        </span>
         {{else}}
-        <span class="api-card-bookmark">
+        <a href="#" class="star-button">
           <i class="fa fa-bookmark bookmark-default"></i>
           {{ apiBackend.bookmarkCount }}
-        </span>
+        </a>
         {{/if}}
       </div>
       <div class="view-api-navigation">
diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index e10789681a..f8db8baed6 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -30,6 +30,45 @@
   display: inline-block;
 }
 
+.page-head-starsblock {
+  font-size: 16px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+}
+
+.page-head-starsblock {
+  a {
+    color: @gray;
+    text-decoration: none;
+    &:hover { text-decoration: none; color: @gray; }
+    &:focus { text-decoration: none; color: @gray; }
+    &:active { text-decoration: none; color: @gray; }
+    &:visited { text-decoration: none; color: @gray; }
+  }
+
+  .star-button {
+    background-color: #f4f4f4;
+    border-right: 1px solid #ddd;
+    display: inline-block;
+    font-size: 14px;
+    font-weight: bold;
+    line-height: 14px;
+    padding: 6px 12px 6px 12px;
+    text-decoration: none;
+    &:hover { text-decoration: none; color: darken(@gray, 10%); }
+    &:focus { text-decoration: none; color: darken(@gray, 10%); }
+    &:active { text-decoration: none; color: darken(@gray, 10%); }
+    &:visited { text-decoration: none; color: darken(@gray, 10%); }
+  }
+
+  .star-counter {
+    padding: 3px 7px;
+    color: #333;
+    vertical-align: middle;
+    background-color: #fff;
+  }
+}
+
 .view-api-navigation {
   position: relative;
   top: 2px;

From 1a2e286a06fa43b0ec498b41eb7f4c77444e0181 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 13:14:29 +0300
Subject: [PATCH 37/58] updated boomark view block

---
 catalogue/client/{catalogue.css => catalogue.less} | 11 +++++++++++
 catalogue/client/grid/grid.html                    | 12 ------------
 catalogue/client/table/table.html                  |  4 ----
 3 files changed, 11 insertions(+), 16 deletions(-)
 rename catalogue/client/{catalogue.css => catalogue.less} (62%)

diff --git a/catalogue/client/catalogue.css b/catalogue/client/catalogue.less
similarity index 62%
rename from catalogue/client/catalogue.css
rename to catalogue/client/catalogue.less
index dd03214379..7d17f7b280 100644
--- a/catalogue/client/catalogue.css
+++ b/catalogue/client/catalogue.less
@@ -1,3 +1,5 @@
+@import "/core/client/style/bootstrap-variables.less";
+
 .sort-options-select {
   padding-left: 0.5em;
 }
@@ -34,3 +36,12 @@
   cursor: default;
   background-color: #fafafa !important;
 }
+
+.api-card-bookmark a {
+  color: @gray;
+  text-decoration: none;
+  &:hover { text-decoration: none; color: @gray; }
+  &:focus { text-decoration: none; color: @gray; }
+  &:active { text-decoration: none; color: @gray; }
+  &:visited { text-decoration: none; color: @gray; }
+}
diff --git a/catalogue/client/grid/grid.html b/catalogue/client/grid/grid.html
index 886f5db579..9a663ea1d4 100644
--- a/catalogue/client/grid/grid.html
+++ b/catalogue/client/grid/grid.html
@@ -22,17 +22,6 @@
             </p>
           </div>
           <ul class="api-card-stats list-inline">
-            <li class="pull-left">
-              <div class="api-card-star-average"
-                   data-toggle="tooltip"
-                   data-placement="bottom"
-                   title="{{_ 'catalogue-AverageRating-Tooltip'}}">
-                {{#if api.averageRating }}
-                {{ api.averageRating }}
-                <i class="fa fa-star-half-o"></i>
-                {{/if}}
-              </div>
-            </li>
             {{# if currentUser }}
             <li class="pull-left">
               <div
@@ -40,7 +29,6 @@
                    data-toggle="tooltip"
                    data-placement="bottom"
                    title="{{_ 'catalogue-Bookmark-Tooltip_User'}}">
-                <span class="api-card-bookmark-number">{{ api.bookmarkCount }}</span>
                 {{> favourite apiBackend=api }}
               </div>
             </li>
diff --git a/catalogue/client/table/table.html b/catalogue/client/table/table.html
index aae38445d0..286cca3a8f 100644
--- a/catalogue/client/table/table.html
+++ b/catalogue/client/table/table.html
@@ -26,14 +26,10 @@ <h4 class="api-catalogue-table-title">
               {{ api.relativeCreatedAt }}
             </i>
           </td>
-          <td class="col-sm-1">
-            {{> apiBackendRating api }}
-          </td>
           <td class="col-sm-1 text-center">
             {{# if currentUser }}
             <span class="api-card-bookmark">
               {{> favourite apiBackend=api }}
-              {{ api.bookmarkCount }}
             </span>
             {{else}}
             <span class="api-card-bookmark">

From 11c15b16018d7182bedaaeea20da8b951fd6cf16 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 14:15:30 +0300
Subject: [PATCH 38/58] got back lost method

---
 apis/server/methods/apiUmbrellaBaseUrl.js | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 apis/server/methods/apiUmbrellaBaseUrl.js

diff --git a/apis/server/methods/apiUmbrellaBaseUrl.js b/apis/server/methods/apiUmbrellaBaseUrl.js
new file mode 100644
index 0000000000..df8762ce16
--- /dev/null
+++ b/apis/server/methods/apiUmbrellaBaseUrl.js
@@ -0,0 +1,7 @@
+Meteor.methods({
+  'getApiUmbrellaBaseUrl': function () {
+    // Get base url from settings collection
+    var apiUmbrellaBaseUrl = Settings.findOne().apiUmbrella.host;
+    return apiUmbrellaBaseUrl;
+  }
+});

From 827c0bb8fac5df260af5266a3ef0a0c43493a493 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 14:17:39 +0300
Subject: [PATCH 39/58] updated details tab

---
 apis/client/view/details/details.html | 24 ++++++++----
 apis/client/view/details/details.js   | 53 +++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 apis/client/view/details/details.js

diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index e2915da685..873fef3b85 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -14,14 +14,22 @@ <h3>Description</h3>
           </p>
           <hr class="panel-hr" />
           <h3>Base URL</h3>
-          <span class="text-primary">
-            {{> apiBackendUsageInstructions }}
-          </span>
-          <hr class="panel-hr" />
-          <h3>Example</h3>
-          <span class="text-primary">
-            {{> apiBackendUsageInstructions }}
-          </span>
+          <div class="input-group">
+            <input
+                   type="text"
+                   class="form-control"
+                   id="base-url"
+                   value="{{ apiUmbrellaBaseUrl }}">
+            <span class="input-group-btn">
+              <button
+                      class="btn btn-default"
+                      id="copyBaseUrl"
+                      type="button"
+                      data-clipboard-target="#base-url">
+                <i class="fa fa-clipboard" alt="Copy to clipboard"></i>
+              </button>
+            </span>
+          </div>
         </div>
       </div>
     </div>
diff --git a/apis/client/view/details/details.js b/apis/client/view/details/details.js
new file mode 100644
index 0000000000..f783d9e715
--- /dev/null
+++ b/apis/client/view/details/details.js
@@ -0,0 +1,53 @@
+import Clipboard from "clipboard";
+
+Template.viewApiBackendDetails.onCreated(function () {
+
+  // Get reference to template instance
+  var instance = this;
+
+  // Create variable to hold API Umbrella base URL
+  instance.apiUmbrellaBaseUrl = new ReactiveVar();
+
+  // Get API Umbrella base URL from server
+  Meteor.call("getApiUmbrellaBaseUrl", function (error, apiUmbrellaBaseUrl) {
+    // Set reactive variable to contain API Umbrella base URL
+    instance.apiUmbrellaBaseUrl.set(apiUmbrellaBaseUrl);
+  });
+});
+
+Template.viewApiBackendDetails.helpers({
+  apiUmbrellaBaseUrl: function () {
+
+    // Get reference to template instance
+    var instance = Template.instance();
+
+    // Fetch API Backend's frontend prefix value
+    var apiBackendFrontendPrefix = instance.data.apiBackend.url_matches[0].frontend_prefix;
+
+    // Get reference to API Umbrella base URL & construct a URI object
+    var apiUmbrellaBaseUrl = new URI(instance.apiUmbrellaBaseUrl.get());
+
+    // Append a frontend prefix to a API Umbrella base URL
+    apiUmbrellaBaseUrl.segment(0, apiBackendFrontendPrefix);
+
+    // Clean up URL & remove extra slashes
+    apiUmbrellaBaseUrl.normalize();
+
+    return apiUmbrellaBaseUrl;
+  }
+});
+
+Template.viewApiBackendDetails.onRendered(function () {
+
+  // Initialize Clipboard copy button
+  let copyButton = new Clipboard("#copyBaseUrl");
+
+  // Tell the user when copy is successful
+  copyButton.on("success", function () {
+    // Get localized success message
+    const successMessage = TAPi18n.__("profile_apiKey_copySuccessful");
+
+    // Display success message to user
+    sAlert.success(successMessage);
+  })
+});

From 6e4b8e32f707683d0b4c8d24b677019e06cf916a Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 14:46:59 +0300
Subject: [PATCH 40/58] helper to hide/show description

---
 apis/client/view/details/details.html | 4 +++-
 apis/collection/helpers.js            | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index 873fef3b85..cfb6f04fa0 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -7,12 +7,14 @@ <h2 class="panel-title clearfix">
     </div>
     <div class="panel-body">
       <div class="row">
-        <div class="col-md-12 api-details-block">
+        <div class="col-lg-12 api-details-block">
+          {{ # if apiBackend.description }}
           <h3>Description</h3>
           <p>
             {{ apiBackend.description }}
           </p>
           <hr class="panel-hr" />
+          {{ / if }}
           <h3>Base URL</h3>
           <div class="input-group">
             <input
diff --git a/apis/collection/helpers.js b/apis/collection/helpers.js
index 567e3627ef..bdac87e3ee 100644
--- a/apis/collection/helpers.js
+++ b/apis/collection/helpers.js
@@ -148,5 +148,8 @@ ApiBackends.helpers({
   relativeCreatedAt () {
     // Return relative updated_at
     return moment(this.created_at).fromNow();
+  },
+  description () {
+    const apiBackendIdDescription = this.description;
   }
 });

From fe264339d31a7890a72fe0a1ae4c69044dc1f49b Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 14:53:01 +0300
Subject: [PATCH 41/58] removed old heading

---
 apis/client/view/heading/heading.html | 59 ---------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 apis/client/view/heading/heading.html

diff --git a/apis/client/view/heading/heading.html b/apis/client/view/heading/heading.html
deleted file mode 100644
index 061a0f57d9..0000000000
--- a/apis/client/view/heading/heading.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<template name="viewApiBackendPageHeading">
-  <div class="page-heading">
-    <div class="btn-group pull-right" role="group" aria-label="...">
-      {{ # if currentUser }}
-      {{ # if isInRole 'admin' }}
-      {{> flagApiButton apiBackend=apiBackend }}
-      {{ / if }}
-      {{ / if }}
-      {{> apiBackendsUsageInstructionsButton }}
-    </div>
-    <h1 class="page-title">
-      {{> viewApiLogo }}
-      {{ apiBackend.name }}
-      {{> viewApiBackendStatus apiBackend=apiBackend width="0.4"  }}
-    </h1>
-    {{> apiBackendUsageInstructions }}
-
-    <div class="col-xs-12 view-api-navigation">
-      <ul class="nav nav-tabs">
-        <li class="active">
-          <a href="#api-backend-details" data-toggle="tab">
-            <i class="fa fa-info-circle"></i>
-            {{_ "viewApiBackendNavigationMenu_details" }}
-          </a>
-        </li>
-        <li>
-          <a href="#api-backend-documentation" data-toggle="tab">
-            <i class="fa fa-file-text"></i>
-            {{_ "viewApiBackendNavigationMenu_documentation" }}
-          </a>
-        </li>
-        <li>
-          <a href="#api-backend-metadata" data-toggle="tab">
-            <i class="fa fa-book"></i>
-            {{_ "viewApiBackendNavigationMenu_metadata" }}
-          </a>
-        </li>
-        <li>
-          <a href="#api-backend-feedback" data-toggle="tab">
-            <i class="fa fa-comments-o"></i>
-            {{_ "viewApiBackendNavigationMenu_feedback" }}
-          </a>
-        </li>
-        <li>
-          <a href="#api-backend-backlog" data-toggle="tab">
-            <i class="fa fa-check-square-o"></i>
-            {{_ "viewApiBackendNavigationMenu_backlog" }}
-          </a>
-        </li>
-        <li>
-          <a href="#api-backend-export" data-toggle="tab">
-            <i class="fa fa-cloud-download"></i>
-            {{_ "viewApiBackendNavigationMenu_export" }}
-          </a>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>

From 5728c85bfd729ff09181d2578eadaf8a7070b80d Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Mon, 1 Aug 2016 17:08:21 +0300
Subject: [PATCH 42/58] different view for stars

---
 bookmarks/client/favourite.html   | 4 ++++
 catalogue/client/grid/grid.html   | 4 ++--
 catalogue/client/table/table.html | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bookmarks/client/favourite.html b/bookmarks/client/favourite.html
index ddf7d78834..2246844507 100644
--- a/bookmarks/client/favourite.html
+++ b/bookmarks/client/favourite.html
@@ -2,12 +2,16 @@
   {{ # if isBookmarked }}
   <a href="#" class="star-button bookmark bookmarked">
     <i class="fa fa-star"></i>
+    {{ # unless catalogueView }}
     &nbsp;Unstar
+    {{ / unless }}
   </a>
   {{ else }}
   <a href="#" class="star-button bookmark">
     <i class="fa fa-star-o"></i>
+    {{ # unless catalogueView }}
     &nbsp;Star
+    {{ / unless }}
   </a>
   {{ / if }}
   <span class="star-counter">
diff --git a/catalogue/client/grid/grid.html b/catalogue/client/grid/grid.html
index 9a663ea1d4..38beb0196d 100644
--- a/catalogue/client/grid/grid.html
+++ b/catalogue/client/grid/grid.html
@@ -29,7 +29,7 @@
                    data-toggle="tooltip"
                    data-placement="bottom"
                    title="{{_ 'catalogue-Bookmark-Tooltip_User'}}">
-                {{> favourite apiBackend=api }}
+                {{> favourite apiBackend=api catalogueView=true }}
               </div>
             </li>
             {{else}}
@@ -40,7 +40,7 @@
                    data-placement="bottom"
                    title="{{_ 'catalogue-Bookmark-Tooltip_NonUser'}}">
                 <span class="api-card-bookmark-number">{{ api.bookmarkCount }}</span>
-                <i class="fa fa-bookmark bookmark-default"></i>
+                <i class="fa fa-star bookmark-default"></i>
               </div>
             </li>
             {{/if}}
diff --git a/catalogue/client/table/table.html b/catalogue/client/table/table.html
index 286cca3a8f..417488ba16 100644
--- a/catalogue/client/table/table.html
+++ b/catalogue/client/table/table.html
@@ -29,11 +29,11 @@ <h4 class="api-catalogue-table-title">
           <td class="col-sm-1 text-center">
             {{# if currentUser }}
             <span class="api-card-bookmark">
-              {{> favourite apiBackend=api }}
+              {{> favourite apiBackend=api catalogueView=true }}
             </span>
             {{else}}
             <span class="api-card-bookmark">
-              <i class="fa fa-bookmark bookmark-default"></i>
+              <i class="fa fa-star bookmark-default"></i>
               {{ api.bookmarkCount }}
             </span>
             {{/if}}

From 1d640b78382aa5f80cf2f51e55d4fe83ce02444a Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 10:33:25 +0300
Subject: [PATCH 43/58] fixed margin

---
 dashboard/client/dashboard.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dashboard/client/dashboard.less b/dashboard/client/dashboard.less
index 6c9b93635a..7ddc24b3b0 100644
--- a/dashboard/client/dashboard.less
+++ b/dashboard/client/dashboard.less
@@ -1,7 +1,6 @@
 .dashboard-title {
   font-size: 1.7em;
   font-weight: 600;
-  margin-top: 0px;
 }
 
 .dashboard-no-apis {

From 3e49c65e92d80118aa1b39a95505a4ddcf0830a0 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 10:33:59 +0300
Subject: [PATCH 44/58] removed unused file

---
 .../view/details/matchers/matchers.html       | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 apis/client/view/details/matchers/matchers.html

diff --git a/apis/client/view/details/matchers/matchers.html b/apis/client/view/details/matchers/matchers.html
deleted file mode 100644
index 9d7ceef8a3..0000000000
--- a/apis/client/view/details/matchers/matchers.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<template name="viewApiBackendUrlMatchers">
-  <div class="col-xs-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h2 class="panel-title">{{_ "view_ApiBackend_Matchers"}}</h2>
-      </div>
-      <div class="panel-body">
-        <div class="row">
-          {{#each apiBackend.url_matches}}
-          <div class="col-lg-12">
-            <ul class="list-group">
-              <li class="list-group-item">
-                <span class="label label-primary">
-                  {{_ "view_ApiBackend_Backend_Prefix"}}
-                </span>
-                &nbsp;{{ backend_prefix }}
-              </li>
-              <li class="list-group-item">
-                <span class="label label-primary">
-                  {{_ "view_ApiBackend_Frontend_Prefix"}}
-                </span>
-                &nbsp;{{ frontend_prefix }}
-              </li>
-            </ul>
-          </div>
-          {{/each}}
-        </div>
-      </div>
-    </div>
-  </div>
-</template>

From e1d3c4d8a0f6bee7346ac29bb7b20b9b80beea3f Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 10:49:00 +0300
Subject: [PATCH 45/58] cleaned up

---
 apis/client/view/details/servers/servers.html | 38 ------------------
 apis/client/view/details/servers/servers.js   | 13 ------
 apis/client/view/details/servers/servers.less | 40 -------------------
 3 files changed, 91 deletions(-)
 delete mode 100644 apis/client/view/details/servers/servers.html
 delete mode 100644 apis/client/view/details/servers/servers.js
 delete mode 100644 apis/client/view/details/servers/servers.less

diff --git a/apis/client/view/details/servers/servers.html b/apis/client/view/details/servers/servers.html
deleted file mode 100644
index 0595d24e1c..0000000000
--- a/apis/client/view/details/servers/servers.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<template name="viewApiBackendServers">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h2 class="panel-title">{{_ "view_ApiBackend_Servers"}}</h2>
-    </div>
-    <div class="panel-body">
-      <div id="api-backend-servers" class="form-group">
-        <div id="servers-api-backend" class="input-group">
-          <span class="input-group-addon primary">
-            {{_ "view_ApiBackend_Backend"}}
-          </span>
-          <input
-            id="frontend-text"
-            class="form-control"
-            value="{{apiBackend.backend_host}}"
-            title="{{apiBackend.backend_host}}"
-            readonly="readonly"
-          >
-          <span class="input-group-addon {{ serverBackendProtocolClass }}">
-            {{ apiBackend.backend_protocol }}
-          </span>
-        </div>
-        <div id="servers-api-frontend" class="input-group">
-          <span class="input-group-addon primary">
-            {{_ "view_ApiBackend_Frontend"}}
-          </span>
-          <input
-            id="frontend-text"
-            class="form-control"
-            value="{{apiBackend.frontend_host}}"
-            title="{{apiBackend.frontend_host}}"
-            readonly="readonly"
-          >
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
diff --git a/apis/client/view/details/servers/servers.js b/apis/client/view/details/servers/servers.js
deleted file mode 100644
index 73ddea55c0..0000000000
--- a/apis/client/view/details/servers/servers.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Template.viewApiBackendServers.helpers({
-  "serverBackendProtocolClass": function () {
-    // Get API Backend protocol
-    var apiBackendProtocol = this.apiBackend.backend_protocol;
-
-    // Change the class to 'warning' if protocol is HTTP; 'success' if HTTPS
-    if (apiBackendProtocol === "http") {
-      return "warning";
-    } else if (apiBackendProtocol === "https") {
-      return "success";
-    }
-  }
-});
diff --git a/apis/client/view/details/servers/servers.less b/apis/client/view/details/servers/servers.less
deleted file mode 100644
index dc5bd61149..0000000000
--- a/apis/client/view/details/servers/servers.less
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Bootstrap */
-@import "/core/client/style/bootstrap-variables.less";
-
-#frontend-text {
-  background-color: #fff;
-}
-
-#servers-api-backend {
-  margin-bottom: 1em;
-}
-
-.input-group-addon.primary {
-  color: rgb(255, 255, 255);
-  background-color: @brand-primary;
-  border-color: @brand-primary;
-}
-
-.input-group-addon.success {
-  color: rgb(255, 255, 255);
-  background-color: @brand-success;
-  border-color: @brand-success;
-}
-
-.input-group-addon.info {
-  color: rgb(255, 255, 255);
-  background-color: @brand-info;
-  border-color: @brand-info;
-}
-
-.input-group-addon.warning {
-  color: rgb(255, 255, 255);
-  background-color: @brand-warning;
-  border-color: @brand-warning;
-}
-
-.input-group-addon.danger {
-  color: rgb(255, 255, 255);
-  background-color: @brand-danger;
-  border-color: @brand-danger;
-}

From e56dd3788689c0e54fe27d3ccabbbfea637aa370 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 12:11:10 +0300
Subject: [PATCH 46/58] tooltip message when copied

---
 apis/client/view/details/details.html |  1 +
 apis/client/view/details/details.js   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apis/client/view/details/details.html b/apis/client/view/details/details.html
index cfb6f04fa0..2937dd3fbe 100644
--- a/apis/client/view/details/details.html
+++ b/apis/client/view/details/details.html
@@ -27,6 +27,7 @@ <h3>Base URL</h3>
                       class="btn btn-default"
                       id="copyBaseUrl"
                       type="button"
+                      data-original-title="Copied!"
                       data-clipboard-target="#base-url">
                 <i class="fa fa-clipboard" alt="Copy to clipboard"></i>
               </button>
diff --git a/apis/client/view/details/details.js b/apis/client/view/details/details.js
index f783d9e715..966f347f6d 100644
--- a/apis/client/view/details/details.js
+++ b/apis/client/view/details/details.js
@@ -42,12 +42,16 @@ Template.viewApiBackendDetails.onRendered(function () {
   // Initialize Clipboard copy button
   let copyButton = new Clipboard("#copyBaseUrl");
 
+  // Tooltip position
+  $('#copyBaseUrl').tooltip({
+    trigger: 'click',
+    placement: 'bottom'
+  });
+
   // Tell the user when copy is successful
   copyButton.on("success", function () {
-    // Get localized success message
-    const successMessage = TAPi18n.__("profile_apiKey_copySuccessful");
-
-    // Display success message to user
-    sAlert.success(successMessage);
-  })
+    $('#copyBaseUrl').tooltip('hide')
+      .attr('data-original-title', 'Copied!')
+      .tooltip('show');
+  });
 });

From a0966ba774c86728f9e390108b32ec466492c7e3 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 12:13:35 +0300
Subject: [PATCH 47/58] clean up

---
 .../usageInstructions/usageInstructions.html  | 12 -----
 .../usageInstructions/usageInstructions.js    | 47 -------------------
 .../usageInstructionsButton.html              |  9 ----
 3 files changed, 68 deletions(-)
 delete mode 100644 apis/client/view/usageInstructions/usageInstructions.html
 delete mode 100644 apis/client/view/usageInstructions/usageInstructions.js
 delete mode 100644 apis/client/view/usageInstructions/usageInstructionsButton.html

diff --git a/apis/client/view/usageInstructions/usageInstructions.html b/apis/client/view/usageInstructions/usageInstructions.html
deleted file mode 100644
index 13122e1ab9..0000000000
--- a/apis/client/view/usageInstructions/usageInstructions.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<template name="apiBackendUsageInstructions">
-  {{ apiUmbrellaBaseUrl }}
-  {{#unless currentUser}}
-  <p>
-    <strong>
-      {{_ "apiBackend_Usage_Instructions_Note"}}
-    </strong>
-    {{_ "apiBackend_Usage_Instructions_Note_Text"}}
-    <a href="{{ pathFor route='profile' }}">{{_ "apiBackend_Usage_Instructions_Profile_Page_Link"}}</a>
-  </p>
-  {{/unless}}
-</template>
diff --git a/apis/client/view/usageInstructions/usageInstructions.js b/apis/client/view/usageInstructions/usageInstructions.js
deleted file mode 100644
index bc815f1fc6..0000000000
--- a/apis/client/view/usageInstructions/usageInstructions.js
+++ /dev/null
@@ -1,47 +0,0 @@
-Template.apiBackendUsageInstructions.created = function () {
-  // Get reference to template instance
-  var instance = this;
-
-  // Create variable to hold API Umbrella base URL
-  instance.apiUmbrellaBaseUrl = new ReactiveVar();
-
-  // Get API Umbrella base URL from server
-  Meteor.call("getApiUmbrellaBaseUrl", function (error, apiUmbrellaBaseUrl) {
-    // Set reactive variable to contain API Umbrella base URL
-    instance.apiUmbrellaBaseUrl.set(apiUmbrellaBaseUrl);
-  });
-};
-
-Template.apiBackendUsageInstructions.helpers({
-  apiUmbrellaBaseUrl: function () {
-
-    // Get reference to template instance
-    var instance = Template.instance();
-
-    // Fetch API Backend's frontend prefix value
-    var apiBackendFrontendPrefix = instance.data.apiBackend.url_matches[0].frontend_prefix;
-
-    // Get reference to API Umbrella base URL & construct a URI object
-    var apiUmbrellaBaseUrl = new URI(instance.apiUmbrellaBaseUrl.get());
-
-    // Append a frontend prefix to a API Umbrella base URL
-    apiUmbrellaBaseUrl.segment(0, apiBackendFrontendPrefix);
-
-    // Clean up URL & remove extra slashes
-    apiUmbrellaBaseUrl.normalize();
-
-    if (Meteor.user()) {
-
-      // Add api_key parameter to URL (https://host.com/frontend_prefix?api_key=your_api_key)
-      apiUmbrellaBaseUrl.addSearch('api_key', Meteor.user().profile.apiKey);
-
-    } else {
-
-      // Add plain text if user is not authorised
-      apiUmbrellaBaseUrl.addSearch('api_key', "your_api_key_here");
-
-    }
-
-    return apiUmbrellaBaseUrl;
-  }
-});
diff --git a/apis/client/view/usageInstructions/usageInstructionsButton.html b/apis/client/view/usageInstructions/usageInstructionsButton.html
deleted file mode 100644
index eb022af09b..0000000000
--- a/apis/client/view/usageInstructions/usageInstructionsButton.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<template name="apiBackendsUsageInstructionsButton">
-  <button
-    class="btn btn-info btn-sm"
-    data-toggle="collapse"
-    data-target="#usage-instructions">
-    <i class="fa fa-eye"></i>&nbsp;
-      View usage instructions
-  </button>
-</template>

From c4134695694179e0588f0bf99e8d593947c6c2a2 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 12:18:09 +0300
Subject: [PATCH 48/58] moved folder

---
 apis/client/view/{details => }/status/status.html | 0
 apis/client/view/{details => }/status/status.js   | 0
 apis/client/view/{details => }/status/status.less | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename apis/client/view/{details => }/status/status.html (100%)
 rename apis/client/view/{details => }/status/status.js (100%)
 rename apis/client/view/{details => }/status/status.less (100%)

diff --git a/apis/client/view/details/status/status.html b/apis/client/view/status/status.html
similarity index 100%
rename from apis/client/view/details/status/status.html
rename to apis/client/view/status/status.html
diff --git a/apis/client/view/details/status/status.js b/apis/client/view/status/status.js
similarity index 100%
rename from apis/client/view/details/status/status.js
rename to apis/client/view/status/status.js
diff --git a/apis/client/view/details/status/status.less b/apis/client/view/status/status.less
similarity index 100%
rename from apis/client/view/details/status/status.less
rename to apis/client/view/status/status.less

From 53aaeef1242b4c6e1bd812817fe2fad38347b7ca Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 12:18:22 +0300
Subject: [PATCH 49/58] cleaned up

---
 apis/client/view/header/header.less | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index f8db8baed6..0da03d26cf 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -34,9 +34,6 @@
   font-size: 16px;
   border: 1px solid #ddd;
   border-radius: 3px;
-}
-
-.page-head-starsblock {
   a {
     color: @gray;
     text-decoration: none;

From 665d4378ff24c13ffde5c52ec6bff3deab775db1 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 13:25:24 +0300
Subject: [PATCH 50/58] i18n strings

---
 apis/client/view/header/header.html     |  2 +-
 apis/client/view/settings/settings.html | 16 ++++++++--------
 lib/i18n/en.i18n.json                   |  9 +++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 2df50c450e..e5ea83501f 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -65,7 +65,7 @@ <h1 class="api-name">
           <li>
             <a href="#api-backend-settings" data-toggle="tab">
               <i class="fa fa-cog"></i>
-              Settings
+              {{_ "viewApiBackendNavigationMenu_settings" }}
             </a>
           </li>
         </ul>
diff --git a/apis/client/view/settings/settings.html b/apis/client/view/settings/settings.html
index ceaa713248..94d922f220 100644
--- a/apis/client/view/settings/settings.html
+++ b/apis/client/view/settings/settings.html
@@ -2,13 +2,13 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        About
+        {{_ "viewApiBackendSettings_panelTitleAbout" }}
       </h2>
     </div>
     <div class="panel-body">
       <h3>{{_ "editApiBackendForm-uploadLogo" }}</h3>
       <p>
-        You can upload logo. It will appear in the catalogue and view an API page.
+        {{_ "viewApiBackendSettings_uploadLogoText" }}
       </p>
       {{> uploadApiLogo apiBackend=apiBackend }}
       <hr class="panel-hr" />
@@ -24,13 +24,13 @@ <h3>{{_ "editApiBackendForm-uploadLogo" }}</h3>
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2 class="panel-title">
-        Edit
+        {{_ "viewApiBackendSettings_panelTitleEdit" }}
       </h2>
     </div>
     <div class="panel-body">
-      <h3>Modify the API settings</h3>
+      <h3>{{_ "viewApiBackendSettings_editApiSettingsTitle" }}</h3>
       <p>
-        Change settings by editing fields.
+        {{_ "viewApiBackendSettings_editApiSettingsText" }}
       </p>
       <a
          href="{{ pathFor 'editApiBackend' _id=apiBackend._id }}"
@@ -42,13 +42,13 @@ <h3>Modify the API settings</h3>
   <div class="panel panel-danger">
     <div class="panel-heading">
       <h2 class="panel-title">
-        Manage
+        {{_ "viewApiBackendSettings_panelTitleManage" }}
       </h2>
     </div>
     <div class="panel-body">
-      <h3>Delete the API</h3>
+      <h3>{{_ "viewApiBackendSettings_deleteApiTitle" }}</h3>
       <p>
-        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_deleteApiText" }}
       </p>
       <a
          href="#"
diff --git a/lib/i18n/en.i18n.json b/lib/i18n/en.i18n.json
index d9599be5f3..ecd9d1172d 100644
--- a/lib/i18n/en.i18n.json
+++ b/lib/i18n/en.i18n.json
@@ -387,6 +387,15 @@
   "viewApiBackendNavigationMenu_export": "Export",
   "viewApiBackendNavigationMenu_feedback": "Feedback",
   "viewApiBackendNavigationMenu_metadata": "Metadata",
+  "viewApiBackendNavigationMenu_settings": "Settings",
+  "viewApiBackendSettings_panelTitleAbout": "About",
+  "viewApiBackendSettings_panelTitleEdit": "Edit",
+  "viewApiBackendSettings_panelTitleManage": "Manage",
+  "viewApiBackendSettings_editApiSettingsText": "You can modify the proxy settings for your API. Clicking the button will open a settings form.",
+  "viewApiBackendSettings_editApiSettingsTitle": "Modify the API settings",
+  "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_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.",

From 4db74a28f975b7361c3adbe2988752f85a5c643b Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 16:44:48 +0300
Subject: [PATCH 51/58] permissions for settings tab

---
 apis/client/view/header/header.html    |  6 +++++-
 apis/client/view/view_api_backend.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 e5ea83501f..023a582e00 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -16,7 +16,7 @@ <h1 class="api-name">
       </div>
       <div class="page-head-starsblock pull-right">
         {{# if currentUser }}
-          {{> favourite apiBackend=apiBackend }}
+        {{> favourite apiBackend=apiBackend }}
         {{else}}
         <a href="#" class="star-button">
           <i class="fa fa-bookmark bookmark-default"></i>
@@ -62,12 +62,16 @@ <h1 class="api-name">
               {{_ "viewApiBackendNavigationMenu_export" }}
             </a>
           </li>
+          {{ # if currentUser }}
+          {{# if apiBackend.currentUserCanEdit }}
           <li>
             <a href="#api-backend-settings" data-toggle="tab">
               <i class="fa fa-cog"></i>
               {{_ "viewApiBackendNavigationMenu_settings" }}
             </a>
           </li>
+          {{ / if }}
+          {{ / if }}
         </ul>
       </div>
     </div>
diff --git a/apis/client/view/view_api_backend.html b/apis/client/view/view_api_backend.html
index 632d7aa61b..dd601b289a 100644
--- a/apis/client/view/view_api_backend.html
+++ b/apis/client/view/view_api_backend.html
@@ -27,9 +27,13 @@
         {{> apiBacklog apiBackend=apiBackend backlogItems=backlogItems }}
       </div> <!-- /api-backend-export -->
 
-      <div id="api-backend-settings" class="tab-pane fade">
-       {{> viewApiBackendSettings apiBackend=apiBackend }}
-      </div>
+      {{ # if currentUser }}
+        {{# if apiBackend.currentUserCanEdit }}
+          <div id="api-backend-settings" class="tab-pane fade">
+            {{> viewApiBackendSettings apiBackend=apiBackend }}
+          </div>
+        {{ / if }}
+      {{ / if }}
     </div>
   </div>
   {{ else }}

From 275b3ec8217549df5c262908888078b30e769808 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 16:48:44 +0300
Subject: [PATCH 52/58] number of stars single page

---
 apis/client/view/header/header.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apis/client/view/header/header.html b/apis/client/view/header/header.html
index 023a582e00..121744497c 100644
--- a/apis/client/view/header/header.html
+++ b/apis/client/view/header/header.html
@@ -19,8 +19,14 @@ <h1 class="api-name">
         {{> favourite apiBackend=apiBackend }}
         {{else}}
         <a href="#" class="star-button">
-          <i class="fa fa-bookmark bookmark-default"></i>
-          {{ apiBackend.bookmarkCount }}
+          <div
+               class="api-card-bookmark"
+               data-toggle="tooltip"
+               data-placement="bottom"
+               title="{{_ 'catalogue-Bookmark-Tooltip_NonUser'}}">
+            <span class="api-card-bookmark-number">{{ apiBackend.bookmarkCount }}</span>
+            <i class="fa fa-star bookmark-default"></i>
+          </div>
         </a>
         {{/if}}
       </div>

From 7bba3332e1cec582ae89037e6fcf3002cc6ca571 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 17:06:15 +0300
Subject: [PATCH 53/58] ems

---
 apis/client/view/header/header.less     | 19 ++++++++++++-------
 apis/client/view/settings/settings.less |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 0da03d26cf..5295e10e6a 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -2,9 +2,9 @@
 @import "/core/client/style/bootstrap-variables.less";
 
 .page-head-topblock {
-  padding-top: 20px;
+  padding-top: 1.6em;
   padding-bottom: 0;
-  margin-bottom: 20px;
+  margin-bottom: 1.6em;
   color: #666;
   background-color: #fafafa;
   border-bottom: 1px solid #eee;
@@ -31,7 +31,7 @@
 }
 
 .page-head-starsblock {
-  font-size: 16px;
+  font-size: 1em;
   border: 1px solid #ddd;
   border-radius: 3px;
   a {
@@ -47,10 +47,12 @@
     background-color: #f4f4f4;
     border-right: 1px solid #ddd;
     display: inline-block;
-    font-size: 14px;
     font-weight: bold;
-    line-height: 14px;
-    padding: 6px 12px 6px 12px;
+    line-height: 0.9em;
+    padding-left: 0.9em;
+    padding-right: 0.9em;
+    padding-bottom: 0.5em;
+    padding-top: 0.5em;
     text-decoration: none;
     &:hover { text-decoration: none; color: darken(@gray, 10%); }
     &:focus { text-decoration: none; color: darken(@gray, 10%); }
@@ -59,7 +61,10 @@
   }
 
   .star-counter {
-    padding: 3px 7px;
+    padding-left: 0.6em;
+    padding-right: 0.6em;
+    padding-bottom: 0.2em;
+    padding-top: 0.2em;
     color: #333;
     vertical-align: middle;
     background-color: #fff;
diff --git a/apis/client/view/settings/settings.less b/apis/client/view/settings/settings.less
index e49752942a..059693db09 100644
--- a/apis/client/view/settings/settings.less
+++ b/apis/client/view/settings/settings.less
@@ -1,9 +1,9 @@
 .panel-section {
-  margin-bottom: 15px;
+  margin-bottom: 1em;
 }
 
 .panel-hr {
-  margin: 15px 0;
+  margin: 1em 0;
   border: 0;
   border-bottom: 1px solid #ddd;
 }

From b528637f54f9df9904b74839334d088c70852804 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Tue, 2 Aug 2016 17:31:44 +0300
Subject: [PATCH 54/58] temp fix for no bookmarks

---
 apis/collection/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apis/collection/helpers.js b/apis/collection/helpers.js
index bdac87e3ee..9f779a0c0f 100644
--- a/apis/collection/helpers.js
+++ b/apis/collection/helpers.js
@@ -46,7 +46,7 @@ ApiBackends.helpers({
     // Get count of API Bookmarks where API Backend ID is in API Backend IDs array
     const apiBookmarkCount = ApiBookmarks.find({apiIds: apiBackendId}).count();
 
-    return apiBookmarkCount;
+    return apiBookmarkCount || '0';
   },
   setBookmarkCount () {
     // get average rating value

From efd36e084c86edb7bb8f722aa082a5ac2abee780 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 3 Aug 2016 11:54:30 +0300
Subject: [PATCH 55/58] one title style

---
 apis/client/add/wizard.html                   |   2 +-
 apis/client/manage/manage.html                | 152 +++++++++---------
 catalogue/client/catalogue.html               |   2 +-
 catalogue/client/catalogue.less               |   4 -
 .../layouts/master_layout/master_layout.css   |   3 -
 .../layouts/master_layout/master_layout.less  |  17 ++
 core/client/shared/not_authorized.html        |  16 +-
 core/client/shared/not_found.html             |  22 +--
 dashboard/client/dashboard.html               |   2 +-
 dashboard/client/dashboard.less               |   5 -
 10 files changed, 118 insertions(+), 107 deletions(-)
 delete mode 100644 core/client/layouts/master_layout/master_layout.css
 create mode 100644 core/client/layouts/master_layout/master_layout.less

diff --git a/apis/client/add/wizard.html b/apis/client/add/wizard.html
index 1e3bd5f610..a91d79c3c1 100644
--- a/apis/client/add/wizard.html
+++ b/apis/client/add/wizard.html
@@ -1,6 +1,6 @@
 <template name="addApiBackendWizard">
   <div class="container">
-    <h1>
+    <h1 class="page-main-title">
       {{_ "addApiBackendWizard_heading" }}
     </h1>
     {{> wizard
diff --git a/apis/client/manage/manage.html b/apis/client/manage/manage.html
index 17ba3eb389..69483a8a75 100644
--- a/apis/client/manage/manage.html
+++ b/apis/client/manage/manage.html
@@ -1,84 +1,86 @@
 <template name='manageApiBackends'>
-  <h1 class="page-heading">{{_ "manage_ApiBackends_Title"}}</h1>
-  {{# each managedApis }}
-  <div class="panel panel-default managed-apis">
-    <div class="panel-heading">
-      <h2 class="panel-title">
-        {{ name }}
-        <div class="btn-group pull-right">
-          <a
-             href="{{ pathFor route='viewApiBackend' }}"
-             class="btn btn-success">
-            {{_ "manage_ApiBackends_View"}}
-          </a>
-          <a
-             href="{{ pathFor route='editApiBackend' }}"
-             class="btn btn-warning">
-            {{_ "manage_ApiBackends_Edit"}}
-          </a>
-          <a
-             href="#"
-             class="btn btn-danger"
-             id="deleteModal">
-            {{_ "manageApiBackends_deleteButton"}}
-          </a>
-        </div>
-        <div class="clearfix"></div>
-      </h2>
-    </div>
-    <div class="panel-body">
-      <div class="col-md-4">
-        <div class="panel panel-default">
-          <div class="panel-heading">
+  <div class="container">
+    <h1 class="page-main-title">{{_ "manage_ApiBackends_Title"}}</h1>
+    {{# each managedApis }}
+    <div class="panel panel-default managed-apis">
+      <div class="panel-heading">
+        <h2 class="panel-title">
+          {{ name }}
+          <div class="btn-group pull-right">
             <a
-               data-toggle="collapse"
-               data-target="#api-id-{{ _id }}-backend"
-               class="api-panel-title">
-              <h3 class="panel-title">
-                {{ backend_host }} ({{ backend_protocol }})
-              </h3>
+               href="{{ pathFor route='viewApiBackend' }}"
+               class="btn btn-success">
+              {{_ "manage_ApiBackends_View"}}
+            </a>
+            <a
+               href="{{ pathFor route='editApiBackend' }}"
+               class="btn btn-warning">
+              {{_ "manage_ApiBackends_Edit"}}
             </a>
-          </div><!-- /.panel-heading -->
-          <div id="api-id-{{ _id }}-backend" class="panel-body collapse">
-            <h4>Servers</h4>
-            <ul class="list-group">
-              {{# each servers }}
-              <li class="list-group-item">{{ host }} : {{ port }}</li>
-              {{/ each }}
-            </ul>
-          </div><!-- /.panel-body -->
-        </div><!-- /.panel -->
-      </div>
-      <div class="col-md-4 arrow text-center">
-        <i class="fa fa-arrow-right fa-2x"></i>
-        <span>{{_ "manage_ApiBackends_Rewrite"}}</span>
-      </div>
-      <div class="col-md-4">
-        <div class="panel panel-default">
-          <div class="panel-heading">
             <a
-               data-toggle="collapse"
-               data-target="#api-id-{{ _id }}-frontend"
-               class="api-panel-title">
-              <h3 class="panel-title">
-                {{ frontend_host }}
-              </h3>
+               href="#"
+               class="btn btn-danger"
+               id="deleteModal">
+              {{_ "manageApiBackends_deleteButton"}}
             </a>
-          </div><!-- /.panel-heading -->
-          <div id="api-id-{{ _id }}-frontend" class="panel-body collapse">
-            <h4>{{_ "manage_ApiBackends_Matches"}}</h4>
-            <ul class="list-group">
-              {{# each url_matches }}
-              <li class="list-group-item">
-                <span>{{_ "manage_ApiBackends_Backend"}} {{ backend_prefix }}</span><br />
-                <span>{{_ "manage_ApiBackends_Frontend"}} {{ frontend_prefix }}</span>
-              </li>
-              {{/ each }}
-            </ul>
-          </div><!-- /.panel-body -->
-        </div><!-- /.panel -->
+          </div>
+          <div class="clearfix"></div>
+        </h2>
+      </div>
+      <div class="panel-body">
+        <div class="col-md-4">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <a
+                 data-toggle="collapse"
+                 data-target="#api-id-{{ _id }}-backend"
+                 class="api-panel-title">
+                <h3 class="panel-title">
+                  {{ backend_host }} ({{ backend_protocol }})
+                </h3>
+              </a>
+            </div><!-- /.panel-heading -->
+            <div id="api-id-{{ _id }}-backend" class="panel-body collapse">
+              <h4>Servers</h4>
+              <ul class="list-group">
+                {{# each servers }}
+                <li class="list-group-item">{{ host }} : {{ port }}</li>
+                {{/ each }}
+              </ul>
+            </div><!-- /.panel-body -->
+          </div><!-- /.panel -->
+        </div>
+        <div class="col-md-4 arrow text-center">
+          <i class="fa fa-arrow-right fa-2x"></i>
+          <span>{{_ "manage_ApiBackends_Rewrite"}}</span>
+        </div>
+        <div class="col-md-4">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <a
+                 data-toggle="collapse"
+                 data-target="#api-id-{{ _id }}-frontend"
+                 class="api-panel-title">
+                <h3 class="panel-title">
+                  {{ frontend_host }}
+                </h3>
+              </a>
+            </div><!-- /.panel-heading -->
+            <div id="api-id-{{ _id }}-frontend" class="panel-body collapse">
+              <h4>{{_ "manage_ApiBackends_Matches"}}</h4>
+              <ul class="list-group">
+                {{# each url_matches }}
+                <li class="list-group-item">
+                  <span>{{_ "manage_ApiBackends_Backend"}} {{ backend_prefix }}</span><br />
+                  <span>{{_ "manage_ApiBackends_Frontend"}} {{ frontend_prefix }}</span>
+                </li>
+                {{/ each }}
+              </ul>
+            </div><!-- /.panel-body -->
+          </div><!-- /.panel -->
+        </div>
       </div>
     </div>
+    {{/ each }}
   </div>
-  {{/ each }}
 </template>
diff --git a/catalogue/client/catalogue.html b/catalogue/client/catalogue.html
index 06fc553694..d31d06d1ca 100644
--- a/catalogue/client/catalogue.html
+++ b/catalogue/client/catalogue.html
@@ -1,6 +1,6 @@
 <template name="catalogue">
   <div class="container">
-    <h3 class="catalogue-main-title">{{_ "catalogue_Title"}}</h3>
+    <h1 class="page-main-title">{{_ "catalogue_Title"}}</h1>
     <nav id="catalogue-toolbar" class="navbar navbar-default">
       <div class="container-fluid">
         <!-- Brand and toggle get grouped for better mobile display -->
diff --git a/catalogue/client/catalogue.less b/catalogue/client/catalogue.less
index 7d17f7b280..74b9ca1360 100644
--- a/catalogue/client/catalogue.less
+++ b/catalogue/client/catalogue.less
@@ -20,10 +20,6 @@
   display: inline;
 }
 
-.catalogue-main-title {
-  margin-left: 0.63em;
-}
-
 /* Class to make pagination buttons inactive */
 .inactive a {
   color: #d3d3d3 !important;
diff --git a/core/client/layouts/master_layout/master_layout.css b/core/client/layouts/master_layout/master_layout.css
deleted file mode 100644
index 94d81234ac..0000000000
--- a/core/client/layouts/master_layout/master_layout.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.master-layout {
-  margin-bottom: 2em;
-}
diff --git a/core/client/layouts/master_layout/master_layout.less b/core/client/layouts/master_layout/master_layout.less
new file mode 100644
index 0000000000..80700b14d5
--- /dev/null
+++ b/core/client/layouts/master_layout/master_layout.less
@@ -0,0 +1,17 @@
+.master-layout {
+  margin-bottom: 2em;
+}
+
+.content-wrapper {
+  padding-top: 1.4em;
+
+  h1 {
+    margin-top: 0;
+  }
+
+  .page-main-title {
+    font-size: 1.7em;
+    font-weight: 600;
+  }
+}
+
diff --git a/core/client/shared/not_authorized.html b/core/client/shared/not_authorized.html
index e3f5e0ed49..118b2d456d 100644
--- a/core/client/shared/not_authorized.html
+++ b/core/client/shared/not_authorized.html
@@ -1,11 +1,13 @@
 <template name="notAuthorized">
-  <div class="error-page">
-    <h1 class="headline text-danger">{{_ "notAuthorized_Title"}}</h1>
-    <div class="error-content">
-      <p>
-        <i class="fa fa-warning text-danger"></i>&nbsp;
-        {{_ "notAuthorized_Message"}}
-      </p>
+  <div class="container">
+    <div class="error-page">
+      <h1 class="headline text-danger">{{_ "notAuthorized_Title"}}</h1>
+      <div class="error-content">
+        <p>
+          <i class="fa fa-warning text-danger"></i>&nbsp;
+          {{_ "notAuthorized_Message"}}
+        </p>
+      </div>
     </div>
   </div>
 </template>
diff --git a/core/client/shared/not_found.html b/core/client/shared/not_found.html
index 2fd6b6b593..0a51c8fe0f 100644
--- a/core/client/shared/not_found.html
+++ b/core/client/shared/not_found.html
@@ -1,14 +1,16 @@
 <template name="notFound">
-  <div class="error-page">
-    <h2 class="text-warning"> 404</h2>
-    <div class="error-content">
-      <h3><i class="fa fa-warning text-warning"></i> {{_ "notFound_Title"}}</h3>
-      <p>
-        {{_ "notFound_Message_Part1"}}
-        <br><a href='javascript:void(0)' onClick='history.go(-1); return false;'>
-        {{_ "notFound_Message_Part2"}}
-        </a>
-      </p>
+  <div class="container">
+    <div class="error-page">
+      <h2 class="text-warning"> 404</h2>
+      <div class="error-content">
+        <h3><i class="fa fa-warning text-warning"></i> {{_ "notFound_Title"}}</h3>
+        <p>
+          {{_ "notFound_Message_Part1"}}
+          <br><a href='javascript:void(0)' onClick='history.go(-1); return false;'>
+          {{_ "notFound_Message_Part2"}}
+          </a>
+        </p>
+      </div>
     </div>
   </div>
 </template>
diff --git a/dashboard/client/dashboard.html b/dashboard/client/dashboard.html
index 493deda564..7f8f698d09 100644
--- a/dashboard/client/dashboard.html
+++ b/dashboard/client/dashboard.html
@@ -3,7 +3,7 @@
     {{# if isInRole 'admin, manager' }}
     <div class="row">
       <div class="col-lg-12">
-        <h1 class="dashboard-title">
+        <h1 class="page-main-title">
           {{_ "dashboard_mainTitle" }}
         </h1>
       </div>
diff --git a/dashboard/client/dashboard.less b/dashboard/client/dashboard.less
index 7ddc24b3b0..d836fbbf90 100644
--- a/dashboard/client/dashboard.less
+++ b/dashboard/client/dashboard.less
@@ -1,8 +1,3 @@
-.dashboard-title {
-  font-size: 1.7em;
-  font-weight: 600;
-}
-
 .dashboard-no-apis {
   text-align: center;
   margin-top: 5em;

From 965b86cec8ddc79cb2c6819b83daae145b8a5b24 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 3 Aug 2016 12:01:08 +0300
Subject: [PATCH 56/58] fixed counter position

---
 apis/client/view/header/header.less | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 5295e10e6a..43afa5d2be 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -2,9 +2,11 @@
 @import "/core/client/style/bootstrap-variables.less";
 
 .page-head-topblock {
-  padding-top: 1.6em;
+  position: relative;
+  bottom: 1.7em;
+  padding-top: 1.7em;
   padding-bottom: 0;
-  margin-bottom: 1.6em;
+  margin-bottom: 0;
   color: #666;
   background-color: #fafafa;
   border-bottom: 1px solid #eee;
@@ -61,12 +63,11 @@
   }
 
   .star-counter {
-    padding-left: 0.6em;
+    padding-left: 0.4em;
     padding-right: 0.6em;
     padding-bottom: 0.2em;
     padding-top: 0.2em;
     color: #333;
-    vertical-align: middle;
     background-color: #fff;
   }
 }

From 912a414bd66f978f939b320f01bd147eea8fb463 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 3 Aug 2016 12:01:24 +0300
Subject: [PATCH 57/58] content wrapper

---
 core/client/layouts/master_layout/master_layout.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/client/layouts/master_layout/master_layout.html b/core/client/layouts/master_layout/master_layout.html
index 83c7706ff1..ad64de13fb 100644
--- a/core/client/layouts/master_layout/master_layout.html
+++ b/core/client/layouts/master_layout/master_layout.html
@@ -2,8 +2,10 @@
   {{> languageBar }}
   <div class="master-layout">
     {{> navbar branding=branding }}
-    {{> yield }}
-    {{> sAlert}}
-    {{> autoformModals}}
+    <div class="content-wrapper">
+      {{> yield }}
+      {{> sAlert}}
+      {{> autoformModals}}
+    </div>
   </div>
 </template>

From c7d70c95f6ed77accbf266e78dec96942aad9c07 Mon Sep 17 00:00:00 2001
From: elnzv <illya.nizyev@gmail.com>
Date: Wed, 3 Aug 2016 14:06:19 +0300
Subject: [PATCH 58/58] border fix

---
 apis/client/view/header/header.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apis/client/view/header/header.less b/apis/client/view/header/header.less
index 43afa5d2be..9d657b08b1 100644
--- a/apis/client/view/header/header.less
+++ b/apis/client/view/header/header.less
@@ -32,6 +32,10 @@
   display: inline-block;
 }
 
+.nav-tabs > li {
+  margin-bottom: -2px;
+}
+
 .page-head-starsblock {
   font-size: 1em;
   border: 1px solid #ddd;