From 3e39f1c687aa06b65894a923914680ecfb886a69 Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Tue, 29 Aug 2017 10:32:51 +0200 Subject: [PATCH] restructure resource boxes and add some more verbose text --- .../de/resources/{4-News.yaml => 1-News.yaml} | 0 site/data/de/resources/1-PublicAdmin.yaml | 13 ----------- .../{3-Action.yaml => 2-Action.yaml} | 0 site/data/de/resources/2-Public.yaml | 6 ----- .../resources/{6-Press.yaml => 3-Press.yaml} | 0 site/data/de/resources/5-FOI.yaml | 6 ----- site/data/en/resources/1-News.yaml | 6 +++++ site/data/en/resources/1-PublicAdmin.yaml | 13 ----------- site/data/en/resources/2-Action.yaml | 21 ++++++++++++++++++ site/data/en/resources/2-Public.yaml | 6 ----- site/data/en/resources/3-Action.yaml | 6 ----- .../resources/{6-Press.yaml => 3-Press.yaml} | 2 +- site/data/en/resources/4-News.yaml | 6 ----- site/data/en/resources/5-FOI.yaml | 6 ----- .../img/resources/{3.jpg => action.jpg} | Bin .../img/resources/{1.jpg => euparliament.jpg} | Bin site/static/img/resources/{5.jpg => foi.jpg} | Bin site/static/img/resources/{4.jpg => news.jpg} | Bin .../static/img/resources/{6.jpg => press.jpg} | Bin .../img/resources/{2.jpg => public.jpg} | Bin 20 files changed, 28 insertions(+), 63 deletions(-) rename site/data/de/resources/{4-News.yaml => 1-News.yaml} (100%) delete mode 100644 site/data/de/resources/1-PublicAdmin.yaml rename site/data/de/resources/{3-Action.yaml => 2-Action.yaml} (100%) delete mode 100644 site/data/de/resources/2-Public.yaml rename site/data/de/resources/{6-Press.yaml => 3-Press.yaml} (100%) delete mode 100644 site/data/de/resources/5-FOI.yaml create mode 100644 site/data/en/resources/1-News.yaml delete mode 100644 site/data/en/resources/1-PublicAdmin.yaml create mode 100644 site/data/en/resources/2-Action.yaml delete mode 100644 site/data/en/resources/2-Public.yaml delete mode 100644 site/data/en/resources/3-Action.yaml rename site/data/en/resources/{6-Press.yaml => 3-Press.yaml} (93%) delete mode 100644 site/data/en/resources/4-News.yaml delete mode 100644 site/data/en/resources/5-FOI.yaml rename site/static/img/resources/{3.jpg => action.jpg} (100%) rename site/static/img/resources/{1.jpg => euparliament.jpg} (100%) rename site/static/img/resources/{5.jpg => foi.jpg} (100%) rename site/static/img/resources/{4.jpg => news.jpg} (100%) rename site/static/img/resources/{6.jpg => press.jpg} (100%) rename site/static/img/resources/{2.jpg => public.jpg} (100%) diff --git a/site/data/de/resources/4-News.yaml b/site/data/de/resources/1-News.yaml similarity index 100% rename from site/data/de/resources/4-News.yaml rename to site/data/de/resources/1-News.yaml diff --git a/site/data/de/resources/1-PublicAdmin.yaml b/site/data/de/resources/1-PublicAdmin.yaml deleted file mode 100644 index 7010030..0000000 --- a/site/data/de/resources/1-PublicAdmin.yaml +++ /dev/null @@ -1,13 +0,0 @@ -modalID: 1 -title: Leitfaden für die öffentliche Verwaltung -date: -img: 1.jpg -shortLink: guideForPublicAdministration -description: "

GERMAN Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.

- -

Vivamus massa mauris, blandit eu ante nec, pretium accumsan risus. Sed malesuada eu elit sit amet feugiat. Morbi a neque lorem. In rutrum ante nisl. Aliquam dapibus tempor libero eget elementum. Donec vitae odio sed ligula dictum malesuada. Fusce vitae facilisis turpis. Vivamus congue dolor lobortis, rutrum nibh at, pulvinar eros.

- -

