From 5e10530e31cbdc141a0ecc9ef2559b444366e041 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Sun, 5 Apr 2009 15:48:16 +0000
Subject: [PATCH] Carousel bugfix, templates and i18n

---
 docs/changelog/7.x.x.txt                      |   1 +
 .../packages-7.7.3/root_import_carousel.wgpkg | Bin 0 -> 1479 bytes
 lib/WebGUI/Asset/Wobject/Carousel.pm          |  21 ++++++++-------
 lib/WebGUI/i18n/English/Asset_Carousel.pm     |  24 +++++++++++++-----
 4 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5310c6d6c..96de5fffc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.7.3
  - fixed #10094: double explanation in thread help
+ - rfe #9612: Carousel Wobject (was Widget Wobject) (SDH Consulting Group)
 
 7.7.2
  - fixed #10056: YUI javascripts included while adminOff (BNC)
diff --git a/docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg b/docs/upgrades/packages-7.7.3/root_import_carousel.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..a581248fdfa6ead14ffebdd3b805e546f3e7cc5c
GIT binary patch
literal 1479
zcmV;&1vvU2iwFQR(%4A=1MOH_bJ{o*=DEK@!&5TT05)I)rI|@+Q<%+#UC4I2o1Khe
zD_D(@ypn*ro&5Kee8Do8Ks#A7?QkA~ts|Yg&iUd}xuVF({?@DUbLlgur0^W1#96hP
z`Zer&MgLV)tJ_w=FbvBw>J{6l7b-^8sMQOg@+{gn(1Z)f04RhLGJ0y?CjL)K-(CR#
zid;|zN2mx|;O~E4M@s>t0b&9pu2!RMYT0233gn)KYPDD`zD^lF<l_C8fHKKFiO!IT
z@6XvX$|90q3?_Fz<{omhvjojPV&c+Sw4stQct~i#@v=BNBZysd#Cq<cA?S->u#2EO
zgrntykaHxGLmkNIgd=}A4*W_=MkZ;({AeGeRFv^p`Brw4GxLWd7u~~&FS28pcd_dt
zvgi!veMSWpVSpA{BPlEBx$j*pB9>uhJb|QnY4F-Eo&rb4n!mj%h7)|mA22!MaC}od
zzF{}yMzn?8ev9t`N1S6yN>j*6&>drPMUpLYQ*a#blT6@HA{h1gal0I(LduDh_&qP!
z#atQ`4zci2CebtJb_vCi24yOu6)E2{w^D$(!*C#^^_hI#acx6Rjef9QmM7L~o9n_d
zyth83bI+9?>`EmnED*~wn}=4VqfPyUo#cPcO&w6emc*)~a)XcOKByfx#aLG6fm-dk
z$4f$^Aj-<lmdifYUgny0Q_IwkUb9fN<M>3+YRkd>gg7c(;NTE^OIH;|g^{@UMrWj?
zuYEe{UR{+Y0{f-+Q$$3Gl6O}Zf5<x+Y8udVLC2yV_5K#fW{?P+VRwW?DZQo#xtzRS
zmZcLUcnp<Z*}DJ_5OQ0fQmTW;RfirASGu^$RYj@2C5DKL*umi&P%Z;$DqzZGa8DVC
zS(uD~@DPYSSu2Nobf%;LB`3LFYtCt=J{}$%rqAuNmf3u{$Jy7~5b>m8;+pwqjE?(I
zS}GR%kuPJM%!A@Oe30#qO8OFx<NY7e-G}R5t97C}ZL2j*+gE-RbUa8#>*mM>b@4q$
zZqf^@jYgx=s5P{nsQO97eHV9MkQT{OPyG|4c&ylZCsv&n-X$_LS7bX4E~${(ov3;i
z12aZsGTcJB@^KPPpCSz8D4pu#E}B6D{58>T+FG{{Ad^$=sX(?`-QmUga#%4xr_Mtf
z(%jI)Jh61iT`d(6ui3Pl&AM%BE;BU6YLL83XV9vI$k_&+hqPpL4YIU*<czX0Ut|$k
zF+6|{$_-;}kQ0Z6f#}Z*QOiFZr8E4t6ZU`WUy7jD`S82xd7d@w&UC{DA(u^cQ9|U^
zs``_)5uun>)e(W8rBGPanrY=SC~s6^o;8^c&OaT&huc{#xSb6e|5mHcNm1>6eD(P1
zrO{uZP+Euo&7I+Y89p<`|3<}(@xN*9@&7JpkN+3&zt)Sl!~b3c_Ky@glQ$po9sMJ)
zhxuE;{3kKFVkSvj3&Q~yp^qd_&A>bCV-dDMobfk#*A+OI1|$OW7DY;*9f4`3u>%BV
zHzY7vg}~BVl!OJWxClFdVp~}89hl6n8M%S}l8`LH7>(veOtz4s7sF(?)6+A;dGpM9
z82{CKsCm}4gLa9@?50tZ*W_o#WV@tQ`0x3UUrZbDpJ`R?2>;dXdd-l}6~nAo>^=V5
z1${66(^0|7tN4px!!=D}D{QFQD3`C8n@o?BL1zs(G;&>g9XM1yUnZ&p9S;rh7|}^Q
zJ*rk^O9&aEnRHGip7u|Lj(;PvbhNq!TG0^M>g=uu8&Be#EfLN~diNPQ^5Km7D%cyK
zjFle_%TQ)3<nm+q<cHu$wUR54wV>k1Kj$ojWG!?Mn`_6`J_~IH7rvei(Ae~iZl`-m
z!Y{6IG3}e9&2T|ot`k4-;2jb&2fiQvuOE4AGmi-~K+!*q(v=T`{!Ncz5~&(&cm3on
hOwq_okB2?&X-|9F)1LOUr#<~*^dDLHWq<%E001%^-WdP@

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm
index 6ddce2e3d..78b0cf997 100644
--- a/lib/WebGUI/Asset/Wobject/Carousel.pm
+++ b/lib/WebGUI/Asset/Wobject/Carousel.pm
@@ -40,7 +40,7 @@ sub definition {
 	%properties = (
 		templateId =>{
 			fieldType       =>"template",  
-			defaultValue    =>'CarouselTmpl0000000001',
+			defaultValue    =>'CarouselTmpl0000000002',
 			tab             =>"display",
 			noFormPost      =>0,  
 			namespace       =>"Carousel", 
@@ -91,8 +91,9 @@ This method is optional if you set autoGenerateForms=1 in the definition.
 =cut
 
 sub getEditForm {
-	my $self = shift;
+	my $self    = shift;
 	my $tabform = $self->SUPER::getEditForm();
+    my $i18n    = WebGUI::International->new($self->session, "Asset_Carousel");
 
     $self->session->style->setScript($self->session->url->extras('yui/build/editor/editor-min.js'), {type =>
     'text/javascript'});
@@ -101,12 +102,12 @@ sub getEditForm {
     $self->session->style->setScript($self->session->url->extras('wobject/Carousel/carousel.js'), {type =>
     'text/javascript'});
 
-    my $tableRowStart = qq|
-        <tr id="items_row">
-            <td class="formDescription"  valign="top" style="width: 180px;"><label for="item1">Items</label></td>
-            <td id="items_td" valign="top" class="tableData">
-            <input type="button" value="Add item" onClick="javascript:addItem()"></button><br /><br />
-    |;
+    my $tableRowStart = 
+        '<tr id="items_row">'
+        .'    <td class="formDescription"  valign="top" style="width: 180px;"><label for="item1">'
+              .$i18n->get("items label").'</label><div class="wg-hoverhelp">'.$i18n->get("items description").'</div></td>'
+        .'    <td id="items_td" valign="top" class="tableData">'
+        .'    <input type="button" value="Add item" onClick="javascript:addItem()"></button><br /><br />';
 
     $tabform->getTab("properties")->raw($tableRowStart);
 
@@ -114,7 +115,8 @@ sub getEditForm {
         my @items = @{JSON->new->decode($self->getValue('items'))->{items}};
 
         foreach my $item (@items){
-            my $itemHTML = 'ID: <input type="text" id="itemId'.$item->{sequenceNumber}.'" '
+            my $itemHTML = $i18n->get("id label").'<div class="wg-hoverhelp">'.$i18n->get("id description").'</div>: '
+                .'<input type="text" id="itemId'.$item->{sequenceNumber}.'" '
                 .'name="itemId_'.$item->{sequenceNumber}.'" value="'.$item->{itemId}.'">'
                 .'<textarea id="item'.$item->{sequenceNumber}.'" name="item_'.$item->{sequenceNumber}.'" '
                 .'class="carouselItemText" rows="#" cols="#" '
@@ -180,6 +182,7 @@ sub processPropertiesFromFormPost {
     my $self    = shift;
     my $form    = $self->session->form;
     my (@items,$items);
+    $self->SUPER::processPropertiesFromFormPost(@_);
 
     foreach my $param ($form->param) {
         if ($param =~ m/^item_/){
diff --git a/lib/WebGUI/i18n/English/Asset_Carousel.pm b/lib/WebGUI/i18n/English/Asset_Carousel.pm
index 115f5d559..2522a59f0 100644
--- a/lib/WebGUI/i18n/English/Asset_Carousel.pm
+++ b/lib/WebGUI/i18n/English/Asset_Carousel.pm
@@ -21,16 +21,28 @@ our $I18N = {
         context => q|Description of the carousel template field, used as hover help.|
     },
 
-    'payload label' => {
-        message => q|Payload|,
+    'items label' => {
+        message => q|Items|,
         lastUpdated => 0,
-        context => q|Label of the payload field on the edit screen.|
+        context => q|Label of the items field on the edit screen.|
     },
 
-    'payload description' => {
-        message => q|Enter a javacript script tag, flash object html, etc to process this carousel's items.|,
+    'items description' => {
+        message => q|Enter this carousel's items.|,
         lastUpdated => 0,
-        context => q|Description of the payload field, used as hover help.|
+        context => q|Description of the items field, used as hover help.|
+    },
+
+    'id label' => {
+        message => q|ID|,
+        lastUpdated => 0,
+        context => q|Label of the item ID field on the edit screen.|
+    },
+
+    'id description' => {
+        message => q|Enter a unique ID for this carousel item.|,
+        lastUpdated => 0,
+        context => q|Description of the item ID field, used as hover help.|
     },
 };