[project @ Improve remembered decisions page]

1 files changed, 25 insertions, 14 deletions

diff --git a/examples/server/lib/render/sites.php b/examples/server/lib/render/sites.php
index 83b3f20..90b557f 100644
--- a/examples/server/lib/render/sites.php
+++ b/examples/server/lib/render/sites.php
@@ -3,8 +3,9 @@
 require_once "lib/session.php";
 
 define('sites_form',
-       '<div class="form">
-<p>These decisions have been remembered for this session:</p>
+       '<p>These decisions have been remembered for this session. All decisions
+will be forgotten when the session ends.</p>
+<div class="form">
 <form method="post" action="%s">
 <table>
 <tbody>
@@ -15,7 +16,6 @@ define('sites_form',
 <input type="submit" name="refresh" value="Refresh List" />
 <input type="submit" name="forget" value="Forget All" />
 </form>
-<p>All decisions will be forgotten when this session ends.</p>
 </div>
 ');
 
@@ -31,28 +31,39 @@ define('sites_empty_message',
 define('sites_row',
        '<tr>
 <td><input type="checkbox" name=%s value="%s" id=%s /></td>
-<td><label for=%s>%s %s</label></td>
+<td><label for=%s><code>%s</code></label></td>
 </tr>');
 
-function siteListRow_render($i, $site, $trusted)
+function siteListRow_render($i, $site)
 {
     $esc_site = htmlspecialchars($site, ENT_QUOTES);
-    if ($trusted) {
-        $trust = 'Trust';
-    } else {
-        $trust = 'Do not trust';
-    }
     $id = sprintf('"site%s"', $i);
-    return sprintf(sites_row, $id, $esc_site, $id, $id, $trust, $esc_site);
+    return sprintf(sites_row, $id, $esc_site, $id, $id, $esc_site);
 }
 
 function siteList_render($sites)
 {
+    $trusted_sites = array();
+    $untrusted_sites = array();
+    foreach ($sites as $site => $trusted) {
+        if ($trusted) {
+            $trusted_sites[] = $site;
+        } else {
+            $untrusted_sites[] = $site;
+        }
+    }
     $rows = '';
     $i = 0;
-    foreach ($sites as $site => $trusted) {
-        $rows .= siteListRow_render($i, $site, $trusted);
-        $i += 1;
+    foreach (array('Trusted Sites' => $trusted_sites,
+                   'Untrusted Sites' => $untrusted_sites) as
+             $name => $sites) {
+        if ($sites) {
+            $rows .= '<tr><th colspan="2">'. $name . '</th></tr>';
+            foreach ($sites as $site) {
+                $rows .= siteListRow_render($i, $site);
+                $i += 1;
+            }
+        }
     }
     return $rows;
 }