moving pics, fixing NL

news/nl/nl-201906.en.xhtml

@@ -12,14 +12,15 @@
 <p>Last month, Google blacklisted and blocked Huawei from accessing all its proprietary components of the Android mobile operating system. The California based tech giant had to comply with the executive order issued by the U.S. government to effectively ban all American companies from trading with Huawei. 
 While the Chinese telco will not have access to the Google's proprietary components, it will nevertheless be able to use those parts of the Android's operating system available under the open source licence, which is free for anyone to use. This highlights the importance that Free Software has for users, public bodies, and businesses. The Free Software Foundation Europe presented three essential lessons from this case:</p>
 
-<p> 1. Free Software enables control over technology. </p>
-<p> - The more important technology becomes in our daily lives, the more relevant Free Software becomes for individual users.</p>
+<ol> 
+	<li>Free Software enables control over technology: The more important technology becomes in our daily lives, the more relevant Free Software becomes for individual users.</li>
 
-<p> 2. The EU is overly reliant on foreign sources of technology.</p> 
-<p>-  The European Union and its members states should invest in Free Software development and focus on supporting local Free Software organisations and businesses. This can foster greater technological independence for the EU economy. </p>
+	<li>The EU is overly reliant on foreign sources of technology: The European Union and its members states should invest in Free Software development and focus on supporting local Free Software organisations and businesses. This can foster greater technological independence for the EU economy. </li>
+
+	<li>Free Software gives companies technological independence.: A company that uses proprietary software is dependent on such software's vendor and the government that regulates it. The best strategy for a company to avoid this is to use as much Free Software as possible in their supply chains. </li>
+	
+</ol>
 
-<p> 3. Free Software gives companies technological independence.</p>
-<p> -  A company that uses proprietary software is dependent on such software's vendor and the government that regulates it. The best strategy for a company to avoid this is to use as much Free Software as possible in their supply chains. </p>
 <p>Read more details about these lessons in our <a href="https://fsfe.org/news/2019/news-20190520-01.en.html">press release</a>.</p>
 
 <hr/>
@@ -31,7 +32,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
 <p>As with every month, we are trying to spread the word and help individuals and organisations understand what Free Software is and how Free Software contributes to freedom, transparency, and self-determination. If you are interested in seeing us in action and join our cause, keep in mind the following dates and locations in the coming few months:</p>
 <ul>
 <li>On July 3rd, FSFE Programme Manager Max Mehl will explain how Free Software can be the solution to many security problems at <a href="https://2019.pass-the-salt.org/talks/102.html">Pass the Salt</a> in Lille, France.</li>
-<li>On July 6th, FSFE supporter Reinhard Müller will give a presentation at <a href="https://www.tuebix.org/">Tübix</a> about the development of web applications he used successfully for the development of the new <a href="https://id.fsfe.org/authorization?scope=openid">online FSFE community portal</a> in Tübingen, Germany</li>
+<li>On July 6th, FSFE supporter Reinhard Müller will give a presentation at <a href="https://www.tuebix.org/">Tübix</a> about the development of web applications he used successfully for the development of the new <a href="https://my.fsfe.org/">online FSFE community portal</a> in Tübingen, Germany</li>
 <li>On July 8th, the FSFE community in Bonn will have a <a href="https://wiki.fsfe.org/LocalGroups/Bonn">meeting</a> discussing Free Software.</li>
 <li>On July 22nd, the Franken community of the FSFE and the Nuremberg Hackerspace will be <a href="https://wiki.fsfe.org/LocalGroups/Franken/DigitalFestival2019">hosting a lecture</a> about the basics and common misunderstandings of Free Software in Nuremberg, Germany</li>
 <li>Between August 21st and 25th the FSFE will host an <a href="https://signup.c3assemblies.de/assembly/db340abb-1f28-48e0-bbd6-59035e98cb42">assembly</a> at the Chaos Communication Camp in Mildenberg, Germany. The assembly will be part of <a href="https://signup.c3assemblies.de/assembly/c1831305-457e-4199-9070-38e2ac9234de">about:freedom</a>,  a cluster with a focus on digital (human) rights politics, freedom of information and Free Software advocacy. It is a union of different and diverse organisations from all over the world promoting Free Software and defending and extending digital rights. There will be workshops on-site and information materials. If you are coming to the camp, drop by and have a chat with us!</li>
@@ -41,7 +42,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
 <p>Since the last newsletter we have been very active in promoting the Free Software cause, by helping individuals and organisations have a better understanding of what Free Software is and encouraging them to develop and implement it in their lives. We want to share with you the events we have photos and videos for, below:</p>
 
 <figure>
-     <img src="/picturebase/people/201905-webathon.jpg" alt="Our web-a-thon in Frankfurt."/>
+     <img src="/picturebase/events/201905-webathon.jpg" alt="Our web-a-thon in Frankfurt."/>
      <figcaption>Our web-a-thon in Frankfurt.</figcaption>
 </figure>
 
@@ -50,7 +51,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
 </ul>
 
 <figure>
-     <img src="/picturebase/people/201905-webathon-group-picture_800pxl.jpg" alt="Some of the people behind fixing the FSFE's website during the 2nd web-a-thon for the year" />
+     <img src="/picturebase/events/201905-webathon-group-picture-800px.jpg" alt="Some of the people behind fixing the FSFE's website during the 2nd web-a-thon for the year" />
      <figcaption>Some of the people behind fixing the FSFE's website during the 2nd web-a-thon for the year</figcaption>
 </figure>
 
@@ -59,7 +60,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
 </ul>
 
 <figure>
-     <img src="/picturebase/events/201906_Lucas_Lasota_Saarbrucken-horizontal_800pxl.png" alt="Lucas Lasota at the Libre Graphics Meetings in Saarbrücken"/>
+     <img src="/picturebase/onstage/201906_Lucas_Lasota_Saarbrucken-horizontal_800px.png" alt="Lucas Lasota at the Libre Graphics Meetings in Saarbrücken"/>
      <figcaption>Lucas Lasota at the Libre Graphics Meetings in Saarbrücken</figcaption>
 </figure>
 
@@ -77,7 +78,7 @@ While the Chinese telco will not have access to the Google's proprietary compone
 </ul>
 
 <figure>
-     <img src="/picturebase/people/201906_Matthias_Kirschner_OW2con_Paris_800pxl.jpg" alt="Matthias Kirschner keynote at OW2 in Paris"/>
+     <img src="/picturebase/onstage/201906_Matthias_Kirschner_OW2con_Paris_800pxl.jpg" alt="Matthias Kirschner keynote at OW2 in Paris"/>
      <figcaption>Matthias Kirschner keynote at OW2 in Paris </figcaption>
 </figure>
 
@@ -95,21 +96,11 @@ While the Chinese telco will not have access to the Google's proprietary compone
 
 <ul>
 <li>On June 25th, the FSFE's Policy and Project Managers Alexander Sander and Galia Mancheva talked about the Public Money? Public Code! campaign and the updated Copyright Directive at <a href="https://libertybits.org/eventalk_speaker_category/2019/">Libertybits</a> in Sofia, Bulgaria</li>
-</ul>
 
-<figure>
-     <img src="/picturebase/people/201906-AlexSander_Galia-Libertybits_Sofia.jpg" alt="Alexander Sander and Galia Mancheva talk PMPC and Copyright at the Libertybits Free Software event in Sofia, Bulgaria" />
-     <figcaption>Alexander Sander and Galia Mancheva talk PMPC and Copyright at the Libertybits Free Software event in Sofia, Bulgaria </figcaption>
-</figure>
-
-<ul>
 <li>Again on June 25th Matthias Kirschner, the FSFE's president, gave a lecture at the <a href="https://fs-politik.de/veranstaltungen/vortragsreihe-cyber-valley/">University of Tübingen</a> about why software developed with public funds should be available to all.</li>
 </ul>
 
-<figure>
-     <img src="/picturebase/people/201906-Matthias_Kirschner_University_Tubingen-800px.jpg" alt="Matthias giving a lecture at the University of Tübingen" />
-     <figcaption>Matthias Kirschner giving a lecture at the University of Tübingen</figcaption>
-</figure>
+
 
 
 <h2 id="get-active">Get Active</h2>

picturebase/2017-06-R2D2-with-IloveFS.txt

@@ -1,7 +0,0 @@
-- Year: 2017
-- Author: André Klöpfel 
-- License: free to use (CC0)
-- Contact: kloepfel@mailbox.org
-- Additional remarks: the picture was made at the FSFE booth at the Maker Faire in Berlin (June 2017)
-- so far has been used (at/for/inside):
-

picturebase/HOWTO-use-the-picturebase.txt

