From 78b53aecc72db8cbe3e5cfb947d9ea12d4511aea Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 27 Jul 2009 21:13:39 +0000 Subject: [PATCH] Fix a rendering problem in the Product template where images overlap the controls, or brochure, warranty, manual. Also, i18n the word Controls for admin mode being on. --- docs/changelog/7.x.x.txt | 1 + .../packages-7.7.17/default_product.wgpkg | Bin 0 -> 3635 bytes lib/WebGUI/i18n/English/Asset_Product.pm | 6 ++++++ 3 files changed, 7 insertions(+) create mode 100644 docs/upgrades/packages-7.7.17/default_product.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 82a38c645..802e4ea24 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -8,6 +8,7 @@ - fixed #10700: Default My Sales template needs i18n - fixed #10702: Product displays empty brochure, warranty, manual fields - fixed #10704: Commit version tag from AdminBar is not working + - fixed #10510: Product Thumbnails overlap Controls 7.7.16 - fixed #10590: Session::DateTime->secondsToInterval doesn't allow 7 weeks diff --git a/docs/upgrades/packages-7.7.17/default_product.wgpkg b/docs/upgrades/packages-7.7.17/default_product.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..9f79c6beacf118c8799950e634c1485aaf0a1b8e GIT binary patch literal 3635 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 F002BPFA4wv literal 0 HcmV?d00001 diff --git a/lib/WebGUI/i18n/English/Asset_Product.pm b/lib/WebGUI/i18n/English/Asset_Product.pm index ee8e3c952..df0b5223c 100644 --- a/lib/WebGUI/i18n/English/Asset_Product.pm +++ b/lib/WebGUI/i18n/English/Asset_Product.pm @@ -858,6 +858,12 @@ be useful, others may not.|, context => q|hover help for isShippingRequired in the edit sku screen| }, + 'Controls' => { + message => q|Controls|, + lastUpdated => 0, + context => q|A set of links or icons to edit or alter the object.| + }, + }; 1;