more styling and cleanup

This commit is contained in:
Ryan Voots 2020-09-11 16:25:44 -07:00
parent fc5aeff44e
commit 3735cf5aad
5 changed files with 89 additions and 109 deletions

View file

@ -12,3 +12,8 @@
font-weight: bolder; font-weight: bolder;
text-decoration: underline; text-decoration: underline;
} }
.notrendered {
color: #ff7f4f;
font-weight: lighter;
text-decoration: underline wavy;
}

View file

@ -1,9 +1,13 @@
[%- MACRO format_namespace(server, namespace) BLOCK -%]
<span class="factoididentifier"><a href="/[% uenc($server) %]/[% uenc($namespace) %]/list">&lt;<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span>&gt;</a></span>
[%- END -%]
[%- MACRO ns_url(server, namespace) BLOCK -%] [%- MACRO ns_url(server, namespace) BLOCK -%]
[%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
/[%- uenc($server) -%]/[%- uenc($namespace) -%] /[%- uenc($server) -%]/[%- uenc($namespace) -%]
[%- END -%] [%- END -%]
[%- MACRO format_namespace(server, namespace) BLOCK -%]
[%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
<span class="factoididentifier"><a href="[%- ns_url($server, $namespace) -%]/list">&lt;<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span>&gt;</a></span>
[%- END -%]
[%- MACRO row(fact) BLOCK -%] [%- MACRO row(fact) BLOCK -%]
<tr> <tr>
<td>[%- $fact.factoid_id -%]</td> <td>[%- $fact.factoid_id -%]</td>

View file

@ -1,9 +1,13 @@
[%- MACRO format_namespace(server, namespace) BLOCK -%]
<span class="factoididentifier"><a href="/[% uenc($server) %]/[% uenc($namespace) %]/list">&lt;<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span>&gt;</a></span>
[%- END -%]
[%- MACRO ns_url(server, namespace) BLOCK -%] [%- MACRO ns_url(server, namespace) BLOCK -%]
[%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
/[%- uenc($server) -%]/[%- uenc($namespace) -%] /[%- uenc($server) -%]/[%- uenc($namespace) -%]
[%- END -%] [%- END -%]
[%- MACRO format_namespace(server, namespace) BLOCK -%]
[%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
<span class="factoididentifier"><a href="[%- ns_url($server, $namespace) -%]/list">&lt;<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span>&gt;</a></span>
[%- END -%]
[%- MACRO row(fact) BLOCK -%] [%- MACRO row(fact) BLOCK -%]
<tr> <tr>
<td>[%- $fact.factoid_id -%]</td> <td>[%- $fact.factoid_id -%]</td>

View file

@ -1,40 +1,19 @@
[%- WRAPPER "common/page_wrapper.html.tx" WITH title = "Factoid list for <" _ $server _ ":" _ $namespace _ ">" -%] [%- MACRO ns_url(server, namespace) BLOCK -%]
<p> [%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
These are the factoids for /[%- uenc($server) -%]/[%- uenc($namespace) -%]
<span class="factoididentifier"> [%- END -%]
<a href="/[% uenc($server) %]/[% uenc($namespace) %]/list"> [%- MACRO format_namespace(server, namespace) BLOCK -%]
&lt; [%- server = server || "*" -%]
<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span> [%- namespace = namespace || "##NULL" -%]
&gt; <span class="factoididentifier"><a href="[%- ns_url($server, $namespace) -%]/list">&lt;<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span>&gt;</a></span>
</a> [%- END -%]
</span>. [%- MACRO row(fact) BLOCK -%]
<br/> <tr>
<form action="/[% uenc($server) %]/[% uenc($namespace) %]/search"> <td>[% $fact.factoid_id %]</td>
<input type="text" id="q" name="q" value="[% $query %]"/> <td class="text-wrap">[% $fact.original_subject %]</td>
<input type="submit" name="submit" id="submit" value="search"/> <td>[% $fact.copula %]</td>
</form> <td class="text-wrap">
</p>
[% if ($results) %]
<table class="table table-striped table-bordered table-sm">
<thead class="thead-dark">
<th>factoid_id</th>
<th>subject</th>
<th>copula</th>
<th>predicate</th>
<th>history</th>
<th>from namespace</th>
<th>search rank</th>
</thead>
<tbody>
[% for fact IN ($results.to_array)%]
<tr>
<td>[% $fact.factoid_id %]</td>
<td class="text-wrap">[% $fact.original_subject %]</td>
<td>[% $fact.copula %]</td>
<td class="text-wrap">
[% $fact.predicate %] [% $fact.predicate %]
[% if ($fact.compose_macro) %] [% if ($fact.compose_macro) %]
<hr> <hr>
@ -44,19 +23,38 @@ These are the factoids for
<span class="notrendered">Not Available</span> <span class="notrendered">Not Available</span>
[% END %] [% END %]
[% END %] [% END %]
</td> </td>
<td><a href="/[% uenc($server) %]/[% uenc($namespace) %]/revisions?fact=[% $fact.original_subject %]">revisions</a></td> <td><a href="[%- ns_url($server, $namespace) -%]/revisions?fact=[% $fact.original_subject %]">revisions</a></td>
<td> <td>
[% unless (($fact.server||"") == ($real_server||"") && ($fact.namespace||"") == ($real_namespace||"")) %] [%- unless (($fact.server||"") == ($real_server||"") && ($fact.namespace||"") == ($real_namespace||"")) -%]
<span class="server">[% $fact.server %]</span>:<span class="namespace">[% $fact.namespace %]</span> [%- format_namespace($fact.server, $fact.namespace) -%]
[% ELSE %] [%- END -%]
</td>
<td> [% $fact.rank %]</td>
</tr>
[%- END -%]
[% END %] [%- WRAPPER "common/page_wrapper.html.tx" WITH title = "Factoid list for <" _ $server _ ":" _ $namespace _ ">" -%]
</td> <p>
<td> [% $fact.rank %]</td>
</tr> These are the factoids for
[% END %] [%- format_namespace($server, $namespace) -%]
<br/>
<form action="[%- ns_url($server, $namespace) -%]/search">
<input type="text" id="q" name="q" value="[% $query %]"/>
<input type="submit" name="submit" id="submit" value="search"/>
</form>
</p>
[%- if ($results) -%]
<table class="table table-striped table-bordered table-sm">
<thead class="thead-dark"><th>factoid_id</th><th>subject</th><th>copula</th><th>predicate</th><th>history</th><th>from namespace</th><th>search rank</th></thead>
<tbody>
[%- for fact IN ($results.to_array) -%]
[%- row($fact) -%]
[%- END -%]
</tbody> </tbody>
</table> </table>
[% END %] [%- END -%]
[%- END -%] [%- END -%]

View file

@ -1,4 +1,25 @@
[%- WRAPPER "common/page_wrapper.html.tx" WITH title = "Factoid list for <" _ $server _ ":" _ $namespace _ ">" -%] [%- MACRO ns_url(server, namespace) BLOCK -%]
[%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
/[%- uenc($server) -%]/[%- uenc($namespace) -%]
[%- END -%]
[%- MACRO format_namespace(server, namespace) BLOCK -%]
[%- server = server || "*" -%]
[%- namespace = namespace || "##NULL" -%]
<span class="factoididentifier"><a href="[%- ns_url($server, $namespace) -%]/list">&lt;<span class="server">[% $server %]</span>:<span class="namespace">[% $namespace %]</span>&gt;</a></span>
[%- END -%]
[%- MACRO row(ns) BLOCK -%]
<tr>
<td>[%- format_namespace($ns.server, $ns.namespace) -%]</td>
<td>[%- format_namespace($ns.alias_server, $ns.alias_namespace) -%]</td>
<td>[%- IF ns.recursive -%][%- format_namespace($ns.parent_server, $ns.parent_namespace) -%][%- END -%]</td>
<td><a href="[%- ns_url($ns.server, $ns.namespace) -%]/list">factoids</a></td>
<td><a href="[%- ns_url($ns.server, $ns.namespace) -%]/search">search</a></td>
<td>[%- $ns.notes -%]</td>
</tr>
[%- END -%]
[%- WRAPPER "common/page_wrapper.html.tx" WITH title = "Perlbot master factoid viewer" -%]
<p> <p>
Welcome! Welcome!
@ -6,63 +27,11 @@ Pick a namespace to continue:
</p> </p>
<table class="table table-striped table-bordered table-sm" width="100%"> <table class="table table-striped table-bordered table-sm" width="100%">
<thead class="thead-dark"> <thead class="thead-dark"><th>namespace</th><th>aliased to</th><th>parent</th><th>factoid list</th><th>search factoids</th><th>notes</th></thead>
<th>namespace</th>
<th>aliased to</th>
<th>parent</th>
<th>factoid list</th>
<th>search factoids</th>
<th>notes</th>
</thead>
<tbody> <tbody>
[% for ns IN ($configs.to_array) %] [%- for ns IN ($configs.to_array) -%]
[% server = $ns.server || "*" %] [%- row(ns) -%]
[% namespace = $ns.namespace || "##NULL" %] [%- END -%]
[% alias_server = $ns.alias_server || "*" %]
[% alias_namespace = $ns.alias_namespace || "##NULL" %]
[% parent_server = $ns.parent_server || "*" %]
[% parent_namespace = $ns.parent_namespace || "##NULL" %]
<tr>
<td>
<span class="factoididentifier">
<a href="/[% uenc($server) %]/[% uenc($namespace) %]/list">
&lt;
<span class="server">[% server %]</span>:<span class="namespace">[% $namespace %]</span>
&gt;
</a>
</span>
</td>
<td>
<span class="factoididentifier">
<a href="/[% uenc($alias_server) %]/[% uenc($alias_namespace) %]/list">
&lt;
<span class="server">[% $alias_server %]</span>:<span class="namespace">[% $alias_namespace %]</span>
&gt;
</a>
</span>
</td>
<td>
[% IF ($ns.recursive) %]
<span class="factoididentifier">
<a href="/[% uenc($parent_server) %]/[% uenc($parent_namespace) %]/list">
&lt;
<span class="server">[% $parent_server %]</span>:<span class="namespace">[% $parent_namespace %]</span>
&gt;
</a>
</span>
[% END %]
</td>
<td>
<a href="/[% uenc($server) %]/[% uenc($namespace) %]/list">factoids</a>
</td>
<td>
<a href="/[% uenc($server) %]/[% uenc($namespace) %]/search">search</a>
</td>
<td>
[% $ns.notes %]
</td>
</tr>
[% END %]
</tbody> </tbody>
</table> </table>
[%- END -%] [%- END -%]