Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

2 files changed, 11 insertions, 11 deletions

diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 91d9eec8..fdf22a9e 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // @todo Set hover on AlbumGrid list items ?>
-<form action="<?= url::site("/search") ?>" id="gSearchForm">
+<form action="<?= url::site("/search") ?>" id="g-search-form" class="g-short-form">
   <fieldset>
     <legend>
       <?= t("Search") ?>
@@ -17,17 +17,17 @@
   </fieldset>
 </form>
 
-<div id="gSearchResults">
-  <h1><?= t("Search Results") ?></h1>
+<div id="g-search-results">
+  <h1><?= t("Search results") ?></h1>
 
   <? if (count($items)): ?>
-  <ul id="gAlbumGrid">
+  <ul id="g-album-grid" class="ui-helper-clearfix">
     <? foreach ($items as $item): ?>
-      <? $item_class = "gPhoto"; ?>
+      <? $item_class = "g-photo"; ?>
       <? if ($item->is_album()): ?>
-        <? $item_class = "gAlbum"; ?>
+        <? $item_class = "g-album"; ?>
       <? endif ?>
-   <li class="gItem <?= $item_class ?>">
+   <li class="g-item <?= $item_class ?>">
       <a href="<?= $item->url() ?>">
         <?= $item->thumb_img() ?>
         <p>
@@ -40,7 +40,7 @@
     </li>
     <? endforeach ?>
   </ul>
-  <?= $theme->pager() ?>
+  <?= $theme->paginator() ?>
 
   <? else: ?>
   <p>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index 51bb4e14..481d0c82 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -1,9 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<form action="<?= url::site("search") ?>" id="gQuickSearchForm">
+<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form">
   <ul>
     <li>
-      <label for="gSearch"><?= t("Search the gallery") ?></label>
-      <input type="text" name="q" id="gSearch"/>
+      <label for="g-search"><?= t("Search the gallery") ?></label>
+      <input type="text" name="q" id="g-search"/>
     </li>
     <li>
       <input type="submit" value="<?= t("Go")->for_html_attr() ?>" />