From d7f94f450bf9feff1db745bea9773e3c9b257fba Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Mon, 9 Mar 2009 10:48:26 +0000 Subject: [PATCH] changed screenshots in Matrix Listing view to popup --- .../matrix-default-detailed-listing.wgpkg | Bin 1946 -> 2000 bytes .../matrix-default-screenshots-config.wgpkg | Bin 0 -> 1311 bytes .../matrix-default-screenshots.wgpkg | Bin 0 -> 1397 bytes docs/upgrades/upgrade_7.6.14-7.7.0.pl | 14 +++ lib/WebGUI/Asset/MatrixListing.pm | 98 +++++------------- lib/WebGUI/Asset/Wobject/Matrix.pm | 16 +++ lib/WebGUI/i18n/English/Asset_Matrix.pm | 20 ++++ 7 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 docs/upgrades/packages-7.7.0/matrix-default-screenshots-config.wgpkg create mode 100644 docs/upgrades/packages-7.7.0/matrix-default-screenshots.wgpkg diff --git a/docs/upgrades/packages-7.7.0/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.7.0/matrix-default-detailed-listing.wgpkg index e0df045a6e809576dca4908c30b85ed4ed99b559..6b9905fac22a2cee8212e4a80e1ff92224c950b6 100644 GIT binary patch literal 2000 zcmV;>2QT;^iwFP!000001MOICZ`(Ey&gcCK&I6Vdm?Jxmf<4?seN+ zTb-VJNcpt3+U<6?+deqhJJ{PI?N+n)mM|O?K zlBAr5C^MFSBh7{h*JBp@wSvvwauLg!W!mx+dM;$D`6@d(6HJ|JrjFxfMc9o|^f{yP z86DY$jWFTjnv4~@`st$a;RxsT&OGD6Fyl!aL{b>afnPwiW=8vg-AL;P4=)--u>_WC zGfx<3&I}BhdCFkSfVcq2U?dn^s0&dmY%Hftjaiaz#8F3zr-o=1)#^W|V<`jsZcey> z$hA6G75qr2)N#3J48p+u>(u=W^H@#-_`7??Y|4ZQ?ECJS`zcH-R3@S#!)|_GMdVz0LaMsx#WX{h3cN9!aK>oev8VonYsT;4J92f#qb^+27wb zoA3A)IX-%y`w2S#hJu=$t&1a-pVCL|lf#mF<~`Z+&9H+HJM=h+zs zsujsCjQN!C7~<5a^VDhqL5G-L7<^;V6QVhn0Iz0Rb18PGRPE9jqW7h+q)3EMm<}8* z5D@fbB@+!1oR(B!kn<`=N*Uw5Vu)NA&&6<)uyV!<(J2)qf())faRx>{HUcu*fE2ut z>Rt86h57IZlO-T_Gq3t`z6*j*onPTfd_V&$#d;Y?iMa;U=KT_hhzf*vFid20?M7Lm zS#CZ+1q6>$IF+Vsl?I$uNWs8|-0~8W3Oa5NoHqWwBEM>-CnMzhAslB9Nl1%>#3PD` zovUO3h%(CD0z>PDHbfyWMAw|fd3YjB#S_AEBSn$#+^-tC<^9GiP71yxXHvKS z09I8ilp8`lfo(O$$XQgiaLfyb$23@BxTvoMpt`mU640G70q3ka8)uWD zfRkZisns7bDa`c?)>&JV2mB)K!iYd?IbsIV-Q_T$;u?5`d@{-_IiEoM!istgGL$N2 z>ZcY|mUT(OZSR7;W!_sDT`&yl@a2uR)@Q4T*ztr9*6l2`%tUj;Zo93JJEe#c2s%Jy zW()pZXfnjkwub@|e4Is?PA@IxVEX}-)_Lvz9Rg^NJM;rjYT*e3P_=4z={cV;0m^bb ze{XF;DLh{Yk~fe#p(4AYk;xQOw-$X1@Tz=ogJ6~Z1)acQ3un`ifh;|u%F(Tap+AXgRTx5Tn^&K+Q8P*yRb@Yo3-GDQ zcGbKFAWfj5)TfZzYf^Te!b&l=2nM<*`7&&O?CG@vPwAwEgjM6Jk%_$=v=?k=+l<)> z+&e(s=W1fq3{U+soB5`^uNdS4L9QrNyg*QZfy|Hx4B3JuX9;@0hNg);!Mhl!$S665 zHUjQ%YEOyssP}3BzvVg{%jX*0EbQ6xJf9iU>(Ussy-Rv(FsvPb<@~tcw_QlTe^#`u zi&u0{##D^f-S3@B=+vQL&U@g_LHDrJYyIdY+OV>-uFD}$T{jM2*Nv0B+Ve~D*7^

^p>r&cd7YC*}22R z-r-@lw^u%glGHy$*)E*z?gFC?C0fnnm%s7wj)CupIfDzt&y zUeB0`NX=98s$gAF%+OJOvGd~P@XhJ(j}Lpl$zNMXvUT%poV=NNCS1RsYq(umHs6|7 zAXdGC27j>^&~+YT@2wZ`Xm>ij{mx#e;=Xvy3X`jM5_9=ybbKE1x7pNm{%8u?eLHL5 i<@n#<{CyX9?_YU*Mc^v}UlI5}5%>qPqYuvjAOHaL8|hO3 literal 1946 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 D1mddh literal 0 HcmV?d00001 diff --git a/docs/upgrades/upgrade_7.6.14-7.7.0.pl b/docs/upgrades/upgrade_7.6.14-7.7.0.pl index 1f480ada3..65e25aa6c 100644 --- a/docs/upgrades/upgrade_7.6.14-7.7.0.pl +++ b/docs/upgrades/upgrade_7.6.14-7.7.0.pl @@ -33,6 +33,7 @@ my $session = start(); # this line required # upgrade functions go here addGroupToAddToMatrix( $session ); +addScreenshotTemplatesToMatrix( $session ); finish($session); # this line required @@ -47,6 +48,19 @@ sub addGroupToAddToMatrix { print "Done.\n" unless $quiet; } +#---------------------------------------------------------------------------- +sub addScreenshotTemplatesToMatrix { + my $session = shift; + print "\tAdding screenshot templates to Matrix table \n" unless $quiet; + + $session->db->write("alter table Matrix add screenshotsConfigTemplateId char(22);"); + $session->db->write("update Matrix set screenshotsConfigTemplateId = 'matrixtmpl000000000007';"); + $session->db->write("alter table Matrix add screenshotsTemplateId char(22);"); + $session->db->write("update Matrix set screenshotsTemplateId = 'matrixtmpl000000000006';"); + + print "Done.\n" unless $quiet; +} + #---------------------------------------------------------------------------- # Describe what our function does #sub exampleFunction { diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index 511f5dbc6..eaf913ee7 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -692,33 +692,10 @@ sub view { my $storage = $file->getStorageLocation; my @files; @files = @{ $storage->getFiles } if (defined $storage); - - $var->{screenshots} = qq| - - -

- - - - - - - - - Get Adobe -Flash player - - - - - -
-|; + $var->{screenshotsUrl} = $self->getUrl('func=viewScreenshots'); + $var->{screenshotThumbnail} = $storage->getUrl('thumb-'.$files[0]); } - + # Rating form my %rating; @@ -977,9 +954,7 @@ sub www_getScreenshots { my $thumb = 'thumb-'.$file; $xml .= " - 400 - 300 - <![CDATA[<b>Slide</b> One]]> + ".$storage->getUrl($file)." 5 @@ -1007,56 +982,14 @@ Returns the xml config file for the ukplayer that displays the screenshots. =cut sub www_getScreenshotsConfig { - my $self = shift; + my $self = shift; + my $var = $self->get; return $self->session->privilege->noAccess() unless $self->canView; $self->session->http->setMimeType('text/xml'); - my $xml = qq| - - - ?func=getScreenshots - - 400 - 300 - 0xDDDDEE - 20 - 100 - 100 - - Verdana - 12 - 0xCCCCCC - 0xCCCCCC - 0x000000 - true - - 0xCCCCCC - 0xCCCCCC - 0x000000 - false - - 48 - 36 - 0x000000 - true - 100 - 5 - - false - true - false - false - - - - -|; - - return $xml; + return $self->processTemplate($var,$self->getParent->get("screenshotsConfigTemplateId")); } #------------------------------------------------------------------- @@ -1164,7 +1097,24 @@ sub www_view { return $self->view; } +#------------------------------------------------------------------- +=head2 www_viewScreenshots ( ) + +Returns this listing's screenshots in a ukplayer. + +=cut + +sub www_viewScreenshots { + my $self = shift; + my $var = $self->get; + + $var->{configUrl} = 'config='.$self->getUrl("func=getScreenshotsConfig"); + + return $self->session->privilege->noAccess() unless $self->canView; + + return $self->processTemplate($var,$self->getParent->get("screenshotsTemplateId")); +} 1; #vim:ft=perl diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index 355e65698..4e4075dfe 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -130,6 +130,22 @@ sub definition { hoverHelp =>$i18n->get('edit listing template description'), label =>$i18n->get('edit listing template label'), }, + screenshotsTemplateId=>{ + defaultValue =>"matrixtmpl000000000006", + fieldType =>"template", + tab =>"display", + namespace =>"Matrix/Screenshots", + hoverHelp =>$i18n->get('screenshots template description'), + label =>$i18n->get('screenshots template label'), + }, + screenshotsConfigTemplateId=>{ + defaultValue =>"matrixtmpl000000000007", + fieldType =>"template", + tab =>"display", + namespace =>"Matrix/ScreenshotsConfig", + hoverHelp =>$i18n->get('screenshots config template description'), + label =>$i18n->get('screenshots config template label'), + }, defaultSort=>{ fieldType =>"selectBox", tab =>"display", diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index 3a02c1826..f7ace67ae 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -481,6 +481,16 @@ listing,|, message => q|Select a template to be used to show the listing edit screen.|, lastUpdated => 0, }, + + 'screenshots template description' => { + message => q|Select a template to be used to show a listing's screenshots.|, + lastUpdated => 0, + }, + + 'screenshots config template description' => { + message => q|Select a template for a listing's screenshots configuration.|, + lastUpdated => 0, + }, 'categories label' => { message => q|Categories|, @@ -612,6 +622,16 @@ listing,|, lastUpdated => 0, }, + 'screenshots template label' => { + message => q|Listing Screenshots Template|, + lastUpdated => 0, + }, + + 'screenshots config template label' => { + message => q|Listing Screenshots Config Template|, + lastUpdated => 0, + }, + 'edit listing template label' => { message => q|Edit Listing Template|, lastUpdated => 0,