From 429c5ab07fb18e1a262218f2e34ca79593142567 Mon Sep 17 00:00:00 2001 From: Gutenberg back end service account Date: Sat, 29 Aug 2020 23:29:43 -0400 Subject: [PATCH] css adjustments --- _config.yml | 2 +- _includes/_site/footer.html | 20 - _includes/_site/head1.html | 5 - _includes/_site/head2.html | 21 - _includes/_site/latest_books_template.html | 10 - _includes/_site/latest_covers.html | 58 -- _includes/_site/latestbooks-template.html | 60 -- _includes/_site/menu.html | 76 -- _includes/_site/menu_old.html | 65 -- _includes/_site/navbar.html | 153 ---- _includes/_site/navbar.html.LOST | 1 - _includes/_site/new_ebooks_page.html | 659 ------------------ _includes/_site/new_ebooks_page_2.html | 36 - _includes/_site/old_latestbooks.html | 10 - _includes/_site/old_latestbooks_template.html | 60 -- _includes/latest_covers.html | 141 ++-- ebooks/results.php | 32 +- gutenberg/pg-desktop-one.css | 2 +- site/help/new_website.md | 2 +- 19 files changed, 87 insertions(+), 1326 deletions(-) delete mode 100644 _includes/_site/footer.html delete mode 100644 _includes/_site/head1.html delete mode 100644 _includes/_site/head2.html delete mode 100644 _includes/_site/latest_books_template.html delete mode 100644 _includes/_site/latest_covers.html delete mode 100644 _includes/_site/latestbooks-template.html delete mode 100644 _includes/_site/menu.html delete mode 100644 _includes/_site/menu_old.html delete mode 100644 _includes/_site/navbar.html delete mode 120000 _includes/_site/navbar.html.LOST delete mode 100644 _includes/_site/new_ebooks_page.html delete mode 100644 _includes/_site/new_ebooks_page_2.html delete mode 100644 _includes/_site/old_latestbooks.html delete mode 100644 _includes/_site/old_latestbooks_template.html diff --git a/_config.yml b/_config.yml index d8c354a..5847c72 100644 --- a/_config.yml +++ b/_config.yml @@ -49,4 +49,4 @@ destination: /public/vhost/g/gutenberg/dev/html/ timezone: America/New_York encoding: utf-8 # default incremental: TRUE # doesn't seem to work... all files are being built -keep_files: [.htaccess,cache,robots.txt,google3c00b5891470e2e3.html,catalog,browse,dirs,files,.acl.gutenwebdev,.acl.gutenwebprod,MIRRORS.ALL.utf8] +keep_files: [.htaccess,cache,robots.txt,google3c00b5891470e2e3.html,catalog,browse,dirs,files,.acl.gutenwebdev,.acl.gutenwebprod,MIRRORS.ALL.utf8,internal] diff --git a/_includes/_site/footer.html b/_includes/_site/footer.html deleted file mode 100644 index 4f53424..0000000 --- a/_includes/_site/footer.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - iBiblio - diff --git a/_includes/_site/head1.html b/_includes/_site/head1.html deleted file mode 100644 index b6eefd0..0000000 --- a/_includes/_site/head1.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/_includes/_site/head2.html b/_includes/_site/head2.html deleted file mode 100644 index 8c12d6d..0000000 --- a/_includes/_site/head2.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/_includes/_site/latest_books_template.html b/_includes/_site/latest_books_template.html deleted file mode 100644 index cb371c7..0000000 --- a/_includes/_site/latest_books_template.html +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- {% include latest_covers.html %} -
-

Some of our latest eBooks Click Here for more latest books!

-
-
- diff --git a/_includes/_site/latest_covers.html b/_includes/_site/latest_covers.html deleted file mode 100644 index ba31f78..0000000 --- a/_includes/_site/latest_covers.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
-
The Ball of Fire -
The Ball of Fire
-
-
Tom Akerley
-His Adventures in the Tall Timber and at Gaspard's Clearing on the Indian River -
Tom Akerley
-
-
Morristown National Historical Park, A Military Capital of the American Revolution
-National Park Service Historical Handbook Series, No. 7 -
Morristown National Historical Park, A Military Capital of the American
-
-
The Little Dauphin (Life Stories for Young People) -
The Little Dauphin (Life Stories for Young People)
-
-
History of the Seventy-Second Regiment of the North Carolina Troops in the War Between the States, 1861-'65 -
History of the Seventy Second Regiment of the North Carolina Troops in the War
-
-
The Experiences of Uncle Jack
-Being a Biography of Rev. Andrew Jackson Newgent -
The Experiences of Uncle Jack
-
-
The Lady's Knitting-Book
-Containing eighty clear and easy patterns of useful and
-ornamental knitting -
The Lady's Knitting Book
-
-
Fritzchen
-Die Geschichte einer Einsamen -
Fritzchen
-
-
Veterinary Medicines
-Their Actions, Uses and Dose -
Veterinary Medicines
-
-
With Trumpet and Drum -
With Trumpet and Drum
- diff --git a/_includes/_site/latestbooks-template.html b/_includes/_site/latestbooks-template.html deleted file mode 100644 index dd50c57..0000000 --- a/_includes/_site/latestbooks-template.html +++ /dev/null @@ -1,60 +0,0 @@ - - -
- The Ball of Fire -
-
- - -
- Tom Akerley -
-
- - -
- Morristown National Historical Park, A Military Capital of the American Revolution -
-
- - -
- The Little Dauphin (Life Stories for Young People) -
-
- - -
- History of the Seventy-Second Regiment of the North Carolina Troops in the War Between the States, 1861-'65 -
-
- - -
- The Experiences of Uncle Jack -
-
- - -
- The Lady's Knitting-Book -
-
- - -
- Fritzchen -
-
- - -
- Veterinary Medicines -
-
- - -
- With Trumpet and Drum -
-
diff --git a/_includes/_site/menu.html b/_includes/_site/menu.html deleted file mode 100644 index 84e80ac..0000000 --- a/_includes/_site/menu.html +++ /dev/null @@ -1,76 +0,0 @@ - diff --git a/_includes/_site/menu_old.html b/_includes/_site/menu_old.html deleted file mode 100644 index 1ffd892..0000000 --- a/_includes/_site/menu_old.html +++ /dev/null @@ -1,65 +0,0 @@ - diff --git a/_includes/_site/navbar.html b/_includes/_site/navbar.html deleted file mode 100644 index fd168dd..0000000 --- a/_includes/_site/navbar.html +++ /dev/null @@ -1,153 +0,0 @@ -
- - -
-
-
-

Authors: - A  - B  - C  - D  - E  - F  - G  - H  - I  - J  - K  - L  - M  - N  - O  - P  - Q  - R  - S  - T  - U  - V  - W  - X  - Y  - Z  - other  -

-

Titles: - A  - B  - C  - D  - E  - F  - G  - H  - I  - J  - K  - L  - M  - N  - O  - P  - Q  - R  - S  - T  - U  - V  - W  - X  - Y  - Z  - other  -

-

Languages with more than 50 books: - Chinese  - Danish  - Dutch  - English  - Esperanto  - Finnish  - French  - German  - Greek  - Hungarian  - Italian  - Latin  - Portuguese  - Spanish  - Swedish  - Tagalog  -

-

Languages with up to 50 books: - Afrikaans  - Aleut  - Arabic  - Arapaho  - Bodo  - Breton  - Bulgarian  - Caló  - Catalan  - Cebuano  - Czech  - Estonian  - Farsi  - Frisian  - Friulian  - Gaelic, Scottish  - Galician  - Gamilaraay  - Greek, Ancient  - Hebrew  - Icelandic  - Iloko  - Interlingua  - Inuktitut  - Irish  - Japanese  - Kashubian  - Khasi  - Korean  - Lithuanian  - Maori  - Mayan Languages  - Middle English  - Nahuatl  - Napoletano-Calabrese  - Navajo  - North American Indian  - Norwegian  - Occitan  - Ojibwa  - Old English  - Polish  - Romanian  - Russian  - Sanskrit  - Serbian  - Slovenian  - Tagabawa  - Telugu  - Welsh  - Yiddish  -

-

Special Categories: - Audio Book, computer-generated  - Audio Book, human-read  - Compilations  - Data  - Music, recorded  - Music, Sheet  - Other recordings  - Pictures, moving  - Pictures, still  -

-

Recent: - last 24 hours  - last 7 days  - last 30 days  -

