diff --git a/colab/planet/__init__.py b/colab/planet/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/colab/planet/__init__.py +++ /dev/null diff --git a/colab/planet/admin.py b/colab/planet/admin.py deleted file mode 100644 index 2e9147e..0000000 --- a/colab/planet/admin.py +++ /dev/null @@ -1,4 +0,0 @@ -# uncomment the import if you really use. -# from django.contrib import admin - -# Register your models here. diff --git a/colab/planet/context_processors.py b/colab/planet/context_processors.py deleted file mode 100644 index 0ca8310..0000000 --- a/colab/planet/context_processors.py +++ /dev/null @@ -1,6 +0,0 @@ - -from django.conf import settings - - -def feedzilla(request): - return {'feedzilla': getattr(settings, 'FEEDZILLA_ENABLED', False)} diff --git a/colab/planet/locale/es/LC_MESSAGES/django.po b/colab/planet/locale/es/LC_MESSAGES/django.po deleted file mode 100644 index 9f516d1..0000000 --- a/colab/planet/locale/es/LC_MESSAGES/django.po +++ /dev/null @@ -1,103 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Leonardo J. Caballero G. , 2013. -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-26 11:28-0300\n" -"PO-Revision-Date: 2013-10-15 23:46-0430\n" -"Last-Translator: Leonardo J. Caballero G. \n" -"Language-Team: ES \n" -"Language: es\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" -"X-Generator: Virtaal 0.7.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óximo" - -#: templates/feedzilla/_post_template.html:9 -msgid "From" -msgstr "De" - -#: templates/feedzilla/_post_template.html:9 -msgid "on" -msgstr "en" - -#: templates/feedzilla/_post_template.html:17 -msgid "Read original" -msgstr "Leer original" - -#: templates/feedzilla/base.html:6 -msgid "Planet" -msgstr "Planeta" - -#: templates/feedzilla/base.html:15 templates/feedzilla/submit_blog.html:5 -msgid "Submit a blog" -msgstr "Solicite la inclusión de un blog" - -#: templates/feedzilla/base.html:18 -msgid "Tags" -msgstr "Etiquetas" - -#: templates/feedzilla/base.html:22 -msgid "Source Blogs" -msgstr "Fuente de Blogs" - -#: templates/feedzilla/submit_blog.html:8 -msgid "" -"Thank you. Your application has been accepted and will be reviewed by admin " -"in the near time." -msgstr "Gracias. Su solicitud ha sido aceptado y sera revisado por el administrador, lo mas pronto posible." - -#: templates/feedzilla/submit_blog.html:10 -msgid "Required fields" -msgstr "Campos requeridos" - -#: templates/feedzilla/submit_blog.html:14 -msgid "Blog Information" -msgstr "Información del blog" - -#: templates/feedzilla/submit_blog.html:15 -msgid "Blog URL" -msgstr "Dirección URL de Blog" - -#: templates/feedzilla/submit_blog.html:16 -msgid "Blog name" -msgstr "Nombre de blog" - -#: templates/feedzilla/submit_blog.html:17 -msgid "Name of author of the blog" -msgstr "Nombre del autor del blog" - -#: templates/feedzilla/submit_blog.html:18 -msgid "Feed URL" -msgstr "Dirección URL de Feed" - -#: templates/feedzilla/submit_blog.html:18 -msgid "You can specify what exactly feed you want submit" -msgstr "" -"Usted puede especificar cual feed exactamente usted quiere solicitar su " -"inclusión" - -#: templates/feedzilla/submit_blog.html:19 -msgid "Submit" -msgstr "Solicite la inclusión de un blog" - -#: templates/feedzilla/tag.html:5 -#, python-format -msgid "Posts with «%(tag)s» label" -msgstr "Envíos con etiqueta «%(tag)s»" - -#: templates/feedzilla/tag.html:14 -msgid "No posts with such label" -msgstr "No hay envíos con dicha etiqueta" diff --git a/colab/planet/locale/pt_BR/LC_MESSAGES/django.mo b/colab/planet/locale/pt_BR/LC_MESSAGES/django.mo deleted file mode 100644 index ed75b5d..0000000 Binary files a/colab/planet/locale/pt_BR/LC_MESSAGES/django.mo and /dev/null differ diff --git a/colab/planet/locale/pt_BR/LC_MESSAGES/django.po b/colab/planet/locale/pt_BR/LC_MESSAGES/django.po deleted file mode 100644 index 8cde912..0000000 --- a/colab/planet/locale/pt_BR/LC_MESSAGES/django.po +++ /dev/null @@ -1,101 +0,0 @@ -# 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 , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-21 13:55+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \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" - -#: colab/planet/templates/feedzilla/_post_template.html:8 -msgid "From" -msgstr "De" - -#: colab/planet/templates/feedzilla/_post_template.html:8 -msgid "on" -msgstr "em" - -#: colab/planet/templates/feedzilla/_post_template.html:12 -msgid "Read original" -msgstr "Ler original" - -#: colab/planet/templates/feedzilla/base.html:7 -msgid "Community Blogs" -msgstr "" - -#: colab/planet/templates/feedzilla/base.html:17 -msgid "Tags" -msgstr "Tags" - -#: colab/planet/templates/feedzilla/base.html:21 -msgid "Source Blogs" -msgstr "Blogs Fonte" - -#: colab/planet/templates/feedzilla/base.html:25 -#: colab/planet/templates/feedzilla/submit_blog.html:5 -msgid "Submit a blog" -msgstr "Solicite a inclusão de um blog" - -#: colab/planet/templates/feedzilla/index.html:10 -#, fuzzy -#| msgid "There's no RSS registered" -msgid "There is no RSS registered" -msgstr "Não há RSS cadastrado" - -#: colab/planet/templates/feedzilla/index.html:12 -msgid "Please" -msgstr "Por favor" - -#: colab/planet/templates/feedzilla/index.html:13 -msgid "click here" -msgstr "clique aqui" - -#: colab/planet/templates/feedzilla/index.html:14 -msgid "to submit a blog" -msgstr "para a inclusão de um blog" - -#: colab/planet/templates/feedzilla/submit_blog.html:8 -msgid "" -"Thank you. Your application has been accepted and will be reviewed by admin " -"in the near time." -msgstr "" - -#: colab/planet/templates/feedzilla/submit_blog.html:29 -#, fuzzy -msgid "Submit" -msgstr "Solicite a inclusão de um blog" - -#: colab/planet/templates/feedzilla/tag.html:7 -#, python-format -msgid "Posts with «%(tag)s» label" -msgstr "" - -#: colab/planet/templates/feedzilla/tag.html:16 -msgid "No posts with such label" -msgstr "" - -#~ msgid "previous" -#~ msgstr "anterior" - -#~ msgid "next" -#~ msgstr "próxima" - -#~ msgid "Planet" -#~ msgstr "Planet" - -#~ msgid "Blog Information" -#~ msgstr "Informações do blog" - -#, fuzzy -#~ msgid "Blog name" -#~ msgstr "Blogs" diff --git a/colab/planet/management/__init__.py b/colab/planet/management/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/colab/planet/management/__init__.py +++ /dev/null diff --git a/colab/planet/management/commands/__init__.py b/colab/planet/management/commands/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/colab/planet/management/commands/__init__.py +++ /dev/null diff --git a/colab/planet/management/commands/update_planet.py b/colab/planet/management/commands/update_planet.py deleted file mode 100644 index 91fea42..0000000 --- a/colab/planet/management/commands/update_planet.py +++ /dev/null @@ -1,10 +0,0 @@ - -from django.conf import settings - -from feedzilla.management.commands import feedzilla_update - - -class Command(feedzilla_update.Command): - def handle(self, *args, **kwargs): - if getattr(settings, 'FEEDZILLA_ENABLED', False): - super(Command, self).handle(*args, **kwargs) diff --git a/colab/planet/models.py b/colab/planet/models.py deleted file mode 100644 index b47bc55..0000000 --- a/colab/planet/models.py +++ /dev/null @@ -1,4 +0,0 @@ -# uncomment the import if you really use. -# from django.db import models - -# Create your models here. diff --git a/colab/planet/templates/common/pagination.html b/colab/planet/templates/common/pagination.html deleted file mode 100644 index 270f64e..0000000 --- a/colab/planet/templates/common/pagination.html +++ /dev/null @@ -1,34 +0,0 @@ -{% load i18n %} -{% if page.paginator.num_pages > 1 %} -
-
    - {% if page.has_previous %} -
  • «
    • - {% endif %} - - {% if page.paginator.frame_start_page > 1 %} -
  • 1
    • - {% endif %} - {% if page.paginator.frame_start_page > 2 %} -
  • ...
    • - {% endif %} - - {% for number, url in page.paginator.frame %} - {% if not url %}..{% else %} -
  • {{ number }}
    • - {% endif %} - {% endfor %} - - {% if page.paginator.frame_end_page != page.paginator.num_pages %} - {% if page.paginator.frame_end_page != page.paginator.num_pages|add:"-1" %} -
  • ...
    • - {% endif %} -
  • {{ page.paginator.num_pages }}
    • - {% endif %} - - {% if page.has_next %} -
  • »
    • - {% endif %} -
