From e211e9c7bdfba5671d98425f9d7789e903060ca4 Mon Sep 17 00:00:00 2001
From: Charles Oliveira <18oliveira.charles@gmail.com>
Date: Thu, 27 Aug 2015 18:05:26 -0400
Subject: [PATCH] Removed some of workarounds

---
 colab/accounts/templates/accounts/user_update_form.html  | 19 ++++++++-----------
 colab/accounts/views.py                                  |  1 -
 colab/plugins/gitlab/templates/proxy/gitlab_profile.html |  3 +--
 colab/plugins/gitlab/urls.py                             |  2 --
 colab/plugins/gitlab/widgets.py                          | 16 +++++++++++++++-
 colab/plugins/templatetags/plugins.py                    | 20 --------------------
 colab/plugins/utils/widget_manager.py                    | 27 ++++++++++++++++++---------
 7 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/colab/accounts/templates/accounts/user_update_form.html b/colab/accounts/templates/accounts/user_update_form.html
index 57cb968..88d8711 100644
--- a/colab/accounts/templates/accounts/user_update_form.html
+++ b/colab/accounts/templates/accounts/user_update_form.html
@@ -121,7 +121,7 @@ $(function() {
     <h3>{% gravatar user_.email 50 %} {{ user_.get_full_name }} ({{ user_.username }})</h3>
     <a href="https://gravatar.com" target="_blank">
       {% trans "Change your avatar at Gravatar.com" %}
-    </a>{{ lala }}
+    </a>
   </div>
   <br>
   <br>
@@ -148,7 +148,7 @@ $(function() {
     }
   </style>
   <div class="tab-content">
-    <div id="profile" class="tab-pane fade">
+    <div id="profile" class="tab-pane fade in active">
       <form method="post">
         {% csrf_token %}
 
@@ -229,15 +229,12 @@ $(function() {
         </div>
       </form>
     </div>
-    <div id="code" class="tab-pane fade in active">
-      {% content_xpto %}
-    </div>
-    <div id="social" class="tab-pane fade">
-      <p>Some content in menu 2.</p>
-    </div>
+    {% for widget in widgets %}
+      <div id="{{ widget.identifier }}" class="tab-pane fade">
+        <h2>{{ widget.name }}</h2>
+        {{ widget.get_body }}
+      </div>
+    {% endfor %}
   </div>
 
-
-
-
 {% endblock %}
diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index 71fb6e8..874a3cb 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -46,7 +46,6 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
     def get_context_data(self, **kwargs):
         context = {}
         context['widgets'] = WidgetManager.get_widgets('profile', self.request)
-        context['lala'] = 'lala123'
         context.update(kwargs)
         return super(UserProfileUpdateView, self).get_context_data(**context)
 
diff --git a/colab/plugins/gitlab/templates/proxy/gitlab_profile.html b/colab/plugins/gitlab/templates/proxy/gitlab_profile.html
index d68d406..8f97797 100644
--- a/colab/plugins/gitlab/templates/proxy/gitlab_profile.html
+++ b/colab/plugins/gitlab/templates/proxy/gitlab_profile.html
@@ -31,8 +31,7 @@
 {% block head_js %}
 <script>jQuery.noConflict();</script>
 {% endblock %}
-<body>
-</body>
+
 <div id="main-content"></div>
 <script type="text/javascript">
   jQuery(function(){
diff --git a/colab/plugins/gitlab/urls.py b/colab/plugins/gitlab/urls.py
index 5dfa370..f39fc48 100644
--- a/colab/plugins/gitlab/urls.py
+++ b/colab/plugins/gitlab/urls.py
@@ -4,7 +4,5 @@ from django.conf.urls import patterns, url
 from .views import GitlabProxyView, GitlabProfileProxyView
 
 urlpatterns = patterns('',
-    # Gitlab URLs
-    #url(r'(?P<path>profile.*)$', GitlabProfileProxyView.as_view(), name='gitlab'),
     url(r'^(?P<path>.*)$', GitlabProxyView.as_view(), name='gitlab'),
 )
diff --git a/colab/plugins/gitlab/widgets.py b/colab/plugins/gitlab/widgets.py
index 9415a6f..0fd7539 100644
--- a/colab/plugins/gitlab/widgets.py
+++ b/colab/plugins/gitlab/widgets.py
@@ -8,14 +8,28 @@ class GitlabProfileWidget(GitlabProxyView, Widget):
     name = 'Gitlab Profile'
     default_url = '/gitlab/profile/account'
 
+    def get_body(self):
+        start = self.content.find('<body')
+        start = self.content.find('>', start)
+        end = self.content.find('</body>')
+        print "start = " + str(start) + ", end = " + str(end)
+        print "content = " + self.content
+
+        if -1 in [start, end]:
+            return ''
+
+        body = self.content[start + len('>'):end]
+        return mark_safe(body)
+
     def generate_content(self, request):
         requested_url = request.GET.get('code', self.default_url)
         g = GitlabProfileProxyView()
         r = g.dispatch(request, requested_url)
+
         if r.status_code == 302:
             location = r.get('Location')
             requested_url = location[location.find('/{}/'.format(self.app_label)):]
             request.method = 'GET'
             r = g.dispatch(request, requested_url)
 
-        return "<div>" + r.content + "</div>"
\ No newline at end of file
+        self.content = r.content
diff --git a/colab/plugins/templatetags/plugins.py b/colab/plugins/templatetags/plugins.py
index 61279b5..62c83bb 100644
--- a/colab/plugins/templatetags/plugins.py
+++ b/colab/plugins/templatetags/plugins.py
@@ -51,23 +51,3 @@ def plugins_menu(context):
 
     cache.set(cache_key, menu)
     return menu
-
-import requests
-from  django.conf import settings
-from colab.plugins.gitlab.views import GitlabProfileProxyView
-@register.simple_tag(takes_context=True)
-def content_xpto(context):
-    request = context['request']
-    requested_url = request.GET.get('code', '/gitlab/profile/account')
-    print "requested_url1 = " + requested_url
-
-    g = GitlabProfileProxyView()
-    r = g.dispatch(request, requested_url)
-    if r.status_code == 302:
-        location = r.get('Location')
-        requested_url = location[location.find('/gitlab/'):]
-        request.method = 'GET'
-        print "requested_url2 = " + requested_url
-        r = g.dispatch(request, requested_url)
-
-    return "<div>" + r.content + "</div>"
diff --git a/colab/plugins/utils/widget_manager.py b/colab/plugins/utils/widget_manager.py
index 9e8b65d..2b74149 100644
--- a/colab/plugins/utils/widget_manager.py
+++ b/colab/plugins/utils/widget_manager.py
@@ -1,23 +1,32 @@
+from django.utils.safestring import mark_safe
 
 class Widget:
     identifier = None
     name = None
     default_url = None
-    content = None
+    content = ''
 
     def get_body(self):
         # avoiding regex in favor of performance
-        start = content.find('<body>')
-        end = content.find('</body>')
-        head = content[start + len('<body>'):end]
-        return head
+        start = self.content.find('<body>')
+        end = self.content.find('</body>')
+
+        if -1 in [start, end]:
+            return ''
+
+        body = self.content[start + len('<body>'):end]
+        return mark_safe(body)
 
     def get_header(self):
         # avoiding regex in favor of performance
-        start = content.find('<head>')
-        end = content.find('</head>')
-        head = content[start + len('<head>'):end]
-        return head
+        start = self.content.find('<head>')
+        end = self.content.find('</head>')
+
+        if -1 in [start, end]:
+            return ''
+
+        head = self.content[start + len('<head>'):end]
+        return mark_safe(head)
 
     def generate_content(self, request=None):
         self.content = ''
--
libgit2 0.21.2

