Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 41 insertions, 0 deletions

diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
new file mode 100644
index 00000000..2c2b54eb
--- /dev/null
+++ b/themes/wind/views/album.html.php
@@ -0,0 +1,41 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? // @todo Set hover on AlbumGrid list items for guest users ?>
+<div id="g-info">
+  <?= $theme->album_top() ?>
+  <h1><?= html::purify($item->title) ?></h1>
+  <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
+</div>
+
+<ul id="g-album-grid" class="ui-helper-clearfix">
+<? if (count($children)): ?>
+  <? foreach ($children as $i => $child): ?>
+    <? $item_class = "g-photo"; ?>
+    <? if ($child->is_album()): ?>
+      <? $item_class = "g-album"; ?>
+    <? endif ?>
+  <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
+    <?= $theme->thumb_top($child) ?>
+    <a href="<?= $child->url() ?>">
+      <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
+    </a>
+    <?= $theme->thumb_bottom($child) ?>
+    <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
+    <ul class="g-metadata">
+      <?= $theme->thumb_info($child) ?>
+    </ul>
+  </li>
+  <? endforeach ?>
+<? else: ?>
+  <? if ($user->admin || access::can("add", $item)): ?>
+  <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
+  <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
+            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
+  <? else: ?>
+  <li><?= t("There aren't any photos here yet!") ?></li>
+  <? endif; ?>
+<? endif; ?>
+</ul>
+<?= $theme->album_bottom() ?>
+
+<?= $theme->paginator() ?>