+ {% for log in logs %}
+
+
 }})
+
+
+ {% endfor %}
{% endblock %}
{% block tail %}
-{{ super() }}
-
+
{% endblock %}
diff --git a/airflow/www/templates/airflow/tree.html b/airflow/www/templates/airflow/tree.html
index 9a27460e9eaae..796f913e2e4dc 100644
--- a/airflow/www/templates/airflow/tree.html
+++ b/airflow/www/templates/airflow/tree.html
@@ -21,429 +21,438 @@
{% block page_title %}{{ dag.dag_id }} - Tree - Airflow{% endblock %}
{% block head_css %}
-{{ super() }}
-
+
{% endblock %}
{% block content %}
-{{ super() }}
-{% if doc_md %}
-{{ doc_md }}
-{% endif %}
-
-
no_status
-
- {% for state, state_color in state_color_mapping.items() %}
-
{{state}}
-
- {% endfor %}
-
- {% for op in operators %}
-
+ {{ super() }}
+ {% if doc_md %}
+ {{ doc_md }}
+ {% endif %}
+
+
+
no_status
+
+ {% for state, state_color in state_color_mapping.items() %}
+
{{state}}
+
+ {% endfor %}
+
+ {% for op in operators %}
+
+
{{ op.task_type }}
+ {% endfor %}
+
+
+
+
+
+
-
{{ op.task_type }}
- {% endfor %}
-
-
-
-
-
-
-
{% endblock %}
-{% block tail %}
-{{ super() }}
-
-
-
+
+
+
-
+
{% endblock %}
diff --git a/airflow/www/templates/airflow/trigger.html b/airflow/www/templates/airflow/trigger.html
index 573edd7825aa0..3c4488ba9ed1f 100644
--- a/airflow/www/templates/airflow/trigger.html
+++ b/airflow/www/templates/airflow/trigger.html
@@ -20,20 +20,20 @@
{% extends base_template %}
{% block content %}
- {{ super() }}
-
Trigger DAG: {{ dag_id }}
-
+ {{ super() }}
+
Trigger DAG: {{ dag_id }}
+
{% endblock %}
diff --git a/airflow/www/templates/airflow/variable_list.html b/airflow/www/templates/airflow/variable_list.html
index 29ad60c43b462..1b2a88384b3f5 100644
--- a/airflow/www/templates/airflow/variable_list.html
+++ b/airflow/www/templates/airflow/variable_list.html
@@ -27,6 +27,6 @@
-
+
{{ super() }}
{% endblock %}
diff --git a/airflow/www/templates/airflow/version.html b/airflow/www/templates/airflow/version.html
deleted file mode 100644
index f9c21501426b1..0000000000000
--- a/airflow/www/templates/airflow/version.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{#
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-#}
-
-{% extends base_template %}
-
-{% block content %}
- {{ super() }}
-
{{ title }}
- {% set version_label = 'Version' %}
- {% if airflow_version %}
-
- {% else %}
-
{{ version_label }} : Not Available
- {% endif %}
-
Git Version :{% if git_version %} {{ git_version }} {% else %} Not Available {% endif %}
-
-
-{% endblock %}
diff --git a/airflow/www/templates/airflow/xcom.html b/airflow/www/templates/airflow/xcom.html
index 30f81976ac8df..8b32629445f16 100644
--- a/airflow/www/templates/airflow/xcom.html
+++ b/airflow/www/templates/airflow/xcom.html
@@ -21,20 +21,18 @@
{% block title %}Airflow - DAGs{% endblock %}
{% block content %}
- {{ super() }}
-
{{ title }}
-
-
-
- | Key |
- Value |
-
- {% for attr, value in attributes %}
-
- | {{ attr }} |
- {{ value }} |
-
- {% endfor %}
-
-
+ {{ super() }}
+
{{ title }}
+
+
+ | Key |
+ Value |
+
+ {% for attr, value in attributes %}
+
+ | {{ attr }} |
+ {{ value }} |
+
+ {% endfor %}
+
{% endblock %}
diff --git a/airflow/www/templates/analytics/metarouter.html b/airflow/www/templates/analytics/metarouter.html
index 5d1daf0587cf2..5c60093d0cde7 100644
--- a/airflow/www/templates/analytics/metarouter.html
+++ b/airflow/www/templates/analytics/metarouter.html
@@ -17,7 +17,7 @@
under the License.
#}
-
-
-
-
+
+
+
+
{% endblock %}
diff --git a/tests/www/test_views.py b/tests/www/test_views.py
index 761208efeda74..afb49f4b711e2 100644
--- a/tests/www/test_views.py
+++ b/tests/www/test_views.py
@@ -100,6 +100,8 @@ def local_context(self):
'log_auto_tailing_offset',
'log_animation_speed',
'state_color_mapping',
+ 'airflow_version',
+ 'git_version',
# airflow.www.static_config.configure_manifest_files
'url_for_asset',
# airflow.www.views.AirflowBaseView.render_template
@@ -441,7 +443,7 @@ def prepare_dagruns(self):
state=State.RUNNING)
def test_index(self):
- with assert_queries_count(43):
+ with assert_queries_count(41):
resp = self.client.get('/', follow_redirects=True)
self.check_content_in_response('DAGs', resp)
@@ -624,7 +626,7 @@ def test_task_stats_only_noncompleted(self):
def test_dag_details(self):
url = 'dag_details?dag_id=example_bash_operator'
resp = self.client.get(url, follow_redirects=True)
- self.check_content_in_response('DAG details', resp)
+ self.check_content_in_response('DAG Details', resp)
@parameterized.expand(["graph", "tree", "dag_details"])
def test_view_uses_existing_dagbag(self, endpoint):
@@ -687,7 +689,7 @@ def test_dag_details_trigger_origin_graph_view(self):
def test_dag_details_subdag(self):
url = 'dag_details?dag_id=example_subdag_operator.section-1'
resp = self.client.get(url, follow_redirects=True)
- self.check_content_in_response('DAG details', resp)
+ self.check_content_in_response('DAG Details', resp)
def test_graph(self):
url = 'graph?dag_id=example_bash_operator'
@@ -1384,24 +1386,6 @@ def get_external_log_url(self, *args, **kwargs):
self.assertEqual(ExternalHandler.EXTERNAL_URL, response.headers['Location'])
-class TestVersionView(TestBase):
- def test_version(self):
- with self.capture_templates() as templates:
- resp = self.client.get('version', data=dict(
- username='test',
- password='test'
- ), follow_redirects=True)
- self.check_content_in_response('Version Info', resp)
-
- self.assertEqual(len(templates), 1)
- self.assertEqual(templates[0].name, 'airflow/version.html')
- self.assertEqual(templates[0].local_context, dict(
- airflow_version=version.version,
- git_version=mock.ANY,
- title='Version Info',
- ))
-
-
class ViewWithDateTimeAndNumRunsAndDagRunsFormTester:
DAG_ID = 'dag_for_testing_dt_nr_dr_form'
DEFAULT_DATE = datetime(2017, 9, 1)
@@ -1466,8 +1450,8 @@ def test_with_default_parameters(self):
password='test'), follow_redirects=True)
self.test.assertEqual(response.status_code, 200)
data = response.data.decode('utf-8')
- self.test.assertIn('Base date:', data)
- self.test.assertIn('Number of runs:', data)
+ self.test.assertIn('
', data)
+ self.test.assertIn('
', data)
self.assert_run_is_selected(self.runs[0], data)
self.assert_run_is_in_dropdown_not_selected(self.runs[1], data)
self.assert_run_is_in_dropdown_not_selected(self.runs[2], data)
@@ -1939,7 +1923,7 @@ def test_dag_details_success(self):
self.login()
url = 'dag_details?dag_id=example_bash_operator'
resp = self.client.get(url, follow_redirects=True)
- self.check_content_in_response('DAG details', resp)
+ self.check_content_in_response('DAG Details', resp)
def test_dag_details_failure(self):
self.logout()
@@ -1947,7 +1931,7 @@ def test_dag_details_failure(self):
password='dag_faker')
url = 'dag_details?dag_id=example_bash_operator'
resp = self.client.get(url, follow_redirects=True)
- self.check_content_not_in_response('DAG details', resp)
+ self.check_content_not_in_response('DAG Details', resp)
def test_dag_details_success_for_all_dag_user(self):
self.logout()
@@ -2388,7 +2372,7 @@ def test_user_defined_filter_and_macros_raise_error(self):
"Webserver does not have access to User-defined Macros or Filters "
"when Dag Serialization is enabled. Hence for the task that have not yet "
"started running, please use 'airflow tasks render' for debugging the "
- "rendering of template_fields.
OriginalError: no filter named 'hello'",
+ "rendering of template_fields.
OriginalError: no filter named 'hello'",
resp
)
@@ -2468,7 +2452,7 @@ def test_trigger_dag_form_origin_url(self, test_origin, expected_origin):
resp = self.client.get('trigger?dag_id={}&origin={}'.format(test_dag_id, test_origin))
self.check_content_in_response(
- '