Changeset 561

Timestamp:

07/17/08 19:26:13 (2 years ago)

Author:

sidtheduck

Message:

+ Slideshow fixes and javascript redirect to album view at end of slideshow (instead of repeat)
+ Miscellaneous small syntax edits

Location:

trunk

Files:

• plog-admin/includes/install-functions.php (modified) (2 diffs)
• plog-admin/plog-admin-functions.php (modified) (1 diff)
• plog-admin/plog-manage.php (modified) (2 diffs)
• plog-content/themes/air/slideshow.php (modified) (1 diff)
• plog-content/themes/default/slideshow.php (modified) (1 diff)
• plog-content/themes/lucid/slideshow.php (modified) (1 diff)
• plog-includes/js/plog-slideshow.js (modified) (2 diffs)
• plog-includes/plog-functions.php (modified) (2 diffs)

trunk/plog-admin/includes/install-functions.php

@@ -493 +493 @@
         $select = @mysql_select_db($database);
         if (!$select) {
-                $errors[] = "Couldn't find the database $database. MySQL error: " . mysql_error();
+                $errors[] = "Couldn't find the database `$database`. MySQL error: " . mysql_error();
 
         }
@@ -504 +504 @@
         $connection = @ftp_connect($host);
         if (!$connection) {
-                $errors[] = "Couldn't connect to FTP host \"$host\".  Please check your FTP Host:";
+                $errors[] = "Couldn't connect to FTP host `$host`.  Please check your FTP Host:";
         } else {
                 $login = @ftp_login($connection, $user, $pass);
                 if (!$login) {
-                        $errors[] = "Couldn't login to FTP host \"$host\" with username \"$user\" and password \"$pass\". Please check your FTP Username: and FTP Password:";
+                        $errors[] = "Couldn't login to FTP host `$host` with username `$user` and password `$pass`. Please check your FTP Username: and FTP Password:";
                 } else {
                         $checkdir = @ftp_chdir($connection, $path."plog-content/images/"); // check to see if the plog-content/images/ folder is accessible
                         if (!$checkdir) {
-                                $errors[] = "Couldn't find the Plogger 'plog-content/images/' folder along the path \"$path\". Please check your FTP Path to Plogger Base Folder (from FTP login):";
+                                $errors[] = "Couldn't find the Plogger 'plog-content/images/' folder along the path `$path`. Please check your FTP Path to Plogger Base Folder (from FTP login):";
                         }
                 }

trunk/plog-admin/plog-admin-functions.php

@@ -100 +100 @@
                 @unlink($tmpname);
         }
-        $res = @chmod($final_fqfn, 0755);
+        $res = @chmod($final_fqfn, 0777);
 
         // Get the EXIF data.

trunk/plog-admin/plog-manage.php

@@ -58 +58 @@
                 }
 
-                $output .= "\n\t\t\t\t<option value=\"".$album_id."\"$selected>".SmartStripSlashes($album['collection_name']).": ".SmartStripSlashes($album['album_name'])."" ;
+                $output .= "\n\t\t\t\t<option value=\"".$album_id."\"".$selected.">".SmartStripSlashes($album['collection_name']).": ".SmartStripSlashes($album['album_name'])."" ;
                 $output .= "</option>";
         }
@@ -75 +75 @@
                         $collection = get_collection_by_id($id);
                         $collection_name = SmartStripSlashes($collection["name"]);
-                        $breadcrumbs = '<a href="'.$_SERVER["PHP_SELF"].'">' . plog_tr('Collections') . '</a> &raquo; ' . "<strong>$collection_name</strong>";
+                        $breadcrumbs = '<a href="'.$_SERVER["PHP_SELF"].'">' . plog_tr('Collections') . '</a> &raquo; ' . "<strong>".$collection_name."</strong>";
 
                 break;

trunk/plog-content/themes/air/slideshow.php

@@ -9 +9 @@
                         slides.prefetch = 2;
                         slides.timeout = 4000;
+                        // slides.repeat = true;
+                        slides.redirect = "<?php echo generate_url("album", $GLOBALS['plogger_id'], NULL, true) ?>";
 <?php while(plogger_has_pictures()) : ?>
 <?php $pic = plogger_load_picture(); ?>

trunk/plog-content/themes/default/slideshow.php

@@ -13 +13 @@
                                                 slides.prefetch = 2;
                                                 slides.timeout = 4000;
+                                                // slides.repeat = true;
+                                                slides.redirect = "<?php echo generate_url("album", $GLOBALS['plogger_id'], NULL, true) ?>";
 <?php while(plogger_has_pictures()) : ?>
 <?php $pic = plogger_load_picture(); ?>

trunk/plog-content/themes/lucid/slideshow.php

@@ -13 +13 @@
                                                 slides.prefetch = 2;
                                                 slides.timeout = 4000;
+                                                // slides.repeat = true;
+                                                slides.redirect = "<?php echo generate_url("album", $GLOBALS['plogger_id'], NULL, true) ?>";
 <?php while(plogger_has_pictures()) : ?>
 <?php $pic = plogger_load_picture(); ?>

trunk/plog-includes/js/plog-slideshow.js

@@ -166 +166 @@
         // Individual slides can override this.
         this.timeout = 3000;
+
+        // Redirect URL called at the end of the slideshow
+        this.redirect = false;
 
         // Hook functions to be called before and after updating the slide
@@ -374 +377 @@
                 } else if (this.repeat) {
                         this.current = 0;
+                } else if (this.redirect) {
+                        window.location = this.redirect;
                 }
 

trunk/plog-includes/plog-functions.php

@@ -425 +425 @@
         // function for generating the slideshow interface
 function generate_slideshow_interface() {
-        global $config;
+        global $config, $thumbnail_config;
 
         $picture_caption = plogger_get_picture_caption();
@@ -435 +435 @@
         $next_url = '<a accesskey="." title="' . plog_tr('Next Image') . '" href="javascript:slides.next();"><img src="'.THEME_URL.'images/fforward.gif" width="16" height="16" alt="' . plog_tr('Next Image') . '" /></a>';
 
-        $output = "\t\t\t" . '<div class="large-thumb-toolbar" style="width: '.$config["max_display_size"].'px;">'.$large_link.$prev_url.$stop_url.$play_url.$next_url.'</div><!-- /large-thumb-toolbar -->';
+        $output = "\t\t\t" . '<div class="large-thumb-toolbar" style="width: '.$thumbnail_config[THUMB_LARGE].'px;">'.$large_link.$prev_url.$stop_url.$play_url.$next_url.'</div><!-- /large-thumb-toolbar -->';
 
         $imgtag = '<img id="slideshow_image" class="photos-large" src="about:blank" title="'.$picture_caption.'" alt="'.$picture_caption.'" />';