Browse Source

Bug 1722146 - Fix dead links on Association page. r=frg

Ian Neal 3 years ago
parent
commit
efe6bcc080

+ 1 - 1
lib/sitemap.xml

@@ -875,7 +875,7 @@ http://www.damowmow.com/portal/ (use the "Indentify" field)
   <page url="association/" title="SeaMonkey Association" id="association">
     <page url="association/faq" title="FAQ" id="association-faq" />
     <page url="association/statutes" title="Statutes" id="association-statutes" />
-    <page url="association/about" title="About the Association" id="association-about" />
+    <page url="association/financial" title="Financial Report" id="association-financial" />
   </page>
 
   <page url="dev/" title="Development" id="dev">

+ 0 - 37
src/association/about.en.html

@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Language" content="en">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
-
-<link rel="top" href="../" title="SeaMonkey Project">
-<link rel="up" href="../" title="Home">
-
-
-<title>About the SeaMonkey Association</title>
-</head>
-<body>
-<h1>About the SeaMonkey Association</h1>
-The SeaMonkey association was established in January 2012 as a German
-association. In November 2013 the association gained the status as an
-registered association ("eingetragener Verein") according to German law.
-
-<h2>Organization</h2>
-<p>The SeaMonkey association is a Germany based association.</p>
-
-<h3>Association Board</h3>
-<ul>
-<li>Ian Neal</li>
-<li>Frank Wein</li>
-<li>Ricardo Palomares Martinez</li>
-</ul>
-
-<h3>Documents</h3>
-<a href="statutes">Articles of Association of the SeaMonkey association</a><br/>
-<a href="finanzen.pdf">Financial report for the SeaMonkey association</a>
-
-</body>
-</html>

+ 137 - 0
src/association/financial.en.html

@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+
+<link rel="top" href="../" title="SeaMonkey Project">
+<link rel="up" href="../" title="Home">
+
+
+<title>The SeaMonkey Association - Financial Report</title>
+</head>
+
+<body>
+<h1>The SeaMonkey Association - Financial Report</h1>
+<table>
+<tr>
+<th>Year</th>
+<th>2016</th>
+<th>2015</th>
+<th>2014</th>
+<th>2013</th>
+<th>2012</th>
+</tr>
+<tr>
+<td colspan="5"/>
+</tr>
+<tr>
+<td colspan="5"><b>Income</b></td>
+</tr>
+<tr>
+<td>Income from contracts</td>
+<td/>
+<td>-</td>
+<td>-</td>
+<td>6,081</td>
+<td>11,043</td>
+</tr>
+<tr>
+<td>Donations</td>
+<td/>
+<td>1,623</td>
+<td>51</td>
+<td>-</td>
+<td>-</td>
+</tr>
+<tr>
+<td>Other (e.g. tax refund)</td>
+<td/>
+<td>20</td>
+<td>791</td>
+<td>-</td>
+<td>-</td>
+</tr>
+<tr>
+<td colspan="5"/>
+</tr>
+<tr>
+<td><b>Total Income</b></td>
+<td>11,211</td>
+<td>1,643</td>
+<td>843</td>
+<td>6,081</td>
+<td>11,043</td>
+</tr>
+<tr>
+<td colspan="5"/>
+</tr>
+<tr>
+<td colspan="5"><b>Expenses</b></td>
+</tr>
+<tr>
+<td>Administrative expenses</td>
+<td/>
+<td>184</td>
+<td>101</td>
+<td>40</td>
+<td>30</td>
+</tr>
+<tr>
+<td>Other operating expenses</td>
+<td/>
+<td>67</td>
+<td>47</td>
+<td>157</td>
+<td>42</td>
+</tr>
+<tr>
+<tr>
+<td>Taxes</td>
+<td/>
+<td>340</td>
+<td>2,662</td>
+<td>-</td>
+<td>-</td>
+</tr>
+<tr>
+<td colspan="5"/>
+</tr>
+<tr>
+<td><b>Total Expenses</b></td>
+<td>192</td>
+<td>591</td>
+<td>2,811</td>
+<td>196</td>
+<td>72</td>
+</tr>
+<tr>
+<td colspan="5"/>
+</tr>
+<tr>
+<td><b>Net Total</b></td>
+<td>11,020</td>
+<td>1,052</td>
+<td>-1,968</td>
+<td>5,885</td>
+<td>10,971</td>
+</tr>
+<tr>
+<td colspan="5"/>
+</tr>
+<tr>
+<td>Carrying forward to following year</td>
+<td>26,959</td>
+<td>15,940</td>
+<td>14,888</td>
+<td>16,856</td>
+<td/>
+</tr>
+</table>
+<p>Used currency is EUR (€)</p>
+</body>
+</html>

BIN
src/association/finanzen.pdf


+ 27 - 13
src/association/index.en.html

@@ -1,4 +1,3 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en">
 <head>
@@ -14,21 +13,36 @@
 <body>
 <h1>The SeaMonkey Association</h1>
 <img src="/images/seamonkey96.png" style="float: right">
-The SeaMonkey association (SeaMonkey e.V.) is a non-profit organization
+<p>The SeaMonkey association (SeaMonkey e.V.) is a non-profit organization
 located in Germany that promotes openness, innovation, choice
-and participation on the Internet.<br/>
-For that mission it supports the <a
+and participation on the Internet.</p>
+<p>For that mission it supports the <a
 href="http://www.seamonkey-project.org">SeaMonkey project</a> which
-provides the SeaMonkey suite.<br/>
-
-If you're interested in supporting our efforts, please consider
-<a href="../donate/">making a donation</a>. Every dollar you donate goes 
-to support the SeaMonkey project.
+provides the SeaMonkey suite.</p>
+<p>If you're interested in supporting our efforts, please consider
+<a href="../donate/">making a donation</a>. Every dollar you donate goes
+to support the SeaMonkey project.</p>
 
-You can also become a member of the SeaMonkey association.
+<p>You can also become a member of the SeaMonkey association or you can <a
+href="http://www.seamonkey-project.org/dev/get-involved">get involved</a> with
+the SeaMonkey project itself.</p>
+<p>The SeaMonkey project is always looking for new people that can help moving
+SeaMonkey forward.</p>
+<h2>About the SeaMonkey Association</h2>
+The SeaMonkey association was established in January 2012 as a German
+association. In November 2013 the association gained the status as an
+registered association ("eingetragener Verein") according to German law.
+<h3>Association Board</h3>
+<ul>
+<li>Ian Neal</li>
+<li>Frank Wein</li>
+<li>Ricardo Palomares Martinez</li>
+</ul>
 
-Or you can  <a href="http://www.seamonkey-project.org/dev/get-involved">get involved</a> with the SeaMonkey project itself.
-The SeaMonkey project is always looking for new people that can help moving SeaMonkey forward.
+<h3>Documents</h3>
+<ul>
+<li><a href="statutes">Articles of Association of the SeaMonkey association</a></li>
+<li><a href="financial">Financial report for the SeaMonkey association</a></li>
+</ul>
 </body>
 </html>
-