Browse Source

Bug 1722146 - Merge branch 'staging'

Ian Neal 3 years ago
parent
commit
468ffdf1a1

+ 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>

+ 59 - 59
src/association/faq.en.html

@@ -1,59 +1,59 @@
-<!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 - FAQ</title>
-</head>
-
-<body>
-<h1>The SeaMonkey Association - Frequently Asked Questions</h1>
-
-<p><b>Q: What's the purpose of this association?</b><br/>
-
-A: The Association's purpose is the promotion of science and research, as well as the education of people, by promoting openness, innovation, choice and participation on the Internet. For this purpose, it supports the creation and distribution of free software such as the "SeaMonkey Suite", which aids people in education, research and everyday life alike.<br/>
-In other words, the SeaMonkey Association supports the SeaMonkey Project financially and in other possible ways that helps the project. If deemed useful and it is within its statutes, it may also support other projects or people.</p>
-
-<p><b>Q: What other ways does the Association help with the project?</b><br/>
-
-A: The Association may deal with the SeaMonkey Project's finances as far
-as authorised by the SeaMonkey Council, e.g. collecting donations or
-conducting search engine deals, etc.</p>
-
-<p><b>Q: Does the Association lead the Project?</b><br/>
-
-A: No. The SeaMonkey Project will stay the bunch of volunteers it always was, directed by the SeaMonkey Council. The Association, as such, does not have any say about the Project's processes and goals. Association members will still be able to act as individuals though and participate in having a say about the Project's processes and goals.</p>
-
-<p><b>Q: But the Council will surely have power over the Association?</b><br/>
-
-A: No, the SeaMonkey Project and the Council are totally independent from the Association, and vice versa. Of course, there will always be a certain overlap among these three groups, but that's not a necessity. If the Council delegates stuff to the Association, the Council will make sure there's no conflict of interest.</p>
-
-<p><b>Q: And why is the Association located in Germany?</b><br/>
-
-A: As a matter of convenience, since some members live in Germany, the Association is registered there as it makes handling of day-to-day tasks easier. Furthermore, the Association is an "eingetragener Verein (e.V.)", which restricts liability a bit.</p>
-
-<p><b>Q: What does this change mean for SeaMonkey users?</b><br/>
-
-A: This change will not have any significant impact on SeaMonkey users. The project will continue to provide new features and software updates as usual.</p>
-
-<h3>How will these changes affect how the SeaMonkey Project operates</h3>
-
-<p><b>Q: Where will the code for this new project live?  Will it stay in Mozilla managed repositories?</b>
-
-A: Yes, our code will stay part of comm-central.</p>
-
-<p><b>Q: What bug-tracker will be used?</b><br/>
-
-A: All Suite bugs and wishes are tracked in <a href="https://bugzilla.mozilla.org">bugzilla.mozilla.org</a> since 1998 and will continue to do so.</p>
-
-</body>
-</html>
+<!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 - FAQ</title>
+</head>
+
+<body>
+<h1>The SeaMonkey Association - Frequently Asked Questions</h1>
+
+<p><b>Q: What's the purpose of this association?</b><br/>
+
+A: The Association's purpose is the promotion of science and research, as well as the education of people, by promoting openness, innovation, choice and participation on the Internet. For this purpose, it supports the creation and distribution of free software such as the "SeaMonkey Suite", which aids people in education, research and everyday life alike.<br/>
+In other words, the SeaMonkey Association supports the SeaMonkey Project financially and in other possible ways that helps the project. If deemed useful and it is within its statutes, it may also support other projects or people.</p>
+
+<p><b>Q: What other ways does the Association help with the project?</b><br/>
+
+A: The Association may deal with the SeaMonkey Project's finances as far
+as authorised by the SeaMonkey Council, e.g. collecting donations or
+conducting search engine deals, etc.</p>
+
+<p><b>Q: Does the Association lead the Project?</b><br/>
+
+A: No. The SeaMonkey Project will stay the bunch of volunteers it always was, directed by the SeaMonkey Council. The Association, as such, does not have any say about the Project's processes and goals. Association members will still be able to act as individuals though and participate in having a say about the Project's processes and goals.</p>
+
+<p><b>Q: But the Council will surely have power over the Association?</b><br/>
+
+A: No, the SeaMonkey Project and the Council are totally independent from the Association, and vice versa. Of course, there will always be a certain overlap among these three groups, but that's not a necessity. If the Council delegates stuff to the Association, the Council will make sure there's no conflict of interest.</p>
+
+<p><b>Q: And why is the Association located in Germany?</b><br/>
+
+A: As a matter of convenience, since some members live in Germany, the Association is registered there as it makes handling of day-to-day tasks easier. Furthermore, the Association is an "eingetragener Verein (e.V.)", which restricts liability a bit.</p>
+
+<p><b>Q: What does this change mean for SeaMonkey users?</b><br/>
+
+A: This change will not have any significant impact on SeaMonkey users. The project will continue to provide new features and software updates as usual.</p>
+
+<h3>How will these changes affect how the SeaMonkey Project operates</h3>
+
+<p><b>Q: Where will the code for this new project live?  Will it stay in Mozilla managed repositories?</b>
+
+A: Yes, our code will stay part of comm-central.</p>
+
+<p><b>Q: What bug-tracker will be used?</b><br/>
+
+A: All Suite bugs and wishes are tracked in <a href="https://bugzilla.mozilla.org">bugzilla.mozilla.org</a> since 1998 and will continue to do so.</p>
+
+</body>
+</html>

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

@@ -0,0 +1,165 @@
+<!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>
+<style>
+table {
+  border-collapse: collapse;
+}
+
+tr.top_border {
+  border-top: 1px solid black;
+}
+
+th:first-child, td:first-child {
+  text-align: left;
+  padding: 2px 30px 2px 0px;
+}
+
+th:not(:first-child), td:not(:first-child) {
+  text-align: right;
+  padding: 2px 0px 2px 30px;
+}
+
+td.blank_row {
+  padding-top: 30px;
+}
+</style>
+</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="6" class="blank_row"/>
+</tr>
+<tr>
+<td colspan="6"><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="6" class="blank_row"/>
+</tr>
+<tr class="top_border">
+<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="6" class="blank_row"/>
+</tr>
+<tr>
+<td colspan="6"><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="6" class="blank_row"/>
+</tr>
+<tr class="top_border">
+<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="6" class="blank_row"/>
+</tr>
+<tr class="top_border">
+<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="6" class="blank_row"/>
+</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>
+<tr>
+<td colspan="6" class="blank_row"/>
+</tr>
+<tr>
+<td colspan="6">Used currency is EUR (€)</td>
+</tr>
+</table>
+</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>
-