From ddddfc5e8e505f83276acaa89057d5b9a9f6426f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 27 Aug 2009 14:27:49 -0600
Subject: Make the info block display 'File name', instead of 'Folder name'
 when showing a photo. Fixes #631

---
 modules/info/views/info_block.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/info')

diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index f86ae39d..762e989b 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -12,7 +12,7 @@
   <? endif ?>
   <? if ($item->id != 1): ?>
   <li>
-    <strong class="caption"><?= t("Folder name:") ?></strong>
+    <strong class="caption"><?= $theme->page_type == 'album' ?  t("Folder name:"): t("File name:"); ?></strong>
     <?= p::clean($item->name) ?>
   </li>
   <? endif ?>
-- 
cgit v1.2.3


From 826e104fa98eca33afd8cb59ebf8123021145609 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 27 Aug 2009 17:15:20 -0700
Subject: Get rid of the extra "Folder name" row.  It's noisy.  Fixes ticket
 #593.

---
 modules/info/views/info_block.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/info')

diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index 762e989b..3c668168 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -10,9 +10,9 @@
      <?= nl2br(p::purify($item->description)) ?>
   </li>
   <? endif ?>
-  <? if ($item->id != 1): ?>
+  <? if (!$item->is_album()): ?>
   <li>
-    <strong class="caption"><?= $theme->page_type == 'album' ?  t("Folder name:"): t("File name:"); ?></strong>
+    <strong class="caption"><?= t("File name:") ?></strong>
     <?= p::clean($item->name) ?>
   </li>
   <? endif ?>
-- 
cgit v1.2.3