-
-{% endif %} diff --git a/colab/planet/templates/feedzilla/_post_template.html b/colab/planet/templates/feedzilla/_post_template.html deleted file mode 100644 index 33444cc..0000000 --- a/colab/planet/templates/feedzilla/_post_template.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load i18n %} - -
- - -

{{ post.title }}

- -
{% trans "From" %} {{ post.feed.author_or_title }} {% trans "on" %} {{ post.created }}
- - {{ post.summary|safe }} - - {% trans "Read original" %} - - {% if post.tags.count %} -
- Tags: - {% for tag in post.tags.all %} - {{ tag }} - {% endfor %} - -
- {% endif %} -
diff --git a/colab/planet/templates/feedzilla/base.html b/colab/planet/templates/feedzilla/base.html deleted file mode 100644 index 79c2574..0000000 --- a/colab/planet/templates/feedzilla/base.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends 'base.html' %} -{% load i18n feedzilla_tags %} - -{% block title %}Blogs{% endblock %} - -{% block main-content %} -

{% trans 'Community Blogs' %}

-
- -
-
- {% block feedzilla_content %}{% endblock %} -
- -
-
-

{% trans 'Tags' %}

- {% feedzilla_tag_cloud %} -
-
-

{% trans 'Source Blogs' %}

- {% feedzilla_donor_list order_by="title" %} - {% if user.is_authenticated %} -
- {% trans "Submit a blog" %} -
- {% endif %} -
-
-
- -{% endblock %} diff --git a/colab/planet/templates/feedzilla/index.html b/colab/planet/templates/feedzilla/index.html deleted file mode 100644 index e387da1..0000000 --- a/colab/planet/templates/feedzilla/index.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends 'feedzilla/base.html' %} -{% load i18n %} - -{% block feedzilla_content %} - -{% for post in page.object_list %} - {% include 'feedzilla/_post_template.html' %} -
- {% empty %} -

