Merge pull request #3 from gutenbergtools/cleanup

Cleanup

CaptchaPage.py

@@ -26,7 +26,7 @@ import BaseSearcher
 # https://developers.google.com/recaptcha/docs/verify
 #
 
-API = "http://www.google.com/recaptcha/api/verify"
+API = "https://www.google.com/recaptcha/api/verify"
 
 
 class QuestionPage (Page.Page):

CloudStorage.py

@@ -299,5 +299,5 @@ class EbookMetaData (object):
         """ Return the url of the ebook file on gutenberg.org. """
 
         return urllib.parse.urljoin (
-            'http://' + cherrypy.config['file_host'],
+            'https://' + cherrypy.config['file_host'],
             'ebooks/%d.%s' % (self.id, self.filetype))

templates/bibrec.html

@@ -355,7 +355,7 @@ Gutenberg metadata much faster than by scraping.
 		      <td><span class="icon icon_folder" /></td>
 		      <td class="unpadded icon_file"><a href="${e.base_dir}" class="link"
 			i18n:comment="Link to the directory containing all files.">More Files…</a></td>
-		      <td class="noscreen">http:${os.qualify (e.base_dir)}</td>
+		      <td class="noscreen">https:${os.qualify (e.base_dir)}</td>
 		      <td/>
 		      <td class="noprint"><!--! dropbox column --></td>
 		      <td class="noprint"><!--! gdrive  column --></td>

templates/recaptcha.html

@@ -69,7 +69,7 @@
 
 	  <p py:if="os.error is not None" style="color: red">Incorrect please try again</p>
 
-	  <p>You have used Project Gutenberg quite a lot today or clicked through it really fast. Email webmaster2017@pglaf.org to report problems. To make sure you are human, we ask you to resolve this captcha:</p>
+	  <p>You have used Project Gutenberg quite a lot today or clicked through it really fast. Email help2019@pglaf.org to report problems. To make sure you are human, we ask you to resolve this captcha:</p>
 
 	  <form method="post" action="/w/captcha/answer/">
 	    <div id="recaptcha_widget">

templates/results.html

@@ -6,7 +6,7 @@ DON'T USE THIS PAGE FOR SCRAPING.
 
 Seriously. You'll only get your IP blocked.
 
-Download http://www.gutenberg.org/feeds/catalog.rdf.bz2 instead,
+Download https://www.gutenberg.org/feeds/catalog.rdf.bz2 instead,
 which contains *all* Project Gutenberg metadata in one RDF/XML file.
 
 -->

templates/results.mobile

@@ -6,7 +6,7 @@ DON'T USE THIS PAGE FOR SCRAPING.
 
 Seriously. You'll only get your IP blocked.
 
-Download http://www.gutenberg.org/feeds/catalog.rdf.bz2 instead,
+Download https://www.gutenberg.org/feeds/catalog.rdf.bz2 instead,
 which contains *all* Project Gutenberg metadata in one RDF/XML file.
 
 -->

templates/results.opds

@@ -6,7 +6,7 @@ DON'T USE THIS PAGE FOR SCRAPING.
 
 Seriously. You'll only get your IP blocked.
 
-Download http://www.gutenberg.org/feeds/catalog.rdf.bz2 instead,
+Download https://www.gutenberg.org/feeds/catalog.rdf.bz2 instead,
 which contains *all* Project Gutenberg metadata in one RDF/XML file.
 
 -->
@@ -47,7 +47,7 @@ which contains *all* Project Gutenberg metadata in one RDF/XML file.
   <subtitle>Free ebooks since 1971.</subtitle>
   <author>
     <name>Marcello Perathoner</name>
-    <uri>http://www.gutenberg.org</uri>
+    <uri>https://www.gutenberg.org</uri>
     <email>webmaster@gutenberg.org</email>
   </author>
   <icon>${os.qualify ('/pics/favicon.png')}</icon>

templates/site-layout.html

@@ -123,6 +123,7 @@
 
 	  <td rowspan="2" id="logo" i18n:comment="The PG logo at the top left of every page.">
 	    <a href="/wiki/Main_Page" title="Go to the Main Page.">
+	      <span class="icon icon_logo" />
 	    </a>
 	  </td>
 

templates/site-layout.mobile

@@ -56,6 +56,7 @@
       <div class="table link">
 	<div class="row">
 	  <div class="cell leftcell">
+	    <div class="icon icon_search" />
 	  </div>
 	  <div class="cell content">
 	    <form id="search" method="get" action="${os.mobile_search}"