diff --git a/content/templatetags/__init__.py b/content/templatetags/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/content/templatetags/content_tags.py b/content/templatetags/content_tags.py index 55763ba6..8ecb8ae7 100644 --- a/content/templatetags/content_tags.py +++ b/content/templatetags/content_tags.py @@ -1,6 +1,14 @@ +import re +from collections import Sequence + +from bs4 import BeautifulSoup + from django import template from django.utils.safestring import mark_safe +from wagtail.wagtailcore.blocks.base import BoundBlock +from wagtail.wagtailcore.rich_text import RichText + register = template.Library() @@ -97,3 +105,86 @@ def sidebar_page_nav(page): html = list_children(parent, page) return mark_safe(html) + + +class TableOfContentsNode(template.Node): + def __init__(self, html_accessor, toc_var_name): + self.html_accessor = html_accessor + self.html_var = template.Variable(html_accessor) + self.toc_var_name = toc_var_name + + def render(self, context): + + blocks = self.html_var.resolve(context) + + if not isinstance(blocks, Sequence): + blocks = [blocks] + + headings_and_anchors = [] + toc_anchor_count = 1 + + for block in blocks: + if (not isinstance(block, BoundBlock) or not + isinstance(block.value, RichText)): + continue + soup = BeautifulSoup(block.value.source) + h2_tags = soup.find_all('h2') + + if not h2_tags: + continue + + for t in h2_tags: + # let's not add empty headings to table of contents + if not t.string.strip(): + continue + anchor = 'toc-{}'.format(toc_anchor_count) + headings_and_anchors.append((t.string, anchor)) + t.insert_before(soup.new_tag('span', id=anchor, **{'class':'toc-anchor'})) + toc_anchor_count += 1 + + new_source = str(soup) + # See wagtail.wagtailcore.rich_text expand_db_html and + # replace_embed_tag - if the embed tag doesn't close itself, + # replace_embed_tag doesn't recognize it, and can't replace it + # with img tag + new_source = new_source.replace('>', '/>') + block.value.source = new_source + + + context[self.toc_var_name] = headings_and_anchors + + return '' + + def __unicode__(self): + return u'String repr' + + +def do_table_of_contents(parser, token): + """ + Use like this: + {% do_table_of_contents as + %} + + This takes a WagTail BoundBlock or a list of them, and for each block with + RichText value, goes through H2 elements, and adds an anchor to them. It + puts out a list or headings and anchors, as in + [('Heading 1', 'toc-1'), ...], which can be used to render a table of + contents in the template. + """ + try: + # Splitting by None == splitting by spaces. + tag_name, arg = token.contents.split(None, 1) + except ValueError: + raise template.TemplateSyntaxError( + "%r tag requires arguments" % token.contents.split()[0] + ) + m = re.search(r'(.*?) as (\w+)', arg) + if not m: + raise template.TemplateSyntaxError("%r tag had invalid arguments" % + tag_name) + format_string, var_name = m.groups() + + return TableOfContentsNode(format_string, var_name) + + +register.tag('do_table_of_contents', do_table_of_contents) \ No newline at end of file diff --git a/digi/management/commands/update_indicators.py b/digi/management/commands/update_indicators.py new file mode 100644 index 00000000..f6bc5be4 --- /dev/null +++ b/digi/management/commands/update_indicators.py @@ -0,0 +1,45 @@ +from django.core.management.base import BaseCommand, CommandError +from digi.models import Indicator +from datetime import date, timedelta +import requests + +class Command(BaseCommand): + help = 'Fetches and saves new indicator values' + + def handle(self, *args, **options): + for indicator in Indicator.objects.all(): + + #POPULATION + if indicator.slug == 'vaesto': + continue + # indicator.value = indicator.value + 1 + + #HRI DATASETS + elif indicator.slug == 'tietoaineistot': + try: + resp = requests.get('http://hri.fi/api/3/action/package_list') + indicator.value = len(resp.json()['result']) + except Exception as e: + raise CommandError('Something went wrong while updating indicator {}. Retaining previous value {}.'.format(indicator.slug, indicator.value)) + + #OPEN311 ISSUES + elif indicator.slug == 'palaute': + try: + week_ago = (date.today() - timedelta(days=7)).isoformat() + resp = requests.get('https://asiointi.hel.fi/palautews/rest/v1/requests.json?status=closed&start_date={}'.format(week_ago)) + # today = date.today().isoformat() + # resp = requests.get('https://asiointi.hel.fi/palautews/rest/v1/requests.json?status=closed&start_date={}'.format(today)) + indicator.value = len(resp.json()) + except Exception as e: + raise CommandError('Something went wrong while updating indicator {}. Retaining previous value {}.'.format(indicator.slug, indicator.value)) + + elif indicator.slug == 'varaukset': + try: + resp = requests.get('http://api.hel.fi/respa/v1/reservation?all=true') + indicator.value = resp.json()['count'] + except Exception as e: + raise CommandError('Something went wrong while updating indicator {}. Retaining previous value {}.'.format(indicator.slug, indicator.value)) + + + indicator.save() + self.stdout.write(self.style.SUCCESS('Successfully updated indicator {}. Value is now {}'.format(indicator.slug, indicator.value))) diff --git a/digi/migrations/0009_guidefrontpage.py b/digi/migrations/0009_guidefrontpage.py new file mode 100644 index 00000000..681927ac --- /dev/null +++ b/digi/migrations/0009_guidefrontpage.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-11-24 13:05 +from __future__ import unicode_literals + +import digihel.mixins +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0029_unicode_slugfield_dj19'), + ('digi', '0008_auto_20160909_1909'), + ] + + operations = [ + migrations.CreateModel( + name='GuideFrontPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ], + options={ + 'abstract': False, + }, + bases=(digihel.mixins.RelativeURLMixin, 'wagtailcore.page'), + ), + ] diff --git a/digi/migrations/0010_guidecontentpage.py b/digi/migrations/0010_guidecontentpage.py new file mode 100644 index 00000000..f91c00c0 --- /dev/null +++ b/digi/migrations/0010_guidecontentpage.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.12 on 2016-12-14 11:03 +from __future__ import unicode_literals + +import digihel.mixins +from django.db import migrations, models +import django.db.models.deletion +import wagtail.wagtailcore.blocks +import wagtail.wagtailcore.fields +import wagtail.wagtailimages.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0029_unicode_slugfield_dj19'), + ('digi', '0009_guidefrontpage'), + ] + + operations = [ + migrations.CreateModel( + name='GuideContentPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ('body', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('sidebar', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ], + options={ + 'abstract': False, + }, + bases=(digihel.mixins.RelativeURLMixin, 'wagtailcore.page'), + ), + ] diff --git a/digi/migrations/0011_fix_guidepages_fields.py b/digi/migrations/0011_fix_guidepages_fields.py new file mode 100644 index 00000000..21671f81 --- /dev/null +++ b/digi/migrations/0011_fix_guidepages_fields.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.12 on 2016-12-21 13:35 +from __future__ import unicode_literals + +from django.db import migrations +import wagtail.wagtailcore.blocks +import wagtail.wagtailcore.fields +import wagtail.wagtailimages.blocks + + +class Migration(migrations.Migration): + + dependencies = [ + ('digi', '0010_guidecontentpage'), + ] + + operations = [ + migrations.AlterField( + model_name='guidecontentpage', + name='body', + field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('raw_content', wagtail.wagtailcore.blocks.RawHTMLBlock()))), + ), + migrations.AlterField( + model_name='guidecontentpage', + name='sidebar', + field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('raw_content', wagtail.wagtailcore.blocks.RawHTMLBlock()))), + ), + ] diff --git a/digi/migrations/0012_themepage_twitter_hashtag.py b/digi/migrations/0012_themepage_twitter_hashtag.py new file mode 100644 index 00000000..0d7c2972 --- /dev/null +++ b/digi/migrations/0012_themepage_twitter_hashtag.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.12 on 2017-01-16 08:55 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('digi', '0011_fix_guidepages_fields'), + ] + + operations = [ + migrations.AddField( + model_name='themepage', + name='twitter_hashtag', + field=models.CharField(default='', max_length=255), + ), + ] diff --git a/digi/migrations/0013_add_KPI_fields.py b/digi/migrations/0013_add_KPI_fields.py new file mode 100644 index 00000000..03439bd1 --- /dev/null +++ b/digi/migrations/0013_add_KPI_fields.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.12 on 2017-01-24 14:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('digi', '0012_themepage_twitter_hashtag'), + ] + + operations = [ + migrations.AddField( + model_name='indicator', + name='illustration_filename', + field=models.CharField(default='images/hki-tietoaineisto.svg', max_length=100), + ), + migrations.AddField( + model_name='indicator', + name='slug', + field=models.CharField(default='', max_length=100), + ), + migrations.AddField( + model_name='indicator', + name='source_description', + field=models.CharField(default='', max_length=200), + ), + migrations.AddField( + model_name='indicator', + name='source_url', + field=models.CharField(default='http://dev.hel.fi/apis', max_length=100), + ), + ] diff --git a/digi/migrations/0014_projectpage_phase.py b/digi/migrations/0014_projectpage_phase.py new file mode 100644 index 00000000..006441d2 --- /dev/null +++ b/digi/migrations/0014_projectpage_phase.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.12 on 2017-02-15 13:01 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('digi', '0013_add_KPI_fields'), + ] + + operations = [ + migrations.AddField( + model_name='projectpage', + name='phase', + field=models.CharField(choices=[('', 'No phase'), ('DI', 'Selvitys'), ('AL', 'Alfa'), ('BE', 'Beta'), ('LI', 'Tuotanto'), ('RE', 'Poisto')], default='', max_length=2), + ), + ] diff --git a/digi/models.py b/digi/models.py index 05542011..148b3f1e 100644 --- a/digi/models.py +++ b/digi/models.py @@ -1,24 +1,42 @@ -from blog.models import BlogCategory, BlogPage +from blog.models import BlogCategory, BlogPage, BlogIndexPage from django.db import models from django.utils.translation import ugettext_lazy as _ from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel -from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel, StreamFieldPanel +from wagtail.wagtailadmin.edit_handlers import ( + FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel, StreamFieldPanel +) from wagtail.wagtailcore import blocks from wagtail.wagtailcore.fields import StreamField from wagtail.wagtailcore.models import Orderable, Page from wagtail.wagtailimages.edit_handlers import ImageChooserPanel +from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel +from wagtail.wagtailimages.blocks import ImageChooserBlock from wagtail.wagtailsearch import index from content.models import RelatedLink from digihel.mixins import RelativeURLMixin +from events.models import EventsIndexPage +rich_text_blocks = [ + ('heading', blocks.CharBlock(classname="full title")), + ('paragraph', blocks.RichTextBlock()), + ('image', ImageChooserBlock()), +] + +guide_blocks = rich_text_blocks + [ + ('raw_content', blocks.RawHTMLBlock()), +] class Indicator(models.Model): description = models.CharField(max_length=200) + slug = models.CharField(max_length=100, default='') value = models.IntegerField() # no history data for now order = models.IntegerField(null=True, blank=True) front_page = models.BooleanField(default=False) + illustration_filename = models.CharField(max_length=100, default='images/hki-tietoaineisto.svg') + source_description = models.CharField(max_length=200, default='') + source_url = models.CharField(max_length=100, default='http://dev.hel.fi/apis') sort_order_field = 'order' @@ -30,6 +48,22 @@ class Meta: def __str__(self): return self.description +class Phase(): + NONE = '' + DISCOVERY = 'DI' + ALPHA = 'AL' + BETA = 'BE' + LIVE = 'LI' + RETIREMENT = 'RE' + + PHASE_CHOICES = ( + (NONE, 'No phase'), + (DISCOVERY, 'Selvitys'), + (ALPHA, 'Alfa'), + (BETA, 'Beta'), + (LIVE, 'Tuotanto'), + (RETIREMENT, 'Poisto'), + ) class FooterLinkSection(ClusterableModel): title = models.CharField(max_length=100, null=True, blank=True) @@ -49,6 +83,8 @@ class FooterLink(Orderable, RelatedLink): section = ParentalKey('digi.FooterLinkSection', related_name='links') + + class ThemeIndexPage(RelativeURLMixin, Page): subpage_types = ['ThemePage'] @@ -57,6 +93,25 @@ def themes(self): return ThemePage.objects.all() +class GuideFrontPage(RelativeURLMixin, Page): + + @property + def blog_posts(self): + posts = BlogPage.objects.descendant_of(self).live().order_by('-date') + return posts + +class GuideContentPage(RelativeURLMixin, Page): + body = StreamField(guide_blocks) + sidebar = StreamField(guide_blocks) + + content_panels = Page.content_panels + [ + StreamFieldPanel('body'), + StreamFieldPanel('sidebar') + ] + search_fields = Page.search_fields + [ + index.SearchField('body') + ] + class ThemePage(RelativeURLMixin, Page): image = models.ForeignKey('wagtailimages.Image', null=True, blank=True, on_delete=models.SET_NULL, related_name='+') @@ -67,6 +122,7 @@ class ThemePage(RelativeURLMixin, Page): ], null=True, blank=True) blog_category = models.ForeignKey(BlogCategory, help_text='Corresponding blog category', null=True, blank=True, on_delete=models.SET_NULL) + twitter_hashtag = models.CharField(max_length=255, default="") parent_page_types = ['ThemeIndexPage'] content_panels = Page.content_panels + [ @@ -74,6 +130,7 @@ class ThemePage(RelativeURLMixin, Page): FieldPanel('type'), FieldPanel('short_description'), FieldPanel('blog_category'), + FieldPanel('twitter_hashtag'), InlinePanel('roles', label=_("Roles")), InlinePanel('links', label=_("Links")), StreamFieldPanel('body'), @@ -106,12 +163,16 @@ def __str__(self): class ThemeLink(Orderable, RelatedLink): theme = ParentalKey('digi.ThemePage', related_name='links') - class ProjectPage(RelativeURLMixin, Page): type = _('Project') image = models.ForeignKey('wagtailimages.Image', null=True, blank=True, on_delete=models.SET_NULL, related_name='+') short_description = models.TextField(null=True, blank=True) + phase = models.CharField( + max_length=2, + choices=Phase.PHASE_CHOICES, + default=Phase.NONE, + ) body = StreamField([ ('paragraph', blocks.RichTextBlock()), ], null=True, blank=True) @@ -119,6 +180,7 @@ class ProjectPage(RelativeURLMixin, Page): content_panels = Page.content_panels + [ ImageChooserPanel('image'), FieldPanel('short_description'), + FieldPanel('phase'), InlinePanel('roles', label=_("Roles")), InlinePanel('links', label=_("Links")), StreamFieldPanel('body'), @@ -162,9 +224,14 @@ def themes(self): @property def blog_posts(self): - posts = BlogPage.objects.all().order_by('-date') + main_blog_index = BlogIndexPage.objects.get(slug="blogikirjoitukset") + posts = BlogPage.objects.descendant_of(main_blog_index).live().order_by('-date') return posts + @property + def event_index(self): + return EventsIndexPage.objects.live().first() + @property def footer_link_sections(self): return FooterLinkSection.objects.order_by('sort_order') diff --git a/digi/templates/blog/blog_index_page.html b/digi/templates/blog/blog_index_page.html index 15657134..2dc83ba0 100644 --- a/digi/templates/blog/blog_index_page.html +++ b/digi/templates/blog/blog_index_page.html @@ -13,7 +13,7 @@

