Conjunto de mudanças 6208 no repositório publico

Timestamp:

16/04/2012 15:38:47 (9 anos atrás)

Autor:

seocam

Mensagem:

Merge com ​https://bitbucket.org/seocam/atu-colab/src/810a0e848fcd

Localização:

colab/trunk

Arquivos:

• colab/rss/feeds.py (modificado) (2 diffs)
• colab/rss/urls.py (modificado) (1 diff)
• colab/settings.py (modificado) (1 diff)
• colab/static/css/screen.css (modificado) (1 diff)
• colab/static/img/COPYRIGHT (modificado) (1 diff)
• colab/static/img/rss.png (adicionado)
• colab/super_archives/views.py (modificado) (1 diff)
• colab/templates/base.html (modificado) (1 diff)
• colab/templates/home.html (modificado) (3 diffs)
• colab/urls.py (modificado) (1 diff)
• colab/views/other.py (modificado) (2 diffs)
• solr-conf/schema.xml (modificado) (1 diff)
• update-deploy.sh (adicionado)

colab/trunk/colab/rss/feeds.py

@@ -20 +20 @@
 
     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):
@@ -37 +39 @@
 
     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):

colab/trunk/colab/rss/urls.py

@@ -3 +3 @@
 
 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'),
 )
 

colab/trunk/colab/settings.py

@@ -156 +156 @@
 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 *]) 
 """
 

colab/trunk/colab/static/css/screen.css

@@ -223 +223 @@
 }
 
-
+.rss {
+    float: right;
+    padding-top: 2px;
+}
+

colab/trunk/colab/static/img/COPYRIGHT

@@ -7 +7 @@
 * x.png
 * plus.png
+* rss.png
 
 The full Iconic package can be found here: https://github.com/downloads/somerandomdude/Iconic/iconic.zip

colab/trunk/colab/super_archives/views.py

@@ -57 +57 @@
     
     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)
     

colab/trunk/colab/templates/base.html

@@ -45 +45 @@
 
     {% 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>
 

colab/trunk/colab/templates/home.html

@@ -19 +19 @@
 
   <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 %}
@@ -40 +44 @@
 
   <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 %}
@@ -53 +61 @@
 
   <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 %}

colab/trunk/colab/urls.py

@@ -23 +23 @@
         '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'),
         

colab/trunk/colab/views/other.py

@@ -8 +8 @@
 
 from django.template import RequestContext
+from django.http import HttpResponseNotAllowed
 from django.shortcuts import render_to_response
 from django.utils.translation import ugettext as _
@@ -32 +33 @@
 
 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 = {

colab/trunk/solr-conf/schema.xml

@@ -466 +466 @@
           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"/>