mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various changes to about: content markup. Added me to LibNSFB bit. 

svn path=/trunk/netsurf/; revision=12105
This commit is contained in:
Michael Drake 2011-03-18 12:10:15 +00:00
parent 4563b7ea5a
commit 48b374736a
3 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
!NetSurf/Resources/en/credits.html,faf
View File

@ -3,7 +3,7 @@
<html>
<head>
<title>NetSurf | About Credits</title>
<link rel="stylesheet" title="Standard" type="text/css" href="resource:internal.css">
<link rel="stylesheet" type="text/css" href="resource:internal.css">
<style>
div#DevList li {
float: left;

34
!NetSurf/Resources/en/licence.html,faf
View File

@ -3,7 +3,7 @@
<html>
<head>
<title>NetSurf | About Licence</title>
<link rel="stylesheet" title="Standard" type="text/css" href="resource:internal.css">
<link rel="stylesheet" type="text/css" href="resource:internal.css">
<style>
div.licence {
background: #ddd;
@ -36,9 +36,18 @@ dl.components > dd > span + span {
<h1>NetSurf Licence</h1>
<p>NetSurf, the source code, documentation, translatable messages files and UI definitions are licensed under the GNU General Public Licence, version 2.0. In addition, as a special exception, permission is granted to link the code of this release of NetSurf with the OpenSSL project's "OpenSSL" library (or with modified versions of it that use the same licence as the "OpenSSL" library), and distribute the linked executables.</p>
<p>NetSurf, the source code, documentation, translatable messages files and UI
definitions are licensed under the GNU General Public Licence, version 2.0. In
addition, as a special exception, permission is granted to link the code of this
release of NetSurf with the OpenSSL project's "OpenSSL" library (or with
modified versions of it that use the same licence as the "OpenSSL" library),
and distribute the linked executables.</p>
<p>You must obey the GNU General Public License version 2 in all respects for all of the code used other than "OpenSSL". If you modify the code, you may extend this exception to your version of the code, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.</p>
<p>You must obey the GNU General Public License version 2 in all respects for
all of the code used other than "OpenSSL". If you modify the code, you may
extend this exception to your version of the code, but you are not obligated to
do so. If you do not wish to do so, delete this exception statement from your
version.</p>
<h2>Component Licencing</h2>
@ -63,7 +72,7 @@ dl.components > dd > span + span {
<dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt>
<dd>
<span>&copy; 2007&ndash;2011 John-Mark Bell<br />&copy; 2008&ndash;2009 Andrew Sidwell</span>
<span>&copy; 2007&ndash;2011 John-Mark Bell<br>&copy; 2008&ndash;2009 Andrew Sidwell</span>
<span><a href="#mit">MIT</a></span>
</dd>
@ -99,13 +108,13 @@ dl.components > dd > span + span {
<dt><a href="http://source.netsurf-browser.org/trunk/libnsbmp/">Libnsbmp</a></dt>
<dd>
<span>&copy; 2006 Richard Wilson<br />&copy; 2008 Sean Fox</span>
<span>&copy; 2006 Richard Wilson<br>&copy; 2008 Sean Fox</span>
<span><a href="#mit">MIT</a></span>
</dd>
<dt><a href="http://source.netsurf-browser.org/trunk/libnsfb/">Libnsfb</a></dt>
<dd>
<span>&copy; 2009&ndash;2011 Vincent Sanders</span>
<span>&copy; 2009&ndash;2011 Vincent Sanders<br>&copy; 2009&ndash;2011 Michael Drake</span>
<span><a href="#mit">MIT</a></span>
</dd>
@ -163,7 +172,7 @@ dl.components > dd > span + span {
<dt><a href="http://www.openssl.org/">OpenSSL</a></dt>
<dd>
<span>&copy; 1995&ndash;1998 Eric A. Young, Tim J. Hudson<br />&copy; 1998&ndash;2010 The OpenSSL Project</span>
<span>&copy; 1995&ndash;1998 Eric A. Young, Tim J. Hudson<br>&copy; 1998&ndash;2010 The OpenSSL Project</span>
<span><a href="#openssl">OpenSSL</a></span>
</dd>
@ -181,7 +190,10 @@ dl.components > dd > span + span {
<dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2Fgcc4%2Frecipe%2Ffiles%2Fgcc%2Flibunixlib%2F&#a9586e56e500c7fdfb58279167b82472d">UnixLib</a></dt>
<dd>
<span>&copy; 1995&ndash;1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood<br />&copy; 1999&ndash;2009 Nick Burrett, John Tytgat, Peter Naulls, Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos, Graham Shaw, James Bursa and John-Mark Bell.</span>
<span>&copy; 1995&ndash;1999 Simon Callan, Nick Burrett, Nicholas Clark and
Peter Burwood<br>&copy; 1999&ndash;2009 Nick Burrett, John Tytgat, Peter Naulls,
Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos,
Graham Shaw, James Bursa and John-Mark Bell.</span>
<span><a href="#unixlib">UnixLib</a></span>
</dd>
@ -194,8 +206,10 @@ dl.components > dd > span + span {
<h2>Licence texts</h2>
<p>Generic forms of the licence texts appear here where possible. Some components may vary the licence slightly, and our best effort has been made to detect these
changes and have the different licence listed here. Changes in white space, etc, were not considered.</p>
<p>Generic forms of the licence texts appear here where possible. Some
components may vary the licence slightly, and our best effort has been made to
detect these changes and have the different licence listed here. Changes in
white space, etc, were not considered.</p>
<a name="gplv2" />
<h3>GNU General Public Licence, Version 2</h3>

40
content/fetchers/about.c
View File

@ -173,17 +173,18 @@ static bool fetch_about_config_handler(struct fetch_about_context *ctx)
goto fetch_about_config_handler_aborted;
slen = snprintf(buffer, sizeof buffer,
"<html><head><title>NetSurf Browser Config</title>"
"<link rel=\"stylesheet\" title=\"Standard\" "
"type=\"text/css\" href=\"resource:internal.css\">"
"</head>"
"<body id =\"configlist\">"
"<html>\n<head>\n"
"<title>NetSurf Browser Config</title>\n"
"<link rel=\"stylesheet\" type=\"text/css\" "
"href=\"resource:internal.css\">\n"
"</head>\n"
"<body id =\"configlist\">\n"
"<p class=\"banner\">"
"<a href=\"http://www.netsurf-browser.org/\">"
"<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>"
"</p>"
"<h1>NetSurf Browser Config</h1>"
"<table class=\"config\">"
"</p>\n"
"<h1>NetSurf Browser Config</h1>\n"
"<table class=\"config\">\n"
"<tr><th></th><th></th><th></th></tr>\n");
do {
@ -207,7 +208,7 @@ static bool fetch_about_config_handler(struct fetch_about_context *ctx)
} while (res > 0);
slen += snprintf(buffer + slen, sizeof buffer - slen,
"</table></body></html>");
"</table>\n</body>\n</html>\n");
if (fetch_about_send_callback(FETCH_DATA, ctx, buffer, slen,
FETCH_ERROR_NO_ERROR))
@ -310,7 +311,9 @@ static bool fetch_about_testament_handler(struct fetch_about_context *ctx)
#elif defined(WT_BRANCHISRELEASE)
"# This is a release build of NetSurf\n\n"
#elif defined(WT_NO_SVN)
"# This NetSurf was built outside of our revision control environment.\n# This testament is therefore very useful.\n\n"
"# This NetSurf was built outside of our revision "
"control environment.\n"
"# This testament is therefore very useful.\n\n"
#else
"# This NetSurf was built from a branch.\n\n"
#endif
@ -414,16 +417,17 @@ static bool fetch_about_about_handler(struct fetch_about_context *ctx)
goto fetch_about_config_handler_aborted;
slen = snprintf(buffer, sizeof buffer,
"<html><head><title>NetSurf List of About pages</title>"
"<link rel=\"stylesheet\" title=\"Standard\" "
"type=\"text/css\" href=\"resource:internal.css\">"
"</head>"
"<body id =\"aboutlist\">"
"<html>\n<head>\n"
"<title>NetSurf List of About pages</title>\n"
"<link rel=\"stylesheet\" type=\"text/css\" "
"href=\"resource:internal.css\">\n"
"</head>\n"
"<body id =\"aboutlist\">\n"
"<p class=\"banner\">"
"<a href=\"http://www.netsurf-browser.org/\">"
"<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>"
"</p>"
"<h1>NetSurf List of About pages</h1>"
"</p>\n"
"<h1>NetSurf List of About pages</h1>\n"
"<ul>\n");
for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
@ -452,7 +456,7 @@ static bool fetch_about_about_handler(struct fetch_about_context *ctx)
}
slen += snprintf(buffer + slen, sizeof buffer - slen,
"</ul></body></html>");
"</ul>\n</body>\n</html>\n");
if (fetch_about_send_callback(FETCH_DATA, ctx, buffer, slen,
FETCH_ERROR_NO_ERROR))