From: <ap...@us...> - 2008-11-21 18:10:43
|
Revision: 15720 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15720&view=rev Author: aproulx Date: 2008-11-21 18:10:35 +0000 (Fri, 21 Nov 2008) Log Message: ----------- updating code for categories in imags Galleries Modified Paths: -------------- trunk/db/tiki.sql trunk/lib/imagegals/imagegallib.php trunk/templates/tiki-galleries.tpl trunk/tiki-galleries.php Modified: trunk/db/tiki.sql =================================================================== --- trunk/db/tiki.sql 2008-11-21 17:49:03 UTC (rev 15719) +++ trunk/db/tiki.sql 2008-11-21 18:10:35 UTC (rev 15720) @@ -1049,7 +1049,6 @@ parentgallery int(14) NOT NULL default -1, showname char(1) NOT NULL default 'y', showimageid char(1) NOT NULL default 'n', - showcategories char(1) NOT NULL default 'n', showdescription char(1) NOT NULL default 'n', showcreated char(1) NOT NULL default 'n', showuser char(1) NOT NULL default 'n', @@ -1058,6 +1057,7 @@ showfilesize char(1) NOT NULL default 'n', showfilename char(1) NOT NULL default 'n', defaultscale varchar(10) NOT NULL DEFAULT 'o', + showcategories char(1) NOT NULL default 'n', PRIMARY KEY (galleryId), KEY name (name), KEY description (description(255)), Modified: trunk/lib/imagegals/imagegallib.php =================================================================== --- trunk/lib/imagegals/imagegallib.php 2008-11-21 17:49:03 UTC (rev 15719) +++ trunk/lib/imagegals/imagegallib.php 2008-11-21 18:10:35 UTC (rev 15720) @@ -1776,7 +1776,7 @@ } function replace_gallery($galleryId, $name, $description, $theme, $user, $maxRows, $rowImages, $thumbSizeX, $thumbSizeY, $public, $visible = 'y', $sortorder='created', $sortdirection='desc', -$galleryimage='first',$parentgallery=-1,$showname='y',$showimageid='n',$showdescription='n',$showcategories='n',$showcreated='n',$showuser='n',$showhits='y',$showxysize='y',$showfilesize='n',$showfilename='n',$defaultscale='o',$geographic = 'n') { +$galleryimage='first',$parentgallery=-1,$showname='y',$showimageid='n',$showdescription='n',$showcreated='n',$showuser='n',$showhits='y',$showxysize='y',$showfilesize='n',$showfilename='n',$defaultscale='o',$geographic= 'n',$showcategories='n') { global $prefs; // if the user is admin or the user is the same user and the gallery exists then replace if not then Modified: trunk/templates/tiki-galleries.tpl =================================================================== --- trunk/templates/tiki-galleries.tpl 2008-11-21 17:49:03 UTC (rev 15719) +++ trunk/templates/tiki-galleries.tpl 2008-11-21 18:10:35 UTC (rev 15720) @@ -1,6 +1,5 @@ {* $Id$ *} {title help="Image+Galleries" admpage="gal"}{tr}Galleries{/tr}{/title} - {if $tiki_p_create_galleries eq 'y'} {if $edit_mode ne 'y' or $galleryId ne 0} @@ -56,13 +55,13 @@ <input type="checkbox" name="showname" value="y" {if $showname=='y'}checked="checked"{/if} />{tr}Name{/tr}<br /> <input type="checkbox" name="showimageid" value="y" {if $showimageid=='y'}checked="checked"{/if} />{tr}Image ID{/tr}<br /> <input type="checkbox" name="showdescription" value="y" {if $showdescription=='y'}checked="checked"{/if} />{tr}Description{/tr}<br /> - <input type="checkbox" name="showcategories" value="y" {if $showcategories=='y'}checked="checked"{/if} />{tr}Categories{/tr}<br /> <input type="checkbox" name="showcreated" value="y" {if $showcreated=='y'}checked="checked"{/if} />{tr}Creation Date{/tr}<br /> <input type="checkbox" name="showuser" value="y" {if $showuser=='y'}checked="checked"{/if} />{tr}User{/tr}<br /> <input type="checkbox" name="showhits" value="y" {if $showhits=='y'}checked="checked"{/if} />{tr}Hits{/tr}<br /> <input type="checkbox" name="showxysize" value="y" {if $showxysize=='y'}checked="checked"{/if} />{tr}XY-Size{/tr}<br /> <input type="checkbox" name="showfilesize" value="y" {if $showfilesize=='y'}checked="checked"{/if} />{tr}Filesize{/tr}<br /> <input type="checkbox" name="showfilename" value="y" {if $showfilename=='y'}checked="checked"{/if} />{tr}Filename{/tr}<br /> + <input type="checkbox" name="showcategories" value="y" {if $showcategories=='y'}checked="checked"{/if} />{tr}Categories{/tr}<br /> </td></tr> <tr><td class="formcolor">{tr}Gallery Image{/tr}:</td><td class="formcolor"><select name="galleryimage"> {foreach from=$options_galleryimage key=key item=item} Modified: trunk/tiki-galleries.php =================================================================== --- trunk/tiki-galleries.php 2008-11-21 17:49:03 UTC (rev 15719) +++ trunk/tiki-galleries.php 2008-11-21 18:10:35 UTC (rev 15720) @@ -156,7 +156,6 @@ if ($_REQUEST["galleryId"] > 0) { if ($info = $imagegallib->get_gallery_info($_REQUEST["galleryId"])) { - $scaleinfo = $imagegallib->get_gallery_scale_info($_REQUEST["galleryId"]); $gallery_images = $imagegallib->get_images(0,-1,'name_asc',false,$_REQUEST['galleryId']); foreach($gallery_images['data'] as $key => $item) { @@ -178,7 +177,7 @@ $smarty->assign('parentgallery',$info['parentgallery']); $smarty->assign('showname',$info['showname']); $smarty->assign('showimageid',$info['showimageid']); - $smarty->assign('showcategories',$info['showcategories']); + $smarty->assign('showcategories',$info['showcategories']);; $smarty->assign('showdescription',$info['showdescription']); $smarty->assign('showcreated',$info['showcreated']); $smarty->assign('showuser',$info['showuser']); @@ -240,7 +239,7 @@ $smarty->assign('galleryimage',$_REQUEST['galleryimage']); $smarty->assign('parentgallery',$_REQUEST['parentgallery']); $smarty->assign('defaultscale',$_REQUEST['defaultscale']); - $auxarray=array('showname','showimageid','showcategories','showdescription','showcreated','showuser','showhits','showxysize','showfilesize','showfilename'); + $auxarray=array('showname','showimageid','showdescription','showcreated','showuser','showhits','showxysize','showfilesize','showfilename','showcategories'); foreach($auxarray as $key => $item) { if(!isset($_REQUEST[$item])) { $_REQUEST[$item]='n'; @@ -269,9 +268,8 @@ $gid = $imagegallib->replace_gallery($_REQUEST["galleryId"], $_REQUEST["name"], $_REQUEST["description"], '', $_REQUEST["owner"], $_REQUEST["maxRows"], $_REQUEST["rowImages"], $_REQUEST["thumbSizeX"], $_REQUEST["thumbSizeY"], $public, $visible,$_REQUEST['sortorder'],$_REQUEST['sortdirection'],$_REQUEST['galleryimage'],$_REQUEST['parentgallery'], - $_REQUEST['showname'],$_REQUEST['showimageid'],$_REQUEST['showdescription'],$_REQUEST['showcategories'],$_REQUEST['showcreated'], - $_REQUEST['showuser'],$_REQUEST['showhits'],$_REQUEST['showxysize'],$_REQUEST['showfilesize'],$_REQUEST['showfilename'],$_REQUEST['defaultscale'],$geographic); - + $_REQUEST['showname'],$_REQUEST['showimageid'],$_REQUEST['showdescription'],$_REQUEST['showcreated'], + $_REQUEST['showuser'],$_REQUEST['showhits'],$_REQUEST['showxysize'],$_REQUEST['showfilesize'],$_REQUEST['showfilename'],$_REQUEST['defaultscale'],$geographic,$_REQUEST['showcategories']); #add scales if (isset($_REQUEST["scaleSize"])) { if (strstr($_REQUEST["scaleSize"],',')) { @@ -324,7 +322,7 @@ $smarty->assign('galleryimage',$_REQUEST['galleryimage']); $smarty->assign('parentgallery',$_REQUEST['parentgallery']); $smarty->assign('defaultscale',$_REQUEST['defaultscale']); - $auxarray=array('showname','showimageid','showdescription','showcategories','showcreated','showuser','showhits','showxysize','showfilesize','showfilename'); + $auxarray=array('showname','showimageid','showdescription','showcreated','showuser','showhits','showxysize','showfilesize','showfilename','showcategories'); foreach($auxarray as $key => $item) { if(!isset($_REQUEST[$item])) { $_REQUEST[$item]='n'; @@ -518,5 +516,4 @@ // Display the template $smarty->assign('mid', 'tiki-galleries.tpl'); $smarty->display("tiki.tpl"); - ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |