From ca702a629868c6ad888e04237c89a23711826cfa Mon Sep 17 00:00:00 2001
From: seocam <seocam@bee1b3ed-c3eb-0310-9994-b88e04532788>
Date: Mon, 16 Apr 2012 18:38:47 +0000
Subject: [PATCH] Merge com https://bitbucket.org/seocam/atu-colab/src/810a0e848fcd

---
 colab/rss/feeds.py            |  8 ++++++--
 colab/rss/urls.py             |  6 +++---
 colab/settings.py             |  2 +-
 colab/static/css/screen.css   |  4 ++++
 colab/static/img/COPYRIGHT    |  1 +
 colab/static/img/rss.png      | Bin 0 -> 405 bytes
 colab/super_archives/views.py |  5 ++++-
 colab/templates/base.html     | 17 +++++++++++++++++
 colab/templates/home.html     | 18 +++++++++++++++---
 colab/urls.py                 |  2 +-
 colab/views/other.py          | 20 +++++++++++++++-----
 solr-conf/schema.xml          |  2 +-
 update-deploy.sh              | 19 +++++++++++++++++++
 13 files changed, 87 insertions(+), 17 deletions(-)
 create mode 100644 colab/static/img/rss.png
 create mode 100755 update-deploy.sh

diff --git a/colab/rss/feeds.py b/colab/rss/feeds.py
index 145b606..e788f6a 100644
--- a/colab/rss/feeds.py
+++ b/colab/rss/feeds.py
@@ -19,7 +19,9 @@ class LatestThreadsFeeds(Feed):
         return item.latest_message.url
 
     def item_title(self, item):
-        return item.latest_message.subject_clean    
+        title = '[' + item.mailinglist.name + '] '
+        title += item.latest_message.subject_clean  
+        return title
 
     def item_description(self, item):
         return item.latest_message.body
@@ -36,7 +38,9 @@ class HottestThreadsFeeds(Feed):
         return item.latest_message.url
 
     def item_title(self, item):
-        return item.latest_message.subject_clean    
+        title = '[' + item.mailinglist.name + '] '
+        title += item.latest_message.subject_clean  
+        return title  
 
     def item_description(self, item):
         return item.latest_message.body
diff --git a/colab/rss/urls.py b/colab/rss/urls.py
index cb6d42d..c995183 100644
--- a/colab/rss/urls.py
+++ b/colab/rss/urls.py
@@ -2,8 +2,8 @@ from django.conf.urls.defaults import patterns, url
 import feeds 
 
 urlpatterns = patterns('',
-    url(r'threads/latest/$', feeds.LatestThreadsFeeds()),
-    url(r'colab/latest/$', feeds.LatestColabFeeds()),
-    url(r'threads/hottest/$', feeds.HottestThreadsFeeds()),
+    url(r'threads/latest/$', feeds.LatestThreadsFeeds(), name='rss_latest_threads'),
+    url(r'colab/latest/$', feeds.LatestColabFeeds(), name='rss_latest_colab'),
+    url(r'threads/hottest/$', feeds.HottestThreadsFeeds(), name='rss_hottest_threads'),
 )
 
diff --git a/colab/settings.py b/colab/settings.py
index 23ffeaa..e0c3fc9 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -155,7 +155,7 @@ SOLR_SELECT_PATH = '/solr/select'
 
 SOLR_COLAB_URI = 'http://colab.interlegis.gov.br'
 SOLR_BASE_QUERY = """
-    (Type:changeset OR Type:ticket OR Type:wiki OR Type:thread)
+    ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *]) 
 """
 
 from settings_local import *
diff --git a/colab/static/css/screen.css b/colab/static/css/screen.css
index 14eebba..bc125f0 100644
--- a/colab/static/css/screen.css
+++ b/colab/static/css/screen.css
@@ -222,4 +222,8 @@ img.center {
     content: '';
 }
 
+.rss {
+    float: right;
+    padding-top: 2px;
+}
 
diff --git a/colab/static/img/COPYRIGHT b/colab/static/img/COPYRIGHT
index 5e88aad..86cc332 100644
--- a/colab/static/img/COPYRIGHT
+++ b/colab/static/img/COPYRIGHT
@@ -6,5 +6,6 @@ The icons listed bellow were copied from the Iconic icons package. The icons in 
 * wiki.png 
 * x.png
 * plus.png
+* rss.png
 
 The full Iconic package can be found here: https://github.com/downloads/somerandomdude/Iconic/iconic.zip
diff --git a/colab/static/img/rss.png b/colab/static/img/rss.png
new file mode 100644
index 0000000..978e758
Binary files /dev/null and b/colab/static/img/rss.png differ
diff --git a/colab/super_archives/views.py b/colab/super_archives/views.py
index fe48da0..5a3d30a 100644
--- a/colab/super_archives/views.py
+++ b/colab/super_archives/views.py
@@ -56,7 +56,10 @@ def list_messages(request):
         threads = threads.filter(mailinglist__name=mail_list)
     
     paginator = Paginator(threads, 16)
-    page = int(request.GET.get('p', '1'))
+    try:
+        page = int(request.GET.get('p', '1'))
+    except ValueError:
+        page = 1
     threads = paginator.page(page)
     
     lists = MailingList.objects.all()
diff --git a/colab/templates/base.html b/colab/templates/base.html
index 8c226a2..eeb4f97 100644
--- a/colab/templates/base.html
+++ b/colab/templates/base.html
@@ -44,6 +44,23 @@
       </style>
 
     {% endblock %}
