From 85765e8ddc119c8137b45d6ba5c768e4c8e9a2d5 Mon Sep 17 00:00:00 2001
From: Kirill Zaitsev <kzaitsev@mirantis.com>
Date: Thu, 24 Sep 2015 17:22:20 +0300
Subject: [PATCH] Compress murano-dashboard css

This commit gathers murano-related css files, into css section and
compresses them for better space and performance.
Removes no longer required css from modal forms.

Change-Id: Iaeeec20bd9c6b89e46fb65f4da2e67038acef849
Closes-Bug: #1358233
---
 .../static/muranodashboard/css/one_field_form.css   |  3 ---
 muranodashboard/templates/catalog/app_details.html  | 11 +++++++++--
 muranodashboard/templates/catalog/index.html        | 13 +++++++++----
 muranodashboard/templates/deployments/_logs.html    |  4 +---
 muranodashboard/templates/environments/index.html   |  5 ++++-
 .../templates/packages/_import_bundle.html          |  1 -
 muranodashboard/templates/packages/_upload.html     |  1 -
 muranodashboard/templates/packages/index.html       | 10 ++++++++--
 muranodashboard/templates/services/details.html     |  9 +++++++++
 muranodashboard/templates/services/index.html       | 12 +++++++-----
 10 files changed, 47 insertions(+), 22 deletions(-)
 delete mode 100644 muranodashboard/static/muranodashboard/css/one_field_form.css

diff --git a/muranodashboard/static/muranodashboard/css/one_field_form.css b/muranodashboard/static/muranodashboard/css/one_field_form.css
deleted file mode 100644
index b4c01dc58..000000000
--- a/muranodashboard/static/muranodashboard/css/one_field_form.css
+++ /dev/null
@@ -1,3 +0,0 @@
-div.left {
-    margin-top: 25px;
-}
diff --git a/muranodashboard/templates/catalog/app_details.html b/muranodashboard/templates/catalog/app_details.html
index 5408dcca0..3907632a2 100644
--- a/muranodashboard/templates/catalog/app_details.html
+++ b/muranodashboard/templates/catalog/app_details.html
@@ -1,12 +1,19 @@
 {% extends 'murano_base.html' %}
 {% load i18n sizeformat %}
 {% load static %}
+{% load compress %}
 {% load url from future %}
 {% block title %}{% trans "Application Details" %}: {{ app.name }}{% endblock %}
 
+{% block css %}
+  {{ block.super }}
+  {% compress css %}
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/catalog.css' %}">
+    <link rel="stylesheet" href="{% static 'horizon/lib/font-awesome/css/font-awesome.min.css' %}">
+  {% endcompress %}
+{% endblock %}
+
 {% block page_header %}
-<link rel="stylesheet" href="{% static 'muranodashboard/css/catalog.css' %}">
-<link rel="stylesheet" href="{% static 'horizon/lib/font-awesome/css/font-awesome.min.css' %}">
     {% include "catalog/_details_page_header.html" with name=app.name %}
 {% endblock page_header %}
 
diff --git a/muranodashboard/templates/catalog/index.html b/muranodashboard/templates/catalog/index.html
index b81e9c8e1..be8b18d76 100644
--- a/muranodashboard/templates/catalog/index.html
+++ b/muranodashboard/templates/catalog/index.html
@@ -1,15 +1,20 @@
 {% extends 'murano_base.html' %}
 {% load i18n %}
 {% load static %}
+{% load compress %}
 {% load url from future %}
 
 {% block title %}{% trans "Applications" %}{% endblock %}
 
+{% block css %}
+  {{ block.super }}
+  {% compress css %}
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/catalog.css' %}">
+    <link rel="stylesheet" href="{% static 'horizon/lib/font-awesome/css/font-awesome.min.css' %}">
+  {% endcompress %}
+{% endblock %}
+
 {% block page_header %}
-    <link rel="stylesheet"
-          href="{% static 'muranodashboard/css/catalog.css' %}">
-    <link rel="stylesheet"
-          href="{% static 'horizon/lib/font-awesome/css/font-awesome.min.css' %}">
     {% include "horizon/common/_page_header.html" with title=_("Applications") %}
 {% endblock page_header %}
 
diff --git a/muranodashboard/templates/deployments/_logs.html b/muranodashboard/templates/deployments/_logs.html
index 5abb2a0fd..f3f627628 100644
--- a/muranodashboard/templates/deployments/_logs.html
+++ b/muranodashboard/templates/deployments/_logs.html
@@ -1,7 +1,5 @@
 {% load i18n static %}
 
-<link rel="stylesheet" href="{% static 'muranodashboard/css/reports.css' %}">
-
 <div class="clearfix">
   <h3 class="table-title">{% trans "Deployment Logs" %}</h3>
 </div>
@@ -9,4 +7,4 @@
     {% for report in reports %}
         <div title="{{report.level|capfirst}}" class="report-{{report.level}}">{{report.created}} &mdash; {{report.text | urlize}}</div>
     {% endfor %}
