Merge branch 'bentley-master'

marcespie · Aug 20, 2019 · e08f4e6 · e08f4e6
2 parents 554fa56 + 7d69537
commit e08f4e6
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 66 deletions.
diff --git a/public/404.html b/public/404.html
@@ -1,12 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
+<!doctype html>
+<html lang=en>
 <title>Error 404</title>
-<link rel="stylesheet" href="/css/style.css" />
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-</head>
-<body>
+<link rel="stylesheet" href="/css/style.css">
+<meta charset="utf-8">
+
 <div id="content">
 <div id="back"><a href="/">Home</a></div>
 <h1>Error 404</h1>
@@ -15,5 +12,3 @@ <h2>Page Not Found</h2><p>Bad url.</p>
 <div id="footer">
 Powered by <a href="http://perldancer.org/">Dancer</a>.
 </div>
-</body>
-</html>
diff --git a/public/500.html b/public/500.html
@@ -1,12 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
+<!doctype html>
+<html lang=en>
 <title>Error 500</title>
-<link rel="stylesheet" href="/css/style.css" />
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
-</head>
-<body>
+<link rel="stylesheet" href="/css/style.css">
+<meta charset=utf-8>
+
 <div id="content">
 <div id="back"><a href="/">Home</a></div>
 <h1>Error 500</h1>
@@ -15,5 +12,3 @@ <h2>Internal Server Error</h2><p>Wooops, something went wrong</p>
 <div id="footer">
 Powered by <a href="http://perldancer.org/">Dancer</a>.
 </div>
-</body>
-</html>
diff --git a/public/css/style.css b/public/css/style.css
@@ -88,4 +88,9 @@ form {
 padding: 10px;
 background-color: #eee;
 border: 1px;
+width: 60%;
+}
+
+#test-depends-list, #reverse-depends-list, #files-list {
+display: none;
 }
diff --git a/public/javascripts/script.js b/public/javascripts/script.js
@@ -0,0 +1,20 @@
+$('#test_depends_link').click(function() {
+	$('#test-depends-list').slideToggle('fast', function() {
+		// ok
+	});
+	return(false);
+    });
+
+$('#reverse_depends_link').click(function() {
+	$('#reverse-depends-list').slideToggle('fast', function() {
+		// ok
+	});
+	return(false);
+    });
+
+$('#files_list_link').click(function() {
+	$('#files-list').slideToggle('fast', function() {
+		// ok
+	});
+	return(false);
+    });
diff --git a/views/layouts/main.tt b/views/layouts/main.tt
@@ -1,20 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-type" content="text/html; charset=<% settings.charset %>" />
+<!doctype html>
+<html lang=en>
+<meta charset="<% settings.charset %>">
 <title><% title %></title>
-<link rel="stylesheet" href="<% request.uri_base %>/css/style.css" />
+<link rel="stylesheet" href="//<% request.host %>/css/style.css">
+
+<script src="//<% request.host %>/javascripts/jquery.js"></script>
 
-<script type="text/javascript" src="<% request.uri_base %>/javascripts/jquery.js"></script>
-</head>
-<body>
 <div id="content">
 <% content %>
-<form name="Search" action="/search" style="width: 60%;">
+<form name="Search" action="/search">
 <fieldset>
 <legend>Search</legend>
-<table border="0">
+<table>
 <tr>
 <td>File<td><input type="text" name="file" value="<% params.file %>">
 <td>Descr<td><input type="text" name="descr" value="<% params.descr %>">
@@ -33,5 +30,4 @@
 <div id="footer">
 <a href="/path/databases/ports-readmes-dancer">Ports Readmes</a>, powered by <a href="http://perldancer.org/">Dancer</a> <% dancer_version %>
 </div>
-</body>
-</html>
+<script type="text/javascript" src="//<% request.host %>/javascripts/script.js"></script>
diff --git a/views/port.tt b/views/port.tt
@@ -4,12 +4,11 @@
 </div>
 
 <H2><% fullpkgname | html %> &ndash; <% comment | html %>
-(<a href="http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/<% simplepath | url %>">source</a>)</H2>
+(<a href="https://cvsweb.openbsd.org/ports/<% simplepath | url %>">source</a>)</H2>
 <H3>Description</H3>
 
 <pre>
-<% descr %>
-</pre>
+<% descr %></pre>
 <% IF homepage %>
 WWW: <a href="<% homepage | url %>"><% homepage | html %></a>
 <% ELSE %>
@@ -19,8 +18,7 @@ No homepage
 <% IF readme %>
 <h3>Readme</h3>
 <pre>
-<% readme %>
-</pre>
+<% readme %></pre>
 <% END %>
 
 <h3>Maintainer</h3>
@@ -93,56 +91,32 @@ on <% b.arch | html %>:
 </div>
 <% END %>
 <%IF testdepends %>
-<h3><a href="#" id="test_depends_link">Test dependencies</a></h3>
-<div id="test-depends-list" style="display: none;" class="three">
+<h3><a id="test_depends_link">Test dependencies</a></h3>
+<div id="test-depends-list" class="three">
 <ul>
 <% FOREACH d IN testdepends %>
 <li><a href="<% d.url | url %>"><% d.depends %></a>
 <% END %>
 </ul>
 </div>
-<script type="text/javascript">
-$('#test_depends_link').click(function() {
-	$('#test-depends-list').slideToggle('fast', function() {
-		// ok
-	});
-	return(false);
-    });
-</script>
 <% END %>
 <%IF reversedepends %>
 <h3><a href="#" id="reverse_depends_link">Reverse dependencies</a></h3>
-<div id="reverse-depends-list" style="display: none;" class="three">
+<div id="reverse-depends-list" class="three">
 <ul>
 <% FOREACH d IN reversedepends %>
 <li><a href="<% d.url | url %>"><% d.depends %></a>
 <% END %>
 </ul>
 </div>
-<script type="text/javascript">
-$('#reverse_depends_link').click(function() {
-	$('#reverse-depends-list').slideToggle('fast', function() {
-		// ok
-	});
-	return(false);
-    });
-</script>
 <% END %>
 <% IF files %>
 <h3><a href="#" id="files_list_link">Files</a></h3>
-<div id="files-list" style="display: none;" class="smaller">
+<div id="files-list" class="smaller">
 <ul>
 <% FOREACH a IN files %>
 <li><% a | html %>
 <% END %>
 </ul>
 </div>
-<script type="text/javascript">
-$('#files_list_link').click(function() {
-	$('#files-list').slideToggle('fast', function() {
-		// ok
-	});
-	return(false);
-    });
-</script>
 <% END %>