+
+    {% block google_analytics %}
+    <script type="text/javascript">
+
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-30841845-2']);
+      _gaq.push(['_trackPageview']);
+    
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+
+    </script>
+    {% endblock %}
+
   </head>
 
   <body class="container">
diff --git a/colab/templates/home.html b/colab/templates/home.html
index 35e7801..4cf84ab 100644
--- a/colab/templates/home.html
+++ b/colab/templates/home.html
@@ -18,7 +18,11 @@
 {% block main-content %}
 
   <div class="span-12 colborder">
-    <h3>{% trans "Últimas Colaborações" %}</h3>
+    <h3>{% trans "Últimas Colaborações" %}<a class="rss" target="_blank" 
+        href="{% url rss_latest_colab %}" 
+        title="{% trans "RSS - Últimas Colaborações" %}">
+        <img src="{{ STATIC_URL }}img/rss.png" alt="RSS"/></a>
+    </h3>
     <ul>
       {% for doc in latest_docs %}
         {% include "message-preview.html" %}
@@ -39,7 +43,11 @@
   <hr/>
 
   <div class="span-12 colborder">
-    <h3>{% trans "Discussões Mais Relevantes" %}</h3>
+    <h3>{% trans "Discussões Mais Relevantes" %}<a class="rss" target="_blank" 
+        href="{% url rss_hottest_threads %}" 
+        title="{% trans "RSS - Discussões Mais Relevantes" %}">
+        <img src="{{ STATIC_URL }}img/rss.png" alt="RSS"/></a>
+    </h3>
     <ul>
       {% for thread in hottest_threads %}
         {% include "message-preview.html" with doc=thread.latest_message %}
@@ -52,7 +60,11 @@
   </div>
 
   <div class="span-11 last">
-    <h3>{% trans "Últimas Discussões" %}</h3>
+    <h3>{% trans "Últimas Discussões" %}<a class="rss" target="_blank" 
+        href="{% url rss_latest_threads %}" 
+        title="{% trans "RSS - Últimas Discussões" %}">
+        <img src="{{ STATIC_URL }}img/rss.png" alt="RSS"/></a>
+    </h3>
     <ul>
       {% for thread in latest_threads %}
         {% include "message-preview.html" with doc=thread.latest_message %}
diff --git a/colab/urls.py b/colab/urls.py
index 1367170..c7d58dc 100644
--- a/colab/urls.py
+++ b/colab/urls.py
@@ -22,7 +22,7 @@ urlpatterns = patterns('',
     url(r'^user/hash/(?P<emailhash>[\w]+)$',
         'colab.views.userprofile.by_emailhash'),
     
-    url(r'^user/(?P<username>[\w]+)/edit/?$', 
+    url(r'^user/(?P<username>[\w@+.-]+)/edit/?$', 
         'colab.views.userprofile.update', name='user_profile_update'),
         
     url(r'^search/$', 'colab.views.other.search', name='search'),
diff --git a/colab/views/other.py b/colab/views/other.py
index 987bd04..04d1b54 100644
--- a/colab/views/other.py
+++ b/colab/views/other.py
@@ -7,6 +7,7 @@ Created by Sergio Campos on 2012-01-10.
 """
 
 from django.template import RequestContext
+from django.http import HttpResponseNotAllowed
 from django.shortcuts import render_to_response
 from django.utils.translation import ugettext as _
 
@@ -31,12 +32,21 @@ def home(request):
 
 
 def search(request):
-    if request.method == 'GET':
-        query = request.GET.get('q')
-        sort = request.GET.get('o')
-        type_ = request.GET.get('type')
-        page_number = int(request.GET.get('p', 1))
+    if request.method != 'GET':
+        return HttpResponseNotAllowed(['GET'])
+    
+    query = request.GET.get('q')
+    sort = request.GET.get('o')
+    type_ = request.GET.get('type')
+    try:
+        page_number = int(request.GET.get('p', '1'))
+    except ValueError:
+        page_number = 1
+    
+    try:
         results_per_page = int(request.GET.get('per_page', 16))
+    except ValueError:
+        results_per_page = 16
 
     filters = {
         'Type': type_,
diff --git a/solr-conf/schema.xml b/solr-conf/schema.xml
index 9269719..a413699 100644
--- a/solr-conf/schema.xml
+++ b/solr-conf/schema.xml
@@ -465,7 +465,7 @@
    <field name="Type" type="string" indexed="true"
           stored="true" required="true" multiValued="false"/>
    <field name="Title" type="text_ptbr" indexed="true"
-          stored="true" required="false" multiValued="false"/>
+          stored="true" required="true" multiValued="false"/>
    <field name="Description" type="text_ptbr" indexed="true"
           stored="true" required="false" multiValued="false"/>
    <field name="Creator" type="string" indexed="true"
diff --git a/update-deploy.sh b/update-deploy.sh
new file mode 100755
index 0000000..45551fc
--- /dev/null
+++ b/update-deploy.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+cd /usr/local/src/colab/
+hg pull
+hg up
+rm -fR dist/
+python setup.py sdist
+
+if [[ $1 == 'deps' ]] ; then
+    # com dependencias
+    /usr/local/django/colab/bin/pip install dist/*.gz -U
+else
+    # sem dependencias
+    /usr/local/django/colab/bin/pip install dist/*.gz -U --no-deps
+fi
+
+/usr/local/django/colab/bin/python colab/manage.py syncdb
+/usr/local/django/colab/bin/python colab/manage.py migrate
+touch /usr/local/django/colab/wsgi/colab.wsgi
--
libgit2 0.21.2