{% trans 'There is no RSS registered' %}

-

- {% trans 'Please' %} - {% trans 'click here' %} - {% trans 'to submit a blog' %}

- -{% endfor %} - -{% include "common/pagination.html" %} - -{% endblock %} diff --git a/colab/planet/templates/feedzilla/submit_blog.html b/colab/planet/templates/feedzilla/submit_blog.html deleted file mode 100644 index a638dbb..0000000 --- a/colab/planet/templates/feedzilla/submit_blog.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends 'feedzilla/base.html' %} -{% load i18n %} - -{% block feedzilla_content %} -

{% trans "Submit a blog" %}

- -{% if success %} -

{% trans "Thank you. Your application has been accepted and will be reviewed by admin in the near time." %}

-{% else %} -
- {% csrf_token %} - -
- {% for field in form %} -
-
- - - {{ field.errors }} -
-
- {% endfor %} -
- -
-
- -
-
- -
- -
-{% endif %} -{% endblock %} diff --git a/colab/planet/templates/feedzilla/tag.html b/colab/planet/templates/feedzilla/tag.html deleted file mode 100644 index 3cc3666..0000000 --- a/colab/planet/templates/feedzilla/tag.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends 'feedzilla/base.html' %} -{% load i18n %} - -{% block feedzilla_content %} - -
-

{% block title %}{% blocktrans %}Posts with «{{ tag }}» label{% endblocktrans %}{% endblock title %}

-
- {% if page.object_list %} - {% for post in page.object_list %} - {% include 'feedzilla/_post_template.html' %} -
- {% endfor %} - {% include "pagination.html" %} - {% else %} -

{% trans "No posts with such label" %}