Blogikirjoitukset tagillä '{{ tag }}'

{% else %}
-

Blogi

+

{{self.title}}

{% for blog in blogs|slice:":1" %}
diff --git a/digi/templates/blog/blog_post.html b/digi/templates/blog/blog_post.html index 94df7357..d0467411 100644 --- a/digi/templates/blog/blog_post.html +++ b/digi/templates/blog/blog_post.html @@ -1,4 +1,4 @@ -{% load wagtailcore_tags digi_tags static wagtailimages_tags %} +{% load wagtailcore_tags digi_tags static wagtailimages_tags social_widgets %} {% if include_context == "index_page" %}
@@ -7,7 +7,7 @@
-

Blogi

+

{{self.get_blog_index.title}}

{% endif %} @@ -32,20 +32,24 @@

{{ blog.title }}

-
+
{% if blog.date %} -
+
{{ blog.date|date:"j.n.Y" }}
{% endif %} -
+ +
{% if blog.tags.all %} {% for tag in blog.tags.all %} {{ tag }}{% if not forloop.last %} {% endif %} {% endfor %} {% endif %}
-
+
{% if blog.categories.all %} Posted in {% for cat in blog.categories.all %} @@ -56,6 +60,7 @@

{{ blog.title }}

+ {% phases_indicator page.phase %} {{ blog.body|richtext }}
diff --git a/digi/templates/digi/front_page.html b/digi/templates/digi/front_page.html index f64d62c8..27e37431 100644 --- a/digi/templates/digi/front_page.html +++ b/digi/templates/digi/front_page.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load humanize wagtailimages_tags digi_tags wagtailcore_tags static %} +{% load humanize wagtailimages_tags digi_tags wagtailcore_tags static compress twitter_tags%} {% block body_class %}template-front-page{% endblock %} @@ -14,44 +14,23 @@
-
-
+
+
+ {% for ind in page.indicators %}
-
-
-
- 149 +
+
+
+ {{ ind.value }} +
+
+ {{ ind.description }} +
-
- sähköisesti käsiteltyä palautetta päivässä -
-
-
-
-
-
-
-
- 630 752 -
-
- helsinkiläistä -
-
-
-
-
-
-
-
- 569 -
-
- avointa tietoaineistoa -
+ {{ ind.source_description }}
-
+ {% endfor %}
@@ -75,12 +54,24 @@
- {% for blog in page.blog_posts|slice:":2" %} +
Blogin uusimmat
+ {% for blog in page.blog_posts|slice:":3" %}
- Blogi +
+
+
+ {% image blog.header_image max-1920x1080 as blog_image %} +
+
+
+
+

