openstack/murano-dashboard
Code Issues Proposed changes

Compress murano-dashboard css

Browse Source 
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
This commit is contained in:
Kirill Zaitsev 2015-09-24 17:22:20 +03:00
parent 5ef1386eba
commit 85765e8ddc
10 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
muranodashboard/static/muranodashboard/css/one_field_form.css
View File

@ -1,3 +0,0 @@
div.left {
margin-top: 25px;
}

11
muranodashboard/templates/catalog/app_details.html
View File

@ -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 %}

13
muranodashboard/templates/catalog/index.html
View File

@ -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 %}

4
muranodashboard/templates/deployments/_logs.html
View File

@ -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>
</div>

5
muranodashboard/templates/environments/index.html
View File

@ -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 %}

1
muranodashboard/templates/packages/_import_bundle.html
View File

@ -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 %}

1
muranodashboard/templates/packages/_upload.html
View File

@ -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 %}

10
muranodashboard/templates/packages/index.html
View File

@ -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 }}

9
muranodashboard/templates/services/details.html
View File

@ -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 %}

12
muranodashboard/templates/services/index.html
View File

@ -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 %}