Grigoriy Petukhov avatar Grigoriy Petukhov committed 78a25b2

Remove some stupid things

Comments (0)

Files changed (9)

  * Add feedzilla to INSTALLED_APPS
  * Run `manage.py syncdb` or `manage.py sync` if you use South.
  * Include `url('', include('feedzilla.urls'))` in url config
- * Add `feedzilla.context_processors.settings` into TEMPLATE_CONTEXT_PROCESSORS 
  * Setup Site instance via Django admin interface
  * Setup feedzilla settings via settings.py.  See available settings below.
     You have to import default settings with "from feedzilla.settings import *" line.
- * Setup static files. You should copy or symlink `static/feedzilla` directory contents from feedzilla installation directory to your %MEDIA_ROOT%. Check out the `manage.py feedzilla_static_location` command. It will show your where feedzilla static files are stored.
+ * Setup static files. You should copy or symlink `static/feedzilla` directory contents from feedzilla installation directory to your %MEDIA_ROOT%.
+ * Play with templates. Probably you'll want override some of default templates.
 
 
 Dependencies
 Settings 
 ========
 
- * FEEDZILLA_PAGE_SIZE
+ * FEEDZILLA_PAGE_SIZE - number of items per page
  * FEEDZILLA_SUMMARY_SIZE
- * FEEDZILLA_SITE_TITLE
- * FEEDZILLA_SITE_DESCRIPTION
- * FEEDZILLA_HEAD_LINKS
- * FEEDZILLA_COPYRIGHTS
- * FEEDZILLA_TWITTER
- * FEEDZILLA_FEEDBURNER_FEED = None
- * FEEDZILLA_FEEDBURNER_COUNTER = False
+ * FEEDZILLA_SITE_TITLE - used in feed generation
+ * FEEDZILLA_SITE_DESCRIPTION - used in feed generation
 
 For actual list of settings look into feedzilla/settings.py

feedzilla/context_processors.py

-from django.conf import settings
-
-CONTEXT = {}
-for key in dir(settings):
-    if key.startswith('FEEDZILLA_'):
-        CONTEXT[key] = getattr(settings, key)
-
-def settings(request):
-    return CONTEXT

feedzilla/management/commands/feedzilla_static_location.py

-import logging
-import os.path
-from datetime import datetime
-
-from django.core.management.base import BaseCommand
-
-import feedzilla
-
-class Command(BaseCommand):
-    help = u'Show the location of feedzilla static files'
-
-    def handle(self, *args, **kwargs):
-        logging.basicConfig(level=logging.DEBUG)
-
-        src_static = os.path.join(os.path.dirname(os.path.realpath(feedzilla.__file__)), 'static')
-        print src_static

feedzilla/settings.py

-from datetime import datetime
-
 FEEDZILLA_PAGE_SIZE = 25
 FEEDZILLA_SUMMARY_SIZE = 2000
 FEEDZILLA_SITE_TITLE = 'Yet another feedzilla site'
 FEEDZILLA_SITE_DESCRIPTION = 'Edit your settings to change that line'
-FEEDZILLA_HEAD_LINKS = ()
-FEEDZILLA_COPYRIGHTS = '%d © Feedzilla Aggregator' % datetime.now().year
-FEEDZILLA_FEEDBURNER_FEED = None
-FEEDZILLA_FEEDBURNER_COUNTER = False
-FEEDZILLA_TWITTER = False
-FEEDZILLA_TWITTER_COUNTER = False
-FEEDZILLA_SUBMIT_SITE_BLOCK = True
-FEEDZILLA_TAG_CLOUD = True

feedzilla/static/feedzilla/css/style.css

     background-color: yellow;
 }
 
