diff options
author | Michael Drake <michael.drake@codethink.co.uk> | 2020-02-24 14:17:58 +0000 |
---|---|---|
committer | Michael Drake <michael.drake@codethink.co.uk> | 2020-02-24 14:21:27 +0000 |
commit | a47270c93eaa7bb76638c4c6dbef23359531651c (patch) | |
tree | 1fc9ec550313943aa224532371cb055cec43fab0 | |
parent | e59e52b8539b041153e4cdd80756806b06cf4892 (diff) | |
download | netsurf-a47270c93eaa7bb76638c4c6dbef23359531651c.tar.gz netsurf-a47270c93eaa7bb76638c4c6dbef23359531651c.tar.bz2 |
About fetches resources: Drop maps resource.
It had bitrotted.
-rw-r--r-- | content/fetchers/about.c | 29 | ||||
-rw-r--r-- | content/fetchers/resource.c | 1 | ||||
-rw-r--r-- | frontends/atari/Makefile | 1 | ||||
-rw-r--r-- | frontends/beos/Makefile | 2 | ||||
-rw-r--r-- | frontends/framebuffer/Makefile | 2 | ||||
-rw-r--r-- | frontends/gtk/Makefile | 2 | ||||
-rw-r--r-- | frontends/gtk/res/netsurf.gresource.xml | 1 | ||||
-rw-r--r-- | frontends/gtk/resources.c | 1 | ||||
-rw-r--r-- | resources/en/maps.html | 85 |
9 files changed, 3 insertions, 121 deletions
diff --git a/content/fetchers/about.c b/content/fetchers/about.c index 4b8562cac..dda8fc823 100644 --- a/content/fetchers/about.c +++ b/content/fetchers/about.c @@ -686,28 +686,6 @@ static bool fetch_about_welcome_handler(struct fetch_about_context *ctx) /** - * Handler to generate about scheme maps page - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_maps_handler(struct fetch_about_context *ctx) -{ - fetch_msg msg; - - /* content is going to return redirect */ - fetch_set_http_code(ctx->fetchh, 302); - - msg.type = FETCH_REDIRECT; - msg.data.redirect = "resource:maps.html"; - - fetch_about_send_callback(&msg, ctx); - - return true; -} - - -/** * generate the description of the login query */ static nserror @@ -1354,13 +1332,6 @@ struct about_handlers about_handler_list[] = { false }, { - "maps", - SLEN("maps"), - NULL, - fetch_about_maps_handler, - false - }, - { "config", SLEN("config"), NULL, diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 286f99e12..c17ffd979 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -56,7 +56,6 @@ static const char *fetch_resource_paths[] = { "credits.html", "licence.html", "welcome.html", - "maps.html", "favicon.ico", "default.ico", "netsurf.png", diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 7a3573d9f..de4ca78b3 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -200,7 +200,6 @@ endif $(Q)$(RM) $(ATARI_TARGET_DIR)res/messages $(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages -o $(ATARI_TARGET_DIR)res/messages resources/FatMessages $(Q)cp resources/en/welcome.html $(ATARI_TARGET_DIR)res/welcome.html - $(Q)cp resources/en/maps.html $(ATARI_TARGET_DIR)res/maps.html $(Q)cp resources/en/licence.html $(ATARI_TARGET_DIR)res/licence.html $(Q)cp resources/en/credits.html $(ATARI_TARGET_DIR)res/credits.html diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile index 97fa84810..46f12ec85 100644 --- a/frontends/beos/Makefile +++ b/frontends/beos/Makefile @@ -110,7 +110,7 @@ RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS))) RDEP_BEOS := \ adblock.css beosdefault.css default.css internal.css quirks.css \ netsurf.png favicon.png ca-bundle.txt \ - credits.html licence.html welcome.html maps.html SearchEngines + credits.html licence.html welcome.html SearchEngines RDEP_BEOS := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(RDEP_BEOS)) \ $(wildcard $(FRONTEND_RESOURCES_DIR)/icons/*.png) \ diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile index 9bb042f4a..e035afb00 100644 --- a/frontends/framebuffer/Makefile +++ b/frontends/framebuffer/Makefile @@ -217,7 +217,7 @@ EXETARGET := nsfb NETSURF_FRAMEBUFFER_RESOURCE_LIST := adblock.css credits.html \ default.css internal.css licence.html \ - netsurf.png quirks.css welcome.html maps.html + netsurf.png quirks.css welcome.html install-framebuffer: $(VQ)echo " INSTALL: $(DESTDIR)/$(PREFIX)" diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile index ec9889ea0..02a5fdb73 100644 --- a/frontends/gtk/Makefile +++ b/frontends/gtk/Makefile @@ -177,7 +177,7 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RESOURCE) $(S_FRONTEND) GTK_RESOURCES_LIST := \ languages SearchEngines ca-bundle.txt \ default.css adblock.css quirks.css internal.css \ - credits.html licence.html welcome.html maps.html Messages \ + credits.html licence.html welcome.html Messages \ default.ico favicon.png netsurf.png netsurf.xpm netsurf-16x16.xpm GTK_RESOURCES_LIST := \ diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml index a81500b68..433581786 100644 --- a/frontends/gtk/res/netsurf.gresource.xml +++ b/frontends/gtk/res/netsurf.gresource.xml @@ -50,7 +50,6 @@ <file>it/welcome.html</file> <file>ja/welcome.html</file> <file>nl/welcome.html</file> - <file>maps.html</file> <file>adblock.css</file> <file>default.css</file> <file>internal.css</file> diff --git a/frontends/gtk/resources.c b/frontends/gtk/resources.c index 61853e458..a60119ae1 100644 --- a/frontends/gtk/resources.c +++ b/frontends/gtk/resources.c @@ -124,7 +124,6 @@ static struct nsgtk_resource_s direct_resource[] = { RES_ENTRY("welcome.html"), RES_ENTRY("credits.html"), RES_ENTRY("licence.html"), - RES_ENTRY("maps.html"), RES_ENTRY("default.css"), RES_ENTRY("adblock.css"), RES_ENTRY("internal.css"), diff --git a/resources/en/maps.html b/resources/en/maps.html deleted file mode 100644 index 2427d8a9c..000000000 --- a/resources/en/maps.html +++ /dev/null @@ -1,85 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html> -<head> -<title>NetSurf: Static Maps</title> -<style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:94%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width:90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:0 0.3em 1.2em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}.websearch p {text-align:left;color:#8c93a6;margin-left:1em; }.websearch input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}.websearch input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.footer{font-style:italic;color:#666;text-align:right; clear: both;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}.options {display:table;width:80%;margin:1.2em auto 3em; }.options-col {display:table-cell;}.options-col table {margin:0 auto;}</style> -</head> - -<body> -<h1 class="banner"><a href="http://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1> - -<ul class="nslinks"> -<li><a href="http://www.netsurf-browser.org/">NetSurf web site</a></li> -<li><a href="http://www.netsurf-browser.org/documentation/">Documentation</a></li> -<li><a href="http://www.netsurf-browser.org/downloads/">Download latest NetSurf</a></li> -<li><a href="http://www.netsurf-browser.org/contact/">Contact the developers</a></li> -</ul> - -<div class="onlycontent"> -<h2 class="version">Static Maps</h2> - -<p class="intro">Since NetSurf does not yet have enough JavaScript support -to handle most mapping sites on the web, we provide here a simple interface -to Google's Static Maps API.</p> - -<form method="get" action="https://maps.googleapis.com/maps/api/staticmap"> -<div class="websearch"> -<dl> -<p>Example: <em>Oxford Street, London, UK</em></p> -<input name="center" size="42" maxlength="255" type="text"> -<input type="submit" value="View Map!"> -</div> -<div class="options"> -<div class="options-col"> -<table> -<tr><td>Size</td><td><input name="size" size="10" maxlength="255" type="text" value="400x400"></td></tr> -<tr><td>Scale</td><td><input type="radio" name="scale" value="1" checked>Standard<br> -<input type="radio" name="scale" value="2">Double</td></tr> -</table> -</div> -<div class="options-col"> -<table> -<tr><td>Zoom</td><td><select name="zoom"> -<option value="0">Whole planet</option> -<option value="1">1</option> -<option value="2">2</option> -<option value="3">3</option> -<option value="4">4</option> -<option value="5">5</option> -<option value="6">6</option> -<option value="7">7</option> -<option value="8">8</option> -<option value="9">9</option> -<option value="10">10</option> -<option value="11">11</option> -<option value="12">12</option> -<option value="13">13</option> -<option value="14">14</option> -<option value="15">15</option> -<option value="16" selected>16</option> -<option value="17">17</option> -<option value="18">18</option> -<option value="19">19</option> -<option value="20">20</option> -<option value="21">Really close</option> -</select></td></tr> -<tr><td>Type</td><td><select name="maptype"> -<option value="roadmap" selected>Road map</option> -<option value="satellite">Satellite</option> -<option value="terrain">Terrain</option> -<option value="hybrid">Hybrid</option> -</select></td></tr> -</table> -</div> -</div> -</form> - - - -<div class="footer"> -<p>NetSurf is licensed under the GNU Public Licence version 2</p> -</div> -</div> - - -</body></html> |