From beaf6ec09573de0dd12531ded5cfc37898cb79ea Mon Sep 17 00:00:00 2001
From: Greg Hankins <ghankins@mindspring.com>
Date: Mon, 1 Apr 2019 16:01:01 -0400
Subject: [PATCH] Rebranding issues #447 and #450 plus some cleanup. (#460)

* Rebranding issues #447 and #450 plus some cleanup.

* Delete username-retrieve-complete.html

* Revert "Delete username-retrieve-complete.html"

This reverts commit 8c097667bcf12d9b01076ffdfcbe7b8b40c3eb97.

* Rebranding issues #447 and #450 plus some cleanup.
---
 peeringdb_server/static/site.css              | 42 +++++++++++++------
 .../templates/site/advanced-search-fac.html   |  4 +-
 .../templates/site/advanced-search-ix.html    |  8 ++--
 .../templates/site/advanced-search-net.html   | 12 +++---
 peeringdb_server/templates/site/footer.html   |  6 +++
 peeringdb_server/templates/site/index.html    |  2 +-
 .../templates/site/view_exchange_bottom.html  |  8 ++--
 .../templates/site/view_exchange_side.html    |  8 ++--
 .../templates/site/view_facility_bottom.html  |  4 +-
 .../templates/site/view_facility_side.html    |  4 +-
 .../templates/site/view_network_side.html     |  8 ++--
 .../site/view_organization_side.html          | 12 +++---
 12 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/peeringdb_server/static/site.css b/peeringdb_server/static/site.css
index dc32e6cf..24beca74 100644
--- a/peeringdb_server/static/site.css
+++ b/peeringdb_server/static/site.css
@@ -45,13 +45,21 @@ input[type="textarea"]:active:focus {
   color: #9e1e1e;
   font-weight: bold;
 }
+
 .tiny {
   font-size: 10px;
 }
+
 .suffix {
   margin-left: 5px;
   display: inline;
 }
+
+span.tiny.suffix {
+  color: #00203e;
+  font-size: 12px;
+}
+
 .hidden {
   display: none;
 }
