Merge branch 'xmpp' of github.com:TracyWebTech/colab into xmpp

Matheus Figueiredo
2 parents 2523847d f59c5c68
Showing 17 changed files with 255 additions and 2 deletions Show diff stats
requirements.txt
src/colab/custom_settings.py
src/colab/deprecated/templates/base.html
src/colab/static/css/screen.css
src/colab/urls.py
src/planet/__init__.py
src/planet/admin.py
src/planet/locale/pt_BR/LC_MESSAGES/django.mo
src/planet/locale/pt_BR/LC_MESSAGES/django.po
src/planet/models.py
src/planet/templates/common/pagination.html
src/planet/templates/feedzilla/_post_template.html
src/planet/templates/feedzilla/base.html
src/planet/templates/feedzilla/index.html
src/planet/templates/feedzilla/tag.html
src/planet/tests.py
src/planet/views.py
@@ -5,3 +5,9 @@ pytz==2011n
 chardet==1.0.1
 python-dateutil==1.5
 django-cliauth==0.9
+feedzilla
+django-common
+django-tagging
+feedparser
+lxml
+grab
@@ -16,6 +16,7 @@ LANGUAGES = (
 LANGUAGE_CODE = 'pt-br'
 INSTALLED_APPS = INSTALLED_APPS + (
+
     # Not standard apps
     'south',
     'cliauth',
@@ -25,6 +26,12 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'api',
     'rss',
     'colab.deprecated',
+    'planet',
+
+    # Feedzilla and deps
+    'feedzilla',
+    'tagging',
+    'common',
 )
 LOGGING = {
@@ -87,6 +94,11 @@ STATICFILES_DIRS = (
     os.path.join(BASE_DIR, 'colab', 'static'),
 )
+from feedzilla.settings import *
+FEEDZILLA_PAGE_SIZE = 5
+FEEDZILLA_SITE_TITLE = gettext(u'Planet Colab')
+FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
+
 try:
     from local_settings import *
 except ImportError:
@@ -122,7 +122,7 @@
              target="_blank">{% trans "Report a problem" %}</a>
         </span>
         <span>
-          <a href="#">{% trans "Messenger" %}</a>
+          <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
         </span>
         <span class="right">
@@ -168,17 +168,34 @@ label.avatar-placeholder {
 }
 .tag {
+    text-decoration: none;
     background-color: #2183b3;
     padding: 2px 4px;
-    border-radius: 5;
+    border-radius: 5px;
     font-size: 90%;
     color: #fff;
     margin-right: 5px;
+    line-height: 2;
+    white-space: nowrap;
 }
 .tag:hover, 
 .tag:focus {
     background-color: #21b6e6;
+    color: #fff;
+}
+
+.tag-cloud .size-1 {
+    font-size: 90%;
+}
+.tag-cloud .size-2 {
+    font-size: 100%;
+}
+.tag-cloud .size-3 {
+    font-size: 130%;
+}
+.tag-cloud .size-4 {
+    font-size: 150%;
 }
 .quiet {
@@ -342,3 +359,19 @@ form#set-custom-xmpp-status .custom-xmpp-status {
 #available-chatrooms .available-chatroom {
     margin-left: 1px;
 }
+
+.blog-post-item h3 a {
+    text-decoration: none;
+}
+
+.blog-post-item h3 {
+    margin-bottom: 0.5em;
+}
+
+.blog-post-item .post-meta {
+    margin-bottom: 2em;
+}
+
+.blog-post-item .tags {
+    margin-top: 1em;
+}
@@ -51,6 +51,8 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^account/logout/$', 'django.contrib.auth.views.logout', 
         {'next_page': '/'}, name='logout'),
+
+    url(r'^planet/', include('feedzilla.urls')),
     # Uncomment the next line to enable the admin:
     url(r'^colab/admin/', include(admin.site.urls)),
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,67 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-24 18:36-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/common/pagination.html:5 templates/common/pagination.html.py:7
+msgid "previous"
+msgstr "anterior"
+
+#: templates/common/pagination.html:31 templates/common/pagination.html:33
+msgid "next"
+msgstr "próxima"
+
+#: templates/feedzilla/_post_template.html:9
+msgid "From"
+msgstr "De"
+
+#: templates/feedzilla/_post_template.html:9
+msgid "on"
+msgstr "em"
+
+#: templates/feedzilla/_post_template.html:17
+msgid "Read original"
+msgstr "Ler original"
+
+#: templates/feedzilla/base.html:6
+msgid "Planet"
+msgstr "Planet"
+
+#: templates/feedzilla/base.html:15
+msgid "Submit a blog"
+msgstr "Solicite a inclusão de um blog"
+
+#: templates/feedzilla/base.html:18
+msgid "Tags"
+msgstr "Tags"
+
+#: templates/feedzilla/base.html:22
+msgid "Source Blogs"
+msgstr "Blogs Fonte"
+
+#: templates/feedzilla/tag.html:5
+#, python-format
+msgid "Posts with &laquo;%(tag)s&raquo; label"
+msgstr ""
+
+#: templates/feedzilla/tag.html:14
+msgid "No posts with such label"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Blogs fonte"
+#~ msgstr "Blogs"
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1,38 @@
+{% load i18n %}
+{% if page.paginator.num_pages > 1 %}
+<div class="pagination">
+    {% if page.has_previous %}
+    <a href="{{ alterpath }}{{ page.previous_page_url }}">&laquo; {% trans "previous" %}</a>
+    {% else %}
+    <span class="control">&laquo; {% trans "previous" %}</span>
+    {% endif %}
+
+    {% if page.paginator.frame_start_page > 1 %}
+    <a href="{{ alterpath }}{{ page.first_page_url }}">1</a>
+        {% if page.paginator.frame_start_page > 2 %}
+        <span class="control">...</span>
+        {% endif %}
+    {% endif %}
+
+    {% for number, url in page.paginator.frame %}
+    {% if not url %}..{% else %}
+    <a {% ifequal page.number number%}class="active"{% endifequal %} href="{{ alterpath }}{{ url }}">{{ number }}</a>
+    {% endif %}
+    {% endfor %}
+
+    {% if page.paginator.frame_end_page != page.paginator.num_pages %}
+        {% if page.paginator.frame_end_page != page.paginator.num_pages|add:"-1" %}
+        <span class="control">...</span>
+        {% endif %}
+        <a href="{{ alterpath }}{{ page.last_page_url }}">{{ page.paginator.num_pages }}</a>
+    {% endif %}
+
+    {% if page.has_next %}
+    <a href="{{ alterpath }}{{ page.next_page_url }}">{% trans "next" %} &raquo;</a>
+    {% else %}
+    <span class="control">{% trans "next" %} &raquo;</span>
+    {% endif %}
+
+    <div class="clear"></div>
+</div>
+{% endif %}
@@ -0,0 +1,30 @@
+{% load tagging_tags %}
+{% load i18n %}
+
+<div class="blog-post-item">
+    <a name="post-{{ post.pk }}"></a>
+
+    <h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
+
+    <div class="post-meta">{% trans "From" %} <a href="{{ post.feed.site_url }}">{{ post.feed.author_or_title }}</a> {% trans "on" %} {{ post.created }}</div>
+
+
+    <div class="content">
+        {{ post.summary|safe }}
+    </div>
+
+    <div>
+        <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b>
+    </div>
+
+    {% if post.tags %}
+    <div class="tags">
+      <span><b>Tags:</b>
+        {% tags_for_object post as tags %}
+        {% for tag in tags %}
+          <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a>
+        {% endfor %}
+      </span>
+    </div>
+    {% endif %}
+</div>
@@ -0,0 +1,26 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% load feedzilla_tags %}
+
+{% block main-content %}
+    <h2>{% trans 'Planet' %}</h2>
+    <hr/>
+
+    <div class="span-18">
+      {% block feedzilla_content %}{% endblock %}
+    </div>
+
+    <div class="span-6 last">
+      <div class="box">
+        <a href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
+      </div>
+      <div class="box">
+        <h3>{% trans 'Tags' %}</h3>
+        {% feedzilla_tag_cloud %}
+      </div>
+      <div class="box">
+        <h3>{% trans 'Source Blogs' %}</h3>
+        {% feedzilla_donor_list %}
+      </div>
+    </div>
+{% endblock %}
@@ -0,0 +1,11 @@
+{% extends 'feedzilla/base.html' %}
+{% load i18n %}
+
+{% block feedzilla_content %}
+  {% for post in page.object_list %}
+    {% include 'feedzilla/_post_template.html' %}
+    <hr>
+  {% endfor %}
+  
+  {% include "pagination.html" %}
+{% endblock %}
@@ -0,0 +1,16 @@
+{% extends 'feedzilla/base.html' %}
+{% load i18n %}
+
+{% block feedzilla_content %}
+<h3>{% block title %}{% blocktrans %}Posts with &laquo;{{ tag }}&raquo; label{% endblocktrans %}{% endblock title %}</h3>
+<hr>
+{% if page.object_list %}
+    {% for post in page.object_list %}
+    {% include 'feedzilla/_post_template.html' %}
+    <hr>
+    {% endfor %}
+    {% include "pagination.html" %}
+{% else %}
+    <p>{% trans "No posts with such label" %}</p>
+{% endif %}
+{% endblock %}
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
	@@ -5,3 +5,9 @@ pytz==2011n		@@ -5,3 +5,9 @@ pytz==2011n