-.site-updates .twitter-link {
-    position: relative;
-    top: 2px;
-    padding-right: 5px;
-}
-
 .pop-button {
     float: left;
     width: 45%;

feedzilla/templates/base.html

 {% load i18n %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 <head>
-    <title>{% block title %}{{ FEEDZILLA_SITE_TITLE }}{% endblock %}</title>
+    <title>{% block title %}Yet another feedzilla site{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta name="keywords" content="{% block meta_keywords %}{% endblock %}" />
     <meta name="description" content="{% block meta_description %}{% endblock %}" />
-    <link rel="alternate" type="application/atom+xml" href="{% if FEEDZILLA_FEEDBURNER_FEED %}{{ FEEDZILLA_FEEDBURNER_FEED }}{% else %}{% url feedzilla_feed "posts" %}{% endif %}" title="{{ FEEDZILLA_SITE_TITLE }}" />
+    <link rel="alternate" type="application/atom+xml" href="{% url feedzilla_feed "posts" %}" title="Yet another feedzilla site" />
 
     <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}feedzilla/css/reset.css" />
     <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}feedzilla/css/style.css" />
         <div class="site-head">
             <div class="inner">
                 <div class="logo">
-                    <h2><a href="/">{{ FEEDZILLA_SITE_TITLE }}</a></h2>
-                    <div class="site-description">{{ FEEDZILLA_SITE_DESCRIPTION }}</div>
+                    <h2><a href="/">Yet another feedzilla site</a></h2>
+                    <div class="site-description">Description of this cool site</div>
                 </div>
                 <div class="right">
                     <div class="site-updates">
-                        {% if FEEDZILLA_TWITTER %}
-                        <a href="http://twitter.com/{{ FEEDZILLA_TWITTER }}" class="twitter-link">
-                            <img src="{{ MEDIA_URL }}feedzilla/img/twitter.png" alt="{% trans "Twitter updates" %}" />
-                        </a>
-                        {% endif %}
-                        <a href="{% if FEEDZILLA_FEEDBURNER_FEED %}{{ FEEDZILLA_FEEDBURNER_FEED }}{% else %}{% url feedzilla_feed "posts" %}{% endif %}" class="feed-link">
+                        <a href="{% url feedzilla_feed "posts" %}" class="feed-link">
                             <img src="{{ MEDIA_URL }}feedzilla/img/feed-icon-big.png" alt="{% trans "ATOM feed" %}" />
                         </a>
                     </div>
             <ul>
                 <li><a href="/">{% trans "News stream" %}</a></li>
                 <li><a href="{% url feedzilla_source_list %}">{% trans "Sources" %}</a></li>
-                {% for link in FEEDZILLA_HEAD_LINKS %}
-                {{ link|safe }}
-                {% endfor %}
             </ul>
         </div>
         <div class="site-head-bottom">

feedzilla/templates/feedzilla/_sidebar.html

 {% load feedzilla_tags i18n %}
 
 <div class="box">
-    {% if FEEDZILLA_FEEDBURNER_COUNTER %}
-    <div class="pop-button">{{ FEEDZILLA_FEEDBURNER_COUNTER|safe }}</div>
-    {% endif %}
-    {% if FEEDZILLA_TWITTER_COUNTER %}
-    <div class="pop-button">
-    <a href="http://twitter.com/{{ FEEDZILLA_TWITTER }}">
-        <img src="http://twittercounter.com/counter/?username={{ FEEDZILLA_TWITTER }}" />
-    </a>
-    </div>
-    {% endif %}
-    <div class="clear"></div>
-
-    {% if FEEDZILLA_SUBMIT_SITE_BLOCK %}
     <div class="add-blog">
         <img src="{{ MEDIA_URL }}feedzilla/img/add.png" />
         <a href="{% url feedzilla_submit_blog %}">{% trans "Submit a blog" %}</a>
     </div>
-    {% endif %}
 </div>
 
-{% if FEEDZILLA_TAG_CLOUD %}
 <div class="box">
     <h4>{% trans "Labels" %}</h4>
     <div class="tag-cloud">
     {% feedzilla_tag_cloud %}
     </div>
 </div>
-{% endif %}

feedzilla/templates/footer.html

 {% load i18n %}
 
 <div class="left">
-    {{ FEEDZILLA_COPYRIGHTS|safe }} <br/>
     {% trans "Powered by" %} <a href="http://bitbucket.org/lorien/feedzilla">Feedzilla</a> <br/>
 </div>
 <div class="right">
             data_files.append(os.path.join(prefix, f))
 
 setup(
-    version = '0.1.7',
+    version = '0.1.8',
     description = 'Django application for atom/rss feeds aggregation i.e. planet engine',
     author = 'Grigoriy Petukhov',
     author_email = 'lorien@lorien.name',
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.