-</div>
\ No newline at end of file
+</div>
diff --git a/muranodashboard/templates/environments/index.html b/muranodashboard/templates/environments/index.html
index 61cb6a799..1c04f0a66 100644
--- a/muranodashboard/templates/environments/index.html
+++ b/muranodashboard/templates/environments/index.html
@@ -1,6 +1,7 @@
 {% extends 'murano_base.html' %}
 {% load i18n %}
 {% load static %}
+{% load compress %}
 {% block title %}{% trans "Environments" %}{% endblock %}
 
 {% block page_header %}
@@ -13,5 +14,7 @@
 
 {% block css %}
   {{ block.super }}
-  <link href='{{ STATIC_URL }}muranodashboard/css/catalog.css' type='text/css' media='screen' rel='stylesheet' />
+  {% compress css %}
+    <link href="{% static 'muranodashboard/css/catalog.css' %}" type='text/css' media='screen' rel='stylesheet' />
+  {% endcompress %}
 {% endblock %}
diff --git a/muranodashboard/templates/packages/_import_bundle.html b/muranodashboard/templates/packages/_import_bundle.html
index acafa03d0..1d844354c 100644
--- a/muranodashboard/templates/packages/_import_bundle.html
+++ b/muranodashboard/templates/packages/_import_bundle.html
@@ -10,7 +10,6 @@
 {% block modal-header %}{% trans 'Import Bundle' %}{% endblock %}
 
 {% block modal-body %}
-    <link rel="stylesheet" href="{% static 'muranodashboard/css/one_field_form.css' %}">
     <div class="left" >
     {{ wizard.management_form }}
     {% if wizard.form.forms %}
diff --git a/muranodashboard/templates/packages/_upload.html b/muranodashboard/templates/packages/_upload.html
index db56f7700..5a8ca00e6 100644
--- a/muranodashboard/templates/packages/_upload.html
+++ b/muranodashboard/templates/packages/_upload.html
@@ -11,7 +11,6 @@
 {% block modal-header %}{% trans 'Import Package' %}{% endblock %}
 
 {% block modal-body %}
-    <link rel="stylesheet" href="{% static 'muranodashboard/css/one_field_form.css' %}">
     <div class="left" >
     {{ wizard.management_form }}
     {% if wizard.form.forms %}
diff --git a/muranodashboard/templates/packages/index.html b/muranodashboard/templates/packages/index.html
index 3ada1b13c..47f8690e7 100644
--- a/muranodashboard/templates/packages/index.html
+++ b/muranodashboard/templates/packages/index.html
@@ -1,12 +1,18 @@
 {% extends 'murano_base.html' %}
 {% load i18n %}
 {% load static %}
+{% load compress %}
 {% block title %}{% trans "Package Definitions" %}{% endblock %}
 
+{% block css %}
+  {{ block.super }}
+  {% compress css %}
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/packages.css' %}">
+  {% endcompress %}
+{% endblock %}
+
 {% block page_header %}
     {% include "horizon/common/_page_header.html" with title=_("Package Definitions") %}
-    <link rel="stylesheet"
-          href="{% static 'muranodashboard/css/packages.css' %}">
 {% endblock page_header %}
 {% block main %}
     {{ table.render }}
diff --git a/muranodashboard/templates/services/details.html b/muranodashboard/templates/services/details.html
index 2079b4295..98a776422 100644
--- a/muranodashboard/templates/services/details.html
+++ b/muranodashboard/templates/services/details.html
@@ -1,7 +1,16 @@
 {% extends 'murano_base.html' %}
 {% load i18n sizeformat %}
+{% load static %}
+{% load compress %}
 {% block title %}{% trans "Component Details" %}{% endblock %}
 
+{% block css %}
+  {{ block.super }}
+  {% compress css %}
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/reports.css' %}">
+  {% endcompress %}
+{% endblock %}
+
 {% block page_header %}
     {% include "services/_detail_page_header.html" %}
 {% endblock page_header %}
diff --git a/muranodashboard/templates/services/index.html b/muranodashboard/templates/services/index.html
index 096c47781..33f9ab4e4 100644
--- a/muranodashboard/templates/services/index.html
+++ b/muranodashboard/templates/services/index.html
@@ -1,6 +1,7 @@
 {% extends 'murano_base.html' %}
 {% load i18n %}
 {% load static %}
+{% load compress %}
 {% load horizon %}
 {% load custom_filters %}
 {% block title %}{% trans "Components" %}{% endblock %}
@@ -18,11 +19,12 @@
 {% endblock %}
 
 {% block css %}
-    {% include "_stylesheets.html" %}
-    <link rel="stylesheet"
-          href="{% static 'muranodashboard/css/catalog.css' %}"/>
-    <link rel="stylesheet"
-          href="{% static 'muranodashboard/css/components.css' %}">
+  {{ block.super }}
+  {% compress css %}
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/catalog.css' %}"/>
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/components.css' %}">
+    <link rel="stylesheet" href="{% static 'muranodashboard/css/reports.css' %}">
+  {% endcompress %}
 {% endblock %}
 
 {% block js %}