summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wiki/src/donate.css2
-rw-r--r--wiki/src/donate.fr.po2
-rw-r--r--wiki/src/donate.html16
-rw-r--r--wiki/src/donate/.gitignore1
-rw-r--r--wiki/src/donate/expenses.fr.pngbin18051 -> 0 bytes
-rw-r--r--wiki/src/donate/expenses.pngbin16275 -> 23073 bytes
-rw-r--r--wiki/src/donate/expenses.svg242
-rw-r--r--wiki/src/donate/flattr-badge-large.pngbin1060 -> 0 bytes
-rw-r--r--wiki/src/donate/income-chart.ods (renamed from wiki/src/donate/income-diversity-chart.ods)bin18331 -> 18331 bytes
9 files changed, 11 insertions, 252 deletions
diff --git a/wiki/src/donate.css b/wiki/src/donate.css
index 170548c..34f85d8 100644
--- a/wiki/src/donate.css
+++ b/wiki/src/donate.css
@@ -133,7 +133,7 @@ span.title {
/* Other ways */
-#other-ways, #expenses {
+#other-ways, #meet-partner {
margin-top: 2em;
background: #f5f5f5;
margin-left: -3.4em;
diff --git a/wiki/src/donate.fr.po b/wiki/src/donate.fr.po
index cb64fd4..3f2981a 100644
--- a/wiki/src/donate.fr.po
+++ b/wiki/src/donate.fr.po
@@ -648,7 +648,7 @@ msgstr "Comment nous d├ępensons notre argent"
#. type: Content of: <div><div><p>
msgid "[[!img expenses.png link=\"no\"]]"
-msgstr "[[!img expenses.fr.png link=\"no\"]]"
+msgstr ""
#. type: Content of: <div><div><p>
msgid "Our financial records are available [[here|doc/about/finances]]."
diff --git a/wiki/src/donate.html b/wiki/src/donate.html
index fda902d..bfc42db 100644
--- a/wiki/src/donate.html
+++ b/wiki/src/donate.html
@@ -455,14 +455,6 @@ permitted by law.</strong></p>
</div>
</div>
-<div id="meet-partner" class="row">
- <div class="col-md-12">
- <h3>Our partners</h3>
- <p>Tails also receives grants, awards, corporate donations, and substantial donations from individuals.</p>
- <p>Meet our [[partners|partners]] or [[become a partner|partners/become]]!</p>
- </div>
-</div>
-
<div id="expenses" class="row">
<div class="col-md-12">
@@ -476,3 +468,11 @@ permitted by law.</strong></p>
</div>
</div>
+
+<div id="meet-partner" class="row">
+ <div class="col-md-12">
+ <h3>Our partners</h3>
+ <p>Tails also receives grants, awards, corporate donations, and substantial donations from individuals.</p>
+ <p>Meet our [[partners|partners]] or [[become a partner|partners/become]]!</p>
+ </div>
+</div>
diff --git a/wiki/src/donate/.gitignore b/wiki/src/donate/.gitignore
new file mode 100644
index 0000000..314c362
--- /dev/null
+++ b/wiki/src/donate/.gitignore
@@ -0,0 +1 @@
+expenses-chart.ods
diff --git a/wiki/src/donate/expenses.fr.png b/wiki/src/donate/expenses.fr.png
deleted file mode 100644
index 8903da8..0000000
--- a/wiki/src/donate/expenses.fr.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/donate/expenses.png b/wiki/src/donate/expenses.png
index 8951d8b..5697472 100644
--- a/wiki/src/donate/expenses.png
+++ b/wiki/src/donate/expenses.png
Binary files differ
diff --git a/wiki/src/donate/expenses.svg b/wiki/src/donate/expenses.svg
deleted file mode 100644
index fb7fceb..0000000
--- a/wiki/src/donate/expenses.svg
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg3023"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- width="930.77148"
- height="394.33072"
- xml:space="preserve"
- sodipodi:docname="expenses.svg"
- inkscape:export-filename="/home/amnesia/Persistent/master/wiki/src/blueprint/donation_campaign_2016/expenses.png"
- inkscape:export-xdpi="57.058704"
- inkscape:export-ydpi="57.058704"><metadata
- id="metadata3029"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs3027"><clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3037"><path
- d="m 0,0.1 595.2,0 0,841.8 L 0,841.9 0,0.1 z"
- clip-rule="evenodd"
- id="path3039"
- inkscape:connector-curvature="0" /></clipPath><clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3045"><path
- d="m 56.7,771.2 481.8,0 0,14 -481.8,0 0,-14 z"
- clip-rule="evenodd"
- id="path3047"
- inkscape:connector-curvature="0" /></clipPath><clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3063"><path
- d="m 56.7,56.8 481.8,0 0,14 -481.8,0 0,-14 z"
- clip-rule="evenodd"
- id="path3065"
- inkscape:connector-curvature="0" /></clipPath><clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3291"><path
- d="m 56.6,112 64,0 0,652 -64,0 0,-652 z"
- clip-rule="evenodd"
- id="path3293"
- inkscape:connector-curvature="0" /></clipPath><clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3581"><path
- d="m 248.6,112 83.1,0 0,652 -83.1,0 0,-652 z"
- clip-rule="evenodd"
- id="path3583"
- inkscape:connector-curvature="0" /></clipPath><clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath3709"><path
- d="m 56.6,111.2 438.1,0 0,652.7 -438.1,0 0,-652.7 z"
- clip-rule="evenodd"
- id="path3711"
- inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="1"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="700"
- id="namedview3025"
- showgrid="false"
- inkscape:zoom="0.84123763"
- inkscape:cx="465.38574"
- inkscape:cy="197.16536"
- inkscape:window-x="0"
- inkscape:window-y="28"
- inkscape:window-maximized="1"
- inkscape:current-layer="g3031"
- fit-margin-top="20"
- fit-margin-bottom="20"
- fit-margin-left="20"
- fit-margin-right="20" /><g
- id="g3031"
- inkscape:groupmode="layer"
- inkscape:label="expenses"
- transform="matrix(1.25,0,0,-1.25,-199.89185,1008.093)"><g
- id="g3033"
- transform="matrix(1.3014354,0,0,1.3014354,-202.92949,290.96372)"><g
- id="g3035"
- clip-path="url(#clipPath3037)" /></g><g
- id="g6963"
- transform="translate(36.8,36.189739)"><rect
- transform="scale(1,-1)"
- y="-662.27319"
- x="543.15973"
- height="15.822947"
- width="15.822947"
- id="rect3178"
- style="fill:#ff880e;fill-opacity:1;fill-rule:evenodd;stroke:none" /><text
- transform="scale(1,-1)"
- sodipodi:linespacing="125%"
- id="text4685-3-7-3-6-0-2"
- y="-647.98041"
- x="581.16699"
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"><tspan
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="tspan5032-0"
- y="-647.98041"
- x="581.16699"
- sodipodi:role="line">New features (23%)</tspan></text>
-<rect
- transform="scale(1,-1)"
- y="-632.36676"
- x="543.15973"
- height="15.822947"
- width="15.822947"
- id="rect3178-3"
- style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none" /><text
- transform="scale(1,-1)"
- sodipodi:linespacing="125%"
- id="text4685-3-7-3-6-0-3-9"
- y="-618.07385"
- x="581.16699"
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"><tspan
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="tspan5038-6"
- y="-618.07385"
- x="581.16699"
- sodipodi:role="line">Help desk (16%)</tspan></text>
-<rect
- transform="scale(1,-1)"
- y="-602.46021"
- x="543.15973"
- height="15.822947"
- width="15.822947"
- id="rect3178-3-6"
- style="fill:#7eff00;fill-opacity:1;fill-rule:evenodd;stroke:none" /><text
- transform="scale(1,-1)"
- sodipodi:linespacing="125%"
- id="text4685-3-7-3-6-0-3-0-0"
- y="-588.16718"
- x="581.16699"
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"><tspan
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="tspan5030-2"
- y="-588.16718"
- x="581.16699"
- sodipodi:role="line">Infrastructure (13%)</tspan></text>
-<rect
- transform="scale(1,-1)"
- y="-571.2843"
- x="543.15973"
- height="15.822947"
- width="15.822947"
- id="rect3178-3-6-7"
- style="fill:#058dff;fill-opacity:1;fill-rule:evenodd;stroke:none" /><text
- transform="scale(1,-1)"
- sodipodi:linespacing="125%"
- id="text4685-3-7-3-6-6"
- y="-556.99146"
- x="582.67206"
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"><tspan
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="tspan5036-7"
- y="-556.99146"
- x="582.67206"
- sodipodi:role="line">Administration (12%)</tspan></text>
-<rect
- transform="scale(1,-1)"
- y="-541.37769"
- x="543.15973"
- height="15.822947"
- width="15.822947"
- id="rect3178-3-6-7-5"
- style="fill:#a200aa;fill-opacity:1;fill-rule:evenodd;stroke:none" /><text
- transform="scale(1,-1)"
- sodipodi:linespacing="125%"
- id="text4685-3-7-3-6-6-9"
- y="-527.08472"
- x="582.67206"
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"><tspan
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="tspan5036-7-2"
- y="-527.08472"
- x="582.67206"
- sodipodi:role="line">Meetings (10%)</tspan></text>
-<rect
- transform="scale(1,-1)"
- y="-692.17999"
- x="543.15973"
- height="15.822947"
- width="15.822947"
- id="rect3178-3-6-7-5-3-5-6"
- style="fill:#e30029;fill-opacity:1;fill-rule:evenodd;stroke:none" /><text
- transform="scale(1,-1)"
- sodipodi:linespacing="125%"
- id="text4685-3-7-3-6-6-9-0-3-5"
- y="-677.88696"
- x="581.16699"
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
- xml:space="preserve"><tspan
- style="font-size:16.79999924px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Sans;-inkscape-font-specification:Sans"
- id="tspan5036-7-2-2-7-9"
- y="-677.88696"
- x="581.16699"
- sodipodi:role="line">Releases and foundations (25%)</tspan></text>
-</g><g
- id="g6955"
- transform="translate(-201.38401,196.85853)"><g
- id="g7629"
- transform="matrix(1.5069887,0,0,1.5069887,-261.20981,-187.38299)"><path
- d="m 517.69747,518.25133 c -9.9,0 -19.7,-1.6 -29.1,-4.6 -9.3,-3 -18.2,-7.6 -26.2,-13.4 -7.9,-5.8 -15,-12.8 -20.8,-20.8 -5.8,-8 -10.3,-16.8 -13.3,-26.2 -3.1,-9.4 -4.6,-19.2 -4.6,-29 0,-0.8 0,-1.6 0,-2.3 l 94,2.3 0,0 0,0 0,0 0,0 0,0 0,0 0,94 z"
- style="fill:#e30029;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path6895"
- inkscape:connector-curvature="0" /><path
- d="m 423.69747,421.95133 c 0.2,-9.1 1.8,-18.2 4.6,-26.8 3,-9.4 7.5,-18.2 13.3,-26.2 5.8,-8 12.9,-15 20.8,-20.8 8,-5.8 16.9,-10.3 26.2,-13.4 6.2,-2 12.6,-3.4 19,-4 l 10.1,93.5 0,0 0,0 0,0 0,0 0,0 -94,-2.3 z"
- style="fill:#ff880e;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path6897"
- inkscape:connector-curvature="0" /><path
- d="m 507.59747,330.75133 c 3.3,-0.4 6.7,-0.6 10.1,-0.6 9.9,0 19.7,1.6 29.1,4.6 9.3,3.1 18.2,7.6 26.2,13.4 6.9,5 13,10.9 18.3,17.6 l -73.6,58.5 0,0 0,0 0,0 0,0 -10.1,-93.5 z"
- style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path6899"
- inkscape:connector-curvature="0" /><path
- d="m 591.29747,365.75133 c 0.9,1 1.7,2.1 2.5,3.2 5.8,8 10.3,16.8 13.3,26.2 3.1,9.4 4.7,19.2 4.7,29.1 0,5.5 -0.5,10.9 -1.5,16.3 l -92.6,-16.3 0,0 0,0 0,0 0,0 73.6,-58.5 z"
- style="fill:#7eff00;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path6901"
- inkscape:connector-curvature="0" /><path
- d="m 610.29747,440.55133 c -0.8,4.3 -1.8,8.5 -3.2,12.7 -3,9.4 -7.5,18.2 -13.3,26.2 -5.8,8 -12.9,15 -20.8,20.8 -0.3,0.2 -0.5,0.4 -0.8,0.6 l -54.5,-76.6 0,0 0,0 0,0 0,0 92.6,16.3 z"
- style="fill:#058dff;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path6903"
- inkscape:connector-curvature="0" /><path
- d="m 572.19747,500.85133 c -7.8,5.5 -16.3,9.8 -25.4,12.8 -9.4,3 -19.2,4.6 -29.1,4.6 l 0,-94 0,0 0,0 54.5,76.6 z"
- style="fill:#a200aa;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path6905"
- inkscape:connector-curvature="0" /></g></g></g></svg> \ No newline at end of file
diff --git a/wiki/src/donate/flattr-badge-large.png b/wiki/src/donate/flattr-badge-large.png
deleted file mode 100644
index 4cedca8..0000000
--- a/wiki/src/donate/flattr-badge-large.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/donate/income-diversity-chart.ods b/wiki/src/donate/income-chart.ods
index f71a339..f71a339 100644
--- a/wiki/src/donate/income-diversity-chart.ods
+++ b/wiki/src/donate/income-chart.ods
Binary files differ