From 4df480b102a2cf7822434928874f23ee2899102e Mon Sep 17 00:00:00 2001
From: Kaxil Naik <kaxilnaik@gmail.com>
Date: Mon, 23 Mar 2020 00:48:31 +0000
Subject: [PATCH] [AIRFLOW-6734] Use configured base_template instead of
 hard-coding (#7367)

cherry-picked from 976ec4d70
---
 .../metastore_browser/templates/metastore_browser/base.html    | 2 +-
 airflow/www_rbac/templates/airflow/code.html                   | 3 ++-
 airflow/www_rbac/templates/airflow/config.html                 | 3 ++-
 airflow/www_rbac/templates/airflow/confirm.html                | 3 ++-
 airflow/www_rbac/templates/airflow/dag.html                    | 3 ++-
 airflow/www_rbac/templates/airflow/dags.html                   | 3 ++-
 airflow/www_rbac/templates/airflow/noaccess.html               | 3 ++-
 airflow/www_rbac/templates/airflow/version.html                | 3 ++-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/airflow/contrib/plugins/metastore_browser/templates/metastore_browser/base.html b/airflow/contrib/plugins/metastore_browser/templates/metastore_browser/base.html
index 433fc804a017bd..990516b9b31835 100644
--- a/airflow/contrib/plugins/metastore_browser/templates/metastore_browser/base.html
+++ b/airflow/contrib/plugins/metastore_browser/templates/metastore_browser/base.html
@@ -17,7 +17,7 @@
  under the License.
 #}
 
-{% extends 'airflow/master.html' %}
+{% extends base_template %}
 
 {% block body %}
 <div>
diff --git a/airflow/www_rbac/templates/airflow/code.html b/airflow/www_rbac/templates/airflow/code.html
index c5725a3a6a4cfc..adbcfbfabfaa2c 100644
--- a/airflow/www_rbac/templates/airflow/code.html
+++ b/airflow/www_rbac/templates/airflow/code.html
@@ -15,7 +15,8 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block title %}
     {{ title }}
diff --git a/airflow/www_rbac/templates/airflow/config.html b/airflow/www_rbac/templates/airflow/config.html
index a68c5a7aef49a7..f617b68405d394 100644
--- a/airflow/www_rbac/templates/airflow/config.html
+++ b/airflow/www_rbac/templates/airflow/config.html
@@ -15,7 +15,8 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block title %}
     {{ title }}
diff --git a/airflow/www_rbac/templates/airflow/confirm.html b/airflow/www_rbac/templates/airflow/confirm.html
index 04ba34a5232f49..2b1edcf7cf770a 100644
--- a/airflow/www_rbac/templates/airflow/confirm.html
+++ b/airflow/www_rbac/templates/airflow/confirm.html
@@ -15,7 +15,8 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block content %}
     {{ super() }}
diff --git a/airflow/www_rbac/templates/airflow/dag.html b/airflow/www_rbac/templates/airflow/dag.html
index 4d7dd9621e63a9..8ee46be5ca2498 100644
--- a/airflow/www_rbac/templates/airflow/dag.html
+++ b/airflow/www_rbac/templates/airflow/dag.html
@@ -15,7 +15,8 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block title %}Airflow - DAG {{ dag.dag_id }}{% endblock %}
 
diff --git a/airflow/www_rbac/templates/airflow/dags.html b/airflow/www_rbac/templates/airflow/dags.html
index 421257797dbfa1..febf806b7d1da1 100644
--- a/airflow/www_rbac/templates/airflow/dags.html
+++ b/airflow/www_rbac/templates/airflow/dags.html
@@ -15,7 +15,8 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block title %}Airflow - DAGs{% endblock %}
 
diff --git a/airflow/www_rbac/templates/airflow/noaccess.html b/airflow/www_rbac/templates/airflow/noaccess.html
index 62b28b199dbab8..d9d61fb3fd0327 100644
--- a/airflow/www_rbac/templates/airflow/noaccess.html
+++ b/airflow/www_rbac/templates/airflow/noaccess.html
@@ -15,7 +15,8 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/airflow/www_rbac/templates/airflow/version.html b/airflow/www_rbac/templates/airflow/version.html
index 063593b064a1b1..256ec347c3fc01 100644
--- a/airflow/www_rbac/templates/airflow/version.html
+++ b/airflow/www_rbac/templates/airflow/version.html
@@ -18,7 +18,8 @@
 # under the License.
 #
 #}
-{% extends "airflow/master.html" %}
+
+{% extends base_template %}
 
 {% block content %}
     {{ super() }}