From 40b2287b20c434ae214fa55df3c4f598b341ccfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Wed, 28 Jul 2021 17:03:31 +0200
Subject: [PATCH] feature/Re-brand API Manager - logo

---
 apimanager/apimanager/settings.py   | 4 +++-
 apimanager/base/static/css/base.css | 1 -
 apimanager/base/templates/base.html | 2 +-
 apimanager/base/templates/home.html | 9 +--------
 apimanager/base/views.py            | 1 +
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py
index 881dd0a..7d2d9ca 100644
--- a/apimanager/apimanager/settings.py
+++ b/apimanager/apimanager/settings.py
@@ -226,7 +226,7 @@ API_MANAGER_DATE_FORMAT= '%Y-%m-%d'
 
 API_HOST = 'http://127.0.0.1:8080'
 # Only override this if you have a separate portal instance
-API_PORTAL = None
+API_PORTAL = API_HOST
 API_BASE_PATH = '/obp/v'
 API_VERSION = '4.0.0'
 
@@ -266,6 +266,8 @@ EXCLUDE_URL_PATTERN = []
 # App Name to aggregate metrics
 API_EXPLORER_APP_NAME = 'API Explorer'
 
+LOGO_URL = 'https://static.openbankproject.com/images/OBP/favicon.png'
+
 # Local settings can override anything in here
 try:
     from apimanager.local_settings import *  # noqa
diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css
index fc1014b..afb6436 100644
--- a/apimanager/base/static/css/base.css
+++ b/apimanager/base/static/css/base.css
@@ -33,7 +33,6 @@ footer a:hover, .footer a:focus {
 
 
 .navbar-brand img {
-	width: 20px;
 	height: 20px;
 }
 
diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html
index e55169b..8093917 100644
--- a/apimanager/base/templates/base.html
+++ b/apimanager/base/templates/base.html
@@ -25,7 +25,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="{% url 'home' %}"><img src="https://static.openbankproject.com/images/OBP/favicon.png" alt="brand" /></a>
+				<a class="navbar-brand" href="{% url 'home' %}"><img src="{{ logo_url }}" alt="brand" /></a>
 			</div>
 			<div id="navbar" class="collapse navbar-collapse">
 				<ul class="nav navbar-nav">
diff --git a/apimanager/base/templates/home.html b/apimanager/base/templates/home.html
index 0cda649..6eb5b66 100644
--- a/apimanager/base/templates/home.html
+++ b/apimanager/base/templates/home.html
@@ -65,13 +65,6 @@
 		</div>
 	</div>
 {% endif %}
-
-	<div id="logo-full" class="row">
-		<div class="col-xs-1"></div>
-		<div class="col-xs-10">
-			<a href="https://openbankproject.com"><img class="img-responsive" src="https://static.openbankproject.com/images/OBP/OBP_full_web.png" alt="OBP logo" /></a>
-		</div>
-		<div class="col-xs-1"></div>
-	</div>
+	
 </div>
 {% endblock %}
diff --git a/apimanager/base/views.py b/apimanager/base/views.py
index f34dc25..94796d7 100644
--- a/apimanager/base/views.py
+++ b/apimanager/base/views.py
@@ -17,6 +17,7 @@ class HomeView(TemplateView):
         context = super(HomeView, self).get_context_data(**kwargs)
         context.update({
             'API_HOST': settings.API_HOST,
+            'logo_url': settings.LOGO_URL,
             'directlogin_form': DirectLoginForm(),
             'gatewaylogin_form': GatewayLoginForm(),
         })