Update design [WIP]

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "static/vendor"
+}

.gitignore

@@ -2,6 +2,7 @@
 *.py[cod]
 __pycache__
 *~
+.sass-cache/
 
 # Installer logs
 pip-log.txt
@@ -25,6 +26,9 @@ node_modules
 media
 staticfiles
 
+# Packages installed by bower
+static/vendor/
+
 logfile
 
 .projectile

.travis.yml

@@ -1,9 +1,8 @@
 language: python
 python:
   - 2.7
-before_install:
-  - bin/setup_travis
 install:
+  - npm install
   - pip install -r requirements.dev.txt
   - pip install coveralls
 script:
@@ -15,3 +14,6 @@ matrix:
   allow_failures:
     - python: 3.3
     - python: pypy
+notifications:
+  slack:
+    secure: D2UrTxFolji0qnKvRMqnearuRqdsu9IAdLzOd3d/jOIVtzc2Nqmzd70s2sWLx4rtX/vKbeqEpz1yf738GR48hZhKIy07ySB/hi7u2TelafPzAmaZ+k0jUzWsfACVKpkF77IjSgQ29orUDNUuac2Hc8Wo+niYS3cqVwRprZKmkrs=

README.md

@@ -14,14 +14,15 @@ You must have the following installed:
 
 - Python 2.7
 - libmemcached (`brew install libmemcached` on Mac OS X using [Homebrew](http://brew.sh/))
+- node
 
 You may also wish to follow any install instructions inside a Python virtual environment. Explaining `virtualenv` is outside of the scope of this README, but [this tutorial might help](http://hackercodex.com/guide/python-development-environment-on-mac-osx/).
 
 ## Running in development
 
     pip install -r requirements.dev.txt
     pip install honcho
-    npm install -g less
+    npm install
     python manage.py migrate
     honcho -f Procfile.dev start
 
@@ -40,6 +41,3 @@ will work. These will be documented in due course.
                   ...
     git push heroku master
     heroku run python manage.py migrate
-
-## TODO
-

bin/post_compile

@@ -14,15 +14,6 @@ echo "-----> In post-compile hook"
 # compile phase. See: https://github.com/heroku/heroku-buildpack-python/issues/57
 export MEMCACHE_SERVERS='' MEMCACHIER_SERVERS=''
 
-if [ -f bin/install_nodejs ]; then
-    echo "-----> Installing node"
-    chmod +x bin/install_nodejs
-    bin/install_nodejs
-
-    echo "-----> Installing less"
-    npm install -g less --quiet 2>&1 | indent
-fi
-
 MANAGE_FILE=$(find . -maxdepth 3 -type f -name 'manage.py' | head -1)
 MANAGE_FILE=${MANAGE_FILE:2}
 
@@ -38,7 +29,6 @@ if [ "$DJANGO_COMPRESS_OFFLINE" = "true" ]; then
     # After running the compressor, I can now remove the assets directory and
     # all the NPM packages.
     rm -rf assets/
-    rm -rf .npm/
     rm -rf .heroku/vendor/node/
 fi
 

bower.json

@@ -0,0 +1,29 @@
+{
+  "name": "website",
+  "homepage": "https://github.com/okfn/website",
+  "authors": [
+    "Knut Hühne <knut@viderum.com>"
+  ],
+  "description": "",
+  "main": "",
+  "license": "MIT",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "bootstrap": "^3.3.6",
+    "jquery": "^3.0.0",
+    "jQuery.dotdotdot": "jquery-dotdotdot#^1.8.1",
+    "letteringjs": "^0.7.0",
+    "jQuery.mmenu": "^5.6.5",
+    "bootstrap-sass": "^3.3.6"
+  },
+  "resolutions": {
+    "jquery": "1.9.1 - 2"
+  }
+}

foundation/blogfeed/cms_plugins.py

@@ -0,0 +1,27 @@
+from cms.plugin_base import CMSPluginBase
+from cms.plugin_pool import plugin_pool
+from cms.models.pluginmodel import CMSPlugin
+from django.utils.translation import ugettext_lazy as _
+import feedparser
+
+
+class FeedDisplayPlugin(CMSPluginBase):
+    model = CMSPlugin
+    render_template = "hello_plugin.html"
+    cache = False
+    module = "OKF"
+    name = _("Latest Blogposts")
+
+    def _get_three_articles(self):
+        feed_url = 'https://blog.okfn.org/feed/'
+        feed = feedparser.parse(feed_url)
+        return feed.entries[:3]
+
+    def render(self, context, instance, placeholder):
+        context = super(FeedDisplayPlugin, self)\
+            .render(context, instance, placeholder)
+
+        context['entries'] = self._get_three_articles()
+        return context
+
+plugin_pool.register_plugin(FeedDisplayPlugin)

foundation/blogfeed/templates/hello_plugin.html

@@ -0,0 +1,11 @@
+<div>
+  {% for entry in entries %}
+  <article>
+    <img class="avatar" src="https://secure.gravatar.com/avatar/nosuchavatar?size=160" alt="{{entry.author}}" />
+    <h4><a href='{{entry.link}}'>{{entry.title}}</a></h4>
+    <p>
+      {{entry.summary}}
+    </p>
+  </article>
+  {% endfor %}
+</div>

foundation/features/admin.py

@@ -0,0 +1,11 @@
+from django.contrib import admin
+
+import reversion
+
+from models import Feature
+
+
+class FeatureAdmin(reversion.admin.VersionAdmin):
+    list_display = ('title', )
+
+admin.site.register(Feature, FeatureAdmin)

foundation/features/cms_plugins.py

@@ -0,0 +1,23 @@
+from cms.plugin_base import CMSPluginBase
+from cms.plugin_pool import plugin_pool
+from cms.models.pluginmodel import CMSPlugin
+from django.utils.translation import ugettext_lazy as _
+
+from models import Feature
+
+
+class FeaturePlugin(CMSPluginBase):
+    model = CMSPlugin
+    render_template = "feature_plugin.html"
+    cache = True
+    module = "OKF"
+    name = _("Featured News")
+
+    def render(self, context, instance, placeholder):
+        context = super(FeaturePlugin, self)\
+            .render(context, instance, placeholder)
+
+        context['feature_list'] = Feature.objects.all()
+        return context
+
+plugin_pool.register_plugin(FeaturePlugin)

foundation/features/migrations/0001_initial.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Feature',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('title', models.CharField(max_length=100)),
+                ('text', models.CharField(max_length=200)),
+                ('image', models.ImageField(upload_to=b'features/images')),
+                ('link', models.URLField(blank=True)),
+            ],
+            options={
+                'ordering': ['title'],
+                'verbose_name_plural': 'features',
+            },
+        ),
+    ]

foundation/features/models.py

@@ -0,0 +1,19 @@
+from django.db import models
+
+
+class Feature(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    title = models.CharField(max_length=100)
+    text = models.CharField(max_length=200)
+    image = models.ImageField(upload_to='features/images',
+                              blank=False)
+    link = models.URLField(blank=True)
+
+    def __unicode__(self):
+        return self.title
+
+    class Meta:
+        ordering = ["title"]
+        verbose_name_plural = "features"