-
- diff --git a/_includes/_site/navbar.html.LOST b/_includes/_site/navbar.html.LOST deleted file mode 120000 index 3e949be..0000000 --- a/_includes/_site/navbar.html.LOST +++ /dev/null @@ -1 +0,0 @@ -/export/sunsite/users/gutenbackend/www/dev/html/browse/navbar.html \ No newline at end of file diff --git a/_includes/_site/new_ebooks_page.html b/_includes/_site/new_ebooks_page.html deleted file mode 100644 index 9cbc1ba..0000000 --- a/_includes/_site/new_ebooks_page.html +++ /dev/null @@ -1,659 +0,0 @@ -Help -
- -
- - - -
- -
- -
- -
- -
- -
- -
- -
- -
- Help -
- - -
-
-

- - -

- -

- - -

- -

- - -

- -

- - - -

- -

- - -

- -

- - -

- -

- - -

- -

- -

-
-
-
-
- - Help - - -
-
- - diff --git a/_includes/_site/new_ebooks_page_2.html b/_includes/_site/new_ebooks_page_2.html deleted file mode 100644 index e9000c1..0000000 --- a/_includes/_site/new_ebooks_page_2.html +++ /dev/null @@ -1,36 +0,0 @@ -
-
- Help - - -
-
-
- Yahoo! logo - - - - - -
- -
- Google logo - - - - - -
-
- DuckDuckGo logo - - - - - - -
-
-
- diff --git a/_includes/_site/old_latestbooks.html b/_includes/_site/old_latestbooks.html deleted file mode 100644 index 00610d5..0000000 --- a/_includes/_site/old_latestbooks.html +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- {% include latestbooks-template.html %} -
-

Some of our latest eBooks Click Here for more latest books!

-
-
- diff --git a/_includes/_site/old_latestbooks_template.html b/_includes/_site/old_latestbooks_template.html deleted file mode 100644 index f539cea..0000000 --- a/_includes/_site/old_latestbooks_template.html +++ /dev/null @@ -1,60 +0,0 @@ - - -
- A Popular History Of England From the Earliest Times To The Reign Of Queen Victoria; Vol 3 -
-
- - -
- The Giant Fish of Florida -
-
- - -
- Jean-Christophe Volume 3 (of 4) -
-
- - -
- The Ballad of Blaster Bill -
-
- - -
- An Essay on the State of England -
-
- - -
- Abraham Lincoln's Lost Speech, May 29, 1856 -
-
- - -
- Lettres d'un innocent -
-
- - -
- The Star of Satan -
-
- - -
- Prince Dusty -
-
- - -
- Wilhelm Hauffs sämtliche Werke in sechs Bänden. Sechster Band -
-
diff --git a/_includes/latest_covers.html b/_includes/latest_covers.html index 32a8fff..1da06ef 100644 --- a/_includes/latest_covers.html +++ b/_includes/latest_covers.html @@ -1,4 +1,70 @@ + +
+
+ The Yarn of Old Harbour Town +
+
+
The Yarn of Old Harbour Town
+
+
+
+ + +
+
+ Coco Bolo: King of the Floating Islands +
+
+
Coco Bolo: King of the Floating Islands
+
+
+
+ + +
+
+ Scottish Reminiscences +
+
+
Scottish Reminiscences
+
+
+
+ + +
+
+ Limehouse Nights +
+
+
Limehouse Nights
+
+
+
+ + +
+
+ Smoke of the .45 +
+
+
Smoke of the .45
+
+
+
+ + +
+
+ The Art of Building a Home: A collection of lectures and illustrations +
+
+
The Art of Building a Home: A collection of lectures and illustrations
+
+
+
+
@@ -45,79 +111,4 @@ A Magazine of Methods and Materials for Story Tellers" draggable="false">
- - -
-
- Motion Pictures, 1971
-Catalog of Copyright Entries Third Series Vol 25 Pts 12-13 -
-
-
Motion Pictures, 1971
-
-
-
- - -
-
- The Trinity Archive, Vol. I, No. 3, January 1888 -
-
-
The Trinity Archive, Vol. I, No. 3, January 1888
-
-
-
- - -
-
- Salome
-Dramo En Unu Akto -
-
-
Salome
-
-
-
- - -
-
- Les Industriels
-Métiers et professions en France -
-
-
Les Industriels
-
-
-
- - -
-
- Terror Out of Space -
-
-
Terror Out of Space
-
-
-
- - -
-
- Sir Francis Drake His Voyage, 1595 -
-
-
Sir Francis Drake His Voyage, 1595
-
-
-
\ No newline at end of file diff --git a/ebooks/results.php b/ebooks/results.php index 010b193..34259d2 100644 --- a/ebooks/results.php +++ b/ebooks/results.php @@ -20,9 +20,10 @@ privatecache (); $db2 = $config->db (); $dofulltext = false; -$time_start = getmicrotime (); -$time_query1 = getmicrotime (); -$time_query2 = getmicrotime (); +// For debugging: +// $time_start = getmicrotime (); +// $time_query1 = getmicrotime (); +// $time_query2 = getmicrotime (); function getall ($db, $field, $filterfunc = null) { $f = array (); @@ -409,7 +410,8 @@ if ($yousel) { // flush (); flushes headers too :-( -$time_query1 = getmicrotime (); +// For debugging: +// $time_query1 = getmicrotime (); $where = "books.pk in (" . implode (", ", $pks) . ")"; $offset = $pageno * $pagesize; @@ -429,7 +431,8 @@ books.pk offset $offset"; $db->exec ($sql); -$time_query2 = getmicrotime (); +// For debugging: +// $time_query2 = getmicrotime (); $hcnt = $db->CountRows (); @@ -461,8 +464,9 @@ if ($pages > 1) { $pl = "