5	chardet==1.0.1	5	chardet==1.0.1
6	python-dateutil==1.5	6	python-dateutil==1.5
7	django-cliauth==0.9	7	django-cliauth==0.9
		8	+feedzilla
		9	+django-common
		10	+django-tagging
		11	+feedparser
		12	+lxml
		13	+grab
	@@ -122,7 +122,7 @@		@@ -122,7 +122,7 @@
122	target="_blank">{% trans "Report a problem" %}</a>	122	target="_blank">{% trans "Report a problem" %}</a>
123	</span>	123	</span>
124	<span>	124	<span>
125	- <a href="#">{% trans "Messenger" %}</a>	125	+ <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
126	</span>	126	</span>
127		127
128	<span class="right">	128	<span class="right">
	@@ -168,17 +168,34 @@ label.avatar-placeholder {		@@ -168,17 +168,34 @@ label.avatar-placeholder {
168	}	168	}
169		169
170	.tag {	170	.tag {
		171	+ text-decoration: none;
171	background-color: #2183b3;	172	background-color: #2183b3;
172	padding: 2px 4px;	173	padding: 2px 4px;
173	- border-radius: 5;	174	+ border-radius: 5px;
174	font-size: 90%;	175	font-size: 90%;
175	color: #fff;	176	color: #fff;
176	margin-right: 5px;	177	margin-right: 5px;
		178	+ line-height: 2;
		179	+ white-space: nowrap;
177	}	180	}
178		181
179	.tag:hover,	182	.tag:hover,
180	.tag:focus {	183	.tag:focus {
181	background-color: #21b6e6;	184	background-color: #21b6e6;
		185	+ color: #fff;
		186	+}
		187	+
		188	+.tag-cloud .size-1 {
		189	+ font-size: 90%;
		190	+}
		191	+.tag-cloud .size-2 {
		192	+ font-size: 100%;
		193	+}
		194	+.tag-cloud .size-3 {
		195	+ font-size: 130%;
		196	+}
		197	+.tag-cloud .size-4 {
		198	+ font-size: 150%;
182	}	199	}
183		200
184	.quiet {	201	.quiet {
	@@ -342,3 +359,19 @@ form#set-custom-xmpp-status .custom-xmpp-status {		@@ -342,3 +359,19 @@ form#set-custom-xmpp-status .custom-xmpp-status {
342	#available-chatrooms .available-chatroom {	359	#available-chatrooms .available-chatroom {
343	margin-left: 1px;	360	margin-left: 1px;
344	}	361	}
		362	+
		363	+.blog-post-item h3 a {
		364	+ text-decoration: none;
		365	+}
		366	+
		367	+.blog-post-item h3 {
		368	+ margin-bottom: 0.5em;
		369	+}
		370	+
		371	+.blog-post-item .post-meta {
		372	+ margin-bottom: 2em;
		373	+}
		374	+
		375	+.blog-post-item .tags {
		376	+ margin-top: 1em;
		377	+}
	@@ -51,6 +51,8 @@ urlpatterns = patterns('',		@@ -51,6 +51,8 @@ urlpatterns = patterns('',
51		51
52	url(r'^account/logout/$', 'django.contrib.auth.views.logout',	52	url(r'^account/logout/$', 'django.contrib.auth.views.logout',
53	{'next_page': '/'}, name='logout'),	53	{'next_page': '/'}, name='logout'),
		54	+
		55	+ url(r'^planet/', include('feedzilla.urls')),
54		56
55	# Uncomment the next line to enable the admin:	57	# Uncomment the next line to enable the admin:
56	url(r'^colab/admin/', include(admin.site.urls)),	58	url(r'^colab/admin/', include(admin.site.urls)),
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
	1	+# SOME DESCRIPTIVE TITLE.
	2	+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
	3	+# This file is distributed under the same license as the PACKAGE package.
	4	+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
	5	+#
	6	+msgid ""
	7	+msgstr ""
	8	+"Project-Id-Version: PACKAGE VERSION\n"
	9	+"Report-Msgid-Bugs-To: \n"
	10	+"POT-Creation-Date: 2013-07-24 18:36-0300\n"
	11	+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
	12	+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
	13	+"Language-Team: LANGUAGE <LL@li.org>\n"
	14	+"Language: \n"
	15	+"MIME-Version: 1.0\n"
	16	+"Content-Type: text/plain; charset=UTF-8\n"
	17	+"Content-Transfer-Encoding: 8bit\n"
	18	+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
	19	+
	20	+#: templates/common/pagination.html:5 templates/common/pagination.html.py:7
	21	+msgid "previous"
	22	+msgstr "anterior"
	23	+
	24	+#: templates/common/pagination.html:31 templates/common/pagination.html:33
	25	+msgid "next"
	26	+msgstr "próxima"
	27	+
	28	+#: templates/feedzilla/_post_template.html:9
	29	+msgid "From"
	30	+msgstr "De"
	31	+
	32	+#: templates/feedzilla/_post_template.html:9
	33	+msgid "on"
	34	+msgstr "em"
	35	+
	36	+#: templates/feedzilla/_post_template.html:17
	37	+msgid "Read original"
	38	+msgstr "Ler original"
	39	+
	40	+#: templates/feedzilla/base.html:6
	41	+msgid "Planet"
	42	+msgstr "Planet"
	43	+
	44	+#: templates/feedzilla/base.html:15
	45	+msgid "Submit a blog"
	46	+msgstr "Solicite a inclusão de um blog"
	47	+
	48	+#: templates/feedzilla/base.html:18
	49	+msgid "Tags"
	50	+msgstr "Tags"
	51	+
	52	+#: templates/feedzilla/base.html:22
	53	+msgid "Source Blogs"
	54	+msgstr "Blogs Fonte"
	55	+
	56	+#: templates/feedzilla/tag.html:5
	57	+#, python-format
	58	+msgid "Posts with «%(tag)s» label"
	59	+msgstr ""
	60	+
	61	+#: templates/feedzilla/tag.html:14
	62	+msgid "No posts with such label"
	63	+msgstr ""
	64	+
	65	+#, fuzzy
	66	+#~ msgid "Blogs fonte"
	67	+#~ msgstr "Blogs"
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.db import models
	2	+
	3	+# Create your models here.
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+{% load i18n %}
	2	+{% if page.paginator.num_pages > 1 %}
	3	+<div class="pagination">
	4	+ {% if page.has_previous %}
	5	+ <a href="{{ alterpath }}{{ page.previous_page_url }}">« {% trans "previous" %}</a>
	6	+ {% else %}
	7	+ <span class="control">« {% trans "previous" %}</span>
	8	+ {% endif %}
	9	+
	10	+ {% if page.paginator.frame_start_page > 1 %}
	11	+ <a href="{{ alterpath }}{{ page.first_page_url }}">1</a>
	12	+ {% if page.paginator.frame_start_page > 2 %}
	13	+ <span class="control">...</span>
	14	+ {% endif %}
	15	+ {% endif %}
	16	+
	17	+ {% for number, url in page.paginator.frame %}
	18	+ {% if not url %}..{% else %}
	19	+ <a {% ifequal page.number number%}class="active"{% endifequal %} href="{{ alterpath }}{{ url }}">{{ number }}</a>
	20	+ {% endif %}
	21	+ {% endfor %}
	22	+
	23	+ {% if page.paginator.frame_end_page != page.paginator.num_pages %}
	24	+ {% if page.paginator.frame_end_page != page.paginator.num_pages\|add:"-1" %}
	25	+ <span class="control">...</span>
	26	+ {% endif %}
	27	+ <a href="{{ alterpath }}{{ page.last_page_url }}">{{ page.paginator.num_pages }}</a>
	28	+ {% endif %}
	29	+
	30	+ {% if page.has_next %}
	31	+ <a href="{{ alterpath }}{{ page.next_page_url }}">{% trans "next" %} »</a>
	32	+ {% else %}
	33	+ <span class="control">{% trans "next" %} »</span>
	34	+ {% endif %}
	35	+
	36	+ <div class="clear"></div>
	37	+</div>
	38	+{% endif %}
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+{% load tagging_tags %}
	2	+{% load i18n %}
	3	+
	4	+<div class="blog-post-item">
	5	+ <a name="post-{{ post.pk }}"></a>
	6	+
	7	+ <h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
	8	+
	9	+ <div class="post-meta">{% trans "From" %} <a href="{{ post.feed.site_url }}">{{ post.feed.author_or_title }}</a> {% trans "on" %} {{ post.created }}</div>
	10	+
	11	+
	12	+ <div class="content">
	13	+ {{ post.summary\|safe }}
	14	+ </div>
	15	+
	16	+ <div>
	17	+ <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b>
	18	+ </div>
	19	+
	20	+ {% if post.tags %}
	21	+ <div class="tags">
	22	+ <span><b>Tags:</b>
	23	+ {% tags_for_object post as tags %}
	24	+ {% for tag in tags %}
	25	+ <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a>
	26	+ {% endfor %}
	27	+ </span>
	28	+ </div>
	29	+ {% endif %}
	30	+</div>
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+{% extends 'base.html' %}
	2	+{% load i18n %}
	3	+{% load feedzilla_tags %}
	4	+
	5	+{% block main-content %}
	6	+ <h2>{% trans 'Planet' %}</h2>
	7	+ <hr/>
	8	+
	9	+ <div class="span-18">
	10	+ {% block feedzilla_content %}{% endblock %}
	11	+ </div>
	12	+
	13	+ <div class="span-6 last">
	14	+ <div class="box">
	15	+ <a href="{% url "feedzilla_submit_blog" %}">{% trans "Submit a blog" %}</a>
	16	+ </div>
	17	+ <div class="box">
	18	+ <h3>{% trans 'Tags' %}</h3>
	19	+ {% feedzilla_tag_cloud %}
	20	+ </div>
	21	+ <div class="box">
	22	+ <h3>{% trans 'Source Blogs' %}</h3>
	23	+ {% feedzilla_donor_list %}
	24	+ </div>
	25	+ </div>
	26	+{% endblock %}