From 331ce020658fc5c5fd03753acfcd0c4aedb5d50b Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 28 Feb 2011 09:44:10 -0800
Subject: [PATCH] Update the default View Thing Data template to use the
 viewScreenTitle variable, and i18n the word "View".  Update template docs to
 describe what viewScreenTitle really is.  Fixes bug #12053.

---
 docs/changelog/7.x.x.txt                         |   1 +
 docs/templates.txt                               |   6 ++++++
 .../templates_thingy-default-view-thing.wgpkg    | Bin 0 -> 1986 bytes
 lib/WebGUI/i18n/English/Asset_Thingy.pm          |   4 ++--
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 docs/upgrades/packages-7.10.11/templates_thingy-default-view-thing.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4806b8e67..b9a835528 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,7 @@
 7.10.11
  - fixed #12057: WebGUI::Search, assetIds search clause
  - fixed #12051: Prevent Proxy Caching Breaks Edit/Add Thing
+ - fixed #12053: Thingy: View Thing Data
 
 7.10.10
  - fixed #12035: Story Manager - make keywords from Story view work
diff --git a/docs/templates.txt b/docs/templates.txt
index eae7f3d24..a3db6f3a2 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -1,6 +1,12 @@
 This is a running list of template changes made during upgrades.  If you have copied the default
 templates, you will need to apply these changes manually to your copies.
 
+7.10.11
+
+  * Default View Thing Data Template - templates/thingy-default-view-thing
+    Change how the title is rendered.  If no fields are set to be displayed in the title, show the internationalized word View.
+    If fields are set, then display the viewScreenTitle variable instead.
+
 7.10.9
 
   * Underground style template CSS - style-underground/css/underground-webgui-css
diff --git a/docs/upgrades/packages-7.10.11/templates_thingy-default-view-thing.wgpkg b/docs/upgrades/packages-7.10.11/templates_thingy-default-view-thing.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..712fc387acc87eab38ca396b8969643a7eed452c
GIT binary patch
literal 1986
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
U4+efP@PB6DA6a4H`2ZpS083TZwg3PC

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/i18n/English/Asset_Thingy.pm b/lib/WebGUI/i18n/English/Asset_Thingy.pm
index ae615b2d6..0b24cac16 100644
--- a/lib/WebGUI/i18n/English/Asset_Thingy.pm
+++ b/lib/WebGUI/i18n/English/Asset_Thingy.pm
@@ -918,8 +918,8 @@ below/after the form element.|,
     },
 
     'viewScreenTitle' => {
-        message => q|The title for the view screen|,
-        lastUpdated => 1104630516,
+        message => q|The title for the view screen.  This is the concatenation of all values for fields which have View Screen Title set for this Thing.  If no fields are set, then the title is empty.|,
+        lastUpdated => 1298915023,
     },
 
     'import_url' => {