From f4ac92acbbd0f8f6f83431ed2b7b1b7efbc08276 Mon Sep 17 00:00:00 2001
From: Charles Oliveira <18oliveira.charles@gmail.com>
Date: Tue, 4 Nov 2014 14:34:19 -0200
Subject: [PATCH] Added diazo rule to drop all theme css

---
 colab/proxy/noosfero/diazo.xml                     |  7 +++----
 colab/proxy/noosfero/templates/proxy/noosfero.html | 14 ++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/colab/proxy/noosfero/diazo.xml b/colab/proxy/noosfero/diazo.xml
index 6c20a74..2d07b24 100644
--- a/colab/proxy/noosfero/diazo.xml
+++ b/colab/proxy/noosfero/diazo.xml
@@ -8,10 +8,9 @@
 
     <merge attributes="class" css:theme="body" css:content="body" />
 
-    <drop css:theme="link[href='/static/third-party/font-awesome/css/font-awesome.min.css']" />
-    <drop css:theme="link[href='/static/converse.js/converse.min.css']" />
-    <drop css:theme="link[href='/static/third-party/bootstrap/css/bootstrap.min.css']" />
-    <drop css:theme="link[href='/static/css/screen.css']" />
+    <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" />
+    <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" />
+    <drop css:theme="link[href^='/static/css/screen']" />
     <drop theme="/html/head/script" />
     <drop css:content="#barra-brasil" />
     <drop css:content="#user" />
diff --git a/colab/proxy/noosfero/templates/proxy/noosfero.html b/colab/proxy/noosfero/templates/proxy/noosfero.html
index 1680b54..36a2d3e 100644
--- a/colab/proxy/noosfero/templates/proxy/noosfero.html
+++ b/colab/proxy/noosfero/templates/proxy/noosfero.html
@@ -2,12 +2,10 @@
 {% load static from staticfiles %}
 
 {% block head_css %}
-<link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}" 
-      media="screen, projection" rel="stylesheet" type="text/css">
-<link href="{% static 'noosfero/css/screen.css' %}" media="screen, projection" rel="stylesheet" type="text/css">
-<style>
-
-</style>
+  <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}" 
+    media="screen, projection" rel="stylesheet" type="text/css">
+  <link href="{% static 'noosfero/css/screen.css' %}" 
+    media="screen, projection" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block navbar %}
@@ -24,6 +22,6 @@
 
 {% block footer_js %}
 {{ block.super }}
-<script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script>
-<script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script>
+  <script src="{% static 'noosfero/js/jquery.dropdown.js' %}" type="text/javascript"></script>
+  <script src="{% static 'noosfero/js/collapse.js' %}" type="text/javascript"></script>
 {% endblock %}
--
libgit2 0.21.2