" . join (" ", $pagelinks) . "

\n\n"; } -$time_end = getmicrotime (); -$time = $time_end - $time_start; +// For debugging: +// $time_end = getmicrotime (); +// $time = $time_end - $time_start; echo ($pl); @@ -472,13 +476,13 @@ $table->PrintTable ($db, "Titles", "pgdbfiles"); echo ($pl); -$time_end = getmicrotime (); - -$time1 = $time_query1 - $time_start; -$time2 = $time_query2 - $time_query1; -$time3 = $time_end - $time_query2; -$time = $time_end - $time_start; - +// For debugging purposes: +// $time_end = getmicrotime (); +// +// $time1 = $time_query1 - $time_start; +// $time2 = $time_query2 - $time_query1; +// $time3 = $time_end - $time_query2; +// $time = $time_end - $time_start; // p ("Processing time: $time ($time1 + $time2 + $time3) seconds"); pagefooter (); diff --git a/gutenberg/pg-desktop-one.css b/gutenberg/pg-desktop-one.css index 07afa6c..ea419d0 100644 --- a/gutenberg/pg-desktop-one.css +++ b/gutenberg/pg-desktop-one.css @@ -221,7 +221,7 @@ span.title{display:block;font-weight:bold;} a span.title{text-decoration:underline;} span.subtitle{display:block;color:black;} span.extra{display:block;color:gray;} -h1 .icon{float:left;} +h1 .icon{float:left;margin-top:80px} .icon_flattr{background-position:0px 0px;width:93px;height:20px;} .icon_paypal{background-position:0px -21px;width:92px;height:26px;} .icon_logo{background-position:0px -48px;width:72px;height:72px;} diff --git a/site/help/new_website.md b/site/help/new_website.md index 7e03938..bffcb05 100644 --- a/site/help/new_website.md +++ b/site/help/new_website.md @@ -28,7 +28,7 @@ THANK YOU for your patience as we continue to update the website to fix remainin 1. Bookshelf editing is not currently available. Bookshelves only have older entries. Most bookshelves had not been updated recently anyway, and we hope to add bookshelf editing capabilities soon. Status: Under development. 2. Need to remove mention of https://www.gutenberg.org/wiki/Gutenberg:Help_on_Bibliographic_Record_Page from bibrec (help text, appears 4x on each bibrec page). 3. OPDS catalog (for offline readers) does not seem to be part of the new site, but should be in Offline Catalogs (https://www.gutenberg.org/ebooks/offline_catalogs.html). Status: It would help if someone told us where it used to be. -4. "Top" lists are not being updated. https://www.gutenberg.org/browse/scores/top .. this is likely due to changes in the logfiles. Status: being investigated. +4. "Top" lists are not being updated. https://www.gutenberg.org/browse/scores/top .. this is likely due to changes in the logfiles. Status: Logfiles from the new servers are not being made available for analysis; iBiblio needs to help with this. ### User interface and user experience issues 1. Display issues on book landing pages (such as https://www.gutenberg.org/ebooks/1342) and search output pages (such as https://www.gutenberg.org/ebooks/1342/also/). The top of the content is too high, going behind the main top menu bar. Status: CSS issue; working on it.