summaryrefslogtreecommitdiff
path: root/modules/info
diff options
context:
space:
mode:
Diffstat (limited to 'modules/info')
-rw-r--r--modules/info/helpers/info_block.php37
-rw-r--r--modules/info/views/info_block.html.php33
2 files changed, 40 insertions, 30 deletions
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 3cbbb12b..97820d84 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -31,6 +31,43 @@ class info_block_Core {
$block->css_id = "g-metadata";
$block->title = $theme->item()->is_album() ? t("Album info") : t("Photo info");
$block->content = new View("info_block.html");
+
+ $info[] = array(
+ 'label' => t("Title:"),
+ 'value' => html::purify($theme->item->title)
+ );
+ if ($theme->item->description) {
+ $info[] = array(
+ 'label' => t("Description:"),
+ 'value' => nl2br(html::purify($theme->item->description))
+ );
+ }
+ if (!$theme->item->is_album()) {
+ $info[] = array(
+ 'label' => t("File name:"),
+ 'value' => html::clean($theme->item->name));
+ }
+ if ($theme->item->captured) {
+ $info[] = array(
+ 'label' => t("Captured:"),
+ 'value' => gallery::date_time($theme->item->captured)
+ );
+ }
+ if ($theme->item->owner) {
+ $display_name = $theme->item->owner->display_name();
+ if ($theme->item->owner->url) {
+ $info[] = array(
+ 'label' => t("Owner:"),
+ 'value' => "<a href=\"{$theme->item->owner->url}\">" . html::clean($display_name) . "</a>"
+ );
+ } else {
+ $info[] = array(
+ 'label' => t("Owner:"),
+ 'value' => html::clean($display_name)
+ );
+ }
+ }
+ $block->content->metadata = $info;
}
break;
}
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index ebe9bd28..88f29a88 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -1,35 +1,8 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<ul class="g-metadata">
+ <? foreach($metadata as $k => $v): ?>
<li>
- <strong class="caption"><?= t("Title:") ?></strong>
- <?= html::purify($item->title) ?>
+ <strong class="caption"><?= $v['label'] ?></strong> <?= $v['value'] ?>
</li>
- <? if ($item->description): ?>
- <li>
- <strong class="caption"><?= t("Description:") ?></strong>
- <?= nl2br(html::purify($item->description)) ?>
- </li>
- <? endif ?>
- <? if (!$item->is_album()): ?>
- <li>
- <strong class="caption"><?= t("File name:") ?></strong>
- <?= html::clean($item->name) ?>
- </li>
- <? endif ?>
- <? if ($item->captured): ?>
- <li>
- <strong class="caption"><?= t("Captured:") ?></strong>
- <?= gallery::date_time($item->captured)?>
- </li>
- <? endif ?>
- <? if ($item->owner): ?>
- <li>
- <strong class="caption"><?= t("Owner:") ?></strong>
- <? if ($item->owner->url): ?>
- <a href="<?= $item->owner->url ?>"><?= html::clean($item->owner->display_name()) ?></a>
- <? else: ?>
- <?= html::clean($item->owner->display_name()) ?>
- <? endif ?>
- </li>
- <? endif ?>
+ <? endforeach; ?>
</ul>