From: <je...@us...> - 2006-05-19 22:43:18
|
Revision: 13696 Author: jenst Date: 2006-05-19 15:43:06 -0700 (Fri, 19 May 2006) ViewCVS: http://svn.sourceforge.net/gallery/?rev=13696&view=rev Log Message: ----------- 2006-05-20 Jens Tkotz <je...@pe...> 1.6-svn-b1-j32-UNSTABLE * CSS -> 1.6 slideshow Modified Paths: -------------- branches/DEV_1_6/gallery/ChangeLog branches/DEV_1_6/gallery/Version.php branches/DEV_1_6/gallery/html_wrap/slideshow.footer.default branches/DEV_1_6/gallery/html_wrap/slideshow.header.default branches/DEV_1_6/gallery/includes/slideshow/applet.inc branches/DEV_1_6/gallery/includes/slideshow/high.inc branches/DEV_1_6/gallery/includes/slideshow/low.inc branches/DEV_1_6/gallery/js/multifile.js.php branches/DEV_1_6/gallery/slideshow.php branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default Modified: branches/DEV_1_6/gallery/ChangeLog =================================================================== --- branches/DEV_1_6/gallery/ChangeLog 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/ChangeLog 2006-05-19 22:43:06 UTC (rev 13696) @@ -1,3 +1,7 @@ +2006-05-20 Jens Tkotz <je...@pe...> 1.6-svn-b1-j32-UNSTABLE + + * CSS -> 1.6 slideshow + 2006-05-19 Jens Tkotz <je...@pe...> 1.6-svn-b1-j31-UNSTABLE * Fix: mod_rewrite changes in b29 were not complete. Modified: branches/DEV_1_6/gallery/Version.php =================================================================== --- branches/DEV_1_6/gallery/Version.php 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/Version.php 2006-05-19 22:43:06 UTC (rev 13696) @@ -22,7 +22,7 @@ ?> <?php -$gallery->version = '1.6-svn-b1-j31-UNSTABLE'; +$gallery->version = '1.6-svn-b1-j32-UNSTABLE'; $gallery->config_version = 97; $gallery->album_version = 38; $gallery->user_version = 6; Modified: branches/DEV_1_6/gallery/html_wrap/slideshow.footer.default =================================================================== --- branches/DEV_1_6/gallery/html_wrap/slideshow.footer.default 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/html_wrap/slideshow.footer.default 2006-05-19 22:43:06 UTC (rev 13696) @@ -6,18 +6,22 @@ // To override this footer, create a file called slideshow.footer // in this directory. // -?> +?> <?php includeTemplate('slideshow.footer.tpl'); -require_once(dirname(__FILE__) .'/info_donation-block.tpl'); +require_once(dirname(dirname(__FILE__)) .'/templates/info_donation-block.tpl.default'); global $GALLERY_EMBEDDED_INSIDE; if (! isset($GALLERY_EMBEDDED_INSIDE)) { if (!empty($gallery->album)) { - echo gallery_validation_link("slideshow.php", false, array("set_albumName" => $gallery->album->fields['name'])); + echo gallery_validation_link( + "slideshow.php", + false, + array("set_albumName" => $gallery->album->fields['name']) + ); } else { - echo gallery_validation_link("slideshow.php", false); + echo gallery_validation_link("slideshow.php", false); } } Modified: branches/DEV_1_6/gallery/html_wrap/slideshow.header.default =================================================================== --- branches/DEV_1_6/gallery/html_wrap/slideshow.header.default 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/html_wrap/slideshow.header.default 2006-05-19 22:43:06 UTC (rev 13696) @@ -14,10 +14,20 @@ // ?> <?php + includeHtmlWrap("wrapper.header"); global $title; -if(!includeTemplate('slideshow.header.tpl')) { + +if (!includeTemplate('slideshow.header.tpl')) { + if(!isset($newstyle)) { ?> + <div class="g-header"> + <div class="g-pagetitle"><?php echo $title ?></div> + </div> +<?php + } + else { +?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> @@ -44,6 +54,7 @@ </tr> <tr> <td align="center" valign="top"> -<?php +<?php + } } ?> \ No newline at end of file Modified: branches/DEV_1_6/gallery/includes/slideshow/applet.inc =================================================================== --- branches/DEV_1_6/gallery/includes/slideshow/applet.inc 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/includes/slideshow/applet.inc 2006-05-19 22:43:06 UTC (rev 13696) @@ -23,7 +23,7 @@ <?php function slideshow_initialize() { global $albumName, $gallery, $title; - + if (empty($albumName)) { $title = sprintf(_("Slide Show for Gallery :: %s"), $gallery->app->galleryTitle); @@ -35,24 +35,10 @@ function slideshow_body() {} function slideshow_controlPanel() { - global $pixelImage; -?> -<table width="100%" border="0" cellspacing="0" cellpadding="0" class="modnavboxmid"> - <tr> - <td colspan="3"><?php echo $pixelImage ?></td> - </tr> - <tr> - <td height="25" width="1"><?php echo $pixelImage ?></td> - <td align="center" valign="middle"><span class="admin"> -<?php echo _("If you don't have the Java Plugin 1.4 or later, or you don't want to wait for the applet to download, you can use one of the non-fullscreen versions.") ?> - </span></td> - <td width="1"><?php echo $pixelImage ?></td> - </tr> - <tr> - <td colspan="3"><?php echo $pixelImage ?></td> - </tr> -</table> -<?php + echo infobox(array(array( + 'type' => 'information', + 'text' => _("If you don't have the Java Plugin 1.4 or later, or you don't want to wait for the applet to download, you can use one of the non-fullscreen versions.") + ))); } function slideshow_image() { @@ -65,8 +51,8 @@ 300, 430, "com.gallery.GalleryRemote.GRAppletSlideshow", - $gallery->app->photoAlbumURL . "/java/GalleryRemoteAppletMini.jar," . - $gallery->app->photoAlbumURL . "/java/GalleryRemoteHTTPClient.jar," . + $gallery->app->photoAlbumURL . "/java/GalleryRemoteAppletMini.jar," . + $gallery->app->photoAlbumURL . "/java/GalleryRemoteHTTPClient.jar," . $gallery->app->photoAlbumURL . "/java/applet_img.jar", isset($gallery->album) ? $gallery->album->fields["name"] : "", array( Modified: branches/DEV_1_6/gallery/includes/slideshow/high.inc =================================================================== --- branches/DEV_1_6/gallery/includes/slideshow/high.inc 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/includes/slideshow/high.inc 2006-05-19 22:43:06 UTC (rev 13696) @@ -29,10 +29,10 @@ // default settings --- $defaultLoop = 0; $defaultTransition = 0; - $defaultPause = 3; + $defaultPause = 3; $full_option = false; - + define('PHOTO_URL', 1 << 0); define('PHOTO_CAPTION', 1 << 1); define('PHOTO_URL_AS_HREF', 1 << 2); @@ -45,23 +45,23 @@ if ($photo_count > 0) { if ($number == 0 || $number > $photo_count) { $number = $photo_count; - } + } if ($random) { $random_full_urls = array(); $random_photos = array(); $rand_keys = array_rand ($urls, $number); if ($number == 1) { $rand_keys = array($rand_keys); - } + } foreach ($rand_keys as $key) { $random_urls[] = $urls[$key]; $random_full_urls[] = $full_urls[$key]; $random_captions[] = $captions[$key]; - } + } $urls = $random_urls; $full_urls = $random_full_urls; $captions = $random_captions; - } + } if (empty($albumName)) { if ($random) { $title = sprintf(_("%s Random Images from %s"), @@ -70,7 +70,7 @@ } else { $title = sprintf(_("Slide Show for Gallery :: %s"), $gallery->app->galleryTitle); - } + } } else { if ($random) { $title = sprintf(_("%d Random Images from album :: %s"), @@ -78,10 +78,10 @@ $gallery->album->fields["title"]); } else { $title = sprintf(_("Slide Show for album :: %s"), $gallery->album->fields["title"]); - } - } - } -} + } + } + } +} function buildSlideshowPhotos(&$full_urls, &$urls, &$captions, $album = null, $recursive = true) { global $gallery, $full_option; @@ -96,16 +96,16 @@ $subAlbum = $albumDB->getAlbum($gallery->user, $i); if (!$gallery->user->canReadAlbum($subAlbum)) { continue; - } + } $photo_count += buildSlideshowPhotos($full_urls, $urls, $captions, $subAlbum, $recursive); - } + } return $photo_count; - } + } if (!$gallery->user->canReadAlbum($album)) { return $photo_count; - } + } $numPhotos = $album->numPhotos(1); - $numDisplayed = 0; + $numDisplayed = 0; // Find the correct starting point, accounting for hidden photos $index = getNextPhoto(0, $album); $photo_count = 0; @@ -116,15 +116,15 @@ * an album that we can't read. */ break; - } + } $photo = $album->getPhoto($index); - $numDisplayed++; + $numDisplayed++; // Skip movies if ($photo->isMovie()) { $index = getNextPhoto($index, $album); continue; - } + } if ($photo->isAlbum()) { if ($recursive) { $subAlbumName = $album->getAlbumName($index); @@ -133,11 +133,11 @@ $subAlbum->load($subAlbumName); if ($gallery->user->canReadAlbum($subAlbum)) { $photo_count += buildSlideshowPhotos($full_urls, $urls, $captions, $subAlbum, $recursive); - } - } + } + } $index = getNextPhoto($index, $album); continue; - } + } $photo_count++; $urls[] = $album->getPhotoPath($index, 0); @@ -146,24 +146,24 @@ $full_urls[] = $album->getPhotoPath($index, 1); } else { $full_urls[] = $album->getPhotoPath($index, 0); - } + } $caption = $album->getCaption($index); if ($recursive) { $caption .= ' (<a href="' . makeAlbumURL($album->fields["name"]) . '">' . $album->fields['title'] . '</a>)'; - } + } $caption .= $album->getCaptionName($index); $caption = str_replace("\"", " ", $caption); $caption = str_replace("\n", " ", $caption); - $caption = str_replace("\r", " ", $caption); + $caption = str_replace("\r", " ", $caption); // Print out the entry for this image as Javascript - $captions[] = $caption; + $captions[] = $caption; // Go to the next photo $index = getNextPhoto($index, $album); - } + } return $photo_count; -} +} function printSlideshowPhotos($full_urls, $urls, $captions, $what, $photo_count) { $count = 0; @@ -171,18 +171,18 @@ $count++; if (($what &PHOTO_URL) != 0) { print "photo_urls[$count] = \"" . $urls[$index] . "\";\n"; - } + } if (($what &PHOTO_URL_AS_HREF) != 0) { print "<a id=\"photo_urls_$count\" href=\"" . $urls[$index] . "\"></a>\n"; print "<a id=\"full_photo_urls_$count\" href=\"" . $full_urls[$index] . "\"></a>\n"; - } + } if (($what &PHOTO_CAPTION) != 0) { // Print out the entry for this image as Javascript print "photo_captions[$count] = \"" . $captions[$index] . "\";\n"; - } - } -} + } + } +} function slideshow_body() { global $gallery, $albumName, $defaultLoop, $defaultPause, $defaultTransition, $full_option, @@ -267,7 +267,7 @@ foreach ($transitions as $definition) { print "transitions[$trans_i] = \"$definition\";\n"; $trans_i++; - } + } print "var transition_count = $transitionCount;\n"; ?> @@ -394,7 +394,7 @@ wait_for_current_photo(); return 0; } - + preload_next_photo(); reset_timer(); } @@ -510,14 +510,14 @@ 60 => _("1 Minute")), $defaultPause, // default value 1, // select size - array('onchange' => 'reset_timer()', 'class' => 'adminform') + array('onchange' => 'reset_timer()', 'class' => 'g-admin') ); if ($loop) { $checked = ($defaultLoop) ? 'checked' : ''; $iconElements[] = $loopIconText; $iconElements[] = '<input type="checkbox" name="loopCheck"'. $checked .'onclick="toggleLoop();">'; - } + } echo makeIconMenu($iconElements, 'right', false); ?> @@ -530,43 +530,38 @@ $transitionNames, $defaultTransition, 1, - array('onchange' => 'change_transition()', 'class' => 'adminform'))); ?>'); + array('onchange' => 'change_transition()', 'class' => 'g-admin'))); ?>'); } // --> </script></td></tr></table> </form> <?php - } + } - function slideshow_image() { +function slideshow_image() { global $gallery, $albumName, $defaultLoop, $defaultPause, $defaultTransition, $full_option, $album, $recursive, $number, $random, $loop, $borderColor, $borderwidth, $bgcolor, $url, $full_urls, $urls, $caption, $captions, $photo_count, $title, $transitionNames, $transitionCount, $pixelImage; - - if ($photo_count > 0) { - ?> + if ($photo_count > 0) { +?> -<table border="0" cellspacing="0" cellpadding="0"> -<tr> - <td><script type="text/javascript"> +<div class="center"> + <script type="text/javascript"> <!-- firstPhotoURL = document.getElementById("photo_urls_" + 1).href; document.write("<img border=<?php echo $borderwidth ?> bgcolor=<?php echo $borderColor ?> src=\""); document.write(firstPhotoURL); document.write("\" name=slide>"); // --> - </script></td> -</tr> -</table> -<br> + </script> <script type="text/javascript"> <!-- /* show the caption */ -document.write("<div class='pcaption' id='caption'><\/div>"); +document.write('<div class="g-photo-caption" id="caption"><\/div>'); /* Load the first picture */ setCaption(photo_captions[1]); @@ -576,20 +571,12 @@ play(); // --> </script> +</div> <?php - } else { - - ?> - -<br><b><?php echo _("This album has no photos to show in a slide show.") ?></b> -<br><br> -<span class="admin"> -<a href="<?php echo makeGalleryUrl("view_album.php", - array("set_albumName" => $gallery->session->albumName)) ?>">[<?php echo _("back to album") ?>]</a> -</span> - -<?php - } - } - ?> + } + else { + echo "<p><b>". _("This album has no photos to show in a slide show.") ."</b></p>"; + } +} +?> Modified: branches/DEV_1_6/gallery/includes/slideshow/low.inc =================================================================== --- branches/DEV_1_6/gallery/includes/slideshow/low.inc 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/includes/slideshow/low.inc 2006-05-19 22:43:06 UTC (rev 13696) @@ -2,17 +2,17 @@ /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2006 Bharat Mediratta - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. - * + * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. @@ -28,7 +28,7 @@ * browsers, so try not to introduce any new functions. It's better * to have reduced functionality here than have it broken on some * browsers. If you MUST add new JS, research it thoroughly to make - * sure it should work with ancient browsers, but better to only + * sure it should work with ancient browsers, but better to only * change the JS to fix bugs. * * Thanks @@ -36,7 +36,7 @@ ?> <?php -list($slide_index, $slide_pause, $slide_full, $slide_dir, $slide_loop) = +list($slide_index, $slide_pause, $slide_full, $slide_dir, $slide_loop) = getRequestVar(array('slide_index', 'slide_pause', 'slide_full', 'slide_dir', 'slide_loop')); function slideshow_initialize() { @@ -49,7 +49,7 @@ $defaultPause = 3; $defaultFull = 0; $defaultDir = 1; - + if (!isset($slide_index)) { $slide_index = 1; } @@ -65,11 +65,11 @@ if (!isset($slide_dir)) { $slide_dir = $defaultDir; } - + if ($slide_full && !$gallery->user->canViewFullImages($gallery->album)) { $slide_full = 0; } - + $bgcolor = $gallery->album->fields['bgcolor']; $title = _("Slide Show for album") ." :: ". $gallery->album->fields["title"]; } @@ -96,9 +96,9 @@ $photoURL, $caption, $imageDir, $pixelImage, $number; ?> <script type="text/javascript"> -var timer; +var timer; var current_location = <?php echo $slide_index ?>; -var next_location = <?php echo $slide_index ?>; +var next_location = <?php echo $slide_index ?>; var pics_loaded = 0; var onoff = 0; var timeout_value; @@ -111,18 +111,18 @@ <?php $numPhotos = $gallery->album->numPhotos(1); -$numDisplayed = 0; +$numDisplayed = 0; // A slideshow_length of 0 means "show all" // as does a length which is greater than the number of photos if ($number == 0 || $number > $numPhotos) { - $number = $numPhotos; -} + $number = $numPhotos; +} // Find the correct starting point, accounting for hidden photos $index = getNextPhoto(0); $photo_count = 0; -while ($numDisplayed < $numPhotos && $numDisplayed < $number) { +while ($numDisplayed < $numPhotos && $numDisplayed < $number) { if ($index > $numPhotos) { /* * We went past the end -- this can happen if the last element is an @@ -165,7 +165,7 @@ $index = getNextPhoto($index); } ?> -var photo_count = <?php echo $photo_count ?>; +var photo_count = <?php echo $photo_count ?>; function stop() { onoff = 0; @@ -222,13 +222,13 @@ array('set_albumName' => $gallery->session->albumName, 'mode' => 'low')); ?>"; document.location = slideShowUrl + "&slide_index=" + next_location + "&slide_full=" + full - + "&slide_loop=" + loop + "&slide_pause=" + (timeout_value / 1000) + + "&slide_loop=" + loop + "&slide_pause=" + (timeout_value / 1000) + "&slide_dir=" + direction; return 0; } function preload_next_photo() { - + /* Calculate the new next location */ next_location = (parseInt(current_location) + parseInt(direction)); if (next_location > photo_count) { @@ -243,7 +243,7 @@ stop(); } } - + /* Preload the next photo */ preload_photo(next_location); } @@ -257,7 +257,7 @@ preload_photo(current_location); return 0; } - + return 1; } @@ -272,7 +272,7 @@ images[index].src = photo_urls[index]; pics_loaded++; } - } + } } </script> @@ -287,11 +287,11 @@ $bgcolor, $title, $gallery, $numPhotos, $numDisplayed, $index, $photo_count, $photo, $image, $thumbImage, $photoURL, $caption, $imageDir, $pixelImage; - global $playIconText,$stopIconText,$delayIconText, $forwardIconText, + global $playIconText,$stopIconText,$delayIconText, $forwardIconText, $backwardIconText, $normalSizeIconText, $fullSizeIconText, $loopIconText; ?> -<form name="TopForm" style="margin:0px"> +<form name="TopForm"> <?php $iconElements[] = '<a href="#" onClick="stop(); return false;">'. $stopIconText .'</a>'; $iconElements[] = '<a href="#" onClick="play(); return false;">'. $playIconText .'</a>'; @@ -322,7 +322,7 @@ 60 => _("1 Minute")), $defaultPause, // default value 1, // select size - array('onchange' => 'reset_timer()', 'class' => 'adminform') + array('onchange' => 'reset_timer()', 'class' => 'g-admin') ); if ($loop) { @@ -350,21 +350,14 @@ <?php if ($photo_count > 0) { ?> - -<table border="0" cellspacing="0" cellpadding="0"> -<tr> - <td> <script type="text/javascript"> - document.write("<img border==<?php echo $borderwidth ?> bgcolor=<?php echo $borderColor ?> src="+photo_urls[<?php echo $slide_index ?>]+" name=slide>"); + document.write("<img border=<?php echo $borderwidth ?> bgcolor=<?php echo $borderColor ?> src="+photo_urls[<?php echo $slide_index ?>]+" name=slide>"); </script> -</tr> -</table> - <br> <script type="text/javascript"> /* show the caption either in a nice div or an ugly form textarea */ -document.write("<div class='pcaption'>" + "[" + current_location + " <?php echo _("of") ?> " + photo_count + "] " + photo_captions[<?php echo $slide_index ?>] + "</div>"); +document.write("<div class='g-photo-caption'>" + "[" + current_location + " <?php echo _("of") ?> " + photo_count + "] " + photo_captions[<?php echo $slide_index ?>] + "</div>"); /* Start the show. */ play(); @@ -372,20 +365,11 @@ </script> <?php -} else { + } + else { + echo "<p><b>". _("This album has no photos to show in a slide show.") ."</b></p>"; + } ?> - -<br><b><?php echo _("This album has no photos to show in a slide show.") ?></b> -<br><br> -<span class="admin"> -<a href="<?php echo makeGalleryUrl("view_album.php", -array("set_albumName" => $gallery->session->albumName)) ?>">[<?php echo _("back to album") ?>]</a> -</span> - -<?php -} -?> - </div> <?php } ?> Modified: branches/DEV_1_6/gallery/js/multifile.js.php =================================================================== --- branches/DEV_1_6/gallery/js/multifile.js.php 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/js/multifile.js.php 2006-05-19 22:43:06 UTC (rev 13696) @@ -31,7 +31,7 @@ this.max = -1; }; this.fieldname = fieldname; - + /** * Add a new file input element */ @@ -148,7 +148,7 @@ // Set row value filenameCaptionDiv.innerHTML = '<b>'+ element.value +'</b>'; } - + // Add button line.appendChild(deleteButton); Modified: branches/DEV_1_6/gallery/slideshow.php =================================================================== --- branches/DEV_1_6/gallery/slideshow.php 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/slideshow.php 2006-05-19 22:43:06 UTC (rev 13696) @@ -72,15 +72,11 @@ $number = (int)$gallery->app->gallery_slideshow_length; $random = ($gallery->app->gallery_slideshow_type == "random"); $loop = ($gallery->app->gallery_slideshow_loop == "yes"); - $borderColor = $gallery->app->default["bordercolor"]; - $borderwidth = $gallery->app->default["border"]; } else { $recursive = ($album->fields["slideshow_recursive"] == "yes"); $loop = ($album->fields["slideshow_loop"] == "yes"); $random = ($album->fields["slideshow_type"] == "random"); $number = (int)$album->fields["slideshow_length"]; - $borderColor = $gallery->album->fields["bordercolor"]; - $borderwidth = $gallery->album->fields["border"]; $bgcolor = $gallery->album->fields['bgcolor']; } @@ -113,7 +109,6 @@ include(dirname(__FILE__) . "/includes/slideshow/$mode.inc"); - slideshow_initialize(); if (!$GALLERY_EMBEDDED_INSIDE) { @@ -152,7 +147,7 @@ ?> </head> -<body dir="<?php echo $gallery->direction ?>"> +<body> <?php } @@ -174,34 +169,26 @@ </script> <?php - slideshow_body(); +slideshow_body(); + $imageDir = $gallery->app->photoAlbumURL."/images"; #-- breadcrumb text --- $breadcrumb["text"] = @returnToPathArray($gallery->album, true); -$breadcrumb["bordercolor"] = $borderColor; -$adminbox["commands"] = ""; - // todo: on the client, prevent old browsers from using High, and remove High from the bar if ( !$gallery->session->offline) { foreach ($modes as $m => $mt) { - $url=makeGalleryUrl('slideshow.php',array('mode' => $m, "set_albumName" => $gallery->session->albumName)); + $url = makeGalleryUrl('slideshow.php',array('mode' => $m, "set_albumName" => $gallery->session->albumName)); if ($m != $mode) { - $adminbox["commands"] .= " <a class=\"admin\" href=\"$url\">[" .$modes[$m] ."]</a>"; + $adminbox["commands"] .= " <a href=\"$url\">[" .$modes[$m] ."]</a>"; } else { $adminbox["commands"] .= " " .$modes[$m]; } } } -$adminbox["text"] = gTranslate('core', "Slide Show"); -$adminbox["bordercolor"] = $borderColor; - -$navigator["fullWidth"] = '100'; -$navigator["widthUnits"] = '%'; - includeLayout('adminbox.inc'); includeLayout('breadcrumb.inc'); Modified: branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default =================================================================== --- branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default 2006-05-19 21:50:59 UTC (rev 13695) +++ branches/DEV_1_6/gallery/templates/info_donation-block.tpl.default 2006-05-19 22:43:06 UTC (rev 13696) @@ -10,14 +10,14 @@ </span> </td> <?php - if (!$gallery->session->offline && + if (!$gallery->session->offline && isset($gallery->app->rssEnabled) && $gallery->app->rssEnabled == "yes") { ?> - <td class="left"><?php echo galleryLink( - $gallery->app->photoAlbumURL . "/rss.php", - getIconText('rss-feed.png', gTranslate('common', "RSS")) - );?> - </td> + <td class="center"> + <a href="<?php echo $gallery->app->photoAlbumURL . "/rss.php"; ?>"> + <?php echo getIconText('rss-feed.png', gTranslate('common', "RSS")); ?> + </a> + </td> <?php } if ($gallery->user->isAdmin() ) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |