From a3ddc3a104f6abe649cb45d8384253e21675730e Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 16:42:17 +0000 Subject: [PATCH 01/91] trying again svn path=/branches/test/; revision=23065 --- projects/os/bsa-letter-analysis.en.xhtml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/os/bsa-letter-analysis.en.xhtml b/projects/os/bsa-letter-analysis.en.xhtml index ebc9c4cab4..520ae00674 100644 --- a/projects/os/bsa-letter-analysis.en.xhtml +++ b/projects/os/bsa-letter-analysis.en.xhtml @@ -4,13 +4,6 @@ - - - - - - - EIF BSA Letter @@ -159,4 +152,14 @@ open-standards + + + Carlo Piana + http://piana.eu + + + + + + From 5359c1b81fdec3214b1cc77f2d7e6bf95263dbfb Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 16:53:38 +0000 Subject: [PATCH 02/91] fixed when there s no link svn path=/branches/test/; revision=23066 --- fsfe.xsl | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/fsfe.xsl b/fsfe.xsl index de23443cc7..f7ebe7071a 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -289,6 +289,8 @@ + + author author @@ -301,9 +303,22 @@ + + + + + + + + + + + - + + + author author @@ -315,6 +330,17 @@ + + + + + + + + + + + From a0b9ddae62fadbce5d0539ae05874fda8b289ea1 Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 16:55:56 +0000 Subject: [PATCH 03/91] fixed when there s no link svn path=/branches/test/; revision=23068 --- fsfe.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfe.xsl b/fsfe.xsl index f7ebe7071a..5e58de2e4c 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -290,7 +290,7 @@ - + author author From 44c299b2e2d0bbc0c3301a37d174c055f34cf9da Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 16:58:23 +0000 Subject: [PATCH 04/91] fixed when there s no link svn path=/branches/test/; revision=23069 --- fsfe.xsl | 8 ++++++-- look/generic.css | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fsfe.xsl b/fsfe.xsl index 5e58de2e4c..c5e3f4731a 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -311,7 +311,9 @@ - + + + @@ -338,7 +340,9 @@ - + + + diff --git a/look/generic.css b/look/generic.css index e2817ac57f..b0ba06ca0d 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1445,11 +1445,12 @@ ul.overview { box-shadow: 0 0 3px rgba(0,0,0,0.3); } -#article-metadata a.author { +#article-metadata .author { padding-right:.7em; + color: #323232; } -#article-metadata a.author:last-child { +#article-metadata .author:last-child { padding-right:0; } From 1026fbc3969b95245f584b66085cbe658a8f96f6 Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 17:14:00 +0000 Subject: [PATCH 05/91] minor color update svn path=/branches/test/; revision=23073 --- look/generic.css | 1 - 1 file changed, 1 deletion(-) diff --git a/look/generic.css b/look/generic.css index b0ba06ca0d..03434c12d9 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1447,7 +1447,6 @@ ul.overview { #article-metadata .author { padding-right:.7em; - color: #323232; } #article-metadata .author:last-child { From df2e7a0d72764fb4f3dc6128915abcc3202d775c Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 17:53:48 +0000 Subject: [PATCH 06/91] fixed space on old version svn path=/branches/test/; revision=23084 --- fsfe.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfe.xsl b/fsfe.xsl index c5e3f4731a..4af325612f 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -260,10 +260,10 @@ - : +  : - PDF: +  PDF: download From 3848f946c731117bff6d14e38ca64b438bf0cde1 Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 18:02:34 +0000 Subject: [PATCH 07/91] footnotes svn path=/branches/test/; revision=23085 --- projects/os/eifv2.en.xhtml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/projects/os/eifv2.en.xhtml b/projects/os/eifv2.en.xhtml index 4a7c66b6e0..3f9515fa6f 100755 --- a/projects/os/eifv2.en.xhtml +++ b/projects/os/eifv2.en.xhtml @@ -605,22 +605,26 @@ abandon its efforts towards actually achieving interoperability in eGovernment services.

-
+

Footnotes

-

[1]. This is a stark contrast with the +

    + +

  1. This is a stark contrast with the European Commission's policy on this subject. See this speech by European Commissioner for Competition, Ms. Neelie Kroes:

    “I know a smart business decision when I see one - choosing - open standards is a very smart business decision indeed.”
    + open standards is a very smart business decision indeed.” [↩] -

    - [2]. Indeed, instead of the vague notion of +

    2. +
  2. + Indeed, instead of the vague notion of "reasonable fee," a nominal one-time fee permits Free Software projects to implement standards. See as a similar case the - agreement between Samba and Microsoft. -

    + agreement between Samba and Microsoft. [↩]. +
    3. +
@@ -632,8 +636,6 @@ Hugo Roy - /about/roy/roy.html - /about/roy/roy-avatar.jpg From 83477f8608cb08e788c9980c542ef030004c0c20 Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Apr 2012 18:03:11 +0000 Subject: [PATCH 08/91] footnotes svn path=/branches/test/; revision=23086 --- projects/os/eifv2.en.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/os/eifv2.en.xhtml b/projects/os/eifv2.en.xhtml index 3f9515fa6f..c79f53b0cc 100755 --- a/projects/os/eifv2.en.xhtml +++ b/projects/os/eifv2.en.xhtml @@ -642,7 +642,7 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + error: From 1578f804715789c7202190086415f98daab9a551 Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 23 Apr 2012 14:51:22 +0000 Subject: [PATCH 11/91] test for multiple revision dates svn path=/branches/test/; revision=23096 --- fsfe.xsl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fsfe.xsl b/fsfe.xsl index 4af325612f..ecd1fad24d 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -354,8 +354,10 @@     - (  - )  + ( + +  +)  From ed259f89e4e329f637dd2d45cb399e1572d1d714 Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 23 Apr 2012 15:10:43 +0000 Subject: [PATCH 12/91] test for multiple revision dates svn path=/branches/test/; revision=23097 --- fsfe.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfe.xsl b/fsfe.xsl index ecd1fad24d..a9dfea6887 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -355,7 +355,7 @@   ( - +   )  From d4f400b3f35156796fd2630b68c7aadb550f5ed4 Mon Sep 17 00:00:00 2001 From: hugo Date: Fri, 27 Apr 2012 18:04:49 +0000 Subject: [PATCH 13/91] diagram for budget 2009 svn path=/branches/test/; revision=23214 --- about/funds/2009.en.xhtml | 27 ++++++++++++++++----------- about/funds/diagrams.css | 27 +++++++++++++++++++++++++++ about/funds/income-2009.png | Bin 0 -> 3156 bytes 3 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 about/funds/diagrams.css create mode 100644 about/funds/income-2009.png diff --git a/about/funds/2009.en.xhtml b/about/funds/2009.en.xhtml index 2e0396eade..823c0e8232 100644 --- a/about/funds/2009.en.xhtml +++ b/about/funds/2009.en.xhtml @@ -3,6 +3,7 @@ FSFE - About - Funds - Income and Expense 2009 + @@ -10,35 +11,39 @@ 2009

FSFE - Income and Expense 2009

+ +
+ Diagram of 2009 income +
- +
- - + + - - + + - - + + - - + + - - + + diff --git a/about/funds/diagrams.css b/about/funds/diagrams.css new file mode 100644 index 0000000000..4ba962df72 --- /dev/null +++ b/about/funds/diagrams.css @@ -0,0 +1,27 @@ +.diagram-indicator { + width: 16px; + height: 16px; + border: 1px solid #000; +} + +#income { } + +#donations .diagram-indicator { + background-color: #78d2ee +} + +#fellowship .diagram-indicator { + background-color: #70d055 +} + +#eu .diagram-indicator { + background-color: #e0f859 +} + +#merchandise .diagram-indicator { + background-color: #d6eaf5 +} + +#interest .diagram-indicator { + background-color: #202d79 +} diff --git a/about/funds/income-2009.png b/about/funds/income-2009.png new file mode 100644 index 0000000000000000000000000000000000000000..1e158f856818290721b5bb7769632ce3bbd5f76d GIT binary patch literal 3156 zcmd6qc{Cf?8o<-4VpNUksM40v&YPBueJ#~gT2-k~)D}e5k|Ci)GnzK&45M1LRV)cX zi=K>*)ZP*dps`NOiaJukS6xE^0O=!t*L?tD z)-e&3xMKyikQg~|T+TpYrXnFrB%8LnY<}Y|dvOHoj>jlBtf*N2nfz;jxb9(Mmv%^- z>i&bL&XSXeHy@Y7ZdMdfU6lzmr#fqfyPGE+TdKhhAO}I8`i?8!Os4)A03UyJw(VJi zcI)lkS0oD$Il_#N=O%WynXk>|2>67=&{!LL$UXoh)K41ltpebkc*7#Ie8)T_Bm@pu z&fGt)D~|P z`$2P$i7f6hk#LWFokhg<6hv%KK{W0kHPT>UY^7GRMh|a=fHWuyW~%=@wh+H70+WpXU2b>4!1;PAKh0)|F@?i2mjmN|L^zl zp9oOHVpI9EZo08loN>r{J{uHmDIqwn&54nzP9^I{yccu5l6*=Ng+a3MX~`Jq4m&fj zL#6&iEtD!36lRFz4VqY~9baFa-vxK0XAE7}p}bgPc6*RXRrV$4wn1 zLwp29^E>B!qMlsIyD=6|K*wo3gnEAn;&He{X@KMZcNpEHQt-VI*WKN-($ibXfGTS+ zxCs*(k4ozK1wY5oaR@5qyz)n}p>-!jXL8)&?-czzc{m=tAUOcH?LV?BsJrUMf}5Vc z=9XRk1Daj!46f8xQnlDI<>9J|Q3Pt&>vlgoq8=0YvE_YIAEXmg--xe8`QwGt$ z0ur^qT&Z|)w+Mu=_dhpKJ*DS)bydLU^OsEm24K`Cbcbx6%WX9{49W<~L-)I|R*Ebh zmC7aC*~!V7Q8d^^qXxm~&fff?>!gXEhSu*cw3|Fz&qa;`PijQrd;O^Qz!Va%Us=s} z<+)ENy!hmWIPX1986vz;+x zsI(3|tNKk;ho@K?`*eg-_v)6tTEXndQtV-(K-T$1=~4a$u6~V(CDeb+Kc80nB5zXD03mb!l0jmzI{=jQM|<0YPp^5Kikx`WxES6*WvMs2Kj58DXr^ zW{RD+YNia4Sfs$uJDaq`P4_2pyiBLs?oXd;J8r#mk~;aj9cw-X>#rD?NK@KEVthE*0q>p zZ+#K8th3RkCX{S^#f1xfSJ4rc?6ObcdNyHho z;13{EJQ1N(f%Lp)$#=_(uqJd-Cy)cDJ;R0o33G=!y4K%{IHqqy<(*{H?mVPb> zR5)Y{aj*8`^UV(NE1m>}wP{WE%hi*OHd3>JXTIqv3oh6{HK#79$_DkyYlHfz<2bDn`PC{sWU;AWRA=w9zs_4CD-VAHR4nHzM zrc9wZ?a*?{879iDgCItd=PwlX^Fa$QfKxDcH1DBPQp6O$qHz^xqXM8 zX{*^J2v&>C{XGApN88WBi3Fp22Ua)W1?7E4W^MPo625DeFu;{87_Rt#y*~_*(5H!m z@A?_}_QIX?+2*IRR{t;cY4ldYj|zjWG=j0R8eR%Rn>OG^7auZSJVG-TO_ zm6g!mHhHq(n?bQn4(f+lUr;LCWe-X|zMsO+`Ldjmv6eaMpy{B!D^R$T>dAVB&1N@X z#1Z*;gdiw(;RPYv`FSsT^s(V;CdsR!oloIy-mT2xP5GxD+~}I1R=cq5mec^IxPC3rD>p9k2hLA=Tt$LO=gc?mnY@JERK{2@iOc2E8oj!q@Zizs0|u`U&BJ!2@YRDkv2}0t4m+#Uv#yK*PpXOSa`ppuHb8st e-UqxLv4gRvDM#sgk)lrkz{ Date: Fri, 27 Apr 2012 18:06:38 +0000 Subject: [PATCH 14/91] diagram for budget 2009 svn path=/branches/test/; revision=23215 --- about/funds/diagrams.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/about/funds/diagrams.css b/about/funds/diagrams.css index 4ba962df72..313a6496b0 100644 --- a/about/funds/diagrams.css +++ b/about/funds/diagrams.css @@ -2,6 +2,8 @@ width: 16px; height: 16px; border: 1px solid #000; + padding-right: 1em; + margin-right: 1em; } #income { } From 8c29c28ffac32210f14ce57db657a0f47b00f8e0 Mon Sep 17 00:00:00 2001 From: hugo Date: Fri, 27 Apr 2012 18:08:00 +0000 Subject: [PATCH 15/91] diagram for budget 2009 svn path=/branches/test/; revision=23216 --- about/funds/2009.en.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/funds/2009.en.xhtml b/about/funds/2009.en.xhtml index 823c0e8232..d04cbbbb73 100644 --- a/about/funds/2009.en.xhtml +++ b/about/funds/2009.en.xhtml @@ -13,7 +13,7 @@

FSFE - Income and Expense 2009

- Diagram of 2009 income + Diagram of 2009 income
Income EUR
Donations1
 Donations1 107,539.55
Fellowship contributions
 Fellowship contributions 76,014,91
EU project funding2
 EU project funding2 7,352.97
Merchandise
 Merchandise 10,148.28
Interest
 Interest 484.19
From ac1a96bfad1eff5f41bd6dd11a3be5c37b1f545b Mon Sep 17 00:00:00 2001 From: samtuke Date: Sun, 29 Apr 2012 15:00:30 +0000 Subject: [PATCH 16/91] fixed fellowship heading color, added items to fellowship menu svn path=/branches/test/; revision=23217 --- look/fellowship.css | 2 +- tools/menu-global.xml | 2 ++ tools/texts-en.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/look/fellowship.css b/look/fellowship.css index 90c4741666..ca5701f3ef 100644 --- a/look/fellowship.css +++ b/look/fellowship.css @@ -26,7 +26,7 @@ a:visited { h2, h3, h4 { - color: rgb(66,121,32); + color: #173B00; } #logo { diff --git a/tools/menu-global.xml b/tools/menu-global.xml index 05d18e1a0c..988a122a68 100644 --- a/tools/menu-global.xml +++ b/tools/menu-global.xml @@ -15,6 +15,8 @@ /fellowship/card.html /fellowship/communicate.html /fellowship/contact.html + /fellowship/get-active.html + /fellowship/faq.html http://planet.fsfe.org/ diff --git a/tools/texts-en.xml b/tools/texts-en.xml index 42d9129556..141ca7e13c 100644 --- a/tools/texts-en.xml +++ b/tools/texts-en.xml @@ -77,6 +77,8 @@ Join Card Communicate + Get active + F.A.Q. Contact Planet Blogs From 0e44278ecbe7ea0135387ef999a7dda37258020d Mon Sep 17 00:00:00 2001 From: samtuke Date: Sun, 29 Apr 2012 15:10:08 +0000 Subject: [PATCH 17/91] fixed H1 colour svn path=/branches/test/; revision=23218 --- look/fellowship.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/look/fellowship.css b/look/fellowship.css index ca5701f3ef..539f4f968b 100644 --- a/look/fellowship.css +++ b/look/fellowship.css @@ -23,9 +23,7 @@ a:visited { color: rgb(193,225,151); } -h2, -h3, -h4 { +h1 { color: #173B00; } From 52fa5264881bf781a3aa8a1078c13720978db508 Mon Sep 17 00:00:00 2001 From: samtuke Date: Sun, 29 Apr 2012 15:36:02 +0000 Subject: [PATCH 18/91] fixed heading css svn path=/branches/test/; revision=23219 --- look/fellowship.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/look/fellowship.css b/look/fellowship.css index 539f4f968b..cbbfe41d39 100644 --- a/look/fellowship.css +++ b/look/fellowship.css @@ -23,7 +23,7 @@ a:visited { color: rgb(193,225,151); } -h1 { +h1, h2, h3 { color: #173B00; } From 2e5e082bda8937ee2412a5fcb59d973ee9e74d19 Mon Sep 17 00:00:00 2001 From: samtuke Date: Sun, 29 Apr 2012 16:28:32 +0000 Subject: [PATCH 19/91] added draft get active page svn path=/branches/test/; revision=23220 --- fellowship/get-active.en.xhtml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 fellowship/get-active.en.xhtml diff --git a/fellowship/get-active.en.xhtml b/fellowship/get-active.en.xhtml new file mode 100644 index 0000000000..6d34845dba --- /dev/null +++ b/fellowship/get-active.en.xhtml @@ -0,0 +1,27 @@ + + + + + Communicate with other Fellows + + + + +

Get active

+ +

Start a Fellowship Group

+ +

Organise an event or conference

+ +

Become a Country Team Coordinator

+ +

Get press coverage for issues or activities

+ +

Engage in local or national politics

+ +

Grow the Free Software community

+ + + + $Date: 2011-12-07 12:09:14 +0000 (Wed, 07 Dec 2011) $ $Author: ato $ + From 668332c5b4b340d7668e43935c034113855aa5a5 Mon Sep 17 00:00:00 2001 From: samtuke Date: Mon, 21 May 2012 17:59:08 +0000 Subject: [PATCH 20/91] changed logo, added source, backed up old one svn path=/branches/test/; revision=23337 --- graphics/fellowship/logo-old.png | Bin 0 -> 14553 bytes graphics/fellowship/logo.png | Bin 14553 -> 7797 bytes graphics/fellowship/logo.svg | 150 +++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 graphics/fellowship/logo-old.png create mode 100644 graphics/fellowship/logo.svg diff --git a/graphics/fellowship/logo-old.png b/graphics/fellowship/logo-old.png new file mode 100644 index 0000000000000000000000000000000000000000..4852d0cc614f59ae6cded9fba813d4dd2b061947 GIT binary patch literal 14553 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 UcJrBllZYT$NhOIYG2@{B2gp8p1poj5 literal 0 HcmV?d00001 diff --git a/graphics/fellowship/logo.png b/graphics/fellowship/logo.png index 4852d0cc614f59ae6cded9fba813d4dd2b061947..55c733ccf7362e68d1f116f285f2b362f6b356e4 100644 GIT binary patch literal 7797 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 UcJrBllZYT$NhOIYG2@{B2gp8p1poj5 diff --git a/graphics/fellowship/logo.svg b/graphics/fellowship/logo.svg new file mode 100644 index 0000000000..04dc37bdfa --- /dev/null +++ b/graphics/fellowship/logo.svg @@ -0,0 +1,150 @@ + + + + + + + + image/svg+xml + + + + + + + + + + fellowship + Free Software Foundation Europe + + + + + + + + + + + From 1d1d9a9a9275e7e5a9ce84a2056b32fa1df98f2f Mon Sep 17 00:00:00 2001 From: samtuke Date: Mon, 21 May 2012 18:25:08 +0000 Subject: [PATCH 21/91] changed logo styling svn path=/branches/test/; revision=23338 --- look/fellowship.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/look/fellowship.css b/look/fellowship.css index cbbfe41d39..d2474de58d 100644 --- a/look/fellowship.css +++ b/look/fellowship.css @@ -29,12 +29,13 @@ h1, h2, h3 { #logo { width: auto; + padding-right: 2.5em; } #header { background-image: url("/graphics/fellowship/ribbon_fellowship2.png"); background-position: bottom left; - height: 250px; + height: 210px; } /* display Fellowship sidebar menu, hiding FSFE menu */ From 5b7e0d8d80271cf73d3c69716a49899993c05c37 Mon Sep 17 00:00:00 2001 From: mk Date: Wed, 23 May 2012 09:21:42 +0000 Subject: [PATCH 22/91] Checking how it will look like svn path=/branches/test/; revision=23348 --- .../secure-boot-analysis.en.xhtml | 202 ++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml new file mode 100644 index 0000000000..11585ff41c --- /dev/null +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -0,0 +1,202 @@ + + + + + "Secure Boot": Who will control our next computers? + + + + + + +

"Secure Boot": Who will control our next computers?

+ +

The FSFE wants to ensure that the owners of IT devices are always in full +and sole control of them.

+ +

With a function called "Secure Boot", which will be deployed in computers +starting 2012, manufacturers of IT hardware and software components strive to +get into a position where they permanently control the IT devices they produce. +Hence such devices will be "secure" from the manufacturer's perspective, but +not necessarily from the owner's point of view: The owner may be treated as an +adversary. By preventing usages the manufacturer do not want, they can control +what a general purpose IT machine (e.g. a PC, laptop, netbook) can be used for. +In case of IT devices with internet access, they can alter these usage +restrictions any time without even informing the device owner. Thereby +IT-manufacturers at their will, can take away common rights owners of products +usually receive.

+ +

Secure boot: Gatekeeper before operating system

+ +

When powered on, an IT-device has to execute a startup-process, called +booting. In case of computers this startup-process is comprised of executing +firmware, which starts a boot-loader for starting an operating system to enable +you to run your application software. In 2012 the industry-wide transition of +PCs, notebooks, servers, and other computers' firmware from conventional BIOS +to UEFI will mostly be +complete. Compared to conventional BIOS, UEFI bears several advantages, as +faster boot time, operating system independent drivers, and promises extended +security.

+ +

The security aspect is handled by a function called "Secure Boot". Since +UEFI 2.3.1 (released April 8, 2011) "Secure Boot" ensures that during the +boot-process only software will execute, which complies with one of predeployed +cryptographic signatures. This is done to prevent unwanted software from being +executed during the startup of the computer, by cryptographically verifying a +signature of each software-component (various stages of the UEFI firmware, the +boot loader, the operating system kernel, etc.) before starting it. Therefore +the cryptographic signatures to be utilised have to be deployed in the UEFI +signature database of each IT-device equipped with UEFI "Secure Boot", +before a cryptographically signed software component can be +started on that specific machine.

+ +

FSFE expects that the vast majority of the computer manufacturers will +implement "Secure Boot", as Microsoft announced that computer manufacturers +must implement UEFI "Secure Boot", if they want to acquire a Windows 8 +certification for devices they build, e.g. for putting the "Compatible with +Windows 8" logo on them.

+ +

The computer: A general purpose machine

+ + +

Evolving the computer as a general purpose machine over the past decades, +our society has created a powerful tool to perform all kinds of tasks with a +single machine. Now IT manufacturers have discovered that they may have an +economic interest to arbitrarily limit what these machines can achieve. With +"Secure Boot" the owners of IT devices will not be able to independently +determine the usage of their machines, as they cannot decide which software to +run.

+ +

Finally, the entity who eventually controls which software can be executed +on a device and thus determines the specific functions the device performs, +ultimately can control any data processed and stored by the device. In result, +the owner of an IT device may not be in sole control of their own data any +more.

+ +

For which devices does this apply?

+ +

Currently many people base their analysis of the UEFI situation on the +"Windows 8 Hardware Certification Requirements", published by Microsoft in +December 2011. It is understood that Microsoft did and still does not have to +make any versions of these hardware-certification requirements public, as they +are the base of an individual contract between Microsoft and each hardware +manufacturer seeking to obtain Microsoft's Windows 8 Certification for their +computer-products. Hence the "Windows 8 Hardware Certification Requirements" +can change anytime without public notice, specific details of the +logo-requirements differ between manufacturers, etc.: Everything happens at +Microsoft's will and mostly behind closed doors. Thus none ought to rely on the +published version of the "Windows 8 Hardware Certification Requirements" being +static, but realise the details devised for "Secure Boot" as a "moving +target".

+ +

So the problem of "Secure Boot" does not necessarily only exist for +"Connected Stand-By Systems" (a large share of the future market of notebooks, +netbooks and PCs) and computers based on ARM microprocessors (mainly tablets +and mobile phones), but can be expanded to any other type of devices by +Microsoft anytime. Equally, hardware-manufacturers not producing Windows 8 +devices may deploy UEFI-"Secure Boot" or other boot-processes restricted by the +help of cryptographic signatures. TiVo has been doing that for a whole decade, +and various game consoles from Sony to Microsoft are using cryptographically +restricted boot processes as well. Other manufacturers of software may employ +specifications or requirements similar to the "Windows 8 Hardware Certification +Requirements", in order to artificially restrict the capabilities of +IT-devices.

+ +

Restricitons to be extended to applications?

+ +

While the UEFI "Secure Boot" specification (as well as the TCG +specifications defining "Trusted Boot") covers the primary boot-process up to +the OS-kernel, the infrastructure to extend signature-checking to all software +running on a computer is mature and working in various Operating Systems. But +beside Windows 8 it is currently only enforced for Windows device drivers.

+ +

If all these measures would be solely under control of device owners, all +these measures could be in their best interest, helping them to enhance +IT-security in a mostly unsecured area to date: the boot-process. I.e. +if the security subsystems specified by the UEFI consortium +and the Trusted Computing Group (TCG) would technically guarantee the owner's +permanent, full and sole control over configuration and management of these +security-subsystems, which includes all their creation, storage, use and +deletion of cryptographic keys, certificates and signatures. But as soon as +other entities can utilise these security subsystems, this enables them to +preclude unintended or simply unforeseen usages of these IT devices.

+ +

Thread to general purpose computing

+ +

Hence in a broader picture the availability of true general purpose +computers under full owner control may become severely hampered. Devices +significantly restricted by measures as "Secure Boot" under company control are +usually called appliances or special purpose computers (e.g. media centers, +telephones, book readers). Thus at least some Windows 8 devices will rather +constitute a Windows appliance than a customary computer. While there may be a +market for such computing appliances, the FSFE strongly calls for clearly +labelling such IT-devices as restricted to use models foreseen by a company, in +order to duly inform a potential buyer.

+ +

Is circumventing those restrictions an option?

+ +

IT savvy people may think that they have seen such measures before, and most +of them were cracked. This was the case in various models of the PlayStation +and Xbox game consoles, as well as many newer mobile phones. But the quality +and breadth is higher this time:

+ +
    + +
  • UEFI "Secure Boot" is primarily aimed at traditional PCs.
    • + +
  • It is backed by large parts of the IT industry, see e.g. the members of the UEFI-Consortium.
    • + +
  • Its design and specification are result of a collective effort of IT + engineers from various companies. It draws from a decade of experience with + signature based boot processes and hence avoids many classical pitfalls, e.g. + the lack of a properly specified and cryptographically secured firmware + (UEFI) update process.
    • + +
  • It utilises hardware based security subsystems, e.g. as specified by the + TCG (TPM or MTM, and accompanying specifications): While the + UEFI-specification does not mandate a specific implementation of "protected + storage" for cryptographic keys, certificates and signatures, + the recent TCG-specifications (since 2011) fit well.
    • + +
  • Security-flaws in "Secure Boot" implementations are expected (as in all + software), but as there will be commercial competition between UEFI vendors, + it is in their best interest to resolve these security flaws. In contrast, in + the past only single manufacturers implemented cryptographically restricted + boot-processes for their own, specific devices: TiVo Inc. for their TIVOs, + Microsoft for various generations of their Xbox, as well as Sony for their + Playstations.
    • + +
+ +

FSFE's demands

+ +

For maintaining sustained growth in the development and use of software, the +broad availability of general purpose computers is crucial.

+ +

Thus the FSFE strongly calls for concisely informing buyers before their +purchase of the technical measures, the specific usage restrictions and their +consequences in IT-devices with signature based usage restrictions under +control of a company.

+ +

Furthermore, the FSFE strongly recommends to exlusively purchase IT devices, +which grant their owners full and sole control over security subsystems (e. g. +signature-based usage-restrictions), in order to maintain the ability to +install arbitrary software and lastly to retain exclusive control over ones own +data.

+ + + + $Date$ $Author: Matthias Kirschner$ + + + + + From 4399cfd86952c2306573e5f55e6e523af8197429 Mon Sep 17 00:00:00 2001 From: samtuke Date: Thu, 24 May 2012 16:51:37 +0000 Subject: [PATCH 23/91] made dt green svn path=/branches/test/; revision=23363 --- look/fellowship.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/look/fellowship.css b/look/fellowship.css index d2474de58d..c17ab1ba68 100644 --- a/look/fellowship.css +++ b/look/fellowship.css @@ -40,4 +40,8 @@ h1, h2, h3 { /* display Fellowship sidebar menu, hiding FSFE menu */ #menu ul li.fellowship ul { display: block } -#menu ul li.fsfe ul { display: none } \ No newline at end of file +#menu ul li.fsfe ul { display: none } + +dt { + color: #173B00; +} \ No newline at end of file From dd0b3ddef0c4dab1ef8ea5c821168fe07bbdc855 Mon Sep 17 00:00:00 2001 From: samtuke Date: Thu, 24 May 2012 16:54:13 +0000 Subject: [PATCH 24/91] fixed translation of planet menu item svn path=/branches/test/; revision=23366 --- fellowship/fellowship.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fellowship/fellowship.xsl b/fellowship/fellowship.xsl index 260b20743a..c6867a43ce 100644 --- a/fellowship/fellowship.xsl +++ b/fellowship/fellowship.xsl @@ -413,7 +413,7 @@ planet http://planet.fsfe.org/ - Planet + -

"Secure Boot": Who will control our next computers?

+

"Secure Boot": Who will control your next computer?

-

The FSFE wants to ensure that the owners of IT devices are always in full -and sole control of them.

+

FSFE's goal is to ensure that the owners of IT devices are always in full +and sole control of them. This basic principle is currently being challenged.

With a function called "Secure Boot", which will be deployed in computers -starting 2012, manufacturers of IT hardware and software components strive to +starting 2012, manufacturers of IT hardware and software components are striving to get into a position where they permanently control the IT devices they produce. Hence such devices will be "secure" from the manufacturer's perspective, but -not necessarily from the owner's point of view: The owner may be treated as an -adversary. By preventing usages the manufacturer do not want, they can control -what a general purpose IT machine (e.g. a PC, laptop, netbook) can be used for. +not necessarily from the owner's point of view: The owner is essentially treated as an +adversary. By preventing uses of the device which manufacturers disagree with, they can control +and limit what a general purpose IT machine (e.g. a PC, laptop, netbook) may be used for. In case of IT devices with internet access, they can alter these usage -restrictions any time without even informing the device owner. Thereby -IT-manufacturers at their will, can take away common rights owners of products -usually receive.

+restrictions at any time without even informing the device owner. As a result, +IT manufacturers at their sole discretion can strip owners of the rights +usually associated with owning a device.

-

Secure boot: Gatekeeper before operating system

+

"SecureBoot": Gatekeeper before the operating system

-

When powered on, an IT-device has to execute a startup-process, called -booting. In case of computers this startup-process is comprised of executing -firmware, which starts a boot-loader for starting an operating system to enable -you to run your application software. In 2012 the industry-wide transition of -PCs, notebooks, servers, and other computers' firmware from conventional BIOS -to UEFI will mostly be -complete. Compared to conventional BIOS, UEFI bears several advantages, as -faster boot time, operating system independent drivers, and promises extended -security.

+

When powered on, every IT devices executes a startup process called +booting. In case of computers this startup process is comprised of executing +firmware [FIXME optional: which resides on the devices main board.]. This firmware, in +turn, starts another program called a boot loader, which then powers up the +actual operating system, on top of which users run their applications. +In [FIXME: when? early? late?] 2012 the industry-wide +transition of PCs, notebooks, servers, and other computers' firmware +from conventional BIOS +to UEFI will +be mostly complete. Compared to conventional BIOS, UEFI has several +advantages, such as faster boot time, operating system independent drivers, +and the promise of extended security.

The security aspect is handled by a function called "Secure Boot". Since UEFI 2.3.1 (released April 8, 2011) "Secure Boot" ensures that during the -boot-process only software will execute, which complies with one of predeployed +boot process only software will execute, which complies with one of predeployed cryptographic signatures. This is done to prevent unwanted software from being executed during the startup of the computer, by cryptographically verifying a -signature of each software-component (various stages of the UEFI firmware, the +signature of each software component (various stages of the UEFI firmware, the boot loader, the operating system kernel, etc.) before starting it. Therefore the cryptographic signatures to be utilised have to be deployed in the UEFI signature database of each IT-device equipped with UEFI "Secure Boot", before a cryptographically signed software component can be -started on that specific machine.

+started on that specific machine. [FIXME: this is a key sentence, but +it needs to be much clearer. What does it mean for a signature to be +"deployed in the signature database"?]

FSFE expects that the vast majority of the computer manufacturers will -implement "Secure Boot", as Microsoft announced that computer manufacturers +implement "Secure Boot", as Microsoft has announced [FIXME: link?] that computer manufacturers must implement UEFI "Secure Boot", if they want to acquire a Windows 8 certification for devices they build, e.g. for putting the "Compatible with Windows 8" logo on them.

@@ -66,15 +72,15 @@ Windows 8" logo on them.

The computer: A general purpose machine

-

Evolving the computer as a general purpose machine over the past decades, -our society has created a powerful tool to perform all kinds of tasks with a +

Developing the computer as a general purpose machine over the past decades, +our society has created a powerful tool. We can now perform all kinds of tasks using a single machine. Now IT manufacturers have discovered that they may have an economic interest to arbitrarily limit what these machines can achieve. With "Secure Boot" the owners of IT devices will not be able to independently determine the usage of their machines, as they cannot decide which software to run.

-

Finally, the entity who eventually controls which software can be executed +

Whoever controls which software can be executed on a device and thus determines the specific functions the device performs, ultimately can control any data processed and stored by the device. In result, the owner of an IT device may not be in sole control of their own data any @@ -86,23 +92,24 @@ more.

"Windows 8 Hardware Certification Requirements", published by Microsoft in December 2011. It is understood that Microsoft did and still does not have to make any versions of these hardware-certification requirements public, as they -are the base of an individual contract between Microsoft and each hardware +are the basis of an individual contract between Microsoft and each hardware manufacturer seeking to obtain Microsoft's Windows 8 Certification for their computer-products. Hence the "Windows 8 Hardware Certification Requirements" can change anytime without public notice, specific details of the logo-requirements differ between manufacturers, etc.: Everything happens at -Microsoft's will and mostly behind closed doors. Thus none ought to rely on the +Microsoft's will and mostly behind closed doors. It is therefore not + possible to rely on the published version of the "Windows 8 Hardware Certification Requirements" being static, but realise the details devised for "Secure Boot" as a "moving target".

-

So the problem of "Secure Boot" does not necessarily only exist for +

So the problem of "Secure Boot" is not necessarily limited to "Connected Stand-By Systems" (a large share of the future market of notebooks, netbooks and PCs) and computers based on ARM microprocessors (mainly tablets and mobile phones), but can be expanded to any other type of devices by -Microsoft anytime. Equally, hardware-manufacturers not producing Windows 8 -devices may deploy UEFI-"Secure Boot" or other boot-processes restricted by the -help of cryptographic signatures. TiVo has been doing that for a whole decade, +Microsoft anytime. Equally, hardware manufacturers not producing Windows 8 +devices may deploy UEFI "Secure Boot" or other boot-processes restricted by the +help of cryptographic signatures. TiVo has been doing this for a decade, and various game consoles from Sony to Microsoft are using cryptographically restricted boot processes as well. Other manufacturers of software may employ specifications or requirements similar to the "Windows 8 Hardware Certification @@ -117,35 +124,36 @@ the OS-kernel, the infrastructure to extend signature-checking to all software running on a computer is mature and working in various Operating Systems. But beside Windows 8 it is currently only enforced for Windows device drivers.

-

If all these measures would be solely under control of device owners, all -these measures could be in their best interest, helping them to enhance -IT-security in a mostly unsecured area to date: the boot-process. I.e. +

If all these measures would be solely under control of device owners, they +could be in their best interest, helping them to enhance security of the boot +process, which today is mostly unsecured. This would be the case if the security subsystems specified by the UEFI consortium -and the Trusted Computing Group (TCG) would technically guarantee the owner's -permanent, full and sole control over configuration and management of these -security-subsystems, which includes all their creation, storage, use and -deletion of cryptographic keys, certificates and signatures. But as soon as -other entities can utilise these security subsystems, this enables them to -preclude unintended or simply unforeseen usages of these IT devices.

+and the Trusted Computing Group (TCG) would guarantee the owner's permanent, +full and sole control over configuration and management of these +security-subsystems, which includes the creation, storage, use and deletion of +cryptographic keys, certificates and signatures. But as soon as other entities +beside the device owner can utilise these security subsystems, this enables +them to preclude unintended or simply unforeseen usages of these IT +devices.

-

Thread to general purpose computing

+

Threat to general purpose computing

-

Hence in a broader picture the availability of true general purpose -computers under full owner control may become severely hampered. Devices +

Hence, with the implementation of "Secure Boot", the availability of true general purpose +computers under full owner control may be greatly reduced. Devices significantly restricted by measures as "Secure Boot" under company control are usually called appliances or special purpose computers (e.g. media centers, telephones, book readers). Thus at least some Windows 8 devices will rather constitute a Windows appliance than a customary computer. While there may be a market for such computing appliances, the FSFE strongly calls for clearly -labelling such IT-devices as restricted to use models foreseen by a company, in +labelling such IT devices as restricted to use models foreseen by a company, in order to duly inform a potential buyer.

-

Is circumventing those restrictions an option?

+

Is circumventing these restrictions an option?

IT savvy people may think that they have seen such measures before, and most of them were cracked. This was the case in various models of the PlayStation -and Xbox game consoles, as well as many newer mobile phones. But the quality -and breadth is higher this time:

+and Xbox game consoles, as well as many newer mobile phones. But the +implementation is much tighter this time, and the scope is much greater:

    @@ -155,7 +163,7 @@ and breadth is higher this time:

    href="TODO">the members of the UEFI-Consortium.
  • Its design and specification are result of a collective effort of IT - engineers from various companies. It draws from a decade of experience with + engineers from various companies. It draws on a decade of experience with signature based boot processes and hence avoids many classical pitfalls, e.g. the lack of a properly specified and cryptographically secured firmware (UEFI) update process.
    • @@ -166,10 +174,10 @@ and breadth is higher this time:

    storage" for cryptographic keys, certificates and signatures, the recent TCG-specifications (since 2011) fit well. -
  • Security-flaws in "Secure Boot" implementations are expected (as in all +
  • Security flaws in "Secure Boot" implementations are expected (as in all software), but as there will be commercial competition between UEFI vendors, - it is in their best interest to resolve these security flaws. In contrast, in - the past only single manufacturers implemented cryptographically restricted + it is in the vendors' best interest to resolve these security flaws. In contrast, in + the past only individual manufacturers implemented cryptographically restricted boot-processes for their own, specific devices: TiVo Inc. for their TIVOs, Microsoft for various generations of their Xbox, as well as Sony for their Playstations.
    • @@ -181,16 +189,16 @@ and breadth is higher this time:

    For maintaining sustained growth in the development and use of software, the broad availability of general purpose computers is crucial.

    -

    Thus the FSFE strongly calls for concisely informing buyers before their -purchase of the technical measures, the specific usage restrictions and their -consequences in IT-devices with signature based usage restrictions under -control of a company.

    +

    FSFE demands that before purchasing a device, buyers must receive clear and +concise information about the technical measures implemented in the device, as +well as the specific usage restrictions and their consequences for the owner +[[FIXME: is this part necessary? -- in IT devices with signature based +restrictions.].

    -

    Furthermore, the FSFE strongly recommends to exlusively purchase IT devices, -which grant their owners full and sole control over security subsystems (e. g. -signature-based usage-restrictions), in order to maintain the ability to -install arbitrary software and lastly to retain exclusive control over ones own -data.

    +

    Furthermore, FSFE strongly recommends buyers to exlusively purchase IT devices +which grant their owners full, sole and permanent control over security subsystems (e. g. +signature-based usag restrictions), in order to maintain the ability to +install arbitrary software and to retain exclusive control over their own data.

    From 647abb57d6619d4115455a22a777d5f9e1d1925a Mon Sep 17 00:00:00 2001 From: mk Date: Sat, 26 May 2012 12:19:11 +0000 Subject: [PATCH 26/91] Moving headline svn path=/branches/test/; revision=23378 --- .../secure-boot-analysis.en.xhtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index 91eff39116..5eb3b48bcb 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -95,8 +95,8 @@ make any versions of these hardware-certification requirements public, as they are the basis of an individual contract between Microsoft and each hardware manufacturer seeking to obtain Microsoft's Windows 8 Certification for their computer-products. Hence the "Windows 8 Hardware Certification Requirements" -can change anytime without public notice, specific details of the -logo-requirements differ between manufacturers, etc.: Everything happens at +can change anytime without public notice, or specific details of the +logo-requirements differ between manufacturers: Everything happens at Microsoft's will and mostly behind closed doors. It is therefore not possible to rely on the published version of the "Windows 8 Hardware Certification Requirements" being @@ -120,10 +120,12 @@ IT-devices.

    While the UEFI "Secure Boot" specification (as well as the TCG specifications defining "Trusted Boot") covers the primary boot-process up to -the OS-kernel, the infrastructure to extend signature-checking to all software +the operating system's kernel, the infrastructure to extend signature-checking to all software running on a computer is mature and working in various Operating Systems. But beside Windows 8 it is currently only enforced for Windows device drivers.

    +

    Threat to general purpose computing

    +

    If all these measures would be solely under control of device owners, they could be in their best interest, helping them to enhance security of the boot process, which today is mostly unsecured. This would be the case @@ -136,8 +138,6 @@ beside the device owner can utilise these security subsystems, this enables them to preclude unintended or simply unforeseen usages of these IT devices.

    -

    Threat to general purpose computing

    -

    Hence, with the implementation of "Secure Boot", the availability of true general purpose computers under full owner control may be greatly reduced. Devices significantly restricted by measures as "Secure Boot" under company control are From f9c2c72b08eec805dce8fc4219b9a20141da73ad Mon Sep 17 00:00:00 2001 From: mk Date: Sun, 27 May 2012 15:08:10 +0000 Subject: [PATCH 27/91] Making sure it is factually correct. svn path=/branches/test/; revision=23382 --- .../secure-boot-analysis.en.xhtml | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index 5eb3b48bcb..306cc078df 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -20,28 +20,28 @@

    FSFE's goal is to ensure that the owners of IT devices are always in full and sole control of them. This basic principle is currently being challenged.

    +Verfügungsgewalt über ihre IT-Geräte innehaben) --> This fundamental principle is recently being challenged.

    With a function called "Secure Boot", which will be deployed in computers starting 2012, manufacturers of IT hardware and software components are striving to get into a position where they permanently control the IT devices they produce. Hence such devices will be "secure" from the manufacturer's perspective, but -not necessarily from the owner's point of view: The owner is essentially treated as an -adversary. By preventing uses of the device which manufacturers disagree with, they can control +not necessarily from the owner's point of view: The owner can be treated as an +adversary. By preventing uses of the device which the manufacturer does not intend, they can control and limit what a general purpose IT machine (e.g. a PC, laptop, netbook) may be used for. In case of IT devices with internet access, they can alter these usage restrictions at any time without even informing the device owner. As a result, -IT manufacturers at their sole discretion can strip owners of the rights -usually associated with owning a device.

    +IT manufacturers at their will can take away common rights owners of products +usually receive.

    -

    "SecureBoot": Gatekeeper before the operating system

    +

    "Secure Boot": Gatekeeper before the operating system

    -

    When powered on, every IT devices executes a startup process called +

    When powered on, IT devices execute a startup process called booting. In case of computers this startup process is comprised of executing -firmware [FIXME optional: which resides on the devices main board.]. This firmware, in -turn, starts another program called a boot loader, which then powers up the -actual operating system, on top of which users run their applications. -In [FIXME: when? early? late?] 2012 the industry-wide +firmware. This firmware, in +turn, starts another program called a boot loader, which then launches the +actual operating system, on top of which applications can be executed. +In 2012 the industry-wide transition of PCs, notebooks, servers, and other computers' firmware from conventional BIOS to UEFI will @@ -59,12 +59,10 @@ boot loader, the operating system kernel, etc.) before starting it. Therefore the cryptographic signatures to be utilised have to be deployed in the UEFI signature database of each IT-device equipped with UEFI "Secure Boot", before a cryptographically signed software component can be -started on that specific machine. [FIXME: this is a key sentence, but -it needs to be much clearer. What does it mean for a signature to be -"deployed in the signature database"?]

    +started on that specific machine.

    FSFE expects that the vast majority of the computer manufacturers will -implement "Secure Boot", as Microsoft has announced [FIXME: link?] that computer manufacturers +implement "Secure Boot", as Microsoft has announced that computer manufacturers must implement UEFI "Secure Boot", if they want to acquire a Windows 8 certification for devices they build, e.g. for putting the "Compatible with Windows 8" logo on them.

    @@ -72,15 +70,16 @@ Windows 8" logo on them.

    The computer: A general purpose machine

    -

    Developing the computer as a general purpose machine over the past decades, -our society has created a powerful tool. We can now perform all kinds of tasks using a -single machine. Now IT manufacturers have discovered that they may have an +

    Evolving the computer as a general purpose machine over the past decades, +our society has created a powerful tool to perform all kinds of tasks with a +single machine. +Now IT manufacturers have discovered that they may have an economic interest to arbitrarily limit what these machines can achieve. With "Secure Boot" the owners of IT devices will not be able to independently determine the usage of their machines, as they cannot decide which software to run.

    -

    Whoever controls which software can be executed +

    The entity who eventually controls which software can be executed on a device and thus determines the specific functions the device performs, ultimately can control any data processed and stored by the device. In result, the owner of an IT device may not be in sole control of their own data any @@ -92,13 +91,13 @@ more.

    "Windows 8 Hardware Certification Requirements", published by Microsoft in December 2011. It is understood that Microsoft did and still does not have to make any versions of these hardware-certification requirements public, as they -are the basis of an individual contract between Microsoft and each hardware +are the base of an individual contract between Microsoft and each hardware manufacturer seeking to obtain Microsoft's Windows 8 Certification for their computer-products. Hence the "Windows 8 Hardware Certification Requirements" can change anytime without public notice, or specific details of the -logo-requirements differ between manufacturers: Everything happens at -Microsoft's will and mostly behind closed doors. It is therefore not - possible to rely on the +logo-requirements may differ between manufacturers: Everything happens at +Microsoft's will and mostly behind closed doors. Thus nobody can rely +on the published version of the "Windows 8 Hardware Certification Requirements" being static, but realise the details devised for "Secure Boot" as a "moving target".

    @@ -126,11 +125,11 @@ beside Windows 8 it is currently only enforced for Windows device drivers.

    Threat to general purpose computing

    -

    If all these measures would be solely under control of device owners, they +

    If all these measures would be solely under control of device owners, these could be in their best interest, helping them to enhance security of the boot process, which today is mostly unsecured. This would be the case if the security subsystems specified by the UEFI consortium -and the Trusted Computing Group (TCG) would guarantee the owner's permanent, +and the Trusted Computing Group (TCG) would technically guarantee the owner's permanent, full and sole control over configuration and management of these security-subsystems, which includes the creation, storage, use and deletion of cryptographic keys, certificates and signatures. But as soon as other entities @@ -152,8 +151,8 @@ order to duly inform a potential buyer.

    IT savvy people may think that they have seen such measures before, and most of them were cracked. This was the case in various models of the PlayStation -and Xbox game consoles, as well as many newer mobile phones. But the -implementation is much tighter this time, and the scope is much greater:

    +and Xbox gaming consoles, as well as many newer mobile phones. But the +quality and breadth is wider this time:

      @@ -176,7 +175,7 @@ implementation is much tighter this time, and the scope is much greater:

    • Security flaws in "Secure Boot" implementations are expected (as in all software), but as there will be commercial competition between UEFI vendors, - it is in the vendors' best interest to resolve these security flaws. In contrast, in + it is in their best interest to resolve these security flaws. In contrast, in the past only individual manufacturers implemented cryptographically restricted boot-processes for their own, specific devices: TiVo Inc. for their TIVOs, Microsoft for various generations of their Xbox, as well as Sony for their @@ -189,8 +188,8 @@ implementation is much tighter this time, and the scope is much greater:

      For maintaining sustained growth in the development and use of software, the broad availability of general purpose computers is crucial.

      -

      FSFE demands that before purchasing a device, buyers must receive clear and -concise information about the technical measures implemented in the device, as +

      FSFE demands that before purchasing a device, buyers must be informed +concisely about the technical measures implemented in the device, as well as the specific usage restrictions and their consequences for the owner [[FIXME: is this part necessary? -- in IT devices with signature based restrictions.].

      From 58b8a389d4fea16262c3bc26444a795bda0f6616 Mon Sep 17 00:00:00 2001 From: mk Date: Sun, 27 May 2012 15:24:48 +0000 Subject: [PATCH 28/91] Checking Demands svn path=/branches/test/; revision=23383 --- .../secure-boot-analysis.en.xhtml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index 306cc078df..24f485b82b 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -189,15 +189,13 @@ quality and breadth is wider this time:

      broad availability of general purpose computers is crucial.

      FSFE demands that before purchasing a device, buyers must be informed -concisely about the technical measures implemented in the device, as -well as the specific usage restrictions and their consequences for the owner -[[FIXME: is this part necessary? -- in IT devices with signature based -restrictions.].

      +concisely about the technical measures implemented in this device, as +well as the specific usage restrictions and their consequences for the owner.

      -

      Furthermore, FSFE strongly recommends buyers to exlusively purchase IT devices +

      Furthermore, FSFE strongly recommends to exlusively purchase IT devices which grant their owners full, sole and permanent control over security subsystems (e. g. signature-based usag restrictions), in order to maintain the ability to -install arbitrary software and to retain exclusive control over their own data.

      +install arbitrary software and lastly to retain exclusive control over ones own data.

      From da0e3168e8e322764267c7fb37adce7a5abe7993 Mon Sep 17 00:00:00 2001 From: mk Date: Sun, 27 May 2012 15:40:00 +0000 Subject: [PATCH 29/91] Final fix up svn path=/branches/test/; revision=23384 --- .../secure-boot-analysis.en.xhtml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index 24f485b82b..25aebf2e01 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -57,12 +57,12 @@ executed during the startup of the computer, by cryptographically verifying a signature of each software component (various stages of the UEFI firmware, the boot loader, the operating system kernel, etc.) before starting it. Therefore the cryptographic signatures to be utilised have to be deployed in the UEFI -signature database of each IT-device equipped with UEFI "Secure Boot", +signature database of each IT device equipped with UEFI "Secure Boot", before a cryptographically signed software component can be started on that specific machine.

      FSFE expects that the vast majority of the computer manufacturers will -implement "Secure Boot", as Microsoft has announced that computer manufacturers +implement "Secure Boot", as Microsoft has announced that computer manufacturers must implement UEFI "Secure Boot", if they want to acquire a Windows 8 certification for devices they build, e.g. for putting the "Compatible with Windows 8" logo on them.

      @@ -89,7 +89,7 @@ more.

      Currently many people base their analysis of the UEFI situation on the "Windows 8 Hardware Certification Requirements", published by Microsoft in -December 2011. It is understood that Microsoft did and still does not have to +December 2011. It is understood that Microsoft did not and still does not have to make any versions of these hardware-certification requirements public, as they are the base of an individual contract between Microsoft and each hardware manufacturer seeking to obtain Microsoft's Windows 8 Certification for their @@ -103,24 +103,24 @@ static, but realise the details devised for "Secure Boot" as a "moving target".

      So the problem of "Secure Boot" is not necessarily limited to -"Connected Stand-By Systems" (a large share of the future market of notebooks, +"Connected Stand-By Systems" (probably a large share of the future market of notebooks, netbooks and PCs) and computers based on ARM microprocessors (mainly tablets and mobile phones), but can be expanded to any other type of devices by Microsoft anytime. Equally, hardware manufacturers not producing Windows 8 -devices may deploy UEFI "Secure Boot" or other boot-processes restricted by the +devices may deploy UEFI "Secure Boot" or other boot processes restricted by the help of cryptographic signatures. TiVo has been doing this for a decade, -and various game consoles from Sony to Microsoft are using cryptographically +and various gaming consoles from Sony to Microsoft are using cryptographically restricted boot processes as well. Other manufacturers of software may employ specifications or requirements similar to the "Windows 8 Hardware Certification Requirements", in order to artificially restrict the capabilities of -IT-devices.

      +IT devices.

      Restricitons to be extended to applications?

      -

      While the UEFI "Secure Boot" specification (as well as the TCG -specifications defining "Trusted Boot") covers the primary boot-process up to +

      While the UEFI "Secure Boot" specification (as well as the +specifications of the Trusted Computing Group defining "Trusted Boot") covers the primary boot process up to the operating system's kernel, the infrastructure to extend signature-checking to all software -running on a computer is mature and working in various Operating Systems. But +running on a computer is mature and working in various operating systems. But beside Windows 8 it is currently only enforced for Windows device drivers.

      Threat to general purpose computing

      @@ -128,10 +128,10 @@ beside Windows 8 it is currently only enforced for Windows device drivers.

      If all these measures would be solely under control of device owners, these could be in their best interest, helping them to enhance security of the boot process, which today is mostly unsecured. This would be the case -if the security subsystems specified by the UEFI consortium +if the security subsystems specified by the UEFI forum and the Trusted Computing Group (TCG) would technically guarantee the owner's permanent, full and sole control over configuration and management of these -security-subsystems, which includes the creation, storage, use and deletion of +security subsystems, which includes the creation, storage, use and deletion of cryptographic keys, certificates and signatures. But as soon as other entities beside the device owner can utilise these security subsystems, this enables them to preclude unintended or simply unforeseen usages of these IT @@ -159,7 +159,7 @@ quality and breadth is wider this time:

    • UEFI "Secure Boot" is primarily aimed at traditional PCs.
    • It is backed by large parts of the IT industry, see e.g. the members of the UEFI-Consortium.
      • + href="http://www.uefi.org/about/">the members of the UEFI Forum.
    • Its design and specification are result of a collective effort of IT engineers from various companies. It draws on a decade of experience with @@ -169,15 +169,15 @@ quality and breadth is wider this time:

    • It utilises hardware based security subsystems, e.g. as specified by the TCG (TPM or MTM, and accompanying specifications): While the - UEFI-specification does not mandate a specific implementation of "protected + UEFI specification does not mandate a specific implementation of "protected storage" for cryptographic keys, certificates and signatures, - the recent TCG-specifications (since 2011) fit well.
      • + the recent TCG specifications (since 2011) fit well.
    • Security flaws in "Secure Boot" implementations are expected (as in all software), but as there will be commercial competition between UEFI vendors, it is in their best interest to resolve these security flaws. In contrast, in the past only individual manufacturers implemented cryptographically restricted - boot-processes for their own, specific devices: TiVo Inc. for their TIVOs, + boot processes for their own, specific devices: TiVo Inc. for their TIVOs, Microsoft for various generations of their Xbox, as well as Sony for their Playstations.
      • From e162ced6f862b7b22f2d8a1b2dd50166b62236f1 Mon Sep 17 00:00:00 2001 From: mk Date: Sun, 27 May 2012 15:41:17 +0000 Subject: [PATCH 30/91] Formating svn path=/branches/test/; revision=23385 --- .../secure-boot-analysis.en.xhtml | 165 +++++++++--------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index 25aebf2e01..fbb6b7dfcc 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -18,40 +18,39 @@

      "Secure Boot": Who will control your next computer?

      -

      FSFE's goal is to ensure that the owners of IT devices are always in full -and sole control of them. This fundamental principle is recently being challenged.

      +

      FSFE's goal is to ensure that the owners of IT devices are always in full +and sole control of them. This fundamental principle +is recently being challenged.

      With a function called "Secure Boot", which will be deployed in computers -starting 2012, manufacturers of IT hardware and software components are striving to -get into a position where they permanently control the IT devices they produce. -Hence such devices will be "secure" from the manufacturer's perspective, but -not necessarily from the owner's point of view: The owner can be treated as an -adversary. By preventing uses of the device which the manufacturer does not intend, they can control -and limit what a general purpose IT machine (e.g. a PC, laptop, netbook) may be used for. -In case of IT devices with internet access, they can alter these usage -restrictions at any time without even informing the device owner. As a result, -IT manufacturers at their will can take away common rights owners of products -usually receive.

      +starting 2012, manufacturers of IT hardware and software components are +striving to get into a position where they permanently control the IT devices +they produce. Hence such devices will be "secure" from the manufacturer's +perspective, but not necessarily from the owner's point of view: The owner can +be treated as an adversary. By preventing uses of the device which the +manufacturer does not intend, they can control and limit what a general purpose +IT machine (e.g. a PC, laptop, netbook) may be used for. In case of IT devices +with internet access, they can alter these usage restrictions at any time +without even informing the device owner. As a result, IT manufacturers at their +will can take away common rights owners of products usually receive.

      "Secure Boot": Gatekeeper before the operating system

      -

      When powered on, IT devices execute a startup process called -booting. In case of computers this startup process is comprised of executing -firmware. This firmware, in -turn, starts another program called a boot loader, which then launches the -actual operating system, on top of which applications can be executed. -In 2012 the industry-wide -transition of PCs, notebooks, servers, and other computers' firmware -from conventional BIOS -to UEFI will -be mostly complete. Compared to conventional BIOS, UEFI has several -advantages, such as faster boot time, operating system independent drivers, -and the promise of extended security.

      +

      When powered on, IT devices execute a startup process called booting. In +case of computers this startup process is comprised of executing firmware. This +firmware, in turn, starts another program called a boot loader, which then +launches the actual operating system, on top of which applications can be +executed. In 2012 the industry-wide transition of PCs, notebooks, servers, and +other computers' firmware from conventional BIOS to UEFI will be mostly +complete. Compared to conventional BIOS, UEFI has several advantages, such as +faster boot time, operating system independent drivers, and the promise of +extended security.

      The security aspect is handled by a function called "Secure Boot". Since -UEFI 2.3.1 (released April 8, 2011) "Secure Boot" ensures that during the -boot process only software will execute, which complies with one of predeployed +UEFI 2.3.1 (released April 8, 2011) "Secure Boot" ensures that during the boot +process only software will execute, which complies with one of predeployed cryptographic signatures. This is done to prevent unwanted software from being executed during the startup of the computer, by cryptographically verifying a signature of each software component (various stages of the UEFI firmware, the @@ -62,25 +61,25 @@ signature database of each IT device equipped with UEFI "Secure Boot", started on that specific machine.

      FSFE expects that the vast majority of the computer manufacturers will -implement "Secure Boot", as Microsoft has announced that computer manufacturers -must implement UEFI "Secure Boot", if they want to acquire a Windows 8 -certification for devices they build, e.g. for putting the "Compatible with -Windows 8" logo on them.

      +implement "Secure Boot", as Microsoft has + announced that computer manufacturers must implement UEFI "Secure Boot", +if they want to acquire a Windows 8 certification for devices they build, e.g. +for putting the "Compatible with Windows 8" logo on them.

      The computer: A general purpose machine

      -

      Evolving the computer as a general purpose machine over the past decades, +

      Evolving the computer as a general purpose machine over the past decades, our society has created a powerful tool to perform all kinds of tasks with a -single machine. -Now IT manufacturers have discovered that they may have an +single machine. Now IT manufacturers have discovered that they may have an economic interest to arbitrarily limit what these machines can achieve. With "Secure Boot" the owners of IT devices will not be able to independently determine the usage of their machines, as they cannot decide which software to run.

      -

      The entity who eventually controls which software can be executed -on a device and thus determines the specific functions the device performs, +

      The entity who eventually controls which software can be executed on a +device and thus determines the specific functions the device performs, ultimately can control any data processed and stored by the device. In result, the owner of an IT device may not be in sole control of their own data any more.

      @@ -89,70 +88,71 @@ more.

      Currently many people base their analysis of the UEFI situation on the "Windows 8 Hardware Certification Requirements", published by Microsoft in -December 2011. It is understood that Microsoft did not and still does not have to -make any versions of these hardware-certification requirements public, as they -are the base of an individual contract between Microsoft and each hardware +December 2011. It is understood that Microsoft did not and still does not have +to make any versions of these hardware-certification requirements public, as +they are the base of an individual contract between Microsoft and each hardware manufacturer seeking to obtain Microsoft's Windows 8 Certification for their computer-products. Hence the "Windows 8 Hardware Certification Requirements" can change anytime without public notice, or specific details of the logo-requirements may differ between manufacturers: Everything happens at -Microsoft's will and mostly behind closed doors. Thus nobody can rely -on the +Microsoft's will and mostly behind closed doors. Thus nobody can rely on the published version of the "Windows 8 Hardware Certification Requirements" being static, but realise the details devised for "Secure Boot" as a "moving target".

      -

      So the problem of "Secure Boot" is not necessarily limited to -"Connected Stand-By Systems" (probably a large share of the future market of notebooks, +

      So the problem of "Secure Boot" is not necessarily limited to "Connected +Stand-By Systems" (probably a large share of the future market of notebooks, netbooks and PCs) and computers based on ARM microprocessors (mainly tablets and mobile phones), but can be expanded to any other type of devices by Microsoft anytime. Equally, hardware manufacturers not producing Windows 8 devices may deploy UEFI "Secure Boot" or other boot processes restricted by the -help of cryptographic signatures. TiVo has been doing this for a decade, -and various gaming consoles from Sony to Microsoft are using cryptographically +help of cryptographic signatures. TiVo has been doing this for a decade, and +various gaming consoles from Sony to Microsoft are using cryptographically restricted boot processes as well. Other manufacturers of software may employ specifications or requirements similar to the "Windows 8 Hardware Certification -Requirements", in order to artificially restrict the capabilities of -IT devices.

      +Requirements", in order to artificially restrict the capabilities of IT +devices.

      Restricitons to be extended to applications?

      -

      While the UEFI "Secure Boot" specification (as well as the -specifications of the Trusted Computing Group defining "Trusted Boot") covers the primary boot process up to -the operating system's kernel, the infrastructure to extend signature-checking to all software -running on a computer is mature and working in various operating systems. But -beside Windows 8 it is currently only enforced for Windows device drivers.

      +

      While the UEFI "Secure Boot" specification (as well as the specifications of +the Trusted Computing Group defining "Trusted Boot") covers the primary boot +process up to the operating system's kernel, the infrastructure to extend +signature-checking to all software running on a computer is mature and working +in various operating systems. But beside Windows 8 it is currently only +enforced for Windows device drivers.

      Threat to general purpose computing

      If all these measures would be solely under control of device owners, these could be in their best interest, helping them to enhance security of the boot process, which today is mostly unsecured. This would be the case -if the security subsystems specified by the UEFI forum -and the Trusted Computing Group (TCG) would technically guarantee the owner's permanent, -full and sole control over configuration and management of these +if the security subsystems specified by the UEFI forum and the +Trusted Computing Group (TCG) would technically guarantee the owner's +permanent, full and sole control over configuration and management of these security subsystems, which includes the creation, storage, use and deletion of cryptographic keys, certificates and signatures. But as soon as other entities beside the device owner can utilise these security subsystems, this enables them to preclude unintended or simply unforeseen usages of these IT devices.

      -

      Hence, with the implementation of "Secure Boot", the availability of true general purpose -computers under full owner control may be greatly reduced. Devices -significantly restricted by measures as "Secure Boot" under company control are -usually called appliances or special purpose computers (e.g. media centers, -telephones, book readers). Thus at least some Windows 8 devices will rather -constitute a Windows appliance than a customary computer. While there may be a -market for such computing appliances, the FSFE strongly calls for clearly -labelling such IT devices as restricted to use models foreseen by a company, in -order to duly inform a potential buyer.

      +

      Hence, with the implementation of "Secure Boot", the availability of true +general purpose computers under full owner control may be greatly reduced. +Devices significantly restricted by measures as "Secure Boot" under company +control are usually called appliances or special purpose computers (e.g. media +centers, telephones, book readers). Thus at least some Windows 8 devices will +rather constitute a Windows appliance than a customary computer. While there +may be a market for such computing appliances, the FSFE strongly calls for +clearly labelling such IT devices as restricted to use models foreseen by a +company, in order to duly inform a potential buyer.

      Is circumventing these restrictions an option?

      IT savvy people may think that they have seen such measures before, and most of them were cracked. This was the case in various models of the PlayStation -and Xbox gaming consoles, as well as many newer mobile phones. But the -quality and breadth is wider this time:

      +and Xbox gaming consoles, as well as many newer mobile phones. But the quality +and breadth is wider this time:

        @@ -168,18 +168,18 @@ quality and breadth is wider this time:

        (UEFI) update process.
      • It utilises hardware based security subsystems, e.g. as specified by the - TCG (TPM or MTM, and accompanying specifications): While the - UEFI specification does not mandate a specific implementation of "protected - storage" for cryptographic keys, certificates and signatures, - the recent TCG specifications (since 2011) fit well.
        • + TCG (TPM or MTM, and accompanying specifications): While the UEFI + specification does not mandate a specific implementation of "protected + storage" for cryptographic keys, certificates and signatures, the recent TCG + specifications (since 2011) fit well.
      • Security flaws in "Secure Boot" implementations are expected (as in all software), but as there will be commercial competition between UEFI vendors, it is in their best interest to resolve these security flaws. In contrast, in - the past only individual manufacturers implemented cryptographically restricted - boot processes for their own, specific devices: TiVo Inc. for their TIVOs, - Microsoft for various generations of their Xbox, as well as Sony for their - Playstations.
        • + the past only individual manufacturers implemented cryptographically + restricted boot processes for their own, specific devices: TiVo Inc. for + their TIVOs, Microsoft for various generations of their Xbox, as well as Sony + for their Playstations.
      @@ -188,20 +188,21 @@ quality and breadth is wider this time:

      For maintaining sustained growth in the development and use of software, the broad availability of general purpose computers is crucial.

      -

      FSFE demands that before purchasing a device, buyers must be informed -concisely about the technical measures implemented in this device, as -well as the specific usage restrictions and their consequences for the owner.

      +

      FSFE demands that before purchasing a device, buyers must be informed +concisely about the technical measures implemented in this device, as well as +the specific usage restrictions and their consequences for the owner.

      -

      Furthermore, FSFE strongly recommends to exlusively purchase IT devices -which grant their owners full, sole and permanent control over security subsystems (e. g. -signature-based usag restrictions), in order to maintain the ability to -install arbitrary software and lastly to retain exclusive control over ones own data.

      +

      Furthermore, FSFE strongly recommends to exlusively purchase IT devices +which grant their owners full, sole and permanent control over security +subsystems (e. g. signature-based usag restrictions), in order to maintain the +ability to install arbitrary software and lastly to retain exclusive control +over ones own data.

      $Date$ $Author: Matthias Kirschner$ - + From 30c474043ae7051cef39603c1c9c15f97ac51bbf Mon Sep 17 00:00:00 2001 From: samtuke Date: Mon, 28 May 2012 11:54:10 +0000 Subject: [PATCH 31/91] imported faq page from trunk svn path=/branches/test/; revision=23390 --- fellowship/faq.en.xhtml | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 fellowship/faq.en.xhtml diff --git a/fellowship/faq.en.xhtml b/fellowship/faq.en.xhtml new file mode 100755 index 0000000000..2045c76b6f --- /dev/null +++ b/fellowship/faq.en.xhtml @@ -0,0 +1,54 @@ + + + + + FAQ + + +

      FAQ

      + +
      +
      Can the Fellowship sponsor my event?
      +
      FSFE may be able to help with travel, material, or campaign costs. Contact the Fellowship administrators if you would like financial help with a Fellowship related activity.
      + +
      Can I use the FSFE or Fellowship logo?
      +
      The Fellowship logo (and variations of it) can be used in association with any Free Software related activity performed by FSFE Fellows. It can also be incorperated into logos of local Fellowship groups if so desired.
      + +
      If you would like to use the FSFE logo, please see the advocacy page.
      + +
      How can I contact other Fellows in my area?
      +
      If there is already a local Fellowship group in your area, use their mailing-list to contact them (see "Is there already a Fellowship Group in my area?").
      + +
      If there is an FSFE team in your country you can ask them who else is in your area. Their details can be found on the Country Teams page.
      + +
      Alternatively you can ask the Fellowship administrators for information.
      + +
      See also Communicate with other Fellows".
      + +
      Can I start a new Fellowship group?
      +
      Absolutely! See "Starting a Fellowship Group" for help and information.
      + +
      Can I use Fellowship services for my project or event?
      +
      Fellows are encouraged to use FSFE services to coordinate Free Software related events. See "Fellowship Services" for information about what services are available.
      + +
      + +
      Can I run a Fellowship booth at an event?
      +
      Yes but you need training. Ask for stock... use these forms...
      + +
      + +
      What if I can't afford the minimum Fellowship donation?
      +
      See information about the Fellowship grant.
      + +
      Is there already a Fellowship Group in my area?
      +
      A list of existing groups can be found on the Fellowship Wiki.
      + +
      Can I contact FSFE Fellows with some news or an event?
      +
      If your news or event is non-commercial and relates to Free Software, please send information about it to the Fellowship administrators. If it is appropriate then they will forward information to Fellows.
      +
      + + + + $Date: 2011-12-07 12:09:14 +0000 (Wed, 07 Dec 2011) $ $Author: ato $ + \ No newline at end of file From d65244757c2c2780325d98129ddee755aec10b0b Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 28 May 2012 15:49:13 +0000 Subject: [PATCH 32/91] a side box info paragraph style proposition for matze svn path=/branches/test/; revision=23396 --- .../secure-boot-analysis.en.xhtml | 2 ++ look/generic.css | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index fbb6b7dfcc..cf4370304d 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -67,6 +67,7 @@ implement "Secure Boot", as Microsoft +

      The computer: A general purpose machine

      @@ -83,6 +84,7 @@ device and thus determines the specific functions the device performs, ultimately can control any data processed and stored by the device. In result, the owner of an IT device may not be in sole control of their own data any more.

      +

      For which devices does this apply?

      diff --git a/look/generic.css b/look/generic.css index 03434c12d9..eb25222109 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1337,6 +1337,27 @@ a.fn { box-shadow: inset 0 0 6px rgb(23,40,11); } +/* Boxe for aside paragraph or information see /campaigns/generalpurposecomputing/secure-boot-analysis.en.html for example */ + +.box { +width:50%; +padding:0.5em 1.5em; +margin: 1.5em; +z-index:3; +font-size:90%; +line-height:120%; +background-color: rgba(214,234,245,0.5); +border:1px solid #FFF; +border-radius:.5em; +box-shadow:0 0 .5em rgba(0,0,0,0.1); +} + +.box.right { +margin-right:1em; +} + + .box h2 {size:120%;margin-top:0.75em} + .box h3 {size:110%;margin-top:0.5em} /* Nice buttons */ .button { From 5e9d0903abe33343a0ef09701b5a41ef47271f8b Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 28 May 2012 15:59:37 +0000 Subject: [PATCH 33/91] a side box info paragraph style proposition for matze svn path=/branches/test/; revision=23398 --- look/generic.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/look/generic.css b/look/generic.css index eb25222109..b70fd17971 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1356,8 +1356,8 @@ box-shadow:0 0 .5em rgba(0,0,0,0.1); margin-right:1em; } - .box h2 {size:120%;margin-top:0.75em} - .box h3 {size:110%;margin-top:0.5em} + .box h2 {font-size:120%;margin-top:0.75em} + .box h3 {font-size:110%;margin-top:0.5em} /* Nice buttons */ .button { From c6656e87ccfd347e637ecdfe92880d3bc59c9a5a Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 28 May 2012 16:04:43 +0000 Subject: [PATCH 34/91] a side box info paragraph style proposition for matze svn path=/branches/test/; revision=23399 --- look/generic.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/look/generic.css b/look/generic.css index b70fd17971..82a1027c7e 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1346,7 +1346,8 @@ margin: 1.5em; z-index:3; font-size:90%; line-height:120%; -background-color: rgba(214,234,245,0.5); +background-color: rgba(214,234,245,0.8); +color: #17215A; border:1px solid #FFF; border-radius:.5em; box-shadow:0 0 .5em rgba(0,0,0,0.1); From 76406b7186ec76f87cfbf68030b34d0ca9fb2219 Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 28 May 2012 16:17:00 +0000 Subject: [PATCH 35/91] a side box info paragraph style proposition for matze svn path=/branches/test/; revision=23400 --- look/generic.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/look/generic.css b/look/generic.css index 82a1027c7e..a1bf0a3cd2 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1346,8 +1346,9 @@ margin: 1.5em; z-index:3; font-size:90%; line-height:120%; -background-color: rgba(214,234,245,0.8); -color: #17215A; +/*background-color: rgba(214,234,245,0.8);*/ +background-color:#F7FFCC; +/*color: #17215A;*/ border:1px solid #FFF; border-radius:.5em; box-shadow:0 0 .5em rgba(0,0,0,0.1); From 023473651992a1d70caaba3f6a5270726fe18008 Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 28 May 2012 16:26:48 +0000 Subject: [PATCH 36/91] a side box info paragraph style proposition for matze svn path=/branches/test/; revision=23402 --- look/generic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/look/generic.css b/look/generic.css index a1bf0a3cd2..c473e5c249 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1340,7 +1340,7 @@ a.fn { /* Boxe for aside paragraph or information see /campaigns/generalpurposecomputing/secure-boot-analysis.en.html for example */ .box { -width:50%; +width:34%; padding:0.5em 1.5em; margin: 1.5em; z-index:3; From 103948377a82d7a5f19a2214a5342b18256caa1b Mon Sep 17 00:00:00 2001 From: hugo Date: Mon, 28 May 2012 16:28:03 +0000 Subject: [PATCH 37/91] a side box info paragraph style proposition for matze svn path=/branches/test/; revision=23403 --- look/generic.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/look/generic.css b/look/generic.css index c473e5c249..2316918444 100644 --- a/look/generic.css +++ b/look/generic.css @@ -1358,8 +1358,8 @@ box-shadow:0 0 .5em rgba(0,0,0,0.1); margin-right:1em; } - .box h2 {font-size:120%;margin-top:0.75em} - .box h3 {font-size:110%;margin-top:0.5em} + .box h2 {font-size:140%;margin-top:0.75em} + .box h3 {font-size:120%;margin-top:0.5em} /* Nice buttons */ .button { From bd1ee978ea927ee44f9f0967947788299f3ebcee Mon Sep 17 00:00:00 2001 From: mk Date: Fri, 1 Jun 2012 07:51:17 +0000 Subject: [PATCH 38/91] Last fixes svn path=/branches/test/; revision=23420 --- .../secure-boot-analysis.en.xhtml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml index cf4370304d..85aa398409 100644 --- a/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml +++ b/campaigns/generalpurposecomputing/secure-boot-analysis.en.xhtml @@ -9,13 +9,6 @@       Free Software

      --> - -

      "Secure Boot": Who will control your next computer?

      FSFE's goal is to ensure that the owners of IT devices are always in full @@ -69,7 +62,6 @@ for putting the "Compatible with Windows 8" logo on them.

      The computer: A general purpose machine

      -

      Evolving the computer as a general purpose machine over the past decades, our society has created a powerful tool to perform all kinds of tasks with a @@ -131,7 +123,7 @@ could be in their best interest, helping them to enhance security of the boot process, which today is mostly unsecured. This would be the case if the security subsystems specified by the UEFI forum and the Trusted Computing Group (TCG) would technically guarantee the owner's +guarantee a lot, but they have to do it technically --> guarantee the owner's permanent, full and sole control over configuration and management of these security subsystems, which includes the creation, storage, use and deletion of cryptographic keys, certificates and signatures. But as soon as other entities @@ -143,7 +135,7 @@ devices.

      general purpose computers under full owner control may be greatly reduced. Devices significantly restricted by measures as "Secure Boot" under company control are usually called appliances or special purpose computers (e.g. media -centers, telephones, book readers). Thus at least some Windows 8 devices will +centres, telephones, book readers). Thus at least some Windows 8 devices will rather constitute a Windows appliance than a customary computer. While there may be a market for such computing appliances, the FSFE strongly calls for clearly labelling such IT devices as restricted to use models foreseen by a @@ -185,6 +177,13 @@ and breadth is wider this time:

    +

    And even though many of similar usage restrictions have been cracked in the +past, this only shows that their technical implementations were flawed and open +to malware, hence not providing the "security" they were designed for. Although +this is likely to apply to some "Secure Boot" implementations as well, breaking +such mechanisms can never be a solution for freedom issues or the lack of +controllability by the device owner.

    +

    FSFE's demands

    For maintaining sustained growth in the development and use of software, the @@ -196,7 +195,7 @@ the specific usage restrictions and their consequences for the owner.

    Furthermore, FSFE strongly recommends to exlusively purchase IT devices which grant their owners full, sole and permanent control over security -subsystems (e. g. signature-based usag restrictions), in order to maintain the +subsystems (e. g. signature-based usage restrictions), in order to maintain the ability to install arbitrary software and lastly to retain exclusive control over ones own data.

    @@ -205,6 +204,6 @@ over ones own data.

    $Date$ $Author: Matthias Kirschner$ - + From 22d584cb09e1fdb2f4a29d5256d546bc4aebe6db Mon Sep 17 00:00:00 2001 From: guest-vienna-autocommit Date: Wed, 6 Jun 2012 18:33:43 +0000 Subject: [PATCH 39/91] Automatic Fellowship meeting website event commit script (test) >>> Commiting event in Vienna on 2012-06-15 svn path=/branches/test/; revision=23506 --- events/2012/event-20120615-01.de.xml | 25 +++++++++++++++++++++++++ events/2012/event-20120615-01.el.xml | 24 ++++++++++++++++++++++++ events/2012/event-20120615-01.en.xml | 26 ++++++++++++++++++++++++++ events/2012/event-20120615-01.es.xml | 25 +++++++++++++++++++++++++ events/2012/event-20120615-01.fr.xml | 25 +++++++++++++++++++++++++ events/2012/event-20120615-01.it.xml | 24 ++++++++++++++++++++++++ events/2012/event-20120615-01.nl.xml | 25 +++++++++++++++++++++++++ events/2012/event-20120615-01.ru.xml | 24 ++++++++++++++++++++++++ events/2012/event-20120615-01.tags.xml | 23 +++++++++++++++++++++++ 9 files changed, 221 insertions(+) create mode 100644 events/2012/event-20120615-01.de.xml create mode 100644 events/2012/event-20120615-01.el.xml create mode 100644 events/2012/event-20120615-01.en.xml create mode 100644 events/2012/event-20120615-01.es.xml create mode 100644 events/2012/event-20120615-01.fr.xml create mode 100644 events/2012/event-20120615-01.it.xml create mode 100644 events/2012/event-20120615-01.nl.xml create mode 100644 events/2012/event-20120615-01.ru.xml create mode 100644 events/2012/event-20120615-01.tags.xml diff --git a/events/2012/event-20120615-01.de.xml b/events/2012/event-20120615-01.de.xml new file mode 100644 index 0000000000..5daab86530 --- /dev/null +++ b/events/2012/event-20120615-01.de.xml @@ -0,0 +1,25 @@ + + + + Monatliches Fellowship-Treffen in Wien, Österreich + + Dieses Mal findet das Wiener Fellowship-Treffen wieder in der + Bibliothek im Metalab, in der Rathausstraße 6 + im 1. Bezirk in Wien statt. Wir treffen uns ab 18:00 Uhr - die + Agenda starten wir um 19:00 Uhr. Wie immer richtet sich die Einladung + an alle, die sich für die FSFE oder für Freie Software interessieren. + Wir freuen uns auf eine große Teilnehmerzahl! + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.el.xml b/events/2012/event-20120615-01.el.xml new file mode 100644 index 0000000000..1d55102bf9 --- /dev/null +++ b/events/2012/event-20120615-01.el.xml @@ -0,0 +1,24 @@ + + + + Μηνιαία συνάντηση της Κοινότητας στη Βιέννη, Αυστρία + + Αυτόν τον μήνα, η συνάντηση της Βιεννέζικης Κοινότητας θα γίνει στο + Metalab, + που βρίσκεται στην Rathausstraße 6 στην πρώτη περιφέρεια της Βιέννης. Θα είμαστε + εκεί από τις 18:00, με τις συζητήσεις της ημερήσιας διάταξης να αρχίζουν στις 19:00. + Ως συνήθως, αυτή η πρόσκληση είναι για όσους ενδιαφέρονται για το FSFE ή το + Ελεύθερο Λογισμικό. Ελπίζουμε να σας δούμε εκεί! + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.en.xml b/events/2012/event-20120615-01.en.xml new file mode 100644 index 0000000000..6f701ff7bf --- /dev/null +++ b/events/2012/event-20120615-01.en.xml @@ -0,0 +1,26 @@ + + + + Monthly Fellowship meeting in Vienna, Austria + + This month, the Vienna Fellowship meeting will be in + the Metalab, located in the + Rathausstraße 6 in the 1st district of Vienna. We'll be + there from 18:00, with agenda related discussions starting + at 19:00. As usual, this invitation is for everyone interested + in the FSFE or Free Software. We're looking forward to seeing + you there! + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.es.xml b/events/2012/event-20120615-01.es.xml new file mode 100644 index 0000000000..a9b8d5bb6f --- /dev/null +++ b/events/2012/event-20120615-01.es.xml @@ -0,0 +1,25 @@ + + + + Encuentro mensual de los Fellowship en Viena, Austria + + Este mes, el encuentro mensual de Fellowship en Viena será en + el + Metalab, situado en la Rathausstraße 6 en el primer distrito + de Viena. Estaremos allí desde 18:00, comenzaremos con los puntos + de la agenda sobre las 19:00. Como es normal, esta invitación es + para todo aquel que esté interesado en la FSFE o en el Software + Libre. !Esperamos verle allí¡ + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.fr.xml b/events/2012/event-20120615-01.fr.xml new file mode 100644 index 0000000000..e740e9174a --- /dev/null +++ b/events/2012/event-20120615-01.fr.xml @@ -0,0 +1,25 @@ + + + + Rencontre mensuelle de la Fellowship à Vienne, Autriche + + Ce mois-ci, la rencontre de la Fellowship de Vienna aura lieu au + the + Metalab, situé 6 Rathausstraße dans le 1er district de Vienne. + Nous y serons à partir de 18h00, les discussions relatives au + programme commençant à 19h00. Comme d'habitude, toutes les personnes + intéressées par les Logiciels Libres ou la FSFE sont les bienvenues. + Nous vous attendons avec plaisir ! + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.it.xml b/events/2012/event-20120615-01.it.xml new file mode 100644 index 0000000000..80f1b11c16 --- /dev/null +++ b/events/2012/event-20120615-01.it.xml @@ -0,0 +1,24 @@ + + + + Incontro mensile della Fellowship a Vienna, Austria + + Questo mese, l'incontro della Fellowship di Vienna si terrà al + Metalab, + situato in Rathausstraße 6 nel primo distretto di Vienna. Saremo là dalle + 18:00, mentre le discussioni in programma inizieranno alle 19:00. Come sempre, + questo invito è rivolto a chiunque è interessato alla FSFE o al Software + Libero. Ti aspettiamo! + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.nl.xml b/events/2012/event-20120615-01.nl.xml new file mode 100644 index 0000000000..27d997ab12 --- /dev/null +++ b/events/2012/event-20120615-01.nl.xml @@ -0,0 +1,25 @@ + + + + Fellowshipvergadering in Wenen, Oostenrijk + + Onze maandelijkse Fellowshipvergadering organiseren we deze + maand in het Metalab, gelegen in de Rathausstraße 6 in het + eerste district van Wenen. We komen samen rond 18:00 uur en + beginnen met de officiële agenda om 19:00 uur. Deze uitnodiging + geld zoals steeds voor iedereen die geïnteresseerd is in de FSFE + of in Vrij Software. U bent welkom. + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.ru.xml b/events/2012/event-20120615-01.ru.xml new file mode 100644 index 0000000000..e8784e54db --- /dev/null +++ b/events/2012/event-20120615-01.ru.xml @@ -0,0 +1,24 @@ + + + + Ежемесячное собрание сообщества ЕФСПО в Вене + + В этом месяце сообщество ЕФСПО в Вене проведёт собрание в центре + Metalab + по адресу район Внутренний город, улица Ратхаусштрассе, дом 6. Начало в + 18:00, обсуждение повестки дня в 19:00. Как обычно, мы приглашаем всех, + кто заинтересован в деятельности ЕФСПО или просто поддерживает свободное + ПО. С нетерпением ждём встречи! + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + diff --git a/events/2012/event-20120615-01.tags.xml b/events/2012/event-20120615-01.tags.xml new file mode 100644 index 0000000000..1bafe86f18 --- /dev/null +++ b/events/2012/event-20120615-01.tags.xml @@ -0,0 +1,23 @@ + + + + + at + vienna + fellowship + front-page + + + + http://wiki.fsfe.org/FellowshipEvents/Vienna_2012-06-15 + + at + vienna + fellowship + front-page + + + + + + From 3625b4d3e64d99562a6e5b9cba6b79bdc9c6af9b Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 16:13:31 +0000 Subject: [PATCH 40/91] Testing some solutions regarding #313. svn path=/branches/test/; revision=23571 --- cgi-bin/pdfpetition.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/pdfpetition.pl b/cgi-bin/pdfpetition.pl index 7b3eb8e763..c8b6b88305 100755 --- a/cgi-bin/pdfpetition.pl +++ b/cgi-bin/pdfpetition.pl @@ -36,7 +36,7 @@ use constant UPLOAD => "$root/upload/pdfreaders"; my $form = WebBuild::FormValidation->new; my $content = WebBuild::DynamicContent->new; my $query = CGI->new; -$content->layout ("$root/campaigns/pdfreaders/petition.en.html"); +$content->layout ("$root/campaigns/pdfreaders/petition.html"); $form->validates_presence_of ('name'); $form->validates_presence_of ('surname'); From a5a9847c66bfc75e9e9186fa135992aba6e10d34 Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 16:42:45 +0000 Subject: [PATCH 41/91] Testing some solutions regarding #313. svn path=/branches/test/; revision=23572 --- cgi-bin/pdfpetition.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cgi-bin/pdfpetition.pl b/cgi-bin/pdfpetition.pl index c8b6b88305..41d7b5fc0a 100755 --- a/cgi-bin/pdfpetition.pl +++ b/cgi-bin/pdfpetition.pl @@ -36,7 +36,7 @@ use constant UPLOAD => "$root/upload/pdfreaders"; my $form = WebBuild::FormValidation->new; my $content = WebBuild::DynamicContent->new; my $query = CGI->new; -$content->layout ("$root/campaigns/pdfreaders/petition.html"); +$content->layout ("$root/campaigns/pdfreaders/petition.en.html"); $form->validates_presence_of ('name'); $form->validates_presence_of ('surname'); @@ -82,4 +82,4 @@ my $output = <<'EOF'; EOF $content->content ($output); -$content->render +$content->render_utf8 From 5b74c60435372c43c7bee9104e4b31311738e9fc Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 18:09:32 +0000 Subject: [PATCH 42/91] Another test. svn path=/branches/test/; revision=23573 --- campaigns/pdfreaders/petition.en.xhtml | 1 + campaigns/pdfreaders/petition.xsl | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/campaigns/pdfreaders/petition.en.xhtml b/campaigns/pdfreaders/petition.en.xhtml index c993279dd4..8090f8281c 100644 --- a/campaigns/pdfreaders/petition.en.xhtml +++ b/campaigns/pdfreaders/petition.en.xhtml @@ -78,6 +78,7 @@

    +
    diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index 1c4c8f10f5..848505b78b 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -56,7 +56,12 @@ - + + + + + + From 25db39ac78ac7a06300b7d74568fe4def613047d Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 18:12:07 +0000 Subject: [PATCH 43/91] Another test. svn path=/branches/test/; revision=23574 --- campaigns/pdfreaders/petition.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index 848505b78b..9f2cb9f0b8 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -59,7 +59,7 @@ - + From e67cf8029b40716df961376482d5f3775058df44 Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 18:20:35 +0000 Subject: [PATCH 44/91] Another test. svn path=/branches/test/; revision=23575 --- campaigns/pdfreaders/petition.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index 9f2cb9f0b8..b7820511d5 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -59,7 +59,7 @@ - + From a9e97faf0cf0829b85d350b600a3491cabc3f313 Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 18:30:34 +0000 Subject: [PATCH 45/91] Another test. svn path=/branches/test/; revision=23576 --- campaigns/pdfreaders/petition.xsl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index b7820511d5..f6089a8268 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -59,7 +59,14 @@ - + + hidden + lang + lang + + + + From 2e617c62d168d633b2ee7c2efdd1fac244b190a9 Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 20:09:01 +0000 Subject: [PATCH 46/91] Testing some solutions regarding #313. svn path=/branches/test/; revision=23577 --- cgi-bin/pdfpetition.pl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cgi-bin/pdfpetition.pl b/cgi-bin/pdfpetition.pl index 41d7b5fc0a..2192e14562 100755 --- a/cgi-bin/pdfpetition.pl +++ b/cgi-bin/pdfpetition.pl @@ -36,7 +36,14 @@ use constant UPLOAD => "$root/upload/pdfreaders"; my $form = WebBuild::FormValidation->new; my $content = WebBuild::DynamicContent->new; my $query = CGI->new; -$content->layout ("$root/campaigns/pdfreaders/petition.en.html"); + +my $lang = $query->param('lang'); +unless ($lang =~ m/^[a-z]{2}$/ and -e "$root/campaigns/pdfreaders/petition.$lang.html") + { + $lang = 'en' + } + +$content->layout ("$root/campaigns/pdfreaders/petition.$lang.html"); $form->validates_presence_of ('name'); $form->validates_presence_of ('surname'); From 9cd36dbf9c5a2a0f761b17aed548ef88f88038f8 Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 20:17:00 +0000 Subject: [PATCH 47/91] Further testing. svn path=/branches/test/; revision=23578 --- campaigns/pdfreaders/petition.et.xhtml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/campaigns/pdfreaders/petition.et.xhtml b/campaigns/pdfreaders/petition.et.xhtml index a8ff9c47fe..65b935b471 100644 --- a/campaigns/pdfreaders/petition.et.xhtml +++ b/campaigns/pdfreaders/petition.et.xhtml @@ -1,4 +1,7 @@ + + + Petitsioon - PDF-lugejad - Euroopa Vaba Tarkvara Fond From 726a0f5e4a7742e8aecfca7ee28832ed8d4b1bf4 Mon Sep 17 00:00:00 2001 From: repentinus Date: Wed, 20 Jun 2012 20:23:18 +0000 Subject: [PATCH 48/91] Further testing. svn path=/branches/test/; revision=23579 --- campaigns/pdfreaders/petition.et.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/campaigns/pdfreaders/petition.et.xhtml b/campaigns/pdfreaders/petition.et.xhtml index 65b935b471..f820d5cb25 100644 --- a/campaigns/pdfreaders/petition.et.xhtml +++ b/campaigns/pdfreaders/petition.et.xhtml @@ -319,6 +319,7 @@

    +

    Läbi selle ankeedi kogutud teavet kasutatakse ainult PDF-lugejate kampaania läbiviimiseks. Kui Te soovite oma nime eemaldamist allakirjutanute nimekirjast või lisainformatsiooni kogutud andmete hoiustamise kohta, siis võtke ühendust aadressil pdfreaders@lists.fsfe.org.

    From a83c5d6c33ea591b5f311e516a56a1fed1e1e75b Mon Sep 17 00:00:00 2001 From: repentinus Date: Thu, 21 Jun 2012 16:17:43 +0000 Subject: [PATCH 49/91] Further #313 testing. svn path=/branches/test/; revision=23596 --- cgi-bin/pdfpetition.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cgi-bin/pdfpetition.pl b/cgi-bin/pdfpetition.pl index 2192e14562..799dd0b28c 100755 --- a/cgi-bin/pdfpetition.pl +++ b/cgi-bin/pdfpetition.pl @@ -12,6 +12,9 @@ Sam Tuke , extending Alexander Kahl =cut +use open ":encoding(utf8)"; +use open IN => ":encoding(utf8)", OUT => ":utf8"; + use Cwd qw (abs_path); use File::Basename qw (dirname); From 6e6bc2e124e77e201e8e26328223c7bc0a17a587 Mon Sep 17 00:00:00 2001 From: repentinus Date: Thu, 21 Jun 2012 19:13:02 +0000 Subject: [PATCH 50/91] Further #313 testing. svn path=/branches/test/; revision=23598 --- tools/xsltsl/countries.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xsltsl/countries.xsl b/tools/xsltsl/countries.xsl index 82cc0cda8d..b77f7c447b 100644 --- a/tools/xsltsl/countries.xsl +++ b/tools/xsltsl/countries.xsl @@ -147,7 +147,7 @@ - + + + + + + From 041c9c92cece4c23e86ed4d63e1fec9d70083dab Mon Sep 17 00:00:00 2001 From: repentinus Date: Thu, 21 Jun 2012 20:21:08 +0000 Subject: [PATCH 52/91] Estonian country list. svn path=/branches/test/; revision=23601 --- tools/countries.et.xml | 274 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) create mode 100644 tools/countries.et.xml diff --git a/tools/countries.et.xml b/tools/countries.et.xml new file mode 100644 index 0000000000..93082836cb --- /dev/null +++ b/tools/countries.et.xml @@ -0,0 +1,274 @@ + + + + + + +Afganistan + +Ahvenamaa +Albaania +Alžeeria +Ameerika Samoa + +Angola +Anguilla +Antarktis +Antigua ja Barbuda +Argentina +Armeenia +Aruba + +Austraalia +Austria +Aserbaidžaan +Bahama +Bahrein +Bangladesh +Barbados + +Valgevene +Belgia +Belize +Benin +Bermuda +Bhutan +Boliivia +Bosnia ja Hertsegoviina +Botswana +Bouvet Island +Brasiilia +British India ookeani ala +British Neitsisaared +Brunei +Bulgaaria +Burkina Faso +Burundi +Kambodža +Kamerun +Kanada +Roheneemesaared +Kaimanisaared +Kesk-Aafrika Vabariik +Tšaad +Tšiili +Hiina +Jõulusaar + +Kookossaared +Kolumbia +Komoorid +Kongo Vabariik +Cooki saared + +Costa Rica +Côte d’Ivoire +Horvaatia +Kuuba +Curaçao +Küpros +Tšehhi +Põhja-Korea +Kongo Demokraatlik Vabariik +Taani +Djibouti +Dominica +Dominikaani Vabariik +Ekvador +Egiptus +El Salvador +Ekvatoriaal-Guinea +Eritrea +Eesti +Etioopia + +Falklandi saared +Fääri saared +Fidži +Soome +Prantsusmaa +Prantsuse Guajaana +Prantsuse Polüneesia +Prantsuse Antarktika ja Lõunaalad +Gabon +Gambia + +Gruusia +Saksamaa +Ghana +Gibraltar + +Kreeka +Gröönimaa +Grenada +Guadeloupe +Guam +Guatemala +Guernsey +Guinea +Guinea-Bissau +Guyana +Haiti +Heard ja McDonald +Honduras +Hongkong +Ungari +Island +India +Indoneesia +Iraan +Iraak +Iirimaa +Man +Iisrael +Itaalia +Jamaica +Jan Mayen +Jaapan +Jersey +Jordaania + +Kasahstan +Kenya +Kiribati +Kuveit +Kõrgõzstan +Laos +Läti +Liibanon +Lesotho +Libeeria +Liibüa +Liechtenstein +Leedu +Luksemburg +Aomen +Makedoonia +Madagaskar +Malawi +Malaisia +Maldiivid +Mali +Malta +Marshalli saared +Martinique +Mauritaania +Mauritius +Mayotte +Mehhiko +Mikroneesia Liiduriigid +Monaco +Mongoolia +Montenegro +Montserrat +Maroko +Mosambiik +Myanmar +Namiibia +Nauru + +Nepal +Holland +Uus-Kaledoonia +Uus-Meremaa +Nicaragua +Niger +Nigeeria +Niue +Norfolki saar +Põhja-Mariaanid +Norra +Omaan +Pakistan +Belau +Palestiina alad (Gaza maakitsus ja Läänekallas) +Panama +Paapua Uus-Guinea + +Paraguay +Peruu +Filipiinid +Pitcairn +Poola +Portugal +Puerto Rico +Katar +Korea Vabariik (Lõuna-Korea) +Moldova +Réunion +Rumeenia +Vene Föderatsioon +Rwanda +Saint Helena +Saint Kitts ja Nevis +Saint Lucia +Saint-Pierre ja Miquelon +Saint Vincent ja Grenadiinid +Samoa +San Marino +São Tomé ja Príncipe +Saudi Araabia +Senegal +Serbia +Seišellid +Sierra Leone +Singapur +Sint Maarten +Slovakkia +Sloveenia +Saalomoni saared +Somaalia +Lõuna-Aafrika Vabariik +Lõuna-Georgia ja Lõuna-Sandwichi saared +Lõuna-Sudaan +Hispaania + +Sri Lanka +Sudaan +Suriname +Svalbard +Svaasimaa +Rootsi +Šveits +Süüria +Hiina Vabariik (Taiwan) +Tadžikistan +Tai +Ida-Timor +Togo +Tokelau +Tonga +Trinidad ja Tobago + +Tuneesia +Türgi +Türkmenistan +Turks ja Caicos +Tuvalu +Uganda +Ukraina +Araabia Ühendemiraadid +Ühendkuningriik +Tansaania +Ameerika Ühendriigid +Uruguay +Usbekistan +Vanuatu +Püha Tool (Vatikan) +Venezuela +Vietnam +Neitsisaared + +Wallis ja Futuna + +Lääne-Sahara +Jeemen +Sambia +Zimbabwe + + From 2da21e04d87f7a16d2e27c3f368be7be43038069 Mon Sep 17 00:00:00 2001 From: repentinus Date: Thu, 21 Jun 2012 20:32:46 +0000 Subject: [PATCH 53/91] Further testing. svn path=/branches/test/; revision=23602 --- tools/xsltsl/countries.xsl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/xsltsl/countries.xsl b/tools/xsltsl/countries.xsl index e96ac812f3..d54d539c61 100644 --- a/tools/xsltsl/countries.xsl +++ b/tools/xsltsl/countries.xsl @@ -147,12 +147,7 @@ - + From 68043a8627f68308098b23fc8851a36aa2a8afd9 Mon Sep 17 00:00:00 2001 From: repentinus Date: Thu, 21 Jun 2012 22:26:27 +0000 Subject: [PATCH 55/91] Further testing. svn path=/branches/test/; revision=23604 --- campaigns/pdfreaders/petition.xsl | 4 +++- tools/xsltsl/countries.xsl | 20 ++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index f6089a8268..fb90ccdf81 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -54,7 +54,9 @@     - + + + diff --git a/tools/xsltsl/countries.xsl b/tools/xsltsl/countries.xsl index 3228160095..ba91026a80 100644 --- a/tools/xsltsl/countries.xsl +++ b/tools/xsltsl/countries.xsl @@ -143,18 +143,14 @@ - - - + + From acc71d09755773400b2ff7b10689f1b47249e272 Mon Sep 17 00:00:00 2001 From: repentinus Date: Thu, 21 Jun 2012 22:44:20 +0000 Subject: [PATCH 56/91] I am a fruitful tester. svn path=/branches/test/; revision=23606 --- campaigns/pdfreaders/petition.xsl | 4 +++- tools/xsltsl/countries.xsl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index fb90ccdf81..01abf7a47b 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -55,7 +55,9 @@ - + + + diff --git a/tools/xsltsl/countries.xsl b/tools/xsltsl/countries.xsl index ba91026a80..2d95fc631f 100644 --- a/tools/xsltsl/countries.xsl +++ b/tools/xsltsl/countries.xsl @@ -143,7 +143,7 @@ - + en + + + +

    + + Allow commercial uses of your work? + +

    +
      +
    • + + + + Information + +
      +
      +
      +
      +

      Commercial Use

      +
      +

      The licensor permits others to copy, distribute, display, and perform the work, including for commercial purposes.

      +
      +
      +
      +
      +
      • + +
    • + + + + Information + +
      +
      +
      +
      +

      NonCommercial

      +
      +

      The licensor permits others to copy, distribute, display, and perform the work for non-commercial purposes only.

      +
      +
      +
      +
      +
      • +
    + +

    + + Allow modifications of your work? + +

    + +
      +
    • + + + + Information + +
      +
      +
      +
      +

      Allow Derivative Works

      +
      +

      The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it.

      +
      +
      +
      +
      +
      • + +
    • + + +
      • + +
    • + + + + Information + +
      +
      +
      +
      +

      No Derivative Works

      +
      +

      The licensor permits others to copy, distribute and transmit only unaltered copies of the work — not derivative works based on it.

      +
      +
      +
      +
      +
      • +
    + +

    +

    + Jurisdiction of your license + + Information + +
    +
    +
    +
    +

    Jurisdiction

    +
    +

    Use the option "International" if you desire a license using language +and terminology from international treaties. If the licenses have +been ported to your jurisdiction and you feel that your jurisdiction's +ported licenses account for some aspect of local legislation that the +international licenses do not, then you may want to consider +which +license is better suited for your needs.

    +
    +
    +
    +
    +
    + +
    + + +

    + +
    +

    Additional Information

    +

    +

    + + The additional fields are optional, but will be embedded in the HTML generated for your license. This allows users of your work to determine how to attribute it or where to go for more information about the work. + + + Information + +
    +
    +
    +
    +

    Embedded Metadata

    +
    +

    + The information is embedded in a software readable format. + This allows search engines to index additional information + about your work and allows people coming to the license deed + from your page to see information on the deed about how to + attribute your work. +

    +

    + More + information on Creative Commons metadata is available if + you want to find out more. +

    +
    +
    +
    +
    +
    +

    + +
    +
    + Tell us the format of your work: +
    + + +
    + +
    +
    Title of work
    + + + + Information + +
    +
    +
    +
    +

    Title of work

    +
    +

    The title of the work you are licensing.

    +
    +
    +
    +
    +
    + +
    +
    + Attribute work to name +
    + + + + Information + +
    +
    +
    +
    +

    Attribute work to name

    +
    +

    The name users of the work should give attribution to. For example, the name of the work's author.

    +
    +
    +
    +
    +
    + + +
    +
    + Attribute work to URL +
    + + + + Information + +
    +
    +
    +
    +

    Attribute work to URL

    +
    +

    The URL users of the work should link to. For example, the work's page on the author's site.

    +
    +
    +
    +
    +
    + +
    +
    Source work URL
    + + + + Information + +
    +
    +
    +
    +

    Source work URL

    +
    +

    A work another is derived from.

    +
    +
    +
    +
    +
    + +
    +
    More permissions URL
    + + + + Information + +
    +
    +
    +
    +

    More permissions URL

    +
    +

    A URL where a user can obtain information about clearing rights that are not pre-cleared by your CC license.

    +
    +
    +
    +
    +
    +
    + +
    + + +
    + +
    +

    + +

    +
    + + +
    + + + + + + + From 272e28f13560ff882258bf9d5019acf0e22256aa Mon Sep 17 00:00:00 2001 From: samtuke Date: Fri, 20 Jul 2012 13:47:58 +0000 Subject: [PATCH 66/91] testing projects folder migration svn path=/branches/test/; revision=23883 --- projects/.htaccess | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/.htaccess b/projects/.htaccess index 23d9e43023..b30de95ec3 100644 --- a/projects/.htaccess +++ b/projects/.htaccess @@ -27,8 +27,6 @@ RewriteRule ^wsis(.*) /campaigns/wsis$1 [redirect=permanent] RewriteRule ^active(.*)html$ /campaigns/campaigns$1html [redirect=permanent] RewriteRule ^finished(.*)html$ /campaigns/campaigns$1html [redirect=permanent] RewriteRule ^inactive(.*)html$ /campaigns/campaigns$1html [redirect=permanent] -# TODO: the following have to be confirmed -#RewriteRule ^igf(.*) /campaigns/igf$1 [redirect=permanent] # The following projects were moved to the /activities section @@ -38,18 +36,20 @@ RewriteRule ^drm(.*) /activities/drm$1 [redirect=permanent] RewriteRule ^education(.*) /activities/education$1 [redirect=permanent] RewriteRule ^os(.*) /activities/os$1 [redirect=permanent] RewriteRule ^procurement(.*) /activities/procurement$1 [redirect=permanent] -# TODO: the following have to be confirmed -#RewriteRule ^eu(.*) /activities/eu$1 [redirect=permanent] -#RewriteRule ^ftf(.*) /activities/ftf$1 [redirect=permanent] -#RewriteRule ^ms-vs-eu(.*) /activities/ms-vs-eu$1 [redirect=permanent] -#RewriteRule ^un(.*) /activities/un$1 [redirect=permanent] -#RewriteRule ^wipo(.*) /activities/wipo$1 [redirect=permanent] +RewriteRule ^eu(.*) /activities/eu$1 [redirect=permanent] +RewriteRule ^ftf(.*) /activities/ftf$1 [redirect=permanent] +RewriteRule ^fla(.*) /activities/ftf$1 [redirect=permanent] +RewriteRule ^ms-vs-eu(.*) /activities/ms-vs-eu$1 [redirect=permanent] +RewriteRule ^un(.*) /activities/un$1 [redirect=permanent] +RewriteRule ^wipo(.*) /activities/wipo$1 [redirect=permanent] +RewriteRule ^fp6(.*) /activities/fp6$1 [redirect=permanent] +RewriteRule ^fp7(.*) /activities/fp7$1 [redirect=permanent] +RewriteRule ^map(.*) /activities/map$1 [redirect=permanent] +RewriteRule ^igf(.*) /activities/igf$1 [redirect=permanent] -# TODO: the following have to be decided -#RewriteRule ^fellowship(.*) ??? [redirect=permanent] -#RewriteRule ^fla(.*) ??? [redirect=permanent] -#RewriteRule ^fp6(.*) ??? [redirect=permanent] -#RewriteRule ^fp7(.*) ??? [redirect=permanent] -#RewriteRule ^map(.*) ??? [redirect=permanent] -#RewriteRule ^projects(.*)html(.*) ??? [redirect=permanent] -#RewriteRule ^work(.*)html(.*) ??? [redirect=permanent] + +# The following projects were moved somewhere else +# +RewriteRule ^projects(.*)html(.*) /projects$1html$2 [redirect=permanent] +RewriteRule ^work(.*)html(.*) /work$1html$2 [redirect=permanent] +RewriteRule ^leaflet-fellowship-FSA(.*)html(.*) /about/printable/leaflet-fellowship-FSA$1html$2 [redirect=permanent] From 87907e2211b54a4b84983e8e5f31a36f0859902f Mon Sep 17 00:00:00 2001 From: tolld Date: Fri, 20 Jul 2012 14:18:32 +0000 Subject: [PATCH 67/91] test svn path=/branches/test/; revision=23885 --- projects/ftf/license-chooser.en.xhtml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/ftf/license-chooser.en.xhtml b/projects/ftf/license-chooser.en.xhtml index 394cc6934a..12fde95a52 100644 --- a/projects/ftf/license-chooser.en.xhtml +++ b/projects/ftf/license-chooser.en.xhtml @@ -8,13 +8,14 @@ -

    Legal

    +

    Legal

    +

    License chooser

    - With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they; and only on the conditions you specify here. For those new to Creative Commons licensing, we've prepared a list of things to think about. If you want to offer your work with no conditions attached, or you want to mark a work that is already free of known copyright restrictions and in the public domain, choose one of our public domain tools. + This license chooser is aimde to help you to easily navigate in the licensing field.

    - When you choose a license, we provide you with HTML you can use to add the license information to your site and information on how to select a license on one of several free hosting services that have incorporated Creative Commons. This is not a registration and we do not retain a record of your selection. + When you choose a license, we provide you with ??? you can use to add the license information to your site...... This is not a registration and we do not retain a record of your selection.

    @@ -186,6 +187,7 @@ license is better suited for your needs.


    + + + + + + + + + + + +
    +
    Attribution
    From b6aaf0ae32382fc37bc38dd1ee9718c6ecd2aed1 Mon Sep 17 00:00:00 2001 From: tolld Date: Fri, 20 Jul 2012 14:55:51 +0000 Subject: [PATCH 69/91] test svn path=/branches/test/; revision=23889 --- projects/ftf/license-chooser.en.xhtml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/ftf/license-chooser.en.xhtml b/projects/ftf/license-chooser.en.xhtml index d3c9dc81b1..154f6c5a38 100644 --- a/projects/ftf/license-chooser.en.xhtml +++ b/projects/ftf/license-chooser.en.xhtml @@ -48,6 +48,8 @@
    +

    We recommend that you dedicate small pieces of code to the public domain using CC0

    +
    Attribution
    From 1262bea7a73f8e0e6d7f825b2d68ba622fbac907 Mon Sep 17 00:00:00 2001 From: tolld Date: Fri, 20 Jul 2012 15:12:00 +0000 Subject: [PATCH 70/91] test svn path=/branches/test/; revision=23890 --- projects/ftf/license-chooser.en.xhtml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/projects/ftf/license-chooser.en.xhtml b/projects/ftf/license-chooser.en.xhtml index 154f6c5a38..c078b7300c 100644 --- a/projects/ftf/license-chooser.en.xhtml +++ b/projects/ftf/license-chooser.en.xhtml @@ -11,7 +11,7 @@

    Legal

    License chooser

    - This license chooser is aimde to help you to easily navigate in the licensing field. + This license chooser is aimed to help you to easily navigate in the licensing field.

    @@ -24,13 +24,11 @@

    - Tell us the format of your work: + Choose one from the following list of licenses
    -

    We recommend that you dedicate small pieces of code to the public domain using CC0

    +

    In case of small pieces of code(up to 300 lines), we reccomend to dedicate them to the public domain using CC0

    -
    -
    Attribution
    -
    - You must attribute the -work in the manner specified by the author or licensor. -
    -
    + + Choosing a license + + +

    + In order to choose aproriate license you need to answer the following questions: +

    From aa2ac3eecaf52a31e96cf6084d2ce4cd9ae0c3dc Mon Sep 17 00:00:00 2001 From: tolld Date: Fri, 20 Jul 2012 15:28:46 +0000 Subject: [PATCH 71/91] test svn path=/branches/test/; revision=23892 --- projects/ftf/license-chooser.en.xhtml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/ftf/license-chooser.en.xhtml b/projects/ftf/license-chooser.en.xhtml index c078b7300c..bb8d48e6c8 100644 --- a/projects/ftf/license-chooser.en.xhtml +++ b/projects/ftf/license-chooser.en.xhtml @@ -18,6 +18,10 @@ When you choose a license, we provide you with ??? you can use to add the license information to your site...... This is not a registration and we do not retain a record of your selection.

    + + Choosing license for contribution or for the work which combines pieces of the code under other licenses + +

    If you are contributing or developing on the basis of already exisitng project, it is highly reccomended to use the same set of licenses.

    @@ -46,6 +50,10 @@
    + + Small pieces of Code + +

    In case of small pieces of code(up to 300 lines), we reccomend to dedicate them to the public domain using CC0

    From 6330943251e6fda85b648a17773503905d1f10a8 Mon Sep 17 00:00:00 2001 From: tolld Date: Fri, 20 Jul 2012 15:32:14 +0000 Subject: [PATCH 72/91] test svn path=/branches/test/; revision=23893 --- projects/ftf/license-chooser.en.xhtml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/ftf/license-chooser.en.xhtml b/projects/ftf/license-chooser.en.xhtml index bb8d48e6c8..fd29accc6e 100644 --- a/projects/ftf/license-chooser.en.xhtml +++ b/projects/ftf/license-chooser.en.xhtml @@ -56,9 +56,7 @@

    In case of small pieces of code(up to 300 lines), we reccomend to dedicate them to the public domain using CC0

    - - Choosing a license - +

    Choosing a license

    In order to choose aproriate license you need to answer the following questions: From 1f6ba27bf0f9b288af34c7ff0e18239e1aa9aeac Mon Sep 17 00:00:00 2001 From: tolld Date: Fri, 20 Jul 2012 15:44:28 +0000 Subject: [PATCH 73/91] tesy svn path=/branches/test/; revision=23897 --- projects/ftf/license-chooser.en.xhtml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/projects/ftf/license-chooser.en.xhtml b/projects/ftf/license-chooser.en.xhtml index fd29accc6e..9e69a2eb37 100644 --- a/projects/ftf/license-chooser.en.xhtml +++ b/projects/ftf/license-chooser.en.xhtml @@ -58,10 +58,29 @@

    Choosing a license

    +

    In order to choose aproriate license you need to answer the following questions:

    + +

    + Can your project run on a server after others improve it, interacting with its users over a network? +

    + +

    + Are users or developers, already using an established alternative software or library released under a nonfree or permissive license? +

    + +

    + Are you considering the possibility of incorporation of your work with other proprietarya nd free software licenses? +

    + + +

    +Do you want to distribute your softwar eunder less restrictive licenses? +

    +
    From 1242d0c1cdfc2d34d1b5d553c9918e888769b25a Mon Sep 17 00:00:00 2001 From: guest-ubsy Date: Tue, 14 Aug 2012 22:20:12 +0000 Subject: [PATCH 74/91] move file fom trunk to test svn path=/branches/test/; revision=24004 --- projects/os/minimalisticstandards.en.xhtml | 207 +++++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 projects/os/minimalisticstandards.en.xhtml diff --git a/projects/os/minimalisticstandards.en.xhtml b/projects/os/minimalisticstandards.en.xhtml new file mode 100644 index 0000000000..35623f30db --- /dev/null +++ b/projects/os/minimalisticstandards.en.xhtml @@ -0,0 +1,207 @@ + + + + + Minimalistic Data Format – Open Standards – FSFE + + +

    + Open Standards +

    +

    Minimalistic Standards, because being an Open Standard is not enough.

    + +

    A tool is useless without a piece to work on. What are workpieces to our + computers? Data, information, knowledge, opinions, art – in short: Content. It is being + created, processed and transmitted, often directly in an electronic format. More and more + people have a device with an internet connection available, using it to apply evolution + to their ways of working together. +

    + +

    Content is send from one user to another and back. For this it needs to take + on some form: The data-format, which defines rules how content and its + wrapping is handled, what is allowed and how the bit look within a file or over an + online connection. Whoever wants to participate must use a software that understands this + data-format. Otherwise the content would appear like an unkonwn foreign language to the application. + If a data-format doesn’t allow to include pictures, then I simply can’t save pictures with it. + The choice which data-format is used dictates how long I may access the content + and what I may do with it. +

    + +

    When saving a file in a particular data format, a single user probably won’t feel any effect + of his decision. When a IT-department or a public authority + decides which data-format they want to use it has a great impact. The choice of software + going along with the data-format has an effect for years or decades. The more precious + writings, recordings or pictures are saved electronically the more valuable it becomes to be + able to access them. + Conciously or indirectly do these decisions drive the funding of the initial development + or maintenance of data-formats. + Many software producers intentionally try to influence users to + use one of the data-formats the vendor controls. For example for technical schematics of + vehicles, buildings or machinery. The producer of the according CAD application + basically can hold the data for ransom. From the vendor’s point of view this is a strong position + in the upcoming negotiation about the price of the new software version. + Sometimes whole countries end up in such a situation. +

    + +

    Therefore a good data-format can only be an Open Standard. + This requirement however is not enough. The data-format needs to solve a problem properly. + It needs to fit from a functional as well as from a technical point of view. + For this many asspects can be considered. The Essay by Bert + Bos explains the design principle of the W3C - the organisation which develops the formats + of the world wide web. Among others he mentions efficiency, maintainability, accessibility, + extensibility, learnability, simplicity and durability.

    + +

    Two central questions hereby are:

      +
    • How well does the data-format solve the problem? And:
      • +
    • Is it the most simple data-format available or is there an even more simple one?
    + + +

    The first question is self-explanatory: Whoever wants to save, transmit and search within + a text would not want a format for pixel based images – though it is inevitable + using such a format during the first step of scanning papers or facsimiles.

    + +

    The second question is much more interesting: Is the format as easy as possible and as + complicated as necessary? It hard to design or choose a data-format which correspondents + to this rule of minimalism.

    + +

    For on there is the bad influence of a patter called “Design + by Committee”, which stands for the + participation of several decision makers on a technical question. Often many people + are involved on the development of a standard. Decisions about what software is to be used + within an organisation – especially in public ones – are also often made by large committees. + It easily happens that too many cooks spoil the broth and add more than + actually necessary. The W3C at least + is aware of this pattern, says Bos. Many others are not.

    + + +

    In addition many use a checklist when evaluating software solutions. Everyone can + add something to the list. These wishes often are specific ideas for a solution and afterwards + they are compiled into a dense list with all the necessary requirements for the new software. + The software solution checking most marks wins. Most of the time this leads to one data-format + which has many unneeded features. It would be better if wishes were being added + in a problem orientated manner and higher grades are given for solutions which + work with a number of simple, easy extensible and combinable data-formats.

    + +

    Software manufacturers know their customers. The more features on the checklist are ticked + the more precious a software appears. That is because it can – on a quick glimpse – + serve many needs. Except the need for simple elegance. And that is why the software and the data-format + often ends up looking: Bloated with many features, each directly corresponding to one of the + proposed technical solution idea. This give the software producer another edge: + Any competitor will have a hard time to process the complete format or to offer a superior alternative + complete solution. The customer is forced to buy all or nothing. Why another data-format + when there is one that can do everything?

    + +MARK + +

    Every additional feature or guideline complicates the description of the data-format + exponentially. The disadvantages are immane. The developers of a software + that needs to handle a data-format need to understand the description fully. This includes + the whole text as well as all possible combinations of the contained elements. To read less + and understand more leads to a more easy and secure software. This leads to more software + packages that can handle this data-format on a high level. What follows is more competition, + choice and therefore more user for this format.

    + +

    The more tricky a data-format is, the greater the chance there are + rarely needed features. This format and the implementation are comparable to a + huge and angled house. Some rooms are very populated others are virtually never entered. + Of course such a house is hard to secure. Burglars could open a long forgotten window to + the basement or while walking through the hallway hide something in a dark staircase.

    + +

    Experts see complexity as the greatest problem for software security. Because of this + many are critical or even hostile towards standards. + 1

    + +

    To grasp the risks just take a look at how a computer renders fonts: There is the very + commonly used standard ISO/IEC 8859-15 (Latin-9). More than 20, mostly western European + languages could be processed with it. For a single character there are 256 different possibilities. + A new standard namely Unicode (ISO 10646) is supposed to encode all languages. It needs many + more – more than one million – possibilities. In addition a character could be coded with + two different ways. For example with UTF-8 or UCS-2. On one side Unicode is a blessing: + Programmed correctly once an application is prepared to feature hundreds of languages. On + the other hand a programmer can’t possibly predict what could happen with all the characters + in the source code. With the 256 cases with Latin-9 she could. With Unicode this overview + is missing. A feisty attacker might find combinations the developer didn’t think of. This + happens on a regular basis. Here are two examples: 1. (DE)Der + homographische Angriff / (EN) + the homograph attack + frauds the user with similar looking Internet addresses. Cyrillic from the Unicode-Fonts is + suitable for this. 2. The developers of a well known webserver have been pwned by URIs in + Unicode.

    + + +

    It is to no surprise that there are more applications out there that can handle Latin-9 + more correctly than Unicode. The problem is identical with every “thicker” specified data-format: + There are applications that don’t understand the exotic features. Especially because there + are so many features so it is impossible to test. The adverts say the software can read the + data-format “X” but whether this works in practice is questionable.

    + +

    Some data-formats use this problem on purpose: There are different versions. Who likes to + certainty of all applications are compatible needs to express exactly which version. + For example there are three (1.0, 1.1 and 1.2) variants from the Open Document Format (ODF). + Probably with increasing complexity. Are probably many uses in which version 1.0 is + sufficient. But the preset would probably be the newest version the application supports. + For PDF this problem is even more significant. Some versions or parts of a PDF doesn’t even + suffice as an open standard.

    + +

    Who likes to understand computers is being told that there are two different things: + Data and programmes. While data is merely processed the programmes contain commands for + the computer. The difference is clarified with a sticky note saying: Jump from a bridge! + I can read this note, write it and pass it on (process) without any problems. But if I + regard it as a command and execute it then I probably will land on my nose. With computers + it’s the same. Data-formats like ODF, Doc an PDF may contain data and commands for automatic + procession (“Macros”) or interactive elements (Javascript). This turns a regular file into + a potential application with commands for your computer. Naturally attackers try to take + advantage of this. Like with the (DE)Macro-Viruses / (EN)Macro-Viruses.

    + +

    Most texts which are transmitted only need a small fraction of that what common + data-formats have to offer on formatting, mark-up or layout. Since decades a simple file + composed of Latin-9 characters can be edited on every computer with a simple text editor + and all word processors. With increasing demands a small part of HTML 2 could suffice for + headlines, lists and links. Or a (DE)simple / (EN) + simple textbased markup, as it is used in Wikis. Wikipedias and Weblogs of the world + proof that lots of content can be expressed with these simple means.

    + +

    All – except manufacturers of proprietary software – are interested in competing + software and secure products which are interoperable. The minimal rule for data-formats + facilitates all this. It’s meaning is to leave away everything that is not necessarily + needed. The aim is a (DE)simple and elegant design / (EN) + simple and elegant design. A nice solution is a kit with which infinite works may + be created with just a few elements.

    + +

    Even though there are good reasons to choose a data-format which covers several + requirements we should ask ourselves: “Can’t we do that simpler?”

    + +

    Footnotes

    +
      +
    1. "Complexity is the main enemy of security", + Ferguson, Niels, and Schneier, Bruce - Practical Cryptography, Wiley, 2003, + ISBN 0-471-22357-3. p146 "9.4.1 Simplicity", pp365- "23 Standards" + http://www.macfergus.com/pc [↲]
      2. +
    + + + + $Date$ $Author$ + +open-standards + + + https://creativecommons.org/licenses/by-sa/3.0/Neben der Standardlizenz der Webseite steht dieser Artikel unter der Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) + + + +Philipp Kammerer + From 4c9728f01b6888f6d62c166544c8d49413191221 Mon Sep 17 00:00:00 2001 From: guest-ubsy Date: Wed, 15 Aug 2012 11:06:12 +0000 Subject: [PATCH 75/91] Move 'minimalisticstandards.en.xhtml' from '/projects/os/' to '/activities/os'. svn path=/branches/test/; revision=24007 --- {projects => activities}/os/minimalisticstandards.en.xhtml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {projects => activities}/os/minimalisticstandards.en.xhtml (100%) diff --git a/projects/os/minimalisticstandards.en.xhtml b/activities/os/minimalisticstandards.en.xhtml similarity index 100% rename from projects/os/minimalisticstandards.en.xhtml rename to activities/os/minimalisticstandards.en.xhtml From b5f6b4ae1a10634c13d280d877e6463a1d77ad6e Mon Sep 17 00:00:00 2001 From: samtuke Date: Thu, 16 Aug 2012 11:42:17 +0000 Subject: [PATCH 76/91] improved styling rules svn path=/branches/test/; revision=24014 --- internal/bc.en.xhtml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/internal/bc.en.xhtml b/internal/bc.en.xhtml index 1599b89a18..3e6ce6141f 100644 --- a/internal/bc.en.xhtml +++ b/internal/bc.en.xhtml @@ -1,15 +1,24 @@ - - - FSFE - internal tools - business cards form + + + FSFE - internal tools - business cards form +

    Request Business Cards

    -
    +
    "Business cards must answer
    the following questions:
    Who is this? From 0506122ae755969bdbb5fb80faac443c7ff03b1e Mon Sep 17 00:00:00 2001 From: samtuke Date: Thu, 16 Aug 2012 11:55:53 +0000 Subject: [PATCH 77/91] improved code formatting and styling rules svn path=/branches/test/; revision=24015 --- internal/bc.en.xhtml | 561 +++++++++++++++++++++---------------------- 1 file changed, 280 insertions(+), 281 deletions(-) diff --git a/internal/bc.en.xhtml b/internal/bc.en.xhtml index 3e6ce6141f..5f91eadf08 100644 --- a/internal/bc.en.xhtml +++ b/internal/bc.en.xhtml @@ -1,344 +1,343 @@ - - - - FSFE - internal tools - business cards form - - - + + + + FSFE - internal tools - business cards form + + + -

    Request Business Cards

    +

    Request Business Cards

    -
    - "Business cards must answer -
    the following questions: -
    Who is this? -
    Who is represented? -
    What is he/she doing there? -
    How can I reach him/her?" -
    (Matthias Kirschner) -
    +
    + "Business cards must answer +
    the following questions: +
    Who is this? +
    Who is represented? +
    What is he/she doing there? +
    How can I reach him/her?" +
    (Matthias Kirschner) +
    -

    -The purpose of this form is to avoid unnecessary, -duplicate work. In the past, the process "production -of business cards" has often triggered a minimum of 10 emails -(but often enough far more) per person per set of -cards. The main problem was usually the lack of correct, complete data.

    +

    + The purpose of this form is to avoid unnecessary, + duplicate work. In the past, the process "production + of business cards" has often triggered a minimum of 10 emails + (but often enough far more) per person per set of + cards. The main problem was usually the lack of correct, complete data.

    -

    Generally

    +

    Generally

    -

    -In general, everyone on team@ is eligible for FSFE business cards. -If you are not on team@, or are unsure whether it makes sense for -you to order business cards, please contact -council@fsfeurope.org. -

    +

    + In general, everyone on team@ is eligible for FSFE business cards. + If you are not on team@, or are unsure whether it makes sense for + you to order business cards, please contact + council@fsfeurope.org. +

    -

    Language

    +

    Language

    -

    -English is default. If you need cards in another language -for good reasons, we have to produce two sets of cards. -Please use the form below twice in this case. -

    +

    + English is default. If you need cards in another language + for good reasons, we have to produce two sets of cards. + Please use the form below twice in this case. +

    -

    Contents of the card

    +

    Contents of the card

    - -
- -
+ + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + - - + - - + For FSFE's purposes, fax is more or less extinct as a + communications protocol. If you absolutely want to include a fax + number, please use the same format as the phone number. + + + - - + - - - - + + + + - - - - + + + + - + - - - + + + - - + + + - - + - - + + + - - + - - - + + + -
-

1. First name and surname

+

1. First name and surname

-We use the international form with all parts in lower cases with a -leading upper case for each word. If there are very good reasons -to use another form, i.e. printing the surname in upper cases, as -it is common in France, this should be done in the localised -version of the cards, not in the international version. -Data might include middle initials, but no nicknames (e.g. as -used in IRC). + We use the international form with all parts in lower cases with a + leading upper case for each word. If there are very good reasons + to use another form, i.e. printing the surname in upper cases, as + it is common in France, this should be done in the localised + version of the cards, not in the international version. + Data might include middle initials, but no nicknames (e.g. as + used in IRC). -		 - -
-Joe Average -
Joe M. L. Average -
Joe Martin Average -
Dr. Joe Average -
Joe "Coolface" Average -
Joseph AVERAGE -
Average, Joseph -
-
+ + +
+ Joe Average +
Joe M. L. Average +
Joe Martin Average +
Dr. Joe Average +
Joe "Coolface" Average +
Joseph AVERAGE +
Average, Joseph +
+
-

2. Your title (or function)

+

2. Your title (or function)

-A title/function should be mentioned. It might be generic, somehow, i.e. "German Team". -
If you are an intern, please use "Assistant to the President" as your title. -You can leave the field empty as well. -		 - -
-Coordinator of $group -
Intern -
$country team -
-
+ A title/function should be mentioned. It might be generic, somehow, i.e. "German Team". +
If you are an intern, please use "Assistant to the President" as your title. + You can leave the field empty as well. + 		+ +
+ Coordinator of $group +
Intern +
$country team +
+
-If you have two titles (or functions), you can have both of them printed on the card. + If you have two titles (or functions), you can have both of them printed on the card. - - -
-

3. The line "Free Software Foundation Europe"

+ 		+ +
+

3. The line "Free Software Foundation Europe"

-Don't worry about this. It will be included automatically. -		 -Free Software Foundation Europe -
+ Don't worry about this. It will be included automatically. + + Free Software Foundation Europe +
-

4. Address

+

4. Address

-This should normally be an official FSFE address, either in Berlin or Düsseldorf. Other addresses should only be used in exceptional cases. + This should normally be an official FSFE address, either in Berlin or Düsseldorf. Other addresses should only be used in exceptional cases. -		 - Linienstraße 141, 10115 Berlin, Germany
- Talstraße 110, 40127 Düsseldorf, Germany
- -
+ + Linienstraße 141, 10115 Berlin, Germany
+ Talstraße 110, 40127 Düsseldorf, Germany
+ +
-

5. Tel. (optional)

+

5. Tel. (optional)

-When working at an FSFE office, the number of that office -should be mentioned. If not, it might be your own number -or left empty. If in doubt, ask the others. The number -should be grouped by two or three digits, seperated by -spaces. + When working at an FSFE office, the number of that office + should be mentioned. If not, it might be your own number + or left empty. If in doubt, ask the others. The number + should be grouped by two or three digits, seperated by + spaces. -		 -p + -
-p +49 30 275 95 290 -
-
+ + p + +
+ p +49 30 275 95 290 +
+
-

6. Mobile (optional)

+

6. Mobile (optional)

-The mobile phone number you would like to appear on your card., e.g. + The mobile phone number you would like to appear on your card., e.g. -
You should be reachable by phone. So as a minimum 5. or 6. should be filled in. +
You should be reachable by phone. So as a minimum 5. or 6. should be filled in. -		 -m + -
-m +49 30 275 95 290 -
-
+ m + +
+ m +49 30 275 95 290 +
+
+
-

7. Fax (optional)

+

7. Fax (optional)

-For FSFE's purposes, fax is more or less extinct as a -communications protocol. If you absolutely want to include a fax -number, please use the same format as the phone number. -		 -f + -
-f +49 30 203 405 60 -
-
+ f + +
+ f +49 30 203 405 60 +
+
+
-

8. Email

+

8. Email

-This should be your fsfe.org address (or fsfeurope.org, whichever -you use mainly.) + This should be your fsfe.org address (or fsfeurope.org, whichever + you use mainly.) -		 -E-mail -
-name@fsfeurope.org -
full.name@fsfe.org -
another123@freemailservice.com -
someone@myowngeekydomain.com -
-
-

9. Jabber (optional)

+ 		+ E-mail +
+ name@fsfeurope.org +
full.name@fsfe.org +
another123@freemailservice.com +
someone@myowngeekydomain.com +
+
+

9. Jabber (optional)

-Your FSFE jabber address. (You don't know that you have a jabber -address? Something went wrong, please contact -system-hackers@fsfeurope.org.) + Your FSFE jabber address. (You don't know that you have a jabber + address? Something went wrong, please contact + system-hackers@fsfeurope.org.) -		 -Jabber -
+ + Jabber +
-

10. Fingerprint

+

10. Fingerprint

-The fingerprint of your GnuPG key. No, not the key ID, not -the kind of your key. The fingerprint will be printed in two lines. -
(You do not have a GnuPG key? Something went -terribly wrong.) You can generate this fingerprint with the following command in a terminal: -
$ gpg --fingerprint [yourKeyID]
+ The fingerprint of your GnuPG key. No, not the key ID, not + the kind of your key. The fingerprint will be printed in two lines. +
(You do not have a GnuPG key? Something went + terribly wrong.) You can generate this fingerprint with the following command in a terminal: + 
$ gpg --fingerprint [yourKeyID]
-		 + - + -
-2F77 A3E7 70E5 C802 2295 -
87D6 B8B7 8D13 B4BA 019E -
+
+ 2F77 A3E7 70E5 C802 2295 +
87D6 B8B7 8D13 B4BA 019E +
-
(This is a theoretical example. It won't work!) +
(This is a theoretical example. It won't work!) -
+
-

11. URL

+

11. URL

-There is no need to mention an URL. "www.fsfe.org" -will be printed on the reverse side automatically. + There is no need to mention an URL. "www.fsfe.org" + will be printed on the reverse side automatically. -		 -www.fsfe.org -
+ www.fsfe.org +
-

12. Amount of cards

+
+

12. Amount of cards

-The default number for each print run is 500 cards, which will cost EUR 32. If you don't meet a lot of people for FSFE, you might not need that many cards. (For orientation: Karsten uses about 500 cards per year.) + The default number for each print run is 500 cards, which will cost EUR 32. If you don't meet a lot of people for FSFE, you might not need that many cards. (For orientation: Karsten uses about 500 cards per year.) -
If you need fewer than 500 cards, we can do several sets of cards in a single print run for the same price, e.g. 100 cards for 5 different people = 500 cards. If you're not in a hurry, please let us know, and we'll send you your cards whenever there are enough requests for a complete print run. +
If you need fewer than 500 cards, we can do several sets of cards in a single print run for the same price, e.g. 100 cards for 5 different people = 500 cards. If you're not in a hurry, please let us know, and we'll send you your cards whenever there are enough requests for a complete print run. -		 - -
+ +
+
-

What happens now?

+

What happens now?

-

13. Preview

+

13. Preview

-The printing company will send you a proof sheet as PDF, so you -can check whether your card looks ok and all the information on it -is correct. The printing company will not start the production -before you approve this PDF. + The printing company will send you a proof sheet as PDF, so you + can check whether your card looks ok and all the information on it + is correct. The printing company will not start the production + before you approve this PDF. -
We will send it to you and will await your approval. We will -use your fsfe.org address for that purpose. -
+
We will send it to you and will await your approval. We will + use your fsfe.org address for that purpose. +
-

14. Delivery address

+

14. Delivery address

-After your approval, we will send the cards to the address -which is printed on the cards, by default. -
If you want us to send them elsewhere, tell us the -other address, please. -		 -
+ I would like to have the default promotion package
+ Instead of sending me the default package, I would like the promotion package to focus on:
+
+ Any comment:
+
+

Available promotion material

From cd90817066c5973c192544cc0a3c12fa5725e2f1 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 00:22:11 +0000 Subject: [PATCH 83/91] style fix svn path=/branches/test/; revision=24117 --- look/generic.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/look/generic.css b/look/generic.css index 7ca6fde988..b2c6fa19bd 100644 --- a/look/generic.css +++ b/look/generic.css @@ -445,7 +445,7 @@ p.left { border-width: 2px; border-style: dotted; border-color: rgb(107,200,0); - background-color: rgb(173,255,84); + background-color: rgb(208,255,128); padding: .5em; } @@ -644,11 +644,13 @@ p#introduction { /* Promopack order form */ /* ------------------------------------------------------------------------- */ #orderpromo .formlabel { + display: inline-block; text-align: right; width: 40em; + font-weight: bold; } #orderpromo textarea { - display: inline; + display: inline-block; } /* ------------------------------------------------------------------------- */ From aae49abe123c2b7f3c48bc19e0eceddf3bfa5572 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 00:31:56 +0000 Subject: [PATCH 84/91] style fix svn path=/branches/test/; revision=24118 --- look/generic.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/look/generic.css b/look/generic.css index b2c6fa19bd..17e8a22c45 100644 --- a/look/generic.css +++ b/look/generic.css @@ -445,7 +445,7 @@ p.left { border-width: 2px; border-style: dotted; border-color: rgb(107,200,0); - background-color: rgb(208,255,128); + background-color: rgb(94,255,128); padding: .5em; } @@ -643,11 +643,13 @@ p#introduction { /* ------------------------------------------------------------------------- */ /* Promopack order form */ /* ------------------------------------------------------------------------- */ +#orderpromo { + font-weight: bold; +} #orderpromo .formlabel { display: inline-block; text-align: right; - width: 40em; - font-weight: bold; + width: 40%; } #orderpromo textarea { display: inline-block; From 3138867abe26e82028e32e4a40ac3da88af7499d Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 00:45:43 +0000 Subject: [PATCH 85/91] style and dialog fix svn path=/branches/test/; revision=24119 --- look/generic.css | 5 +++-- order/promopack.en.xhtml | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/look/generic.css b/look/generic.css index 17e8a22c45..895d797b45 100644 --- a/look/generic.css +++ b/look/generic.css @@ -445,7 +445,7 @@ p.left { border-width: 2px; border-style: dotted; border-color: rgb(107,200,0); - background-color: rgb(94,255,128); + background-color: rgb(194,255,128); padding: .5em; } @@ -649,7 +649,8 @@ p#introduction { #orderpromo .formlabel { display: inline-block; text-align: right; - width: 40%; + vertical-align: top; + width: 30%; } #orderpromo textarea { display: inline-block; diff --git a/order/promopack.en.xhtml b/order/promopack.en.xhtml index d1d0217bbf..79830c2da7 100644 --- a/order/promopack.en.xhtml +++ b/order/promopack.en.xhtml @@ -53,10 +53,9 @@ in general we just send packages up to 1kg. If you need more, please ask.


Address:
- I would like to have the default promotion package
- Instead of sending me the default package, I would like the promotion package to focus on:
-
- Any comment:
+ Instead of sending me the default package, I would like the promotion package to focus on: +
+ Any comment:
From 17bef42c2d521d4aa57ef009da5511f232c45aea Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 12:56:08 +0000 Subject: [PATCH 86/91] form for ordering promotional material svn path=/branches/test/; revision=24142 --- look/generic.css | 4 +--- order/promopack.en.xhtml | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/look/generic.css b/look/generic.css index 895d797b45..0a6b01c25d 100644 --- a/look/generic.css +++ b/look/generic.css @@ -643,10 +643,8 @@ p#introduction { /* ------------------------------------------------------------------------- */ /* Promopack order form */ /* ------------------------------------------------------------------------- */ -#orderpromo { - font-weight: bold; -} #orderpromo .formlabel { + font-weight: bold; display: inline-block; text-align: right; vertical-align: top; diff --git a/order/promopack.en.xhtml b/order/promopack.en.xhtml index 79830c2da7..33d2c575e6 100644 --- a/order/promopack.en.xhtml +++ b/order/promopack.en.xhtml @@ -32,20 +32,8 @@ special FSFE`s campaign. Please keep in mind, that for postal reasons, in general we just send packages up to 1kg. If you need more, please ask.

-
- - -
    -
  • 3 FreeYourAndroid-Poster, 2 Join the Fellowship-Poster, 1 PDFreaders-Poster
    • -
  • 3 cm FreeYourAndroid-Flyer
    • [3 cm] -
  • 20 FSFE folder and Fellowship leaflets (A5)
    • [50] -
  • some Stickers: "I cannot read your documents", GNU-Sticker, Plussy-Sticker ...
    • -
-

Please be aware that these are rough numbers and they will vary from order to order. They might also vary from your location, as we do have promotion material which is not yet available in English, for example the Flyer "Freiheit!"

- -
-
- Please send promotion to:
+ +

Please send promotional material to:

First name, Last name:
@@ -53,10 +41,22 @@ in general we just send packages up to 1kg. If you need more, please ask.


Address:
- Instead of sending me the default package, I would like the promotion package to focus on: -
+ I would like the promotion package to focus on: +
Any comment:
+ + +
From 239e58bf8dd8e78641357952e9f50c4b9279aacf Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 13:02:47 +0000 Subject: [PATCH 87/91] enable highlight for elements of any type svn path=/branches/test/; revision=24143 --- look/generic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/look/generic.css b/look/generic.css index 0a6b01c25d..2acda54d0d 100644 --- a/look/generic.css +++ b/look/generic.css @@ -441,7 +441,7 @@ p.left { overflow: hidden; } -#content div.highlight { +#content .highlight { border-width: 2px; border-style: dotted; border-color: rgb(107,200,0); From 7a83a27d8ad4f1e9563d8db0fa5235998149d015 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 13:55:17 +0000 Subject: [PATCH 88/91] experimental script for processing promo orders svn path=/branches/test/; revision=24146 --- cgi-bin/orderpromo.pl | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100755 cgi-bin/orderpromo.pl diff --git a/cgi-bin/orderpromo.pl b/cgi-bin/orderpromo.pl new file mode 100755 index 0000000000..b8e4f206a0 --- /dev/null +++ b/cgi-bin/orderpromo.pl @@ -0,0 +1,60 @@ +#!/usr/bin/perl + +use CGI; +use POSIX qw(strftime); + +my $query = new CGI; + +my $date = strftime "%Y-%m-%d", localtime; +my $time = strftime "%s", localtime; +my $reference = "order.$date." . substr $time, -5; + +my $firstname = $query->param("firstname"); +my $lastname = $query->param("lastname"); +my $email = $query->param("email"); +my $address = $query->param("address"); +my $specifics = $query->param("specifics"); +my $comment = $query->param("comment"); + +if ( + # validate input (more or less) + ($firstname or $lastname) + and $email + and $address + and $specifics + and not $query->param("url"); +) { + + #send mail + open(MAIL, "|/usr/lib/sendmail -t -f paul\@fsfeurope.org"); + print MAIL +"From: paul\@fsfeurope.org +To: paul\@fsfeurope.org +Subject: $reference $firstname $lastname + +Hey, someone ordered promotional material: +First Name: $firstname +Last Name: $lastname +EMail: $email + +Address: +$address + +Specifics of the Order: +$specifics + +Comments: +$comments + +KTHXBYE +Your friendly automatic web order program. +"; + close MAIL; + + print "Location: /order/orderpromo-thanks.en.html\n\n" +} else { + + #something was wrong with the input + print "Location: /order/orderpromo-error.en.html\n\n" + +} From 86517aa2c2b46ad9765967a51724dce25c8c0cf4 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 30 Aug 2012 14:04:06 +0000 Subject: [PATCH 89/91] syntax typo fix (hopefully) svn path=/branches/test/; revision=24147 --- cgi-bin/orderpromo.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cgi-bin/orderpromo.pl b/cgi-bin/orderpromo.pl index b8e4f206a0..2b6acfbfff 100755 --- a/cgi-bin/orderpromo.pl +++ b/cgi-bin/orderpromo.pl @@ -22,7 +22,7 @@ if ( and $email and $address and $specifics - and not $query->param("url"); + and not $query->param("url") ) { #send mail @@ -51,10 +51,10 @@ Your friendly automatic web order program. "; close MAIL; - print "Location: /order/orderpromo-thanks.en.html\n\n" + print "Location: /order/orderpromo-thanks.en.html\n\n"; } else { #something was wrong with the input - print "Location: /order/orderpromo-error.en.html\n\n" + print "Location: /order/orderpromo-error.en.html\n\n"; } From 61d9de88874bb314f72b78d5d5d777da01567c88 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 6 Sep 2012 12:31:31 +0000 Subject: [PATCH 90/91] fixed mail address (still in testing stage) svn path=/branches/test/; revision=24242 --- cgi-bin/orderpromo.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cgi-bin/orderpromo.pl b/cgi-bin/orderpromo.pl index 2b6acfbfff..350361d22c 100755 --- a/cgi-bin/orderpromo.pl +++ b/cgi-bin/orderpromo.pl @@ -26,10 +26,10 @@ if ( ) { #send mail - open(MAIL, "|/usr/lib/sendmail -t -f paul\@fsfeurope.org"); + open(MAIL, "|/usr/lib/sendmail -t -f paul\@fsfe.org"); print MAIL -"From: paul\@fsfeurope.org -To: paul\@fsfeurope.org +"From: paul\@fsfe.org +To: paul\@fsfe.org Subject: $reference $firstname $lastname Hey, someone ordered promotional material: From 647672e99739e44050141d15b76861889dc37770 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 6 Sep 2012 13:23:41 +0000 Subject: [PATCH 91/91] display thank-you page in correct language svn path=/branches/test/; revision=24244 --- cgi-bin/orderpromo.pl | 7 +++++-- order/orderpromo-error.en.xhtml | 23 +++++++++++++++++++++++ order/orderpromo-thanks.en.xhtml | 23 +++++++++++++++++++++++ order/promopack.en.xhtml | 3 +++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 order/orderpromo-error.en.xhtml create mode 100644 order/orderpromo-thanks.en.xhtml diff --git a/cgi-bin/orderpromo.pl b/cgi-bin/orderpromo.pl index 350361d22c..64ac1b2d19 100755 --- a/cgi-bin/orderpromo.pl +++ b/cgi-bin/orderpromo.pl @@ -15,6 +15,7 @@ my $email = $query->param("email"); my $address = $query->param("address"); my $specifics = $query->param("specifics"); my $comment = $query->param("comment"); +my $lang = $query->param("language"); if ( # validate input (more or less) @@ -46,15 +47,17 @@ $specifics Comments: $comments +Preferred language was: $lang + KTHXBYE Your friendly automatic web order program. "; close MAIL; - print "Location: /order/orderpromo-thanks.en.html\n\n"; + print "Location: /order/orderpromo-thanks.$lang.html\n\n"; } else { #something was wrong with the input - print "Location: /order/orderpromo-error.en.html\n\n"; + print "Location: /order/orderpromo-error.$lang.html\n\n"; } diff --git a/order/orderpromo-error.en.xhtml b/order/orderpromo-error.en.xhtml new file mode 100644 index 0000000000..52749f5284 --- /dev/null +++ b/order/orderpromo-error.en.xhtml @@ -0,0 +1,23 @@ + + + + + Free Software Foundation Europe - Ooops, there is something wrong with your input! + + + +

Ooops, there is something wrong with your input!

+ +

+ Please make sure you entered your name, email, address, and the order itself. Comments are optional. +

+ + + + $Date$ $Author$ + + diff --git a/order/orderpromo-thanks.en.xhtml b/order/orderpromo-thanks.en.xhtml new file mode 100644 index 0000000000..2fa329eba6 --- /dev/null +++ b/order/orderpromo-thanks.en.xhtml @@ -0,0 +1,23 @@ + + + + + Free Software Foundation Europe - Thank you for your order! + + + +

Thank you for your order!

+ +

+ Our team will see to it that the promotional material is sent to you. You may receive further questions and querys in this matter via mail. +

+ + + + $Date$ $Author$ + + diff --git a/order/promopack.en.xhtml b/order/promopack.en.xhtml index 33d2c575e6..63781e0f56 100644 --- a/order/promopack.en.xhtml +++ b/order/promopack.en.xhtml @@ -33,6 +33,8 @@ in general we just send packages up to 1kg. If you need more, please ask.

+ +

Please send promotional material to:

First name, Last name: @@ -55,6 +57,7 @@ Some stickers: Any comment:
+