Ticket #2. Tighten up search results UI.

1 files changed, 35 insertions, 21 deletions

diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 8d47eed4..fb1fd8a9 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -1,35 +1,49 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gSearchForm">
-  <form action="<?= url::site("/search") ?>">
-    <fieldset>
-      <legend>
-        <?= t("Search") ?>
-      </legend>
-      <ul>
-        <li>
-          <input name="q" type="text" value="<?= $q ?>"/>
-        </li>
-        <li>
-          <input type="submit"/>
-        </li>
-      </ul>
-    </fieldset>
-  </form>
+<? // @todo Set hover on AlbumGrid list items ?>
+<form action="<?= url::site("/search") ?>" id="gSearchForm">
+  <fieldset>
+    <legend>
+      <?= t("Search") ?>
+    </legend>
+    <ul>
+      <li>
+        <label for="q"><?= t("Search the gallery") ?></label>
+        <input name="q" id="q" type="text" value="<?= $q ?>"/>
+      </li>
+      <li>
+        <input type="submit" value="<?= t("Search") ?>" />
+      </li>
+    </ul>
+  </fieldset>
+</form>
 
-  <ul>
+<div id="gSearchResults">
+  <h1><?= t("Search Results") ?></h1>
+
+  <? if (count($items)): ?>
+  <ul id="gAlbumGrid">
     <? foreach ($items as $item): ?>
-    <li>
+      <? $item_class = "gPhoto"; ?>
+      <? if ($item->is_album()): ?>
+        <? $item_class = "gAlbum"; ?>
+      <? endif ?>
+   <li class="gItem <?= $item_class ?>">
       <a href="<?= url::site("items/$item->id") ?>">
         <?= $item->thumb_tag() ?>
         <p>
           <?= $item->title ?>
         </p>
-        <p>
+        <div>
           <?= $item->description ?>
-        </p>
+        </div>
       </a>
     </li>
     <? endforeach ?>
   </ul>
+  <?= $theme->pager() ?>
+
+  <? else: ?>
+  <p><?= t("No results found for '") . $q . "'" ?></p>
+
+  <? endif; ?>
 </div>
-<?= $theme->pager() ?>