- {% endif %} -
-{% endblock %} diff --git a/colab/planet/tests.py b/colab/planet/tests.py deleted file mode 100644 index 55be646..0000000 --- a/colab/planet/tests.py +++ /dev/null @@ -1,4 +0,0 @@ -# uncomment the import if you really use. -# from django.test import TestCase - -# Create your tests here. diff --git a/colab/planet/views.py b/colab/planet/views.py deleted file mode 100644 index 70ce736..0000000 --- a/colab/planet/views.py +++ /dev/null @@ -1,4 +0,0 @@ -# uncomment the import if you really use. -# from django.shortcuts import render - -# Create your views here. diff --git a/colab/proxy/templatetags/proxy.py b/colab/proxy/templatetags/proxy.py index 6d032a6..8125769 100644 --- a/colab/proxy/templatetags/proxy.py +++ b/colab/proxy/templatetags/proxy.py @@ -41,7 +41,8 @@ def proxy_menu(context): menu_links[title] = [] for text, link in links: - menu_links[title].append((text, link)) + url = link + menu_links[title].append((text, url)) menu = render_to_string('proxy/menu_template.html', {'menu_links': menu_links}) diff --git a/colab/settings.py b/colab/settings.py index 6912100..245387d 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -58,7 +58,6 @@ INSTALLED_APPS = ( 'colab.super_archives', 'colab.api', 'colab.rss', - 'colab.planet', 'colab.search', 'colab.badger', 'colab.tz', @@ -201,7 +200,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'colab.home.context_processors.ribbon', 'colab.home.context_processors.google_analytics', 'colab.home.context_processors.browserid_enabled', - 'colab.planet.context_processors.feedzilla', ) MIDDLEWARE_CLASSES = ( @@ -255,14 +253,6 @@ SUPER_ARCHIVES_PATH = '/var/lib/mailman/archives/private' SUPER_ARCHIVES_EXCLUDE = [] SUPER_ARCHIVES_LOCK_FILE = '/var/lock/colab/import_emails.lock' -# Feedzilla (planet) -from feedzilla.settings import * # noqa (flake8 ignore) -FEEDZILLA_PAGE_SIZE = 5 -FEEDZILLA_SITE_TITLE = _(u'Planet Colab') -FEEDZILLA_SITE_DESCRIPTION = _(u'Colab blog aggregator') - -FEEDZILLA_ENABLED = True - # Mailman API settings MAILMAN_API_URL = 'http://localhost:8124' @@ -299,13 +289,6 @@ if locals().get('RAVEN_DSN', False): } INSTALLED_APPS += ('raven.contrib.django.raven_compat',) -if FEEDZILLA_ENABLED: - INSTALLED_APPS += ( - # Feedzilla and deps - 'feedzilla', - 'common', - ) - BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False @@ -317,13 +300,24 @@ for app_label in PROXIED_APPS.keys(): COLAB_APPS = locals().get('COLAB_APPS') or {} for app_name, app in COLAB_APPS.items(): - INSTALLED_APPS += (app_name,) + if 'dependencies' in app: + for dep in app.get('dependencies'): + if dep not in INSTALLED_APPS: + INSTALLED_APPS += (dep,) + + if app_name not in INSTALLED_APPS: + INSTALLED_APPS += (app_name,) if not app or 'templates' not in app: continue template = app.get('templates') + if 'context_processors' in app: + for context_processor in app.get('context_processors'): + if context_processor not in TEMPLATE_CONTEXT_PROCESSORS: + TEMPLATE_CONTEXT_PROCESSORS += (context_processor,) + if template.get('staticdir'): STATICFILES_DIRS += (template.get('staticdir'),) if template.get('templatesdir'): diff --git a/colab/static/css/screen.css b/colab/static/css/screen.css index 8b58cc5..8ba33db 100644 --- a/colab/static/css/screen.css +++ b/colab/static/css/screen.css @@ -357,35 +357,6 @@ ul.unstyled-list .glyphicon-chevron-right { /* End of Converse JS*/ -/* Feedzilla */ - -#planet .well h3 { - margin-top: 0; -} - -.tag-cloud { - text-align: justify; - margin-top: 6px; -} - -.tag-cloud .size-1 { - font-size: 0.9em; -} - -.tag-cloud .size-2 { - font-size: 1.2em; -} - -.tag-cloud .size-3 { - font-size: 1.4em; -} - -.tag-cloud .size-4 { - font-size: 1.6em; -} - -/* end Feedzilla */ - /* user profile update */ .btn.delete-email:not(:hover) { diff --git a/colab/templates/base.html b/colab/templates/base.html index ed218f1..2c7557e 100644 --- a/colab/templates/base.html +++ b/colab/templates/base.html @@ -90,16 +90,8 @@ {% trans "Groups" %} - {% if feedzilla %} -
  • - {% trans "Blogs" %} -
    • - {% endif %} - {% proxy_menu %} -
  • {% trans "Paste" %}
    • - diff --git a/setup.py b/setup.py index 3c81db5..40b1b5d 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,7 @@ REQUIREMENTS = [ 'gunicorn==19.1.0', 'eventlet==0.15.2', 'PyYAML==3.11', + 'yamlordereddictloader=0.1.1' # Deps for sentry client (raven) 'raven==3.5.2', @@ -38,7 +39,6 @@ REQUIREMENTS = [ 'django-conversejs==0.3.4', # Feedzilla (planet) and deps - 'feedzilla==0.24', 'django-common==0.1.51', 'feedparser==5.1.3', 'lxml==3.2.4', -- libgit2 0.21.2