From 74b5e4bc315323f70d80ee4e60545c89feae6090 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 26 Aug 2013 16:48:24 -0300
Subject: [PATCH] Fixing merge

---
 src/colab/deprecated/templates/base.html | 43 ++++++++-----------------------------------
 src/planet/templates/feedzilla/base.html |  7 +++----
 2 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/src/colab/deprecated/templates/base.html b/src/colab/deprecated/templates/base.html
index 8b7997b..4e9f89c 100644
--- a/src/colab/deprecated/templates/base.html
+++ b/src/colab/deprecated/templates/base.html
@@ -3,28 +3,23 @@
 <html>
   <head>
 
-    <!-- Framework CSS -->
-
     <link rel="stylesheet" href="{{ STATIC_URL }}third-party/dist/css/bootstrap.css" type="text/css" media="screen, projection" />
 
     <link rel="stylesheet" href="{{ STATIC_URL }}third-party/dist/css/bootstrap-glyphicons.css" type="text/css" media="screen, projection" />
 
-    <link rel="stylesheet" href="{{ STATIC_URL }}third-party/converse.js/converse.css" type="text/css" media="screen, projection" />
-
     <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
                                 type="text/css" media="screen" charset="utf-8"/>
+
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
     <script src="{{ STATIC_URL }}third-party/dist/js/bootstrap.js"></script>
 
+    <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
+
     {% conversejs_static %}
 
-    <script data-main="{{ STATIC_URL }}third-party/converse.js/main" src="{{ STATIC_URL }}third-party/converse.js/Libraries/require-jquery.js"></script>
 
-    {% block head_js %}
-    {% endblock %}
-    {% block head_css %}
-    {% endblock %}
+    {% block head_js %}{% endblock %}
+    {% block head_css %}{% endblock %}
 
     {% block google_analytics %}
     <script type="text/javascript">
@@ -127,31 +122,9 @@
       {% endblock %}
     </div>
 
-  <div id="chatpanel">
-      <div id="collective-xmpp-chat-data"></div>
-      <div id="toggle-controlbox">
-          <a href="#" class="chat toggle-online-users">
-              <strong class="conn-feedback">Mensageiro</strong> <strong style="display: none" id="online-count">(0)</strong>
-          </a>
-      </div>
-  </div>
-
-<script>
-    require(["jquery", "converse"], function ($, converse) {
-        converse.initialize({
-            auto_list_rooms: false,
-            auto_subscribe: false,
-            bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
-            hide_muc_server: false,
-            i18n: locales['{{ request.LANGUAGE_CODE }}'], // Refer to ./locale/locales.js to see which locales are supported
-            prebind: false,
-            show_controlbox_by_default: true,
-            xhr_user_search: false
-        });
-    });
-</script>
-  {% browserid_js %}
+  {% conversejs_chatpanel %}
+  {% conversejs_initialize %}
 
-  </div>
+  {% browserid_js %}
   </body>
 </html>
diff --git a/src/planet/templates/feedzilla/base.html b/src/planet/templates/feedzilla/base.html
index a3adc5e..09bee25 100644
--- a/src/planet/templates/feedzilla/base.html
+++ b/src/planet/templates/feedzilla/base.html
@@ -1,13 +1,12 @@
 {% extends 'base.html' %}
-{% load i18n %}
-{% load feedzilla_tags %}
+{% load i18n feedzilla_tags taggit_extras %}
 
 {% block main-content %}
     <h2>{% trans 'Planet' %}</h2>
     <hr/>
 
     <div class="row">
-        {% block feedzilla_content %}{% endblock %}
+      {% block feedzilla_content %}{% endblock %}
   
       <div class="col-lg-3">
         <div class="well">
@@ -15,7 +14,7 @@
         </div>
         <div class="well">
           <h3>{% trans 'Tags' %}</h3>
-          {% feedzilla_tag_cloud %}
+          {% include_tagcloud 'feedzilla.post' %}
         </div>
         <div class="well">
           <h3>{% trans 'Source Blogs' %}</h3>
--
libgit2 0.21.2