@@ -0,0 +1,113 @@
+Welcome to the FSFE's picturebase
+
+Please put all pictures in here using the following scheme:
+
+
+# Quality
+Pictures should be uploaded in the best quality and dimensions available. It is easy to downscale any picture but impossible to upscale dimensions. Consider to GIMP your pictures befor uploading to improve their visual appearance.
+
+
+# 800-pixel-web-Version
+Any picture you like to use embedded in fsfe.org should be downscaled to a width of 800 pixels with the same name as your picture but added a "-800px" in the end of the file name. This allows us to embedding this downscaled picture for faster page-loads of fsfe.org and in the same time immediately access the original picture if wanted. 
+Example:
+* /booths/201807-booth-at-rmll.jpg
+* /booths/201807-booth-at-rmll-800px.jpg
+
+
+# Filenames
+Filename are a big help to get an info about a picture without the need to open it. All files should start with the year and most probably also with the month when the picture was taken. 
+Example: 
+* /events/201905-webathon-group-picture.jpg
+
+In case of a graphic it should include the year the grapic was taken
+Example:
+* /campaigns/ilovefs/2019-ilovefs-artwork-Elektrollart.jpeg
+
+depending on the folder the picture is archived in, the filenames also follow a certain scheme that is explained in the next section where the content of these folders is explained as well. 
+
+
+# Topical Folders
+
+we have topical folders inside the picturebase to help find pictures when in need. Please read through the following information to understand where to put your picture.
+
+Sometimes pictures can be in two folder, for example a group-picture shot during a FSFE event qualifies for the /events/ folder as well as the /people/ folder. You have to chose one of the folders then, please do not put them in both!
+
+As a general help to decide where to put them you should follow the approach to go from the most concrete topical folder to the broader one. More concrete are
+- booths (booths only)
+- campaigns (specific campaigns inside)
+- events (only fsfe-events)
+- fundraising (only fundraising relevant pictures here)
+- onstage (only pictures of fsfe people giving talks, workshops etc)
+
+More broader folders are:
+- graphics
+- miscellaneous 
+- people (but only fsfe-people!)
+all of which collect pictures that do not fit in the other categories.
+
+
+## booths
+In this folder all pictures should be about a booth and vice versa: Booth pictures with people or without people, in the morning or at night ... 
+Please give all pictures in here the following name:
+* YYYYMM-booth-at-EVENTNAME
+(YYYY means year and MM means month)
+Example:
+* /booths/201807-booth-at-rmll.jpg
+
+## campaigns
+Pictures that are about a specific campaign end up in their corresponding subfolder of the campaigns-folder. 
+Please give all pictures in here the following name:
+* YYYYMM-SHORTNAMEOFCAMPAIGN-CONTENT
+(YYYY means year and MM means month)
+Example: 
+* /campaigns/ilovefs/201801-pmpc-brochure-people.jpg
+
+## events
+Pictures that are about an event BY THE FSFE should end up here. Community meetings, web-a-thons, GA-meetings etc. Please do not put pictures here of events, the FSFE has been but not organised itself.
+Please give all pictures in here the following name:
+* YYYYMM-NAMEOFEVENT-CONTENT
+(YYYY means year and MM means month)
+Example: 
+* /events/201905-webathon-group-picture.jpg
+
+## fundraising
+Put all pictures and graphics in here that are to be used for fundraising specifically.
+Please give all pictures in here the following name:
+* YYYY-NAMEOFPERSONORCONTENT-PIXELINWIDTH
+(YYYY means year and MM means month)
+Example: 
+* /fundraising/2019-Francesca-Bria-1200x900.en.png
+
+## graphics
+Put all pictures in here that are pure graphics and not to be used in the contexts of the other folders. For example logos that we use on our pages or informational graphics.
+
+## miscelleanous
+Put all pictures and graphics in here that fit in no other folder.
+Please give all pictures in here the following name:
+* YYYY-CONTENT
+(YYYY means year and MM means month)
+Example: 
+* /miscellaneous/2018-cryptie-video-poster.jpg
+
+## onstage
+Pur all pictures here where FSFE affiliated people are on stage or in spotlight, giving a talk, a workhop etc.
+Please give all pictures in here the following name:
+* YYYY-SURNAME-LASTNAME-CONTENT
+(YYYY means year and MM means month)
+Example: 
+* /onstage/201906_Matthias_Kirschner_OW2con_Paris.jpg
+
+
+## people
+Put all pictures in here that show people as their main content, individually or in groups, but only fsfe-people! If we have a group picture by friends that we use in a context, we put them in miscelleanous, like for example: /miscelleanous/201610-pica-pica-hacklab.JPG
+Please give all pictures in here the following name:
+* YYYY-SURNAME-LASTNAME-CONTENT
+(YYYY means year and MM means month)
+Example: 
+* /people/2011-isabell-drost-fromm.jpg
+
+
+
+
+
+

picturebase/about.txt

@@ -1,21 +0,0 @@
-this will become the database for the pictures to be used on fsfe.org that will be filled and organised in the upcoming weeks by Erik with Susanne.
-
-For now, in short: ALL pictures we use on our webpage in the long run shall end up in "picturebase" or in a subfolder. 
-
-Subfolders will be made by categories. This will be 
-	booths - all pictures that include a booth
-	people - pictures of individual people or groups that are associated with FSFE
-	events - all events by fsfe, community-meet-ups, summits, GA-meetings etc
-	community - pictures by and with our community
-	
-all pictues in all categories shall use the following name-scheme: YEAR-MONTH-SHORT-NAME-AND-USE-KEYWORDS.jpg
-For each item please put a .txt-file with the EXACT same name in this repository
-where you leave the following information inside:
-- Year:
-- Author: (single or group)
-- License:
-- Contact: (for any question/feedback)
-- Additional remarks: (if any)
-- so far has been used (at/for/inside):
-
-If you scale the original image for any reason (most probably for web-publishing), then reuse the name with the suffix NAME-000px with 000 being the amount of the pixel in width of the image.