X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fcredits.cgi;h=7cda40251a2422917f43c44f148a01c50190744a;hp=7375afdb8471576b0677c86453c1b23e52511b6b;hb=727ac931479d2c67f50692d5ac3807b1bf9d5dee;hpb=fdde104f2d7a333b79fe61eeeb77582efe10cb58

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 7375afdb84..7cda40251a 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -35,69 +35,110 @@ require "${General::swroot}/header.pl";
 
 &Header::openbigbox('100%', 'center');
 
-&Header::openbox('100%', 'left', $Lang::tr{'credits'});
+&Header::openbox('100%', 'left', $Lang::tr{'donation'});
 
 print <<END
-<br /><center><b><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></b></center>
-<br />
+<p>$Lang::tr{'donation-text'}</p>
+
+<div align="center">
+	<a href="https://www.ipfire.org/donate">
+		<strong>$Lang::tr{'donation'}</strong>
+	</a>
+</div>
+END
+;
+&Header::closebox();
+
+&Header::openbox('100%', 'left',);
+
+print <<END
+<br>
+<center>
+	$Lang::tr{'visit us at'}: <b><a href='https://www.ipfire.org/' target="_blank">https://www.ipfire.org/</a></b>
+</center>
+<br><br>
+
 <p>
-	<b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers.</b><br />
-	<b>We want to say thank you to all of the developers who ever contributed anything to IPFire.</b>
+	<strong>Core Developers:</strong>
 </p>
 
-<p><b>Development:</b><br />
-
-Arne Fitzenreiter
-(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)  - Maintainer IPFire 2.x <br />
-Michael Tremer
-(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>) - Project Leader <br />
-Christian Schmidt
-(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
-Stefan Schantl
-(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
-Jan Paul T&uuml;cking
-(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
-Heiner Schmeling
-(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
-Ronald Wiesinger
-(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)<br />
-Silvio Rechenbach
-(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)<br />
-Dirk Wagner
-(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)<br />
-Erik Kapfer
-(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)<br />
-Alfred Haas
-(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)<br />
-
-<p><b>Inactive:</b><br />
-
-Peter Pfeiffer
-(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
-Peter Sch&auml;lchli
-(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
-</p>
-<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
-There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />
-Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.</p>
-<p>
+<ul style="list-style: none">
+	<li>
+		Michael Tremer
+		(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>)
+	</li>
+	<li>
+		Arne Fitzenreiter
+		(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)
+	</li>
+	<li>
+		Stefan Schantl
+		(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)
+	</li>
+	<li>
+		Alexander Marx
+		(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\@ipfire.org</a>)
+	</li>
+</ul>
 
-This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+<p>
+	<strong>Community Developers:</strong>
 </p>
+
+<ul style="list-style: none">
+	<li>
+		Christian Schmidt
+		(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>)
+	</li>
+	<li>
+		Jan Paul T&uuml;cking
+		(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)
+	</li>
+	<li>
+		Heiner Schmeling
+		(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)
+	</li>
+	<li>
+		Ronald Wiesinger
+		(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)
+	</li>
+	<li>
+		Silvio Rechenbach
+		(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)
+	</li>
+	<li>
+		Dirk Wagner
+		(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)
+	</li>
+	<li>
+		Erik Kapfer
+		(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)
+	</li>
+	<li>
+		Alfred Haas
+		(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)
+	</li>
+	<li>
+		Peter Pfeiffer
+		(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)
+	</li>
+	<li>
+		Peter Sch&auml;lchli
+		(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)
+	</li>
+</ul>
 END
 ;
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'General Public License v3');
-if ( -e "/usr/share/doc/licenses/GPLv3" )  {
-	print '<textarea rows="25" cols="75" readonly="true">';
-	print `cat "/usr/share/doc/licenses/GPLv3"`;
-	print '</textarea>';
-}
-else {
-	print '<br /><a href="http://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GENERAL PUBLIC LICENSE</a><br />';
-}
-
+&Header::openbox("100%", "left", $Lang::tr{'other'});
+print <<END
+	<p>
+		This product includes GeoLite data created by MaxMind, available from
+		<a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
+	</p>
+END
+;
 &Header::closebox();
 
 &Header::closebigbox();