{{ blog.title }}

- + {{ blog.body|first_p|safe }} +
+
+
{% endfor %} Kaikki blogitekstit @@ -88,26 +79,49 @@

{{ blog.title }}

- -

Tapahtumia

- -

Hel<3Dev Avoimen datan avokonttori

-
-
Helsinki Think Company
- Lue lisää » - -

Hel<3Dev Avoimen datan avokonttori

-
-
Helsinki Think Company
- Lue lisää » + {% if self.event_index %} + +

Tapahtumia

 +
    +
    + Tapahtumatiedot + Linked Events -rajapinnasta +
    + {% else %} + Lisää Wagtailin adminissa etusivun alle Events Index Page näyttääksesi tapahtumia. + {% endif %} +
    +
    {% endblock %} + +{% block extra_js %} +{% compress js inline %} + +{% endcompress %} +{% endblock %} diff --git a/digi/templates/digi/guide_content_page.html b/digi/templates/digi/guide_content_page.html new file mode 100644 index 00000000..8b63f7ab --- /dev/null +++ b/digi/templates/digi/guide_content_page.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% load wagtailcore_tags content_tags people_tags %} + +{% block body_class %}template-contentpage{% endblock %} + +{% block content %} +
    + +
    +
    +

    Digipalveluopas

    +

    {{ page.title }}

    + {% include "content/blocks.html" with blocks=page.body only %} +
    +
    +
    +

    Digipalveluopas kehittyy

    +

    Helsingin digipalveluiden kehittämisopas auttaa kaupungin organisaatiota ja sen yhteistyökumppaneita, kuten yrityksiä ja muita kehittäjiä, noudattamaan yhteisiä periaatteita ja käyttämään sopivia työkaluja, kun kaupungin digitaalisia palveluita suunnitellaan ja rakennetaan.

    + +

    Digipalveluoppaan sisältöä laajennetaan vuonna 2017 kattaamaan käyttökokemukseen, palveluiden ulkoasuun ja teknologiaan liittyviä ohjeistuksia.

    +
    + {% include "content/blocks.html" with blocks=page.sidebar only %} +
    +
    + +{% endblock %} diff --git a/digi/templates/digi/guide_front_page.html b/digi/templates/digi/guide_front_page.html new file mode 100644 index 00000000..f0e0a45b --- /dev/null +++ b/digi/templates/digi/guide_front_page.html @@ -0,0 +1,111 @@ +{% extends "base.html" %} +{% load wagtailimages_tags wagtailcore_tags static digi_tags %} + +{% block body_class %}template-guide-front-page{% endblock %} + +{% block content %} + + +
    +
    +

    Digipalvelu­opas

    +

    + Helsingin digipalveluiden kehittämisopas auttaa kaupungin organisaatiota ja sen yhteistyökumppaneita, kuten yrityksiä ja muita kehittäjiä, noudattamaan yhteisiä periaatteita ja käyttämään sopivia työkaluja, kun kaupungin digitaalisia palveluita suunnitellaan ja rakennetaan. +

    +
    +

    Digitaalisten palveluiden kehittämis­periaatteet

    +

    Näitä periaatteita noudattamalla voimme luoda helsinkiläisille sujuvan ja kokonaisuutena yhtenäisen palvelukokemuksen.

    +
    +
    1 Lähde tarpeesta
     +
    2 Tee vähemmän
     +
    3 Perusta tietoon
     +
    4 Löydä keskeinen
     +
    5 Muokkaa ja toista
     +
    6 Rakenna kaikille
     +
    7 Luo palveluja
     +
    8 Opasta oikeassa paikassa
     +
    9 Avaa kehittäminen
     +
    10 Jaa opit
     +
    +

    Lue lisää ››

    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    + Opas +

    Käyttökokemus

    +

    Miten uudet digitaaliset palvelut toimivat ja palvelevat erilaisia käyttäjiä mahdollisimman hyvin? Millaisia yhteisiä käyttökokemusperiaatteita voimme soveltaa palvelujen suunnittelussa?

    +

    Tämä sisältö julkaistaan 2017

     +
    +
    +
    + +
    +
    +
    + +
    +
    + Opas +

    Digitaalisten palveluiden ulkoasu

    +

    Yhtenäinen ulkoasu parantaa palvelujen käytettävyyttä ja tunnistettavuutta. Helsingin kaupungin yhteinen brändiohjeistus uudistuu vuoden 2017 alussa. Kokoamme tänne ohjeita ja käytäntöjä kuinka digitaaliset palvelut luodaan visuaalisesti yhtenäisiksi.

    +

    Tämä sisältö julkaistaan 2017

     +
    +
    +
    + +
    +
    +
    + +
    +
    + Opas +

    Tietoa teknologiasta

    +

    Ohjelmistokehityksen yhtenäiset käytännöt helpottavat ja nopeuttavat kokeilevaa kehittämistä. Kokoamme tänne tietoa suosimistamme ohjelmistokirjastoista ja käytännöistä.

    +

    Tämä sisältö julkaistaan 2017

     +
    +
    +
    +
    + + {% if self.blog_posts %} + +

    Digitarinoita

    + + + {% if self.blog_posts|length > 2 %} +

    Kaikki digitarinat

    + {% endif %} + + {% endif %} +
    +{% endblock %} diff --git a/digi/templates/digi/project_base.html b/digi/templates/digi/project_base.html index 9ce6a6ce..478b73c8 100644 --- a/digi/templates/digi/project_base.html +++ b/digi/templates/digi/project_base.html @@ -11,6 +11,7 @@

    {{ page.title }}

    + {% phases_indicator page.phase %}
    {% image page.image width-800 as page_image %} @@ -44,6 +45,7 @@

    Teeman projektit

    {% include "includes/sidebar_links_and_roles.html" %} + {% include "includes/sidebar_twitter_feed.html" %}
    {% endblock %} diff --git a/digi/templatetags/__init__.py b/digi/templatetags/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/digi/templatetags/digi_tags.py b/digi/templatetags/digi_tags.py index b19054dd..d079c419 100644 --- a/digi/templatetags/digi_tags.py +++ b/digi/templatetags/digi_tags.py @@ -1,4 +1,6 @@ from django import template +from django.utils.safestring import mark_safe +from ..models import Phase register = template.Library() @@ -9,3 +11,27 @@ def first_p(value): if len(paras): return paras[0] + '

    ' return '' + +def is_active_phase(this_phase, current_phase): + if this_phase == current_phase: + return 'active' + else: + return 'inactive' + +@register.simple_tag +def phases_indicator(current_phase): + if current_phase: + html = '
      ' + html += '
    • Selvitys
      • '\ + .format(activity=is_active_phase(Phase.DISCOVERY, current_phase)) + html += '
    • Alfa
      • '\ + .format(activity=is_active_phase(Phase.ALPHA, current_phase)) + html += '
    • Beta
      • '\ + .format(activity=is_active_phase(Phase.BETA, current_phase)) + html += '
    • Tuotanto
      • '\ + .format(activity=is_active_phase(Phase.LIVE, current_phase)) + html += '
    • Poisto
      • '\ + .format(activity=is_active_phase(Phase.RETIREMENT, current_phase)) + html += '
    ' + return mark_safe(html) + return '' \ No newline at end of file diff --git a/digi/templatetags/twitter_tags.py b/digi/templatetags/twitter_tags.py index 96a2d243..b25d3846 100644 --- a/digi/templatetags/twitter_tags.py +++ b/digi/templatetags/twitter_tags.py @@ -1,71 +1,31 @@ -import logging -import time - import tweepy from django import template from django.conf import settings -from django.core.cache import cache +from django.utils.text import slugify +from digi.tweet_utils import render_tweet_html +from digi.utils import get_cached_with_mtime TWEET_CACHE_REFRESH_AGE = 60 * 15 # if tweets are 15 minutes old, attempt reload -log = logging.getLogger(__name__) register = template.Library() def get_tweepy_api(): - auth = tweepy.OAuthHandler( - consumer_key=settings.TWITTER_CONSUMER_KEY, - consumer_secret=settings.TWITTER_CONSUMER_SECRET, - ) - auth.set_access_token( - key=settings.TWITTER_ACCESS_TOKEN, - secret=settings.TWITTER_ACCESS_TOKEN_SECRET, - ) + try: + auth = tweepy.OAuthHandler( + consumer_key=settings.TWITTER_CONSUMER_KEY, + consumer_secret=settings.TWITTER_CONSUMER_SECRET, + ) + auth.set_access_token( + key=settings.TWITTER_ACCESS_TOKEN, + secret=settings.TWITTER_ACCESS_TOKEN_SECRET, + ) + except AttributeError: + print('No Twitter tokens found in settings') + return None return tweepy.API(auth) -def get_cached_with_mtime(cache_key, getter, max_mtime=60, default=None, expiry=86400): - """ - Get something with a maximum modification time. - - I.e. if the data stored in the cache is older than max_mtime seconds (or does not - exist), it attempts to call getter() for a new value. - - However, if the - - :param cache_key: Cache key string - :type cache_key: str - :param getter: Getter function - :type getter: function - :param max_mtime: Maximum modification time, in seconds - :type max_mtime: int - :param default: Default value, if nothing is in the cache - :type default: object - :param expiry: Maximum expiry for the cache entity, in seconds - :type expiry: int - :return: data, from the getter or the cache - :rtype: object - """ - cached_data = cache.get(cache_key) - if cached_data is None or (time.time() - cached_data['mtime']) > max_mtime: - try: - cached_data = { - 'mtime': time.time(), - 'data': getter(), - } - cache.set(cache_key, cached_data, expiry) - except Exception: - if settings.DEBUG: - raise - log.warn('error fetching in get_cached_with_mtime(%s)', cache_key, exc_info=True) - if cached_data is None: - # If we didn't have anything cached to begin with, - # at least cache something for a while to avoid hammering the original `getter()` - cached_data = {'mtime': time.time(), 'data': default} - cache.set(cache_key, cached_data, max_mtime) - return cached_data['data'] - - @register.simple_tag() def twitter_search(query): """ @@ -75,9 +35,19 @@ def twitter_search(query): :return: :rtype: """ - return get_cached_with_mtime( - cache_key='twitter_%s' % query, - max_mtime=TWEET_CACHE_REFRESH_AGE, - getter=lambda: get_tweepy_api().search(q=query, rpp=100, result_type='recent'), - default=[], - ) + tweepy_api = get_tweepy_api() + if not tweepy_api: + return None + try: + results = list(get_cached_with_mtime( + cache_key='twitter_%s' % slugify(query), + max_mtime=TWEET_CACHE_REFRESH_AGE, + getter=lambda: tweepy_api.search(q=query, rpp=100, result_type='recent'), + default=[], + )) + except tweepy.TweepError as error: + print('Tweepy responded with error: ' + str(error)) + return None + for result in results: + result.html = render_tweet_html(result) + return results diff --git a/digi/tweet_utils.py b/digi/tweet_utils.py new file mode 100644 index 00000000..44812ba4 --- /dev/null +++ b/digi/tweet_utils.py @@ -0,0 +1,11 @@ +from django.utils.safestring import mark_safe +from ttp import ttp + +TWEET_PARSER = ttp.Parser() + +def render_tweet_html(status): + text = status.text + try: + return mark_safe(TWEET_PARSER.parse(text).html) + except: # better return something :( + return text diff --git a/digi/utils.py b/digi/utils.py new file mode 100644 index 00000000..4bb3ad6d --- /dev/null +++ b/digi/utils.py @@ -0,0 +1,49 @@ +import logging +import time + +from django.conf import settings +from django.core.cache import cache + +log = logging.getLogger(__name__) + + +def get_cached_with_mtime(cache_key, getter, max_mtime=60, default=None, expiry=86400): + """ + Get something with a maximum modification time. + + I.e. if the data stored in the cache is older than max_mtime seconds (or does not + exist), it attempts to call getter() for a new value. + + However, if the + + :param cache_key: Cache key string + :type cache_key: str + :param getter: Getter function + :type getter: function + :param max_mtime: Maximum modification time, in seconds + :type max_mtime: int + :param default: Default value, if nothing is in the cache + :type default: object + :param expiry: Maximum expiry for the cache entity, in seconds + :type expiry: int + :return: data, from the getter or the cache + :rtype: object + """ + cached_data = cache.get(cache_key) + if cached_data is None or (time.time() - cached_data['mtime']) > max_mtime: + try: + cached_data = { + 'mtime': time.time(), + 'data': getter(), + } + cache.set(cache_key, cached_data, expiry) + except Exception: + if settings.DEBUG: + raise + log.warn('error fetching in get_cached_with_mtime(%s)', cache_key, exc_info=True) + if cached_data is None: + # If we didn't have anything cached to begin with, + # at least cache something for a while to avoid hammering the original `getter()` + cached_data = {'mtime': time.time(), 'data': default} + cache.set(cache_key, cached_data, max_mtime) + return cached_data['data'] diff --git a/digihel/settings.py b/digihel/settings.py index 67acddf7..5f3bc24f 100644 --- a/digihel/settings.py +++ b/digihel/settings.py @@ -40,7 +40,7 @@ 'feedback', 'search', 'glossy', - + 'events', 'wagtail.wagtailforms', 'wagtail.wagtailredirects', 'wagtail.wagtailembeds', @@ -63,6 +63,7 @@ 'wagtail_svgmap', 'wagtailtinymce', 'djcelery', + 'social_widgets', 'allauth', 'allauth.account', @@ -181,6 +182,7 @@ COMPRESS_PRECOMPILERS = ( ('text/x-scss', 'django_libsass.SassCompiler'), + ('text/coffeescript', 'coffee --compile --stdio'), ) COMPRESS_CSS_FILTERS = ( 'compressor.filters.css_default.CssAbsoluteFilter', @@ -199,6 +201,7 @@ 'bootstrap-validator#0.11.5', 'remarkable-bootstrap-notify#3.1.3', 'matchHeight#0.7.0', + 'moment', ] diff --git a/digihel/static/css/digihel.scss b/digihel/static/css/digihel.scss index 62a2b16d..d4dbf07a 100644 --- a/digihel/static/css/digihel.scss +++ b/digihel/static/css/digihel.scss @@ -67,10 +67,18 @@ h4 { margin-top: $line-height-computed; } +hr { + border-top: 2px solid #ccc; +} + .page-title { clear: both; } +.content { + margin-bottom: $line-height-computed * 2; +} + // make all images responsive by default img { @extend .img-responsive; @@ -123,53 +131,153 @@ img { } } -.phase-label--draft { - background-color: lighten($gray, 40%); +$discoverycolor: #b8d154; +$alphacolor: #3bbfbb; +$betacolor: #05c2de; +$livecolor: #0396d1; +$retirementcolor: #999999; +$inactivecolor: #dedede; +$labelheight: 22px; + +.phase-process { + margin: 6px 0; + padding: 0; + list-style: none; + display: table; + table-layout: fixed; + width: 100%; + li { + display: table-cell; + width: 25%; + transition: width 0.2s; + } + li:hover { + width: 50%; + } + .phase-label { + display: block; + } + li:first-child { + .phase-label { + margin-left: 0; + } + .phase-label::before { + border: 0; + } + } + li:last-child { + .phase-label { + margin-right: 0; + } + .phase-label::after { + border: 0; + } + } +} - &::after, - &::before { - border-color: lighten($gray, 40%); + +.phase-label--discovery { + background-color: $discoverycolor; + &::after, &::before { + border-color: $discoverycolor; + } +} + +.phase-label--alpha { + background-color: $alphacolor; + &::after, &::before { + border-color: $alphacolor; + } +} + +.phase-label--beta { + background-color: $betacolor; + &::after, &::before { + border-color: $betacolor; + } +} + +.phase-label--live { + background-color: $livecolor; + &::after, &::before { + border-color: $livecolor; + } +} + +.phase-label--retirement { + background-color: $retirementcolor; + &::after, &::before { + border-color: $retirementcolor; } } .phase-label { - color: $white; display: inline-block; - font-size: $line-height-computed / 2; - font-weight: bold; - height: $line-height-computed; - line-height: $line-height-computed; - margin: $line-height-computed / 2; - padding: 0 $line-height-computed / 4; - position: relative; - text-align: center; - text-transform: uppercase; - - &::after, + position: relative; + height: $labelheight; + line-height: $labelheight; + margin: 0 $labelheight / 2; + font-size: $labelheight / 2; + padding: 0 $labelheight / 4; + font-weight: bold; + text-transform: uppercase; + text-align: center; + color: #fff; + &::after { + content:""; + position: absolute; + top:0; + left:100%; + height:0; + width:0; + border-width: $labelheight / 2; + border-style:solid; + border-top-color:transparent !important; + border-bottom-color:transparent !important; + border-right-color:transparent !important; + } &::before { - content: ''; - height: 0; + content:""; position: absolute; - top: 0; - width: 0; + top:0; + right:100%; + height:0; + width:0; + border-width: $labelheight / 2; + border-style:solid; + border-top-color:transparent !important; + border-bottom-color:transparent !important; + border-left-color:transparent !important; } +} - &::after { - border-bottom-color: transparent !important; - border-right-color: transparent !important; - border-style: solid; - border-top-color: transparent !important; - border-width: $line-height-computed / 2; - left: 100%; +.phase-label.is-inactive { + background: #dedede; + &::before, &::after { + border-color: #dedede; } +} - &::before { - border-bottom-color: transparent !important; - border-left-color: transparent !important; - border-style: solid; - border-top-color: transparent !important; - border-width: $line-height-computed / 2; - right: 100%; +//* Social Share Widgets */ + +.social-widgets { + border-bottom: $gray-lighter 2px solid; + border-top: $gray-lighter 2px solid; + list-style: none; + margin-bottom: $line-height-computed ; + padding: ($line-height-computed / 2) 0 0; + + li { + margin-bottom: .5em; + margin-left: 0; + } + + @media screen and (max-width: $screen-sm-max) { + li { + display: inline-block; + height: $line-height-computed; + vertical-align: middle; + } } } @@ -227,10 +335,91 @@ img { } } +//* Fixed Side Bar */ + +.floating-sidebar { + .affix-bottom, + .affix { + position: relative; + } +} + +@media screen and (min-width: $screen-sm-max) { + .floating-sidebar { + &.affix { + position: fixed; + top: 84px; + width: 300px; + } + + &.affix-bottom { + position: absolute; + width: 300px; + } + } +} + +//* TOC navigation */ + +.pagenav { + margin-bottom: $line-height-computed * 2; + + @media screen and (min-width: $screen-sm-max) { + width: 300px; + } + + &::before { + border-top: 3px solid $helsinkiblue; + display: block; + content: " "; + padding-bottom: $line-height-computed / 2; + } + + &::after { + border-bottom: 3px solid $helsinkiblue; + content: " "; + display: block; + padding-top: $line-height-computed / 2; + } + + h5 { + margin-left: $padding-small-horizontal; + margin-top: 0; + } + + .nav { + li { + margin-left: $padding-small-horizontal; + } + + li a { + color: $gray; + padding: 5px $padding-small-horizontal; + line-height: 1; + + &:hover { + background: transparent; + color: $helsinkiturquoise; + } + } + + li.active a { + background: $gray-lighter; + } + } +} + +// add spacing on anchors to accommodate navbar +.toc-anchor { + display: block; + height: $navbar-height; + margin-bottom: -2em; +} + //* Side Navigation */ .sidenav { - border-left: 2px solid $gray-lighter; + font-size: 14px; line-height: 1; margin-bottom: $line-height-computed; @@ -240,24 +429,35 @@ img { padding: $line-height-computed $padding-large-horizontal; } + > ul > li a, > ul > li.open a { + font-weight: 700; + font-size: 16px; + color: $brand-primary; + } + .closed { ul { display: none; } } + > ul { + border-left: 2px solid $gray-lighter; + margin-top: $line-height-computed; + } + ul { - padding-left: $padding-large-horizontal; + padding-left: $padding-small-horizontal; + } - li { - list-style: none; - margin-bottom: $padding-large-vertical; + li { + list-style: none; + margin-bottom: $padding-large-vertical; - a { - color: $gray-light; - } + a { + color: $gray-light; - a:hover { + &:hover { color: $gray; } } @@ -266,6 +466,7 @@ img { li.active { > a { color: $helsinkiblue; + font-weight: 700; &:hover { color: $helsinkiblue; @@ -275,7 +476,8 @@ img { li.open { > a { - color: $gray-dark; + color: $gray; + font-weight: 700; &:hover { color: $gray-darker; @@ -393,6 +595,11 @@ img { .theme-header-image { margin-bottom: 2em; } + + .phase-process { + margin-top: 0; + margin-bottom: $line-height-computed; + } } .theme-box { @@ -425,6 +632,7 @@ img { .contacts-list { background: $gray-lighter; padding: 1em; + margin-bottom: 2em; .media { border-top: 1px dotted $gray-base; @@ -529,13 +737,12 @@ img { //* Box stylings */ .events-highlights { - position: relative; .event-illustration { height: 6em; display: block; position: absolute; - top: -2em; + top: -1.5em; right: -1.5em; } @@ -549,21 +756,84 @@ img { } .event-date { + color: lighten($helsinkiturquoise, 45%); } .event-location { + color: lighten($helsinkiturquoise, 45%); } .event-description { } + + .events-source { + @extend .small; + border-top: 1px solid lighten($helsinkiturquoise, 45%); + margin-top: $line-height-computed; + } + +} + +.twitter-feed { + .twitter-illustration { + height: 6em; + display: block; + position: absolute; + top: -1.5em; + right: -1.5em; + } + + .tweet { + margin-bottom: $line-height-computed; + //border: 1px solid lighten($helsinkiturquoise,40%); + //padding: $line-height-computed / 2; + a { + color: lighten($helsinkiturquoise,45%); + } + } + + .tweet__author { + @extend .media; + margin-bottom: 6px; + } + + .tweet__avatar { + @extend .media-left; + padding-right: 10px; + } + + .tweet__fullname { + color: lighten($helsinkiturquoise,45%); + display: block; + font-size: 1.15em; + font-weight: 700; + line-height: 1; + } + + .tweet__username { + display: block; + color: #fff; + font-size: $font-size-small; + } + + .tweet__timestamp { + font-size: $font-size-small; + color: #fff; + } + + .tweet__tweettext { + margin-bottom: 6px; + } } .manual-links, -.events-highlights { +.events-highlights, +.twitter-feed { background-color: $helsinkiturquoise; color: $white; margin-bottom: 2em; padding: 1em; + position: relative; h2, h3 { @@ -640,12 +910,36 @@ img { .blogs-preview { + margin-bottom: $line-height-computed * 2; + + .card-type { + margin-bottom: $line-height-computed; + } + h3 { + color: $helsinkiblue; + margin-bottom: $line-height-computed / 2; margin-top: 0; } + time { + color: $gray-light; + margin-bottom: $line-height-computed / 2; + } + + .blog-post-main-image { + background-position: center; + background-size: cover; + height: 100%; + margin-bottom: $line-height-computed * 2; + + @media screen and (max-width: $screen-sm-max) { + height: $line-height-computed * 8; + margin-bottom: $line-height-computed; + } + } + .blog-post { - border-bottom: 1px dotted $gray-base; margin-bottom: $line-height-computed / 2; padding-bottom: $line-height-computed / 2; } @@ -857,6 +1151,10 @@ img { margin: 0; } + .blog-post-date { + margin-bottom: $line-height-computed; + } + .blog-post-date { color: $gray-light; font-size: $font-size-large; @@ -876,6 +1174,14 @@ img { .blog-post-author-details { @extend .media-body; } + + .blog-post-tags { + margin-bottom: $line-height-computed; + } + + .blog-post-categories { + margin-bottom: $line-height-computed; + } } // Blog Index @@ -894,7 +1200,6 @@ img { } .page-header-blogpost { - border-bottom: 1px dotted $gray-base; margin-bottom: $line-height-computed; } @@ -981,7 +1286,7 @@ img { background-color: $helsinkiturquoise; background-position: center; background-size: cover; - height: $line-height-computed * 8; + height: $line-height-computed * 12; @media screen and (min-width: $screen-sm-min) { height: $line-height-computed * 16; @@ -1006,6 +1311,11 @@ img { text-decoration: none; } } + + .phase-process { + margin-top: 0; + margin-bottom: $line-height-computed; + } } //* Search page */ @@ -1016,4 +1326,254 @@ img { .search-results-item { border-bottom: 1px solid $helsinkiblue; +} + +//* Events page */ + +.events-index { + + .event-preview { + background: $helsinkiturquoise; + margin-bottom: $line-height-computed; + + a { + &:hover { + color: $white; + text-decoration: underline; + } + } + } + + .event-thumbnail { + background-position: center; + background-size: cover; + height: $line-height-computed * 7; + margin-bottom: $line-height-computed / 2; + } + + .event-meta { + color: lighten($helsinkiturquoise, 45%); + padding: 0 $padding-large-vertical; + } + + .event-meta__time { + display: block; + } + + .event-meta__place { + display: block; + margin-bottom: $line-height-computed / 2; + + a { + color: $white; + + &:hover { + text-decoration: underline; + } + } + + } + + .event-headline { + color: $white; + margin: 0; + margin-bottom: $line-height-computed / 2; + padding: 0 $padding-large-vertical; + } + + .event-description { + color: $white; + padding: 0 $padding-large-vertical $line-height-computed; + } +} + + +//* Digi Guide */ + +.design-principles-banner { + border-top: 3px solid $helsinkiturquoise; + border-bottom: 3px solid $helsinkiturquoise; + margin-top: $line-height-computed; + + p { + font-size: 18px; + } + + a { + color: $helsinkiturquoise; + } +} + +.design-principles { + background: #3040aa; + color: #fff; + @extend .clearfix; + + h2 { + color: $helsinkiturquoise; + margin-top: $line-height-computed; + } + + .principle { + float: left; + margin: 5px 2%; + width: 46%; + + @media screen and (min-width: $screen-md-min) { + margin: 5px 1%; + width: 18%; + } + } + + .principle__content { + background: #05add6; + background-repeat: no-repeat; + background-size: cover; + background-position: center; + color: #fff; + font-size: 24px; + height: $line-height-computed * 7; + line-height: 1; + margin-bottom: $line-height-computed / 2; + padding: 6px; + text-align: center; + } + + .principle__content:hover { + .principle__figure { + //color: #3040aa; + } + + .principle__figure::after { + bottom: -8px; + } + + .principle__figure::before { + top: -8px; + } + } + + .principle__figure { + display: block; + position: relative; + font-size: 34px; + font-weight: 700; + width: 60px; + margin: $line-height-computed auto; + text-align: center; + transition: all .5s; + + &::after, &::before { + border: 4px solid #fff; + content: ""; + display: block; + position: absolute; + left: 5px; + height: 8px; + width: 50px; + transition: all .5s; + } + + &::after { + bottom: -12px; + border-top: 0; + } + + &::before { + top: -12px; + border-bottom: 0; + } + } +} + +.guidepage-container h1 { + hyphens: auto; +} + +@media screen and (min-width: $screen-xs-min) { + .guidepage-container h1 { + hyphens: none; + } +} + +.guidepage-section-header { + border-bottom: 4px solid #3842a6; + float: left; + font-size: 24px; + margin-bottom: 1em; + margin-top: 0; + padding-bottom: .5em; + + a { + color: $text-color; + } +} + +.guidepage-infobox { + background-color: #3842a6; + color: $white; + margin-bottom: 2em; + padding: 1em; + position: relative; +} + +.guide-principle { + margin: 0; + padding: $navbar-height 0 0 0; + + .principle-header { + @extend .clearfix; + color: $helsinkiblue; + + .principle--title { + margin-left: 90px; + display: block; + font-size: $font-size-h2; + } + } + + .principle--figure { + display: block; + float: left; + width: 60px; + font-size: 60px; + font-weight: 700; + //margin: $line-height-computed / 2 auto; + text-align: center; + + &::after { + border: 6px solid $helsinkiturquoise; + border-top: 0; + content: ""; + display: block; + height: 10px; + margin: 0 auto; + width: 60px; + } + + &::before { + border: 6px solid $helsinkiturquoise; + border-bottom: 0; + content: ""; + display: block; + height: 10px; + margin: 0 auto; + width: 60px; + } + } + + p { + //@extend .lead; + font-size: $font-size-large; + color: $helsinkiblue; + } + + .principle-tags { + .principle-tag { + @extend .label; + //@extend .label-info; + background: $helsinkiturquoise; + } + } + } \ No newline at end of file diff --git a/digihel/static/images/illustrations/illustrationflow@2x.png b/digihel/static/images/illustrations/illustrationflow@2x.png new file mode 100644 index 00000000..4ba64045 Binary files /dev/null and b/digihel/static/images/illustrations/illustrationflow@2x.png differ diff --git a/digihel/static/images/illustrations/illustrationtech@2x.png b/digihel/static/images/illustrations/illustrationtech@2x.png new file mode 100644 index 00000000..c41b7d37 Binary files /dev/null and b/digihel/static/images/illustrations/illustrationtech@2x.png differ diff --git a/digihel/static/images/illustrations/illustrationvisual@2x.png b/digihel/static/images/illustrations/illustrationvisual@2x.png new file mode 100644 index 00000000..5cf7cd8c Binary files /dev/null and b/digihel/static/images/illustrations/illustrationvisual@2x.png differ diff --git a/digihel/static/images/illustrations/principle10@2x.png b/digihel/static/images/illustrations/principle10@2x.png new file mode 100644 index 00000000..22f2d417 Binary files /dev/null and b/digihel/static/images/illustrations/principle10@2x.png differ diff --git a/digihel/static/images/illustrations/principle1@2x.png b/digihel/static/images/illustrations/principle1@2x.png new file mode 100644 index 00000000..a67996f0 Binary files /dev/null and b/digihel/static/images/illustrations/principle1@2x.png differ diff --git a/digihel/static/images/illustrations/principle2@2x.png b/digihel/static/images/illustrations/principle2@2x.png new file mode 100644 index 00000000..c2cd813f Binary files /dev/null and b/digihel/static/images/illustrations/principle2@2x.png differ diff --git a/digihel/static/images/illustrations/principle3@2x.png b/digihel/static/images/illustrations/principle3@2x.png new file mode 100644 index 00000000..221dc339 Binary files /dev/null and b/digihel/static/images/illustrations/principle3@2x.png differ diff --git a/digihel/static/images/illustrations/principle4@2x.png b/digihel/static/images/illustrations/principle4@2x.png new file mode 100644 index 00000000..7fc6e936 Binary files /dev/null and b/digihel/static/images/illustrations/principle4@2x.png differ diff --git a/digihel/static/images/illustrations/principle5@2x.png b/digihel/static/images/illustrations/principle5@2x.png new file mode 100644 index 00000000..d8c58969 Binary files /dev/null and b/digihel/static/images/illustrations/principle5@2x.png differ diff --git a/digihel/static/images/illustrations/principle6@2x.png b/digihel/static/images/illustrations/principle6@2x.png new file mode 100644 index 00000000..ef4a44e7 Binary files /dev/null and b/digihel/static/images/illustrations/principle6@2x.png differ diff --git a/digihel/static/images/illustrations/principle7@2x.png b/digihel/static/images/illustrations/principle7@2x.png new file mode 100644 index 00000000..a22c2d5f Binary files /dev/null and b/digihel/static/images/illustrations/principle7@2x.png differ diff --git a/digihel/static/images/illustrations/principle8@2x.png b/digihel/static/images/illustrations/principle8@2x.png new file mode 100644 index 00000000..22f5a6aa Binary files /dev/null and b/digihel/static/images/illustrations/principle8@2x.png differ diff --git a/digihel/static/images/illustrations/principle9@2x.png b/digihel/static/images/illustrations/principle9@2x.png new file mode 100644 index 00000000..f605e74d Binary files /dev/null and b/digihel/static/images/illustrations/principle9@2x.png differ diff --git a/digihel/static/images/twitter.svg b/digihel/static/images/twitter.svg new file mode 100644 index 00000000..80bd4bb9 --- /dev/null +++ b/digihel/static/images/twitter.svg @@ -0,0 +1 @@ +twitter \ No newline at end of file diff --git a/digihel/templates/base.html b/digihel/templates/base.html index 4ce7080e..8ef30c7c 100644 --- a/digihel/templates/base.html +++ b/digihel/templates/base.html @@ -105,11 +105,15 @@ {# Global javascript #} - - - - - + + + + + + + {% compress js %} + + {% endcompress %} +{% endcompress %} +{% endblock %} diff --git a/events/tests.py b/events/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/events/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/events/views.py b/events/views.py new file mode 100644 index 00000000..20f30fbe --- /dev/null +++ b/events/views.py @@ -0,0 +1,17 @@ +from django.shortcuts import render +from django.http import HttpResponse, HttpResponseNotFound +from events.models import EventsIndexPage + +# Create your views here. + + +def event_data(request): + future = request.GET.get('future', 'False') + try: + if future.lower() == 'true': + data = EventsIndexPage.objects.get().events(future=True) + else: + data = EventsIndexPage.objects.get().events() + except EventsIndexPage.DoesNotExist: + return HttpResponseNotFound({'No events index page could be found. Please create one in Wagtail Admin.'}) + return HttpResponse(data) diff --git a/glossy/migrations/0002_categorypage.py b/glossy/migrations/0002_categorypage.py new file mode 100644 index 00000000..f222768f --- /dev/null +++ b/glossy/migrations/0002_categorypage.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.12 on 2017-02-20 12:35 +from __future__ import unicode_literals + +import digihel.mixins +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailcore', '0029_unicode_slugfield_dj19'), + ('glossy', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='CategoryPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ('category', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='glossy.Category')), + ], + options={ + 'abstract': False, + }, + bases=(digihel.mixins.RelativeURLMixin, 'wagtailcore.page'), + ), + ] diff --git a/glossy/models.py b/glossy/models.py index 05b39811..b0065d14 100644 --- a/glossy/models.py +++ b/glossy/models.py @@ -1,12 +1,23 @@ from django.db import models +from django.db.models.functions import Lower from django.utils.six import python_2_unicode_compatible +from django.utils.text import slugify + from wagtail.wagtailcore.fields import RichTextField +from wagtail.wagtailcore.models import Orderable, Page +from wagtail.wagtailadmin.edit_handlers import FieldPanel +from wagtail.wagtailsearch import index + +from digihel.mixins import RelativeURLMixin @python_2_unicode_compatible class Category(models.Model): name = models.CharField(max_length=64) + def ordered_terms(self): + return self.terms.all().order_by(Lower('name')) + def __str__(self): return self.name @@ -16,7 +27,7 @@ class Meta: @python_2_unicode_compatible -class Term(models.Model): +class Term(index.Indexed, models.Model): ctime = models.DateTimeField(auto_now_add=True, editable=False, verbose_name='created on') mtime = models.DateTimeField(auto_now=True, editable=False, verbose_name='last modified on') @@ -25,5 +36,34 @@ class Term(models.Model): body = RichTextField(blank=True) list_visible = models.BooleanField(default=True, db_index=True) + def __str__(self): return self.name + + def get_absolute_url(self): + try: + category_page = self.category.categorypage + except CategoryPage.DoesNotExist: + return None + + return '{}#{}'.format(category_page.url, slugify(self.name)) + + +class CategoryPage(RelativeURLMixin, Page): + category = models.OneToOneField(to=Category, on_delete=models.PROTECT) + + content_panels = Page.content_panels + [ + FieldPanel('category'), + ] + + def get_term_names(self): + term_names = self.category.ordered_terms().filter(list_visible=True).values_list('name', flat=True) + return '\n'.join(term_names) + + search_fields = Page.search_fields + [ + index.SearchField('get_term_names'), + ] + + def __str__(self): + return '{} - term category page'.format(self.category.name) + diff --git a/glossy/static/js/glossy-terms.js b/glossy/static/js/glossy-terms.js deleted file mode 100644 index 155c7f35..00000000 --- a/glossy/static/js/glossy-terms.js +++ /dev/null @@ -1,55 +0,0 @@ -(function ($) { - var GLOSSY_TERMS_URL = window.GLOSSY_TERMS_URL || '/glossy-terms/'; - var termMapping = {}; - - /** - * Retrieve term definitions for each `glossy-term` span in the DOM - * from the Glossy terms AJAX API. - * - * @returns {*} jQuery ajax promise - */ - function retrieveTermDefinitions() { - var $terms = $('span.glossy-term'); - var termIds = []; - $terms.each(function () { - var termId = $(this).data('term-id'); - if (termId && !termMapping[termId]) { - termIds.push(termId); - } - }); - if (!termIds.length) { - return; - } - return $.ajax({ - url: GLOSSY_TERMS_URL, - data: {ids: termIds.join(',')}, - }); - } - - /** - * Replace `glossy-term` `span`s with abbrs for currently known terms. - */ - function replaceTermSpans() { - $('span.glossy-term').each(function () { - var $term = $(this); - var termInfo = termMapping[$term.data('term-id')]; - if (!termInfo) { - return; - } - var $abbr = $('', { - class: 'glossy-term replaced', - 'data-term-id': termInfo.id, - html: $term.html(), - title: termInfo.body.replace(/<[^>]+>/g, ' '), - }); - $term.replaceWith($abbr); - }); - } - - $(function () { - retrieveTermDefinitions().done(function (data) { - termMapping = $.extend(termMapping, data); - replaceTermSpans(); - }); - }); -}(jQuery)); diff --git a/glossy/static/js/tinymce-termlink.js b/glossy/static/js/tinymce-termlink.js new file mode 100644 index 00000000..e974922d --- /dev/null +++ b/glossy/static/js/tinymce-termlink.js @@ -0,0 +1,44 @@ +(function () { + tinymce.PluginManager.add('termlink', function (editor, url) { + editor.addButton('termlink', { + text: 'Termi', + icon: false, + onclick: function () { + var terms = [{'text': '---', 'value': '---'}].concat(window.TERMLINK_MENU); + editor.windowManager.open({ + title: 'Lisää termiviittaus', + body: [ + {type: 'textbox', name: 'text', label: 'Teksti', value: editor.selection.getContent()}, + {type: 'listbox', name: 'term', label: 'Termi', values: terms}, + ], + onsubmit: function (e) { + if(!e.data.term) { + return; + } + var term = null; + for(var i=0; i < window.TERMLINK_MENU.length; i++){ + var menu = window.TERMLINK_MENU[i].menu; + for(var j=0; j < menu.length; j++) { + if(menu[j].value == e.data.term){ + term = menu[j]; + } + } + } + var html = [ + '', + term.text, + '', + ].join(''); + editor.insertContent(html); + }, + }); + } + }); + }); +}()); diff --git a/glossy/static/js/tinymce-termspan.js b/glossy/static/js/tinymce-termspan.js deleted file mode 100644 index b7fbc30b..00000000 --- a/glossy/static/js/tinymce-termspan.js +++ /dev/null @@ -1,31 +0,0 @@ -(function () { - tinymce.PluginManager.add('termspan', function (editor, url) { - editor.addButton('termspan', { - text: 'Termi', - icon: false, - onclick: function () { - var terms = [{'text': '---', 'value': '---'}].concat(window.TERMSPAN_MENU); - editor.windowManager.open({ - title: 'Lisää termiviittaus', - body: [ - {type: 'textbox', name: 'text', label: 'Teksti'}, - {type: 'listbox', name: 'term', label: 'Termi', values: terms}, - ], - onsubmit: function (e) { - if(!e.data.term) { - return; - } - var html = [ - '', - e.data.text, - '', - ].join(''); - editor.insertContent(html); - }, - }); - } - }); - }); -}()); diff --git a/glossy/templates/glossy/category_page.html b/glossy/templates/glossy/category_page.html new file mode 100644 index 00000000..308bc90a --- /dev/null +++ b/glossy/templates/glossy/category_page.html @@ -0,0 +1,30 @@ +{% extends "kehmet/base.html" %} + +{% block body_class %}template-kehmet-content-page{% endblock %} + +{% block toc %} + +{% endblock toc %} + +{% block kehmet_content %} + +

    {{ page.category.name }}

    + +{% for term in page.category.ordered_terms.all %} +{% if term.list_visible %} +

    {{ term.name }}

    +
    {{ term.body|safe }}
    +{% endif %} +{% endfor %} + +{% endblock %} + diff --git a/glossy/urls.py b/glossy/urls.py index 33d37510..0ec86985 100644 --- a/glossy/urls.py +++ b/glossy/urls.py @@ -1,7 +1,4 @@ -from django.conf.urls import url -from glossy.views import get_terms urlpatterns = [ - url('^glossy-terms/$', get_terms, name='glossy-terms'), ] diff --git a/glossy/utils.py b/glossy/utils.py index 1e3b86e4..8ca74691 100644 --- a/glossy/utils.py +++ b/glossy/utils.py @@ -1,6 +1,7 @@ import json from collections import defaultdict +from django.db.models.functions import Lower from django.utils.html import escape from django.utils.safestring import mark_safe @@ -10,11 +11,18 @@ def get_tinymce_term_menu(): # TODO: If there are lots of terms, this should probably be AJAXified. terms_by_category = defaultdict(list) - for term_id, category_id, name in Term.objects.all().values_list('id', 'category_id', 'name'): - terms_by_category[category_id].append({ - 'text': name, - 'value': term_id, - }) + for term in Term.objects.order_by(Lower('name')).select_related('category__categorypage'): + url = term.get_absolute_url() + if url and term.list_visible: + page = term.category.categorypage + page_parent = term.category.categorypage.get_parent() + terms_by_category[term.category_id].append({ + 'text': term.name, + 'data_id': page.id, + 'data_parent_id': page_parent.id, + 'url': url, + 'value': term.id, + }) category_name_map = dict( Category.objects.filter(id__in=terms_by_category.keys()).values_list('id', 'name') ) diff --git a/glossy/views.py b/glossy/views.py index 2094f36d..e69de29b 100644 --- a/glossy/views.py +++ b/glossy/views.py @@ -1,18 +0,0 @@ -from django.http.response import JsonResponse - -from glossy.models import Term - - -def get_terms(request): - """ - Get term definitions for the given IDs. - - Ids to be passed in comma-separated in the `ids` query string argument. - - :param request: HTTP Request - :type request: django.http.HttpRequest - :return: JSON response - """ - term_ids = [int(term_id) for term_id in request.GET.get('ids', '0').split(',')] - term_data = Term.objects.filter(id__in=term_ids).values('id', 'name', 'body') - return JsonResponse({term['id']: term for term in term_data}) diff --git a/glossy/wagtail_hooks.py b/glossy/wagtail_hooks.py index 45ea3e5e..b6beb8e0 100644 --- a/glossy/wagtail_hooks.py +++ b/glossy/wagtail_hooks.py @@ -34,7 +34,7 @@ class GlossyAdminGroup(ModelAdminGroup): @hooks.register('insert_tinymce_js') def tinymce_term_span_js(): return format_html( - '', + '', to_js(get_tinymce_term_menu()), - to_js_primitive(static('js/tinymce-termspan.js')), + to_js_primitive(static('js/tinymce-termlink.js')), ) diff --git a/kehmet/templates/kehmet/base.html b/kehmet/templates/kehmet/base.html index bf652091..512e57d0 100644 --- a/kehmet/templates/kehmet/base.html +++ b/kehmet/templates/kehmet/base.html @@ -1,7 +1,9 @@ {% extends "base.html" %} -{% load wagtailcore_tags kehmet_tags static %} +{% load wagtailcore_tags kehmet_tags content_tags static %} {% block content %} +{% if page.body %}{% do_table_of_contents page.body as toc %}{% endif %} + Luonnos @@ -75,6 +91,17 @@
    Anna palautetta