Donec tincidunt tortor ultrices, ullamcorper odio eget, ultricies tellus. Sed egestas dui orci, pulvinar sollicitudin nibh pulvinar quis. Vestibulum ultricies ligula nec ipsum egestas dictum. Nam vitae pretium arcu, vel ultricies quam. Quisque consequat lorem sed leo tempus ultricies. Sed luctus varius mauris ac volutpat. Aliquam quis consectetur orci, eget placerat mauris. Vivamus sollicitudin vulputate suscipit. Sed at maximus est, ac aliquet dolor. Proin porttitor nulla in consectetur mollis. Suspendisse varius eros at tellus dictum hendrerit. Etiam gravida, felis a tincidunt porttitor, sem augue scelerisque elit, vel sagittis nunc neque quis metus.

- -

Donec egestas faucibus enim id sollicitudin. Morbi ullamcorper ipsum ut arcu ornare, eget tempus velit vehicula. Pellentesque id sem in nisi auctor ultrices at at tortor. In in ultricies augue. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam at massa eget quam fringilla ullamcorper. Vestibulum tincidunt egestas nunc, quis condimentum lectus sollicitudin eget. Maecenas rutrum viverra semper. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris sodales leo orci. Cras convallis ante diam, non ultrices odio varius quis. Phasellus libero tellus, tristique vitae ante eu, lacinia posuere libero. Nulla facilisi. Aliquam sapien nisi, mattis vel maximus sit amet, consectetur quis nunc.

" - diff --git a/site/data/de/resources/3-Action.yaml b/site/data/de/resources/2-Action.yaml similarity index 100% rename from site/data/de/resources/3-Action.yaml rename to site/data/de/resources/2-Action.yaml diff --git a/site/data/de/resources/2-Public.yaml b/site/data/de/resources/2-Public.yaml deleted file mode 100644 index d12222e..0000000 --- a/site/data/de/resources/2-Public.yaml +++ /dev/null @@ -1,6 +0,0 @@ -modalID: 2 -title: Leitfaden für die Öffentlichkeit -date: -img: 2.jpg -shortLink: guideForGeneralPublic -description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/de/resources/6-Press.yaml b/site/data/de/resources/3-Press.yaml similarity index 100% rename from site/data/de/resources/6-Press.yaml rename to site/data/de/resources/3-Press.yaml diff --git a/site/data/de/resources/5-FOI.yaml b/site/data/de/resources/5-FOI.yaml deleted file mode 100644 index d89ae3f..0000000 --- a/site/data/de/resources/5-FOI.yaml +++ /dev/null @@ -1,6 +0,0 @@ -modalID: 5 -title: Informationsfreiheit -date: -img: 5.jpg -shortLink: freedomOfInformation -description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/1-News.yaml b/site/data/en/resources/1-News.yaml new file mode 100644 index 0000000..11342c5 --- /dev/null +++ b/site/data/en/resources/1-News.yaml @@ -0,0 +1,6 @@ +modalID: 4 +title: Latest News +date: +img: news.jpg +shortLink: latestNews +description: Here should be an auto-generated list of news and their teasers from fsfe.org which are tagged with [pmpc](https://fsfe.org/tags/tagged-pmpc.en.html). There's no tag-specific RSS yet so we have to hack that. See issue https://git.fsfe.org/pmpc/website/issues/2 diff --git a/site/data/en/resources/1-PublicAdmin.yaml b/site/data/en/resources/1-PublicAdmin.yaml deleted file mode 100644 index 89c86e9..0000000 --- a/site/data/en/resources/1-PublicAdmin.yaml +++ /dev/null @@ -1,13 +0,0 @@ -modalID: 1 -title: Guide for Public Administration -date: -img: 1.jpg -shortLink: guideForPublicAdministration -description: "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.

- -

Vivamus massa mauris, blandit eu ante nec, pretium accumsan risus. Sed malesuada eu elit sit amet feugiat. Morbi a neque lorem. In rutrum ante nisl. Aliquam dapibus tempor libero eget elementum. Donec vitae odio sed ligula dictum malesuada. Fusce vitae facilisis turpis. Vivamus congue dolor lobortis, rutrum nibh at, pulvinar eros.

- -

Donec tincidunt tortor ultrices, ullamcorper odio eget, ultricies tellus. Sed egestas dui orci, pulvinar sollicitudin nibh pulvinar quis. Vestibulum ultricies ligula nec ipsum egestas dictum. Nam vitae pretium arcu, vel ultricies quam. Quisque consequat lorem sed leo tempus ultricies. Sed luctus varius mauris ac volutpat. Aliquam quis consectetur orci, eget placerat mauris. Vivamus sollicitudin vulputate suscipit. Sed at maximus est, ac aliquet dolor. Proin porttitor nulla in consectetur mollis. Suspendisse varius eros at tellus dictum hendrerit. Etiam gravida, felis a tincidunt porttitor, sem augue scelerisque elit, vel sagittis nunc neque quis metus.