@@ -107,12 +115,14 @@ a, a:hover, a:visited {
 }
 
 a.empty {
-  color:#000;
+  color:#ffffff;
   text-decoration: none;
 }
 
 a.btn {
   text-decoration: none;
+  color:#ffffff;
+  margin-bottom: 15px;
 }
 
 .btn-inline {
@@ -469,8 +479,8 @@ div.recent div.participant > a {
 }
 
 div.recent div.age {
-  font-size: 12px;
-  color: #4b6063;
+  font-size: 14px;
+  color: #00203e;
   margin-bottom: 5px;
 }
 
@@ -524,7 +534,7 @@ div.view_row {
 div.view_row > div.help {
   background-color: #1c3f28;
   padding: 3px;
-  font-size: 12px;
+  font-size: 2px;
 }
 
 div.view_field {
@@ -563,10 +573,10 @@ div.view_value {
   overflow: visible;
 }
 
-
 div.view_value.fmt_text {
   /*white-space: pre-wrap;*/
 }
+
 div.view_value.fmt_text h1 {
   font-size: 20px;
   margin: 0px 0px 5px 0px;
@@ -642,7 +652,6 @@ div.list div.header {
   border-bottom: 10px #f1f1f1 solid;
 }
 
-
 div.list div.filter {
   padding: 5px;
 }
@@ -667,8 +676,8 @@ div.list div.empty-result {
 }
 
 div.list div.empty-result div.help {
-  font-size: 11px;
-  color: #4b6063;
+  font-size: 14px;
+  color: #00203e;
 }
 
 div.list > div.scrollable {
@@ -712,16 +721,18 @@ div.list div.row > div > div:nth-child(1) {
 }
 
 div.list div.row > div > div:nth-child(2) {
-  font-size: 12px;
+  color: #ffffff;
+  font-size: 14px;
 }
 
 div.list div.row.item > div > div:nth-child(2) {
-  color: #4b6063;
+  color: #00203e;
+  font-size: 14px;
 }
 
 div.list div.row.item > div > div:nth-child(2) input[type="text"],
 div.list div.row.item > div > div:nth-child(2) select {
-  color: #000000;
+  color: #00203e;
   font-size: 14px;
 }
 
@@ -1102,10 +1113,15 @@ div.advanced-search-view div.results div.row > div > div:empty:before {
   content: '-';
 }
 
-div.advanced-search-view div.results div.row > div > div:nth-child(2),
+div.advanced-search-view div.results div.row > div > div:nth-child(2) {
+  color: #00203e;
+  font-size: 14px;
+  display: block;
+}
+
 span.hint {
   color: #00203e;
-  font-size: 11px;
+  font-size: 14px;
   display: block;
 }
 
diff --git a/peeringdb_server/templates/site/advanced-search-fac.html b/peeringdb_server/templates/site/advanced-search-fac.html
index 96c9db06..4c8a82c4 100644
--- a/peeringdb_server/templates/site/advanced-search-fac.html
+++ b/peeringdb_server/templates/site/advanced-search-fac.html
@@ -52,7 +52,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Country" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Country" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-name="country__in"
@@ -159,7 +159,7 @@
   </div>
  
   <div class="results-empty center" style="display:none;">
-    {% trans "Nothing matched your search criteria." %}
+    {% trans "No search results." %}
   </div>
 
 
diff --git a/peeringdb_server/templates/site/advanced-search-ix.html b/peeringdb_server/templates/site/advanced-search-ix.html
index 6a531e7b..e80b2dcc 100644
--- a/peeringdb_server/templates/site/advanced-search-ix.html
+++ b/peeringdb_server/templates/site/advanced-search-ix.html
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Country" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Country" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-name="country__in"
@@ -38,7 +38,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Continental Region" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Continental Region" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-name="region_continent__in"
@@ -63,7 +63,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Media Type" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Media Type" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-data="enum/media",
@@ -107,7 +107,7 @@
   </div>
  
   <div class="results-empty center" style="display:none;">
-    {% trans "Nothing matched your search criteria." %}
+    {% trans "No search results." %}
   </div>
 
 
diff --git a/peeringdb_server/templates/site/advanced-search-net.html b/peeringdb_server/templates/site/advanced-search-net.html
index 06db22f8..599966aa 100644
--- a/peeringdb_server/templates/site/advanced-search-net.html
+++ b/peeringdb_server/templates/site/advanced-search-net.html
@@ -17,7 +17,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Network Type" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Network Type" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-name="info_type__in"
@@ -28,7 +28,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Traffic Levels" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Traffic Levels" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span>)</div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-name="info_traffic__in"
@@ -40,7 +40,7 @@
       </div>
 
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Traffic Ratio" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Traffic Ratio" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-name="info_ratio__in"
@@ -75,7 +75,7 @@
       </div>
 
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "General Peering Policy" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "General Peering Policy" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-data="enum/policy_general"
@@ -87,7 +87,7 @@
       </div>
 
       <div class="row">
-        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Geographic Scope" %}<span class="hint">ctrl/cmd {% trans "click to select multiple" %}</span></div>
+        <div class="col-xs-4 col-sm-5 col-md-4">{% trans "Geographic Scope" %}<span class="hint">(ctrl/cmd {% trans "click to select multiple" %})</span></div>
         <div class="col-xs-8 col-sm-7 col-md-8">
           <div data-edit-type="select"
                data-edit-data="enum/scopes_advs"
@@ -205,7 +205,7 @@
   </div>
 
   <div class="results-empty center" style="display:none;">
-    {% trans "Nothing matched your search criteria." %}
+    {% trans "No search results." %}
   </div>
 
 
diff --git a/peeringdb_server/templates/site/footer.html b/peeringdb_server/templates/site/footer.html
index db61fa21..314c230f 100644
--- a/peeringdb_server/templates/site/footer.html
+++ b/peeringdb_server/templates/site/footer.html
@@ -24,6 +24,12 @@
         <a href="/about">{% trans "About" %}</a>
         </div>
         <div>
+        <a href="/register">{% trans "Register" %}</a>
+        </div>
+        <div>
+        <a href="/advanced_search">{% trans "Search" %}</a>
+        </div>
+        <div>
         <a href="/sponsors">{% trans "Sponsors" %}</a>
         </div>
         <div>
diff --git a/peeringdb_server/templates/site/index.html b/peeringdb_server/templates/site/index.html
index 40e78994..7f0b0029 100644
--- a/peeringdb_server/templates/site/index.html
+++ b/peeringdb_server/templates/site/index.html
@@ -47,7 +47,7 @@
       {% endblocktrans %}
       </p>
       <p>
-      {% trans "Learn more" %} <a href="/about">{% trans "about" %}</a> PeeringDB.
+      {% trans "Learn more" %} <a href="/about">{% trans "about" %}</a> PeeringDB or <a href="/register">{% trans "register" %}</a>.
       </p>
       </div>
       <div class="recent col-lg-6 col-md-12 col-sm-12 col-xs-12 left">
diff --git a/peeringdb_server/templates/site/view_exchange_bottom.html b/peeringdb_server/templates/site/view_exchange_bottom.html
index 67542294..c37a9d2b 100644
--- a/peeringdb_server/templates/site/view_exchange_bottom.html
+++ b/peeringdb_server/templates/site/view_exchange_bottom.html
@@ -36,8 +36,8 @@
        data-edit-template="ixlan-item">
 
     <div class="empty-result">
-      <div class="message"> {% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{%trans "Name" %}</b> {% trans "or" %} <b>{% trans "dot1q" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{%trans "Name" %}</b> {% trans "or" %} <b>{% trans "dot1q" %}.</b></div>
     </div>
 
     {% for x in data.ixlans %}
@@ -252,8 +252,8 @@
        data-edit-template="ixfac-item">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Facility" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Facility" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}.</b></div>
     </div>
 
     {% for f in data.facilities %}
diff --git a/peeringdb_server/templates/site/view_exchange_side.html b/peeringdb_server/templates/site/view_exchange_side.html
index 28101d5f..a3e95296 100644
--- a/peeringdb_server/templates/site/view_exchange_side.html
+++ b/peeringdb_server/templates/site/view_exchange_side.html
@@ -30,12 +30,12 @@
   <div class="scrollable" id="list-networks">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
+      <div class="message">{% trans "No filter matches." %}</div>
       <div class="help">
         {% spaceless %}
-        {% trans "You may filter by" %}
-        <b>{% trans "Exchange" %}</b>, <b>{% trans "ASN" %}</b>, <b>{% trans "Policy" %}</b>,
-        <b>{% trans "IP" %}</b> {% trans "or" %} <b>{% trans "Speed" %}</b>
+        {% trans "You may filter by" %} 
+        <b>{% trans "Exchange" %}</b>, <b>{% trans "ASN" %}</b>, <b>{% trans "Policy" %}</b>, 
+        <b>{% trans "IP" %}</b> {% trans "or" %} <b>{% trans "Speed" %}.</b>
         {% endspaceless %}
       </div>
     </div>
diff --git a/peeringdb_server/templates/site/view_facility_bottom.html b/peeringdb_server/templates/site/view_facility_bottom.html
index a04c245e..198a8073 100644
--- a/peeringdb_server/templates/site/view_facility_bottom.html
+++ b/peeringdb_server/templates/site/view_facility_bottom.html
@@ -27,8 +27,8 @@
   <div class="scrollable" id="list-exchanges">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Exchange" %}</b> {% trans "or" %} <b>{%trans "Long Name" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Exchange" %}</b> {% trans "or" %} <b>{%trans "Long Name" %}.</b></div>
     </div>
 
     {% for x in data.exchanges %}
diff --git a/peeringdb_server/templates/site/view_facility_side.html b/peeringdb_server/templates/site/view_facility_side.html
index ec9d8adb..fb1f825e 100644
--- a/peeringdb_server/templates/site/view_facility_side.html
+++ b/peeringdb_server/templates/site/view_facility_side.html
@@ -23,8 +23,8 @@
   <div class="scrollable" id="list-peers">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Peer Name" %}</b> {% trans "or" %} <b>{% trans "ASN" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Peer Name" %}</b> {% trans "or" %} <b>{% trans "ASN" %}.</b></div>
     </div>
 
     {% for n in data.peers %}
diff --git a/peeringdb_server/templates/site/view_network_side.html b/peeringdb_server/templates/site/view_network_side.html
index 20739fa6..a3f70c5d 100644
--- a/peeringdb_server/templates/site/view_network_side.html
+++ b/peeringdb_server/templates/site/view_network_side.html
@@ -39,8 +39,8 @@
        data-edit-template="netixlan-item">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Exchange" %}</b>, <b>{% trans "ASN" %}</b> {% trans "or" %} <b>{% trans "Speed" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Exchange" %}</b>, <b>{% trans "ASN" %}</b> {% trans "or" %} <b>{% trans "Speed" %}.</b></div>
     </div>
 
     {% for x in data.exchanges %}
@@ -231,8 +231,8 @@
        data-edit-template="netfac-item">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Facility" %}</b>, <b>{% trans "ASN" %}</b>, <b>{% trans "Country" %}</b>, <b>{% trans "City" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Facility" %}</b>, <b>{% trans "ASN" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}.</b></div>
     </div>
 
     {% for f in data.facilities %}
diff --git a/peeringdb_server/templates/site/view_organization_side.html b/peeringdb_server/templates/site/view_organization_side.html
index 1e8b60f9..00ad8925 100644
--- a/peeringdb_server/templates/site/view_organization_side.html
+++ b/peeringdb_server/templates/site/view_organization_side.html
@@ -36,8 +36,8 @@
        data-edit-template="facility-item">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Name" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Name" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}.</b></div>
     </div>
 
     {% for n in data.facilities %}
@@ -104,8 +104,8 @@
        data-edit-template="network-item">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter" %}</div>
-      <div class="help">{% trans "You may filter by"%} <b>{% trans "Name" %}</b> {% trans "or" %} <b>{% trans "ASN" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by"%} <b>{% trans "Name" %}</b> {% trans "or" %} <b>{% trans "ASN" %}.</b></div>
     </div>
 
     {% for n in data.networks %}
@@ -172,8 +172,8 @@
        data-edit-template="exchange-item">
 
     <div class="empty-result">
-      <div class="message">{% trans "Nothing matched your filter"%}</div>
-      <div class="help">{% trans "You may filter by" %} <b>{% trans "Name" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}</b></div>
+      <div class="message">{% trans "No filter matches." %}</div>
+      <div class="help">{% trans "You may filter by" %} <b>{% trans "Name" %}</b>, <b>{% trans "Country" %}</b> {% trans "or" %} <b>{% trans "City" %}.</b></div>
     </div>
 
     {% for n in data.exchanges %}