From af7166709e6f47a46031e814f6ac4c8332b5b58d Mon Sep 17 00:00:00 2001
From: Adrian Cochrane <adrian@openwork.nz>
Date: Fri, 5 Jun 2020 19:28:57 +1200
Subject: [PATCH] Allow navigating to bookmarks page, improve it's layout.

---
 data/pages/NOT-FOUND                    | 12 +++++++-----
 data/pages/bookmarks                    |  8 ++++++--
 src/Traits/autocomplete/imply-http.vala | 24 ++----------------------
 3 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/data/pages/NOT-FOUND b/data/pages/NOT-FOUND
index d5d57dc..864851a 100644
--- a/data/pages/NOT-FOUND
+++ b/data/pages/NOT-FOUND
@@ -17,10 +17,17 @@
     <p>{% trans %}Maybe you meant one of these other internal pages?{% endtrans %}</p>
 
     <dl>
+      <dt><a href="odysseus:bookmarks">{% trans %}Bookmarks{% endtrans %}</a></dt>
+      <dd>{% trans %}Webpages you've starred.{% endtrans %}</dd>
       <dt><a href="odysseus:credits">{% trans %}Credits{% endtrans %}</a></dt>
       <dd>{% trans %}The people you should thank for this gorgeous browsing experience.{% endtrans %}</dd>
       <dt><a href="odysseus:debugging/index">{% trans %}Odysseus Debugging{% endtrans %}</a></dt>
       <dd>{% trans %}Tools for ensuring your browser is working correctly.{% endtrans %}</dd>
+      <dt><a href="odysseus:feedreaders">{% trans %}Compatible Feed Readers{% endtrans %}</a></dt>
+      <dd>{% trans %}Lists all compatible feedreaders available in your package repositories.{% endtrans %}</dd>
+      <dt>{% trans %}Compatible Apps{% endtrans %}:
+        <form action="odysseus:filetype" method="GET"><input type="text" placeholder="MIME Type" name="mime" /></form>
+      </dt>
       <dt><a href="odysseus:history">{% trans %}History{% endtrans %}</a></dt>
       <dd>{% trans %}The pages you've visited before.{% endtrans %}</dd>
       <dt><a href="odysseus:home">{% trans %}Odysseus's homepage{% endtrans %}</a></dt>
@@ -28,11 +35,6 @@
       <dd>{% trans %}This is what you see when you open a new tab.{% endtrans %}</dd>
       <dt><a href="odysseus:privacy">{% trans %}Privacy Policy{% endtrans %}</a></dt>
       <dd>{% trans %}The privacy situation around Odysseus.{% endtrans %}</a></dt>
-      <dt><a href="odysseus:feedreaders">{% trans %}Compatible Feed Readers{% endtrans %}</a></dt>
-      <dd>{% trans %}Lists all compatible feedreaders available in your package repositories.{% endtrans %}</dd>
-      <dt>{% trans %}Compatible Apps{% endtrans %}:
-        <form action="odysseus:filetype" method="GET"><input type="text" placeholder="MIME Type" name="mime" /></form>
-      </dt>
       <dd>{% trans %}Lists all apps in your package repository capable of opening a specific MIME type.{% endtrans %}</dd>
       <dt><a href="odysseus:suggestions">{% trans %}Personalized suggestions{% endtrans %}</a></dt>
       <dd>{% trans %}Links recommended by visited pages you have yet to visit.{% endtrans %}</dd>
diff --git a/data/pages/bookmarks b/data/pages/bookmarks
index 052e170..9a48a70 100644
--- a/data/pages/bookmarks
+++ b/data/pages/bookmarks
@@ -1,8 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>{% trans %}Favourites{% endtrans %}</title>
-  <style>@import url(odysseus:butterick.css)</style>
+  <title>[starred] {% trans %}Favourites{% endtrans %}</title>
+  <style>
+    @import url(odysseus:butterick.css);
+    figure {width: 134px; overflow: crop;}
+    legend {text-overflow: ellipsis;}
+  </style>
 </head>
 <body>
   <nav>
diff --git a/src/Traits/autocomplete/imply-http.vala b/src/Traits/autocomplete/imply-http.vala
index 03e47d9..bbbe6bd 100644
--- a/src/Traits/autocomplete/imply-http.vala
+++ b/src/Traits/autocomplete/imply-http.vala
@@ -25,28 +25,8 @@ namespace Odysseus.Traits {
                 return; // Doesn't even resemble a URI!
 
             // TODO handle IPv6 addresses.
-            bool has_schema;
-            if ("://" in query) has_schema = true;
-            else if (!(":" in query)) has_schema = false;
-            else {
-                var host = query.split("/", 2)[0];
-                if (host == null) host = query;
-
-                var user = host[0:host.index_of("@")];
-                if (user != null) has_schema = !(":" in user);
-                else {
-                    var port = host[host.index_of(":")+1:host.length];
-                    has_schema = false;
-                    foreach (var digit in port.data) {
-                        if ('0' < digit || digit > '9') {
-                            has_schema = true;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (has_schema) c.suggestion(query);
+            // Maybe other failure cases, but the more sophisticated test broke.
+            if (":" in query) c.suggestion(query);
             else c.suggestion("https://" + query);
         }
     }
