Merge pull request #3 from gutenbergtools/cleanup

Cleanup
google-oauth
eshellman 2019-04-22 12:19:54 -04:00 committed by GitHub
commit 3fd77b4e5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 8 deletions

View File

@ -26,7 +26,7 @@ import BaseSearcher
# https://developers.google.com/recaptcha/docs/verify # 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): class QuestionPage (Page.Page):

View File

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

View File

@ -355,7 +355,7 @@ Gutenberg metadata much faster than by scraping.
<td><span class="icon icon_folder" /></td> <td><span class="icon icon_folder" /></td>
<td class="unpadded icon_file"><a href="${e.base_dir}" class="link" <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> 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/>
<td class="noprint"><!--! dropbox column --></td> <td class="noprint"><!--! dropbox column --></td>
<td class="noprint"><!--! gdrive column --></td> <td class="noprint"><!--! gdrive column --></td>

View File

@ -69,7 +69,7 @@
<p py:if="os.error is not None" style="color: red">Incorrect please try again</p> <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/"> <form method="post" action="/w/captcha/answer/">
<div id="recaptcha_widget"> <div id="recaptcha_widget">

View File

@ -6,7 +6,7 @@ DON'T USE THIS PAGE FOR SCRAPING.
Seriously. You'll only get your IP blocked. 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. which contains *all* Project Gutenberg metadata in one RDF/XML file.
--> -->

View File

@ -6,7 +6,7 @@ DON'T USE THIS PAGE FOR SCRAPING.
Seriously. You'll only get your IP blocked. 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. which contains *all* Project Gutenberg metadata in one RDF/XML file.
--> -->

View File

@ -6,7 +6,7 @@ DON'T USE THIS PAGE FOR SCRAPING.
Seriously. You'll only get your IP blocked. 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. 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> <subtitle>Free ebooks since 1971.</subtitle>
<author> <author>
<name>Marcello Perathoner</name> <name>Marcello Perathoner</name>
<uri>http://www.gutenberg.org</uri> <uri>https://www.gutenberg.org</uri>
<email>webmaster@gutenberg.org</email> <email>webmaster@gutenberg.org</email>
</author> </author>
<icon>${os.qualify ('/pics/favicon.png')}</icon> <icon>${os.qualify ('/pics/favicon.png')}</icon>

View File

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

View File

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