- -

Donec egestas faucibus enim id sollicitudin. Morbi ullamcorper ipsum ut arcu ornare, eget tempus velit vehicula. Pellentesque id sem in nisi auctor ultrices at at tortor. In in ultricies augue. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam at massa eget quam fringilla ullamcorper. Vestibulum tincidunt egestas nunc, quis condimentum lectus sollicitudin eget. Maecenas rutrum viverra semper. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris sodales leo orci. Cras convallis ante diam, non ultrices odio varius quis. Phasellus libero tellus, tristique vitae ante eu, lacinia posuere libero. Nulla facilisi. Aliquam sapien nisi, mattis vel maximus sit amet, consectetur quis nunc.

" - diff --git a/site/data/en/resources/2-Action.yaml b/site/data/en/resources/2-Action.yaml new file mode 100644 index 0000000..187ac42 --- /dev/null +++ b/site/data/en/resources/2-Action.yaml @@ -0,0 +1,21 @@ +modalID: 3 +title: Take Action! +date: +img: action.jpg +shortLink: takeAction +description: "Help us convince our governments that software paid with your taxes should be public by... + + +* ... signing the petition [LINK] + +* ... sharing the petition with others [LINK for sharing] + +* ... get info material + +* ... call your representative + +* ... donating to our campaign [LINK] + +" + + diff --git a/site/data/en/resources/2-Public.yaml b/site/data/en/resources/2-Public.yaml deleted file mode 100644 index e0986e8..0000000 --- a/site/data/en/resources/2-Public.yaml +++ /dev/null @@ -1,6 +0,0 @@ -modalID: 2 -title: Guide for general public -date: -img: 2.jpg -shortLink: guideForGeneralPublic -description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/3-Action.yaml b/site/data/en/resources/3-Action.yaml deleted file mode 100644 index f8107f7..0000000 --- a/site/data/en/resources/3-Action.yaml +++ /dev/null @@ -1,6 +0,0 @@ -modalID: 3 -title: Take Action! -date: -img: 3.jpg -shortLink: takeAction -description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/6-Press.yaml b/site/data/en/resources/3-Press.yaml similarity index 93% rename from site/data/en/resources/6-Press.yaml rename to site/data/en/resources/3-Press.yaml index 2dd51d6..619d396 100644 --- a/site/data/en/resources/6-Press.yaml +++ b/site/data/en/resources/3-Press.yaml @@ -1,6 +1,6 @@ modalID: 6 title: Press information date: -img: 6.jpg +img: press.jpg shortLink: pressInformation description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/4-News.yaml b/site/data/en/resources/4-News.yaml deleted file mode 100644 index 72d3734..0000000 --- a/site/data/en/resources/4-News.yaml +++ /dev/null @@ -1,6 +0,0 @@ -modalID: 4 -title: Latest News -date: -img: 4.jpg -shortLink: latestNews -description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/5-FOI.yaml b/site/data/en/resources/5-FOI.yaml deleted file mode 100644 index bad5645..0000000 --- a/site/data/en/resources/5-FOI.yaml +++ /dev/null @@ -1,6 +0,0 @@ -modalID: 5 -title: Freedom of Information -date: -img: 5.jpg -shortLink: freedomOfInformation -description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/static/img/resources/3.jpg b/site/static/img/resources/action.jpg similarity index 100% rename from site/static/img/resources/3.jpg rename to site/static/img/resources/action.jpg diff --git a/site/static/img/resources/1.jpg b/site/static/img/resources/euparliament.jpg similarity index 100% rename from site/static/img/resources/1.jpg rename to site/static/img/resources/euparliament.jpg diff --git a/site/static/img/resources/5.jpg b/site/static/img/resources/foi.jpg similarity index 100% rename from site/static/img/resources/5.jpg rename to site/static/img/resources/foi.jpg diff --git a/site/static/img/resources/4.jpg b/site/static/img/resources/news.jpg similarity index 100% rename from site/static/img/resources/4.jpg rename to site/static/img/resources/news.jpg diff --git a/site/static/img/resources/6.jpg b/site/static/img/resources/press.jpg similarity index 100% rename from site/static/img/resources/6.jpg rename to site/static/img/resources/press.jpg diff --git a/site/static/img/resources/2.jpg b/site/static/img/resources/public.jpg similarity index 100% rename from site/static/img/resources/2.jpg rename to site/static/img/resources/public.jpg