From 22a687bf0f8a09abaa4892382a15d959b9df2de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Tue, 4 Oct 2016 23:22:33 +0200 Subject: [PATCH 1/4] Add Miscellaneous Documents migration script --- .../management/commands/migratemisc.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 website/documents/management/commands/migratemisc.py diff --git a/website/documents/management/commands/migratemisc.py b/website/documents/management/commands/migratemisc.py new file mode 100644 index 00000000..02645219 --- /dev/null +++ b/website/documents/management/commands/migratemisc.py @@ -0,0 +1,34 @@ +from django.core.files.base import ContentFile +from django.utils import timezone +from django.utils.timezone import datetime + +from utils.management.commands import legacylogin +from documents.models import MiscellaneousDocument + +from bs4 import BeautifulSoup +import requests +import os + + +def filefield_from_url(filefield, url): + file = ContentFile(requests.get(url).content) + filefield.save(os.path.basename(url), file) + + +class Command(legacylogin.Command): + help = "Scrapes the Miscellaneous Documents from the old Thalia website" + + def handle(self, *args, **options): + super().handle(*args, **options) + url = "https://thalia.nu/association/documents" + documentpage = self.session.get(url) + soup = BeautifulSoup(documentpage.text, 'lxml') + container = soup(attrs={'class': 'generalcontainer'})[0] + documents = container.find_all('li', recursive=False) + for document in documents: + name = document.find('h2').find(text=True) + obj, cr = MiscellaneousDocument.objects.get_or_create(name=name) + url = document.find(attrs={'class': 'overlay-icon-link'}) + if url is not None: + url = "https://thalia.nu" + url['href'] + filefield_from_url(obj.file, url) -- GitLab From 8215da31dae4849608f4fd870cc880b4d0c414fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Tue, 4 Oct 2016 23:23:09 +0200 Subject: [PATCH 2/4] Fix documents HTML, move CSS to one file and make it LESS + compress and add thumbnail --- .../management/commands/migratemisc.py | 13 +- .../static/documents/css/generalmeetings.css | 17 --- .../static/documents/css/policydocuments.css | 38 ------ .../documents/static/documents/css/style.less | 125 ++++++++++++++++++ .../static/documents/images/thumb.png | Bin 0 -> 26669 bytes .../documents/associationdocument.html | 19 ++- .../templates/documents/generic.html | 15 +-- .../documents/templates/documents/index.html | 36 ++--- 8 files changed, 166 insertions(+), 97 deletions(-) delete mode 100644 website/documents/static/documents/css/generalmeetings.css delete mode 100644 website/documents/static/documents/css/policydocuments.css create mode 100644 website/documents/static/documents/css/style.less create mode 100644 website/documents/static/documents/images/thumb.png diff --git a/website/documents/management/commands/migratemisc.py b/website/documents/management/commands/migratemisc.py index 02645219..ae407d9a 100644 --- a/website/documents/management/commands/migratemisc.py +++ b/website/documents/management/commands/migratemisc.py @@ -1,13 +1,10 @@ -from django.core.files.base import ContentFile -from django.utils import timezone -from django.utils.timezone import datetime - -from utils.management.commands import legacylogin -from documents.models import MiscellaneousDocument +import os -from bs4 import BeautifulSoup import requests -import os +from bs4 import BeautifulSoup +from django.core.files.base import ContentFile +from documents.models import MiscellaneousDocument +from utils.management.commands import legacylogin def filefield_from_url(filefield, url): diff --git a/website/documents/static/documents/css/generalmeetings.css b/website/documents/static/documents/css/generalmeetings.css deleted file mode 100644 index d62dd864..00000000 --- a/website/documents/static/documents/css/generalmeetings.css +++ /dev/null @@ -1,17 +0,0 @@ -/* https://kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/ */ -.wordbreak { - -ms-word-break: break-all; - word-break: break-all; - - /* Non standard for webkit */ - word-break: break-word; - - -webkit-hyphens: auto; - -moz-hyphens: auto; - -ms-hyphens: auto; - hyphens: auto; -} - -#meetingcontainer > div:not(:first-child) { - display: none; -} \ No newline at end of file diff --git a/website/documents/static/documents/css/policydocuments.css b/website/documents/static/documents/css/policydocuments.css deleted file mode 100644 index 5247a3cb..00000000 --- a/website/documents/static/documents/css/policydocuments.css +++ /dev/null @@ -1,38 +0,0 @@ -.unknowncontainer .post-header { - text-align:center; - height:176px; /* 176 - padding */ - width:220px; - font-size:64px; - line-height: 176px; - cursor:default; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.unknowncontainer { - background:none !important; - border:2px dashed #9C9C9C; - color:#9C9C9C; -} - -.policywrapper { - overflow-x:hidden; - padding-top:20px; -} - -.slider-control-prev, -.slider-control-next { - cursor:pointer; -} - -.slider-control-prev { - display:none; -} - -ul { - margin-bottom:0px !important; -} diff --git a/website/documents/static/documents/css/style.less b/website/documents/static/documents/css/style.less new file mode 100644 index 00000000..5b826d63 --- /dev/null +++ b/website/documents/static/documents/css/style.less @@ -0,0 +1,125 @@ +.thimbus-page { + .policy-wrapper { + overflow-x: hidden; + padding-top: 20px; + } + + .policy-wrapper, .misc-wrapper { + .portfolio-posts { + margin-bottom: 0; + + .slider-control-prev, + .slider-control-next { + cursor: pointer; + } + + .slider-control-prev { + display: none; + } + + .post { + width: 220px; + float: left; + min-height: 1px; + margin-left: 20px; + + .document-thumb { + position: relative; + + > span { + width: 100%; + position: absolute; + bottom: 40px; + text-align: center; + font-family: 'GillSansMT-Condensed', 'Open Sans', Helvetica, sans-serif; + font-size: 20px; + } + } + + .unknowncontainer { + background: none !important; + border: 2px dashed #9C9C9C; + color: #9C9C9C; + height: 310px; + + .post-header { + text-align: center; + height: 176px; /* 176 - padding */ + width: 220px; + font-size: 64px; + line-height: 176px; + cursor: default; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + } + } + } + } + + /* https://kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/ */ + .wordbreak { + -ms-word-break: break-all; + word-break: break-all; + + /* Non standard for webkit */ + word-break: break-word; + + -webkit-hyphens: auto; + -moz-hyphens: auto; + -ms-hyphens: auto; + hyphens: auto; + } + + #meetingcontainer > div:not(:first-child) { + display: none; + } + + #alvselect { + outline-width: 0px !important; + width: 140px; + padding: 0px 15px; + } +} + +/* Portrait tablet to landscape and desktop */ +@media (min-width: 768px) and (max-width: 979px) { + .thimbus-page { + .policy-wrapper, .misc-wrapper { + width: 700px; + margin: 0 auto; + .portfolio-posts { + .post { + min-width: 220px; + width: 220px; + } + } + } + } +} + +/* Landscape phone to portrait tablet */ +@media (max-width: 767px) { + .thimbus-page { + .policy-wrapper, .misc-wrapper { + .portfolio-posts { + .post { + min-width: 190px; + width: 190px; + + .unknowncontainer { + height: 268px; + + .post-header { + width: 190px; + } + } + } + } + } + } +} \ No newline at end of file diff --git a/website/documents/static/documents/images/thumb.png b/website/documents/static/documents/images/thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..dc085709400f5f88e962f38f8861eb9388c393af GIT binary patch literal 26669 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 literal 0 HcmV?d00001 diff --git a/website/documents/templates/documents/associationdocument.html b/website/documents/templates/documents/associationdocument.html index 6387f37c..c631a026 100644 --- a/website/documents/templates/documents/associationdocument.html +++ b/website/documents/templates/documents/associationdocument.html @@ -1,14 +1,13 @@ +{% load staticfiles %} + {% if documents %} -
  • +
  • - - - - -
    -
    -

    {{ name }} {{ year|stringformat:"d"|slice:"2:4" }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" }}

    +
    + + {{ name | upper }} {{ year | stringformat:"d" | slice:"2:4" | upper }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" | upper }} +
    @@ -22,13 +21,13 @@
    • {% else %} -
  • +
  • ?
    -

    {{ name }} '{{ year | stringformat:"d" | slice:"2:4" }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" }}

    +

    {{ name | upper }} '{{ year | stringformat:"d" | slice:"2:4" | upper }}-'{{ year | add:1 | stringformat:"d" | slice:"2:4" | upper }}

    • diff --git a/website/documents/templates/documents/generic.html b/website/documents/templates/documents/generic.html index 3295b5b8..3dd0afcc 100644 --- a/website/documents/templates/documents/generic.html +++ b/website/documents/templates/documents/generic.html @@ -1,13 +1,12 @@ -
  • +{% load staticfiles %} + +
  • - - - - -
    -
    -

    {{ document.name }}

    +
    + + {{ document.name | upper }} +
    diff --git a/website/documents/templates/documents/index.html b/website/documents/templates/documents/index.html index cef1a770..09da84cd 100644 --- a/website/documents/templates/documents/index.html +++ b/website/documents/templates/documents/index.html @@ -1,34 +1,38 @@ {% extends 'base.html' %} {% load staticfiles %} {% load i18n %} +{% load compress %} {% block css_head %} -{{ block.super }} - - + {{ block.super }} + {% compress css %} + + {% endcompress %} {% endblock %} {% block body %} -

    {% trans "Miscellaneous Documents" %}

    +

    {% trans "Miscellaneous Documents" %}

    {% trans "Thalia was officially founded on November 7th, 1990. The relevant statutes and internal rules can be accessed here. The statues have last been amended in September 2007; the internal rules have been changed on several occasions. Other miscellaneous documents can be found here as well, such as the declaration form and the canteen regulations. Please read these carefully, so that we can all have a pleasant time when having drinks in the canteen." %}

    -
      - {% for miscellaneous_document in miscellaneous_documents %} - {% include 'documents/miscellaneous.html' with document=miscellaneous_document %} - {% endfor %} -
    +
    +
      + {% for miscellaneous_document in miscellaneous_documents %} + {% include 'documents/miscellaneous.html' with document=miscellaneous_document %} + {% endfor %} +
    +
    -

    {% trans "Policy Documents & Annual Reports" %}

    +

    {% trans "Policy Documents & Annual Reports" %}

    {% trans "Every candidate board of Thalia drafts a policy document before being installed, to detail their plans for the next year. This also includes a general planning of all activities, as well as the budget for that year. Furthermore, the association is obliged to deliver an annual report and provide a financial overview. These documents show the financial developments over the year, what contacts Thalia maintained and what activities were organized. All historical policy documents and reports are made available, below." %}

    -
    -
    +
    +
      {% for year, docs in association_documents_years %} {% include 'documents/policydocument.html' with documents=docs.policy name=_("Policy") %} @@ -45,19 +49,19 @@
    -

    {% trans "General Meetings" %}

    +

    {% trans "General Meetings" %}

    {% trans "The General Meetings (ALVs) can be attended by all members, honorary members and donors. Thalia organizes at least two general meetings each year. Minutes of these meetings are made available below. This allows (honorary) members and donors that did not attend to get an insight in what was discussed as well." %}

    -
    +
    {% for year, meetings in meeting_years|slice:"5" %} {% endfor %} - {% for year, meetings in meeting_years|slice:"5:" %} - + {% endfor %}
    -- GitLab From c2d7c5a8623901f7129184a0665c9ed134be01ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Tue, 4 Oct 2016 23:29:23 +0200 Subject: [PATCH 3/4] Compress documents javascipt --- website/documents/templates/documents/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/website/documents/templates/documents/index.html b/website/documents/templates/documents/index.html index 09da84cd..e39b6638 100644 --- a/website/documents/templates/documents/index.html +++ b/website/documents/templates/documents/index.html @@ -77,7 +77,9 @@ {% endblock %} {% block js_body %} -{{ block.super }} - - + {{ block.super }} + {% compress js %} + + + {% endcompress %} {% endblock %} \ No newline at end of file -- GitLab From 6a7744cc4898dffa776f11c8a4c44308fb03cb46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Tue, 4 Oct 2016 23:31:56 +0200 Subject: [PATCH 4/4] Add documents page title --- website/documents/templates/documents/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/documents/templates/documents/index.html b/website/documents/templates/documents/index.html index e39b6638..55b21c63 100644 --- a/website/documents/templates/documents/index.html +++ b/website/documents/templates/documents/index.html @@ -3,6 +3,8 @@ {% load i18n %} {% load compress %} +{% block title %}{% trans 'Documents' %} — {{ block.super }}{% endblock %} + {% block css_head %} {{ block.super }} {% compress css %} -- GitLab