From 04d195787ba077e32483d18617065b7bea3d2468 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Wed, 12 Oct 2011 20:11:56 -0400
Subject: [PATCH 01/12] Update GreyDragon support to 3.1.0.

---
 .../views/tag_albums_album.html.php           | 135 ----------
 .../views/calpage.html.php                    |  74 +++---
 .../views/paginator.html.php                  |   4 +-
 .../views/photo.html.php                      |   4 +-
 .../views/tag_albums_album.html.php           | 239 ++++++++++++++++++
 .../views/tag_albums_album.html.php           | 135 ----------
 .../views/calpage.html.php                    |  74 +++---
 .../views/paginator.html.php                  |   4 +-
 .../views/photo.html.php                      |   4 +-
 .../views/tag_albums_album.html.php           | 239 ++++++++++++++++++
 10 files changed, 544 insertions(+), 368 deletions(-)
 delete mode 100644 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
 rename 3.0/modules/tag_albums/-- Theme Files/{GreyDragon 3.0.8 => GreyDragon 3.1.0}/views/calpage.html.php (83%)
 rename {3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8 => 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0}/views/paginator.html.php (98%)
 rename 3.0/modules/tag_albums/-- Theme Files/{GreyDragon 3.0.8 => GreyDragon 3.1.0}/views/photo.html.php (98%)
 create mode 100644 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php
 delete mode 100644 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
 rename 3.1/modules/tag_albums/-- Theme Files/{GreyDragon 3.0.8 => GreyDragon 3.1.0}/views/calpage.html.php (83%)
 rename {3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8 => 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0}/views/paginator.html.php (98%)
 rename 3.1/modules/tag_albums/-- Theme Files/{GreyDragon 3.0.8 => GreyDragon 3.1.0}/views/photo.html.php (98%)
 create mode 100644 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php

diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
deleted file mode 100644
index 3a348d3b..00000000
--- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? 
-  // The g-info block was taken from album.html.php and $theme->album_top() was changed to $theme->dynamic_top().
-  // $item->title and $item->description have been changed to $title and $description.
-  //
-  // The g-album-grid block was also taken from album.html.php.  The section for uploading new photos to an empty album
-  // has been removed.  Also, $theme->context_menu has been removed as well (it was crashing the page).
-?>
-
-<div id="g-album-header">
-  <?= $theme->dynamic_top() ?>
-  <h1><?= $theme->bb2html(html::purify($title), 1) ?></h1>
-</div>
-
-<?= $theme->add_paginator("top"); ?>
-
-<? if (($theme->album_descmode == "top") and ($description)): ?>
-  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
-<? endif; ?>
-
-<? if (isset($filter_text) && (module::get_var("tag_albums", "tag_index_filter"))): ?>
-<div id="g-tags-filter">
-<br/ >
-  <center><?= $filter_text; ?></center>
-</div>
-<? endif ?>
-
-<div class="g-album-grid-container">
-<ul id="g-album-grid" class="<?= $theme->get_grid_column_class(); ?>">
-<? if (count($children)): ?>
-  <? foreach ($children as $i => $child): ?>
-<?
-  // This code is based on grey dragon's get_thumb_element function.
-    $thumb_item = $child;
-
-    $is_portrait = ($thumb_item->thumb_height > $thumb_item->thumb_width);
-
-    $item_class = $child->is_album() ? "g-album" : "g-photo";
-    $content  = '<li id="g-item-id-' . $child->id . '" class="g-item ' . $item_class . ' ' . $theme->thumb_type;
-    if ($child->is_album()):
-    	$_thumb_descmode = $theme->thumb_descmode_a;
-		else:
-    	$_thumb_descmode = $theme->thumb_descmode;
-		endif;
-
-	  $content .= ($_thumb_descmode == "bottom")? " g-expanded" : " g-default";
-    $content .= ($is_portrait)? " g-portrait" : " g-landscape";
-    $content .= '">' . $theme->thumb_top($child);
-
-    if ($theme->thumb_topalign):
-      $_shift = "";
-    else:
-      if (($theme->crop_factor == 1) and (!$is_portrait)): 
-        $_shift = 'style="margin-top: ' . intval(($theme->_thumb_size_y - $thumb_item->thumb_height) / 2) . 'px;"';
-      else:
-        if (($theme->crop_factor > 0) and ($is_portrait)): 
-          $_shift = 'style="margin-top: -' . intval(($thumb_item->thumb_height - $theme->_thumb_size_y) / 2) . 'px;"';
-        else:
-          $_shift = "";
-        endif;
-      endif;
-    endif;
-
-    // $ss = 'z-index: 22; opacity: 1; -ms-transform: rotate(' . (-15 + rand(0, 31)) . 'deg);'; style="' . $ss . '"
-    
-    $content .= '<div class="g-thumbslide"><p class="g-thumbcrop">';
-    $content .= '<a '. $_shift . ' class="g-thumblink" href="' . $child->url() . '">';
-    if ($thumb_item->has_thumb()):
-      $content .= $thumb_item->thumb_img();
-    else:
-      $content .= '<img title="No Image" alt="No Image" src="' . $theme->url("images/missing-img.png") . '"/>';
-    endif;
-    $content .= '</a></p>';
-
-    if (($theme->thumb_metamode != "hide") and ($_thumb_descmode == "overlay_bottom")):
-      $_thumb_metamode = "merged";
-    else:
-	    $_thumb_metamode = $theme->thumb_metamode;
-    endif;
-
-    if (($_thumb_descmode == "overlay") or ($_thumb_descmode == "overlay_top") or ($_thumb_descmode == "overlay_bottom")):
-      $content .= '<ul class="g-description ';
-      if ($_thumb_descmode == "overlay_top"):
-        $content .= 'g-overlay-top';
-      endif;
-      if ($_thumb_descmode == "overlay_bottom"):
-        $content .= 'g-overlay-bottom';
-      endif;
-      $content .= '"><li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
-      if ($_thumb_metamode == "merged"): 
-        $content .= $theme->thumb_info($child);
-      endif;
-      $content .= '</ul>';
-    endif;
-
-    if (($_thumb_metamode == "default") and ($_thumb_descmode != "overlay_bottom")): 
-      $content .= '<ul class="g-metadata">' . $theme->thumb_info($child) . '</ul>';
-    endif;
-
-    if ($_thumb_descmode == "bottom"):
-      $content .= '<ul class="g-description">';
-      $content .= '<li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
-      if ($_thumb_metamode == "merged"): 
-        $content .= $theme->thumb_info($child);
-      endif;
-      $content .= '</ul>';
-    endif;
-
-	/*
-    if ($addcontext):
-      $_text = $this->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail");
-      $content .= (stripos($_text, '<li>'))? $_text : null;
-    endif;
-    */
-	
-    $content .= '</div>';
-    $content .= $theme->thumb_bottom($child);
-    $content .= '</li>';
-
-    print $content;
-  // End rWatcher Edit.
-?>
-  <? endforeach ?>
-<? else: ?>
-  <li><?= t("There aren't any photos here yet!") ?></li>
-<? endif; ?>
-</ul>
-</div>
-<?= $theme->dynamic_bottom() ?>
-
-<? if (($theme->album_descmode == "bottom") and ($description)): ?>
-  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
-<? endif; ?>
-
-<?= $theme->add_paginator("bottom"); ?>
diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php
similarity index 83%
rename from 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php
index 6d39f820..d385a514 100644
--- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php	
@@ -19,7 +19,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <? $theme->load_sessioninfo(); ?>
-<!-- <?= $theme->themename ?> v.<?= $theme->themeversion ?> (ColorPack: <?= $theme->colorpack ?>) - Copyright (c) 2009-2011 Serguei Dosyukov - All Rights Reserved -->
+<!-- <?= $theme->themename ?> v.<?= $theme->themeversion ?> (<?= $theme->colorpack ?> : <?= $theme->framepack ?>) - Copyright (c) 2009-2011 Serguei Dosyukov - All Rights Reserved -->
 <html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en" <?= ($theme->is_rtl)? "dir=rtl" : null; ?> >
 <?
   $item = $theme->item();
@@ -55,10 +55,6 @@
 <meta name="msnbot" content="noindex, nofollow, noarchive, nosnippet, noodp" />
 <meta name="teoma" content="noindex, nofollow, noarchive" />
 <? endif; ?>
-<? if ($theme->blendpagetrans): ?>
-<meta http-equiv="Page-Enter" content="blendtrans(duration=0.5)" /> 
-<meta http-equiv="Page-Exit" content="blendtrans(duration=0.5)" />
-<? endif; ?>
 <!-- Internet Explorer 9 Meta tags : Start -->
 <meta name="application-name" content="<?= $_title; ?>" />
 <meta name="msapplication-tooltip" content="<?= t("Start"); ?> <?= $_title; ?>" />
@@ -74,7 +70,6 @@
 <meta name="msapplication-task" content="name=<?= t("Admin") ?>: <?= t("Dashboard") ?>; action-uri=<?= url::site("admin"); ?>; icon-uri=favicon.ico" />
 <? endif; ?>
 <!-- Internet Explorer 9 Meta tags : End -->
-
 <link rel="shortcut icon" href="<?= $theme->favicon ?>" type="image/x-icon" />
 <? if ($theme->appletouchicon): ?>
 <link rel="apple-touch-icon" href="<?= $theme->appletouchicon; ?>"/>
@@ -100,22 +95,12 @@
 
 <?= $theme->head() ?>
 
-<? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
-<?= $theme->script("animation.js"); ?>
-<?= $theme->script("ui.support.js"); ?>
-
+<? // Theme specific CSS/JS goes last so that it can override module CSS/JS ?>
+<?= $theme->theme_js_inject(); ?>
 <?= $theme->theme_css_inject(); ?>
-
-<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
-<?= $theme->get_combined("css"); ?>
-
-<?= $theme->css_link("colorpacks/" . $theme->colorpack . "/colors.css", FALSE); ?>
-<?= $theme->css_link("framepacks/" . $theme->framepack . "/frame.css",  FALSE); ?>
-<? if ($theme->custom_css_path != ""): ?>
-<?=  $theme->css_link($theme->custom_css_path, TRUE); ?>
-<? endif; ?>
-<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
-<?= $theme->get_combined("script") ?>
+<?= $theme->get_combined("css");          // LOOKING FOR YOUR CSS? It's all been combined into the link ?>
+<?= $theme->custom_css_inject(TRUE); ?>
+<?= $theme->get_combined("script")        // LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link ?>
 
 <!--[if IE 6]>
   <link rel="stylesheet" href="<?= $theme->url("css/old_ie.css") ?>" type="text/css" media="screen,print,projection" />
@@ -128,24 +113,18 @@
      $item = $theme->item();
    else:
      $item = item::root();
-   endif;
-   if ($theme->is_rtl):
-     $body_class = "rtl";
-   else:
-     $body_class = "";
-   endif;
-   if ($theme->viewmode == "mini"):
-     $body_class .= "viewmode-mini";
    endif; ?>
-<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($body_class)? 'class="' . $body_class . '"' : null; ?>>
-<?= $theme->page_top() ?>
+<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= $theme->get_bodyclass(); ?>>
+<div class="QOverlay" style="left: 0px; top: 0px; width: 100%; height: 100%; position: fixed;">
+</div>
+<?= $theme->page_top() ?>                               
 <?= $theme->site_status() ?>
 <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?>
   <style type="text/css">	html { margin-top: 30px !important; }	</style>
   <div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>">
   <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
   </div>
-<? endif ?>
+<? endif; ?>
 <div id="g-header">
 <?= $theme->header_top() ?>
 <? if ($theme->viewmode != "mini"): ?>
@@ -175,40 +154,45 @@
   // The rest of this file is the original page.html.php file from the Grey Dragon theme.
 ?>
 <? if (empty($breadcrumbs)): ?>
+
+<? // This block is the original breadcrumb code ?>
 <? if (empty($parents)): ?>
 <?= $theme->breadcrumb_menu($theme, null); ?>
 <? else: ?>
 <?= $theme->breadcrumb_menu($theme, $parents); ?>
 <? endif; ?>
+<? // End Original Breadcrumb code, begin modified code. ?>
+
 <? else: ?>
 <?
+    // This is based on the libraries/My_Theme_View.php -> breadcrumb_menu function.
     $breadcrumb_content = "";
     if ($this->breadcrumbs_position == "hide"):
     else:
       $limit_title_length = module::get_var("gallery", "visible_title_length", 999);
 
-      $breadcrumb_content .= '<ul class="g-breadcrumbs g-' . module::get_var("th_greydragon", "breadcrumbs_position", "default") . '">';
+      $breadcrumb_content .= '<ul class="g-breadcrumbs g-' . $this->breadcrumbs_position . '">';
       $i = 0;
         foreach ($breadcrumbs as $breadcrumb):
-		  if ($breadcrumb->url):
-          $breadcrumb_content .= '<li ' . (($i == 0)? " class=\"g-first\"" : null) . '>';
-          $breadcrumb_content .= '<a href="' . $breadcrumb->url . '">';
-          $breadcrumb_content .= text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length);
-          $breadcrumb_content .= '</a></li>';
-		  else:
-          $breadcrumb_content .= '<li class="g-active ' . (($i == 0)? " g-first" : null) . '">' . text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length) . '</li>';
-		  endif;
+          if ($breadcrumb->url):
+            $breadcrumb_content .= '<li ' . (($i == 0)? " class=\"g-first\"" : null) . '>';
+            $breadcrumb_content .= (($i > 0)? " :: " : null );
+            $breadcrumb_content .= '<a href="' . $breadcrumb->url . '">';
+            $breadcrumb_content .= text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length);
+            $breadcrumb_content .= '</a></li>';
+          else:
+            $breadcrumb_content .= '<li class="g-active ' . (($i == 0)? " g-first" : null) . '"> '. (($i > 0)? " :: " : null ) . text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length) . '</li>';
+          endif;
           $i++;
         endforeach;
       $breadcrumb_content .= '</ul>';
     endif;
 
-    print $breadcrumb_content;
-
-  // End Edit.
+    print $breadcrumb_content;  
 ?>
+<? endif; // End Edit. ?>
+
 
-<? endif; ?>
 <?= $theme->custom_header(); ?>
 </div>
 <? if (($theme->page_subtype != "login") and ($theme->page_subtype != "reauthenticate") and ($theme->sidebarvisible == "top")): ?>
diff --git a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php
similarity index 98%
rename from 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php
index cc552628..0a85b414 100644
--- a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php	
@@ -59,7 +59,7 @@
     endfor;
   else:
   // End rWatcher Mod.
-
+  
   switch ($page_type) {
     case "collection":
       if (isset($item)):
@@ -189,7 +189,7 @@
   <? if (isset($parent_url)): ?>
     <a title="<?= t("up") ?>" id="g-navi-parent" href="<?= $parent_url ?>"><span class="ui-icon ui-icon-parent">&nbsp;</span></a>
   <? elseif (isset($parent)): ?>
-    <a title="<?= t("up") ?>" id="g-navi-parent" href="<?= $parent->url() ?>"><span class="ui-icon ui-icon-parent">&nbsp;</span></a>
+    <a title="<?= t("up") ?>" id="g-navi-parent" href="<?= $parent->url("show={$item->id}"); ?>"><span class="ui-icon ui-icon-parent">&nbsp;</span></a>
   <? else: ?>
     <span class="ui-icon ui-icon-parent-d">&nbsp;</span>
   <? endif ?>
diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php
similarity index 98%
rename from 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php
rename to 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php
index 70fb4ca8..bfe20999 100644
--- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php	
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php	
@@ -56,8 +56,8 @@
   <div id="g-photo">
     <?= $theme->resize_top($item) ?>
     <? $_resizewidth = $item->resize_width;
-	
 // rWatcher Modification.
+       //ORIGINAL LINE $siblings = $item->parent()->children(); 
     $siblings = "";
     if (isset($dynamic_siblings)) {
       $siblings = $dynamic_siblings;
@@ -66,7 +66,7 @@
     }
 // End rWatcher Modification
     ?>
-
+	   
     <div class="g-resize" style="margin-left: -<?= intval($_resizewidth / 2); ?>px; ">
     <? $script  = "<script type=\"text/javascript\">\n";
        $script .= "  if (document.images) {\n";
diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php
new file mode 100644
index 00000000..ac750319
--- /dev/null
+++ b/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php	
@@ -0,0 +1,239 @@
+<?php defined("SYSPATH") or die("No direct script access."); ?>
+<? 
+  // Used album.html.php as starting point.
+  // The g-info block was taken from album.html.php and $theme->album_top() was changed to $theme->dynamic_top().
+  // $item->title and $item->description have been changed to $title and $description.
+  //
+  // The g-album-grid block was also taken from album.html.php.  The section for uploading new photos to an empty album
+  // has been removed.  Also, $theme->context_menu has been removed as well (it was crashing the page).
+?>
+
+<div id="g-album-header">
+  <?= $theme->dynamic_top() ?>
+  <h1><?= $theme->bb2html(html::purify($title), 1) ?></h1>
+</div>
+
+<?= $theme->add_paginator("top"); ?>
+
+<? if (($theme->album_descmode == "top") and ($description)): ?>
+  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
+<? endif; ?>
+
+<? if (isset($filter_text) && (module::get_var("tag_albums", "tag_index_filter"))): ?>
+<div id="g-tags-filter">
+<br/ >
+  <center><?= $filter_text; ?></center>
+</div>
+<? endif ?>
+
+<div class="g-album-grid-container">
+<ul id="g-album-grid" class="<?= $theme->get_grid_column_class(); ?>">
+<?
+  if (count($children)):
+		$siblings = $all_siblings;
+		if (($theme->disablephotopage) && (count($siblings) > count($children))):
+			$j = 0;
+			foreach ($siblings as $i => $sibling):
+				//if ($sibling->rand_key == $children[$j]->rand_key):
+                if ($sibling->id == $children[$j]->item_id):
+					//echo $theme->get_thumb_element($sibling, !$theme->hidecontextmenu);
+                    echo rw_get_thumb_element($children[$j], $theme);
+					if ($j + 1 < count($children)):
+						$j++;
+					endif;
+				else:
+					echo $theme->get_thumb_link($sibling);
+					//echo rw_get_thumb_link($sibling, $theme);
+				endif;
+			endforeach;
+		else:         
+			foreach ($children as $i => $child):
+				//echo $theme->get_thumb_element($child, !$theme->hidecontextmenu);
+                echo rw_get_thumb_element($child, $theme);
+			endforeach;
+		endif;
+	else: ?>
+  <li><?= t("There aren't any photos here yet!") ?></li>
+<? endif; ?>
+</ul>
+</div>
+
+<?= $theme->dynamic_bottom() ?>
+
+<? if (($theme->album_descmode == "bottom") and ($description)): ?>
+  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
+<? endif; ?>
+
+<?= $theme->add_paginator("bottom"); ?>
+
+<?
+  function rw_get_thumb_link($item, $theme) {
+    // This code is based on grey dragon's get_thumb_link function.
+    // Change all $this to $theme
+		if ($item->is_album()):
+		  return "";
+		endif;
+
+		/*
+	  if (access::can("view_full", $item)):
+			$direct_link = $item->file_url();
+		else:
+			$direct_link = $item->resize_url();
+		endif;*/
+						$direct_link = $child->full_or_resize_url();
+
+    return '<a title="' . $theme->bb2html(html::purify($item->title), 2) . '" style="display: none;" class="g-sb-preview" rel="g-preview" href="' . $direct_link . '">&nbsp;</a>';
+  }
+
+  function rw_get_thumb_element($child, $theme) {
+    // This code is based on grey dragon's get_thumb_element function.
+    // Change all $item to $child
+    // Change all $this to $theme
+    $thumb_item = $child;
+    if ($theme->thumb_random):
+      if ($child->is_album() && ($rnd = item::random_query()->where("parent_id", "=", $child->id)->find()) && $rnd->loaded()):
+        $thumb_item = $rnd;
+      endif;
+    endif;
+
+    $item_class = $child->is_album() ? "g-album" : "g-photo";
+    $content = '<li id="g-item-id-' . $child->id . '" class="g-item ' . $item_class . ' ' . $theme->thumb_type;
+    if ($child->is_album()):
+    	$_thumb_descmode = $theme->thumb_descmode_a;
+		else:
+    	$_thumb_descmode = $theme->thumb_descmode;
+		endif;
+
+    $content .= ($_thumb_descmode == "bottom")? " g-expanded" : " g-default";
+
+    if ($thumb_item->has_thumb()):
+      $is_portrait = ($thumb_item->thumb_height > $thumb_item->thumb_width);
+      $_shift = "";
+      switch ($theme->thumb_imgalign):
+        case "center":
+          if (($theme->crop_factor == 1) and (!$is_portrait)): 
+            $_shift = 'style="margin-top: ' . intval(($theme->_thumb_size_y - $thumb_item->thumb_height) / 2) . 'px;"';
+          elseif ($theme->crop_factor > 0): 
+            $_shift = 'style="margin-top: -' . intval(($thumb_item->thumb_height - $theme->_thumb_size_y) / 2) . 'px;"';
+          endif;
+          break;
+        case "bottom":
+          if (($theme->crop_factor == 1) and (!$is_portrait)): 
+            $_shift = 'style="margin-top: ' . intval($theme->_thumb_size_y - $thumb_item->thumb_height) . 'px;"';
+          elseif ($theme->crop_factor > 0): 
+            $_shift = 'style="margin-top: -' . intval($thumb_item->thumb_height - $theme->_thumb_size_y) . 'px;"';
+          endif;
+          break;
+        case "fit":
+          break;
+        case "top":
+        default:
+          break;
+      endswitch;
+    else:
+      $is_portrait = FALSE;
+      $_shift = 'style="margin-top: 0px;"';
+    endif;
+
+    $content .= ($is_portrait)? " g-portrait" : " g-landscape";
+    $content .= '">' . $theme->thumb_top($child);
+
+    $content .= '<div class="g-thumbslide">';
+		$thumb_content = '<p class="g-thumbcrop">';
+
+		$use_direct_link = (($theme->disablephotopage) && (!$child->is_album())); 
+		$class_name = "g-thumblink";
+		if ($use_direct_link):
+			$class_name .= ' g-sb-preview" rel="g-preview';
+		  //if (access::can("view_full", $child)):
+				//$direct_link = $child->file_url();
+			//else:
+				$direct_link = $child->full_or_resize_url();
+			//endif;
+		else:
+			$direct_link = $child->url();
+		endif;
+
+    if ($use_direct_link && module::is_active("exif") && module::info("exif")): 
+      $thumb_content .= '<a class="g-meta-exif-link g-dialog-link" href="' . url::site("exif/show/{$child->id}") . '" title="' . t("Photo details")->for_html_attr() . '">&nbsp;</a>';
+    endif;
+
+    $thumb_content .= '<a title="' . $theme->bb2html(html::purify($child->title), 2) . '" '. $_shift . ' class="' . $class_name . '" href="' . $direct_link . '">';
+    if ($thumb_item->has_thumb()):
+      if (($theme->crop_factor > 1) && ($theme->thumb_imgalign == "fit")):
+      	if ($thumb_item->thumb_height > $theme->_thumb_size_y):
+      		if ($is_portrait):
+      			$_max = $theme->_thumb_size_y;
+      		else:
+	      	  $_max = intval($theme->_thumb_size_x * ($theme->_thumb_size_y / $thumb_item->thumb_height));
+	      	endif;
+	      else:
+	        $_max = $theme->_thumb_size_x;
+        endif;
+      	$_max = min($thumb_item->thumb_width, $_max);
+        $thumb_content .= $thumb_item->thumb_img(array(), $_max);
+      else:
+        $thumb_content .= $thumb_item->thumb_img();
+      endif;
+    else:
+      $thumb_content .= '<img title="No Image" alt="No Image" src="' . $theme->url("images/missing-img.png") . '"/>';
+    endif;
+    $thumb_content .= '</a></p>';
+
+    if (($theme->thumb_metamode != "hide") and ($_thumb_descmode == "overlay_bottom")):
+      $_thumb_metamode = "merged";
+    else:
+	    $_thumb_metamode = $theme->thumb_metamode;
+    endif;
+
+    if (($_thumb_descmode == "overlay") or ($_thumb_descmode == "overlay_top") or ($_thumb_descmode == "overlay_bottom")):
+      $thumb_content .= '<ul class="g-description ';
+      if ($_thumb_descmode == "overlay_top"):
+        $thumb_content .= 'g-overlay-top';
+      endif;
+      if ($_thumb_descmode == "overlay_bottom"):
+        $thumb_content .= 'g-overlay-bottom';
+      endif;
+      $thumb_content .= '"><li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
+      if ($_thumb_metamode == "merged"): 
+        $thumb_content .= $theme->thumb_info($child);
+      endif;
+      $thumb_content .= '</ul>';
+    endif;
+
+    if (($_thumb_metamode == "default") and ($_thumb_descmode != "overlay_bottom")): 
+      $thumb_content .= '<ul class="g-metadata">' . $theme->thumb_info($child) . '</ul>';
+    endif;
+
+    if ($_thumb_descmode == "bottom"):
+      $thumb_content .= '<ul class="g-description">';
+      $thumb_content .= '<li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
+      if ($_thumb_metamode == "merged"): 
+        $thumb_content .= $theme->thumb_info($item);
+      endif;
+      $thumb_content .= '</ul>';
+    endif;
+
+    /*
+    if ($addcontext):
+      $_text = $this->context_menu($item, "#g-item-id-{$item->id} .g-thumbnail");
+      $thumb_content .= (stripos($_text, '<li>'))? $_text : null;
+    endif;
+    */
+		try {
+	    $view = new View("frame.html");
+	    $view->thumb_content = $thumb_content;
+	    $content .= $view;
+    } catch (Exception $e) {
+			$content .= $thumb_content;
+    }
+
+    $content .= '</div>';
+    $content .= $theme->thumb_bottom($child);
+    $content .= '</li>';
+
+    return $content;
+    //print $content;
+    // End of modified function code.
+  }
+?>
\ No newline at end of file
diff --git a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php
deleted file mode 100644
index 3a348d3b..00000000
--- a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/tag_albums_album.html.php	
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? 
-  // The g-info block was taken from album.html.php and $theme->album_top() was changed to $theme->dynamic_top().
-  // $item->title and $item->description have been changed to $title and $description.
-  //
-  // The g-album-grid block was also taken from album.html.php.  The section for uploading new photos to an empty album
-  // has been removed.  Also, $theme->context_menu has been removed as well (it was crashing the page).
-?>
-
-<div id="g-album-header">
-  <?= $theme->dynamic_top() ?>
-  <h1><?= $theme->bb2html(html::purify($title), 1) ?></h1>
-</div>
-
-<?= $theme->add_paginator("top"); ?>
-
-<? if (($theme->album_descmode == "top") and ($description)): ?>
-  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
-<? endif; ?>
-
-<? if (isset($filter_text) && (module::get_var("tag_albums", "tag_index_filter"))): ?>
-<div id="g-tags-filter">
-<br/ >
-  <center><?= $filter_text; ?></center>
-</div>
-<? endif ?>
-
-<div class="g-album-grid-container">
-<ul id="g-album-grid" class="<?= $theme->get_grid_column_class(); ?>">
-<? if (count($children)): ?>
-  <? foreach ($children as $i => $child): ?>
-<?
-  // This code is based on grey dragon's get_thumb_element function.
-    $thumb_item = $child;
-
-    $is_portrait = ($thumb_item->thumb_height > $thumb_item->thumb_width);
-
-    $item_class = $child->is_album() ? "g-album" : "g-photo";
-    $content  = '<li id="g-item-id-' . $child->id . '" class="g-item ' . $item_class . ' ' . $theme->thumb_type;
-    if ($child->is_album()):
-    	$_thumb_descmode = $theme->thumb_descmode_a;
-		else:
-    	$_thumb_descmode = $theme->thumb_descmode;
-		endif;
-
-	  $content .= ($_thumb_descmode == "bottom")? " g-expanded" : " g-default";
-    $content .= ($is_portrait)? " g-portrait" : " g-landscape";
-    $content .= '">' . $theme->thumb_top($child);
-
-    if ($theme->thumb_topalign):
-      $_shift = "";
-    else:
-      if (($theme->crop_factor == 1) and (!$is_portrait)): 
-        $_shift = 'style="margin-top: ' . intval(($theme->_thumb_size_y - $thumb_item->thumb_height) / 2) . 'px;"';
-      else:
-        if (($theme->crop_factor > 0) and ($is_portrait)): 
-          $_shift = 'style="margin-top: -' . intval(($thumb_item->thumb_height - $theme->_thumb_size_y) / 2) . 'px;"';
-        else:
-          $_shift = "";
-        endif;
-      endif;
-    endif;
-
-    // $ss = 'z-index: 22; opacity: 1; -ms-transform: rotate(' . (-15 + rand(0, 31)) . 'deg);'; style="' . $ss . '"
-    
-    $content .= '<div class="g-thumbslide"><p class="g-thumbcrop">';
-    $content .= '<a '. $_shift . ' class="g-thumblink" href="' . $child->url() . '">';
-    if ($thumb_item->has_thumb()):
-      $content .= $thumb_item->thumb_img();
-    else:
-      $content .= '<img title="No Image" alt="No Image" src="' . $theme->url("images/missing-img.png") . '"/>';
-    endif;
-    $content .= '</a></p>';
-
-    if (($theme->thumb_metamode != "hide") and ($_thumb_descmode == "overlay_bottom")):
-      $_thumb_metamode = "merged";
-    else:
-	    $_thumb_metamode = $theme->thumb_metamode;
-    endif;
-
-    if (($_thumb_descmode == "overlay") or ($_thumb_descmode == "overlay_top") or ($_thumb_descmode == "overlay_bottom")):
-      $content .= '<ul class="g-description ';
-      if ($_thumb_descmode == "overlay_top"):
-        $content .= 'g-overlay-top';
-      endif;
-      if ($_thumb_descmode == "overlay_bottom"):
-        $content .= 'g-overlay-bottom';
-      endif;
-      $content .= '"><li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
-      if ($_thumb_metamode == "merged"): 
-        $content .= $theme->thumb_info($child);
-      endif;
-      $content .= '</ul>';
-    endif;
-
-    if (($_thumb_metamode == "default") and ($_thumb_descmode != "overlay_bottom")): 
-      $content .= '<ul class="g-metadata">' . $theme->thumb_info($child) . '</ul>';
-    endif;
-
-    if ($_thumb_descmode == "bottom"):
-      $content .= '<ul class="g-description">';
-      $content .= '<li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
-      if ($_thumb_metamode == "merged"): 
-        $content .= $theme->thumb_info($child);
-      endif;
-      $content .= '</ul>';
-    endif;
-
-	/*
-    if ($addcontext):
-      $_text = $this->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail");
-      $content .= (stripos($_text, '<li>'))? $_text : null;
-    endif;
-    */
-	
-    $content .= '</div>';
-    $content .= $theme->thumb_bottom($child);
-    $content .= '</li>';
-
-    print $content;
-  // End rWatcher Edit.
-?>
-  <? endforeach ?>
-<? else: ?>
-  <li><?= t("There aren't any photos here yet!") ?></li>
-<? endif; ?>
-</ul>
-</div>
-<?= $theme->dynamic_bottom() ?>
-
-<? if (($theme->album_descmode == "bottom") and ($description)): ?>
-  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
-<? endif; ?>
-
-<?= $theme->add_paginator("bottom"); ?>
diff --git a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php
similarity index 83%
rename from 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php
index 6d39f820..d385a514 100644
--- a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/calpage.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/calpage.html.php	
@@ -19,7 +19,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <? $theme->load_sessioninfo(); ?>
-<!-- <?= $theme->themename ?> v.<?= $theme->themeversion ?> (ColorPack: <?= $theme->colorpack ?>) - Copyright (c) 2009-2011 Serguei Dosyukov - All Rights Reserved -->
+<!-- <?= $theme->themename ?> v.<?= $theme->themeversion ?> (<?= $theme->colorpack ?> : <?= $theme->framepack ?>) - Copyright (c) 2009-2011 Serguei Dosyukov - All Rights Reserved -->
 <html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en" <?= ($theme->is_rtl)? "dir=rtl" : null; ?> >
 <?
   $item = $theme->item();
@@ -55,10 +55,6 @@
 <meta name="msnbot" content="noindex, nofollow, noarchive, nosnippet, noodp" />
 <meta name="teoma" content="noindex, nofollow, noarchive" />
 <? endif; ?>
-<? if ($theme->blendpagetrans): ?>
-<meta http-equiv="Page-Enter" content="blendtrans(duration=0.5)" /> 
-<meta http-equiv="Page-Exit" content="blendtrans(duration=0.5)" />
-<? endif; ?>
 <!-- Internet Explorer 9 Meta tags : Start -->
 <meta name="application-name" content="<?= $_title; ?>" />
 <meta name="msapplication-tooltip" content="<?= t("Start"); ?> <?= $_title; ?>" />
@@ -74,7 +70,6 @@
 <meta name="msapplication-task" content="name=<?= t("Admin") ?>: <?= t("Dashboard") ?>; action-uri=<?= url::site("admin"); ?>; icon-uri=favicon.ico" />
 <? endif; ?>
 <!-- Internet Explorer 9 Meta tags : End -->
-
 <link rel="shortcut icon" href="<?= $theme->favicon ?>" type="image/x-icon" />
 <? if ($theme->appletouchicon): ?>
 <link rel="apple-touch-icon" href="<?= $theme->appletouchicon; ?>"/>
@@ -100,22 +95,12 @@
 
 <?= $theme->head() ?>
 
-<? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
-<?= $theme->script("animation.js"); ?>
-<?= $theme->script("ui.support.js"); ?>
-
+<? // Theme specific CSS/JS goes last so that it can override module CSS/JS ?>
+<?= $theme->theme_js_inject(); ?>
 <?= $theme->theme_css_inject(); ?>
-
-<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
-<?= $theme->get_combined("css"); ?>
-
-<?= $theme->css_link("colorpacks/" . $theme->colorpack . "/colors.css", FALSE); ?>
-<?= $theme->css_link("framepacks/" . $theme->framepack . "/frame.css",  FALSE); ?>
-<? if ($theme->custom_css_path != ""): ?>
-<?=  $theme->css_link($theme->custom_css_path, TRUE); ?>
-<? endif; ?>
-<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
-<?= $theme->get_combined("script") ?>
+<?= $theme->get_combined("css");          // LOOKING FOR YOUR CSS? It's all been combined into the link ?>
+<?= $theme->custom_css_inject(TRUE); ?>
+<?= $theme->get_combined("script")        // LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link ?>
 
 <!--[if IE 6]>
   <link rel="stylesheet" href="<?= $theme->url("css/old_ie.css") ?>" type="text/css" media="screen,print,projection" />
@@ -128,24 +113,18 @@
      $item = $theme->item();
    else:
      $item = item::root();
-   endif;
-   if ($theme->is_rtl):
-     $body_class = "rtl";
-   else:
-     $body_class = "";
-   endif;
-   if ($theme->viewmode == "mini"):
-     $body_class .= "viewmode-mini";
    endif; ?>
-<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= ($body_class)? 'class="' . $body_class . '"' : null; ?>>
-<?= $theme->page_top() ?>
+<body <?= $theme->body_attributes() ?><?= ($theme->show_root_page)? ' id="g-rootpage"' : null; ?> <?= $theme->get_bodyclass(); ?>>
+<div class="QOverlay" style="left: 0px; top: 0px; width: 100%; height: 100%; position: fixed;">
+</div>
+<?= $theme->page_top() ?>                               
 <?= $theme->site_status() ?>
 <? if (((!$user->guest) or ($theme->show_guest_menu)) and ($theme->mainmenu_position == "bar")): ?>
   <style type="text/css">	html { margin-top: 30px !important; }	</style>
   <div id="g-site-menu" class="g-<?= $theme->mainmenu_position; ?>">
   <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
   </div>
-<? endif ?>
+<? endif; ?>
 <div id="g-header">
 <?= $theme->header_top() ?>
 <? if ($theme->viewmode != "mini"): ?>
@@ -175,40 +154,45 @@
   // The rest of this file is the original page.html.php file from the Grey Dragon theme.
 ?>
 <? if (empty($breadcrumbs)): ?>
+
+<? // This block is the original breadcrumb code ?>
 <? if (empty($parents)): ?>
 <?= $theme->breadcrumb_menu($theme, null); ?>
 <? else: ?>
 <?= $theme->breadcrumb_menu($theme, $parents); ?>
 <? endif; ?>
+<? // End Original Breadcrumb code, begin modified code. ?>
+
 <? else: ?>
 <?
+    // This is based on the libraries/My_Theme_View.php -> breadcrumb_menu function.
     $breadcrumb_content = "";
     if ($this->breadcrumbs_position == "hide"):
     else:
       $limit_title_length = module::get_var("gallery", "visible_title_length", 999);
 
-      $breadcrumb_content .= '<ul class="g-breadcrumbs g-' . module::get_var("th_greydragon", "breadcrumbs_position", "default") . '">';
+      $breadcrumb_content .= '<ul class="g-breadcrumbs g-' . $this->breadcrumbs_position . '">';
       $i = 0;
         foreach ($breadcrumbs as $breadcrumb):
-		  if ($breadcrumb->url):
-          $breadcrumb_content .= '<li ' . (($i == 0)? " class=\"g-first\"" : null) . '>';
-          $breadcrumb_content .= '<a href="' . $breadcrumb->url . '">';
-          $breadcrumb_content .= text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length);
-          $breadcrumb_content .= '</a></li>';
-		  else:
-          $breadcrumb_content .= '<li class="g-active ' . (($i == 0)? " g-first" : null) . '">' . text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length) . '</li>';
-		  endif;
+          if ($breadcrumb->url):
+            $breadcrumb_content .= '<li ' . (($i == 0)? " class=\"g-first\"" : null) . '>';
+            $breadcrumb_content .= (($i > 0)? " :: " : null );
+            $breadcrumb_content .= '<a href="' . $breadcrumb->url . '">';
+            $breadcrumb_content .= text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length);
+            $breadcrumb_content .= '</a></li>';
+          else:
+            $breadcrumb_content .= '<li class="g-active ' . (($i == 0)? " g-first" : null) . '"> '. (($i > 0)? " :: " : null ) . text::limit_chars($theme->bb2html(html::purify($breadcrumb->title), 2), $limit_title_length) . '</li>';
+          endif;
           $i++;
         endforeach;
       $breadcrumb_content .= '</ul>';
     endif;
 
-    print $breadcrumb_content;
-
-  // End Edit.
+    print $breadcrumb_content;  
 ?>
+<? endif; // End Edit. ?>
+
 
-<? endif; ?>
 <?= $theme->custom_header(); ?>
 </div>
 <? if (($theme->page_subtype != "login") and ($theme->page_subtype != "reauthenticate") and ($theme->sidebarvisible == "top")): ?>
diff --git a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php
similarity index 98%
rename from 3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php
index cc552628..0a85b414 100644
--- a/3.0/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/paginator.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/paginator.html.php	
@@ -59,7 +59,7 @@
     endfor;
   else:
   // End rWatcher Mod.
-
+  
   switch ($page_type) {
     case "collection":
       if (isset($item)):
@@ -189,7 +189,7 @@
   <? if (isset($parent_url)): ?>
     <a title="<?= t("up") ?>" id="g-navi-parent" href="<?= $parent_url ?>"><span class="ui-icon ui-icon-parent">&nbsp;</span></a>
   <? elseif (isset($parent)): ?>
-    <a title="<?= t("up") ?>" id="g-navi-parent" href="<?= $parent->url() ?>"><span class="ui-icon ui-icon-parent">&nbsp;</span></a>
+    <a title="<?= t("up") ?>" id="g-navi-parent" href="<?= $parent->url("show={$item->id}"); ?>"><span class="ui-icon ui-icon-parent">&nbsp;</span></a>
   <? else: ?>
     <span class="ui-icon ui-icon-parent-d">&nbsp;</span>
   <? endif ?>
diff --git a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php
similarity index 98%
rename from 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php
rename to 3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php
index 70fb4ca8..bfe20999 100644
--- a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.0.8/views/photo.html.php	
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/photo.html.php	
@@ -56,8 +56,8 @@
   <div id="g-photo">
     <?= $theme->resize_top($item) ?>
     <? $_resizewidth = $item->resize_width;
-	
 // rWatcher Modification.
+       //ORIGINAL LINE $siblings = $item->parent()->children(); 
     $siblings = "";
     if (isset($dynamic_siblings)) {
       $siblings = $dynamic_siblings;
@@ -66,7 +66,7 @@
     }
 // End rWatcher Modification
     ?>
-
+	   
     <div class="g-resize" style="margin-left: -<?= intval($_resizewidth / 2); ?>px; ">
     <? $script  = "<script type=\"text/javascript\">\n";
        $script .= "  if (document.images) {\n";
diff --git a/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php
new file mode 100644
index 00000000..ac750319
--- /dev/null
+++ b/3.1/modules/tag_albums/-- Theme Files/GreyDragon 3.1.0/views/tag_albums_album.html.php	
@@ -0,0 +1,239 @@
+<?php defined("SYSPATH") or die("No direct script access."); ?>
+<? 
+  // Used album.html.php as starting point.
+  // The g-info block was taken from album.html.php and $theme->album_top() was changed to $theme->dynamic_top().
+  // $item->title and $item->description have been changed to $title and $description.
+  //
+  // The g-album-grid block was also taken from album.html.php.  The section for uploading new photos to an empty album
+  // has been removed.  Also, $theme->context_menu has been removed as well (it was crashing the page).
+?>
+
+<div id="g-album-header">
+  <?= $theme->dynamic_top() ?>
+  <h1><?= $theme->bb2html(html::purify($title), 1) ?></h1>
+</div>
+
+<?= $theme->add_paginator("top"); ?>
+
+<? if (($theme->album_descmode == "top") and ($description)): ?>
+  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
+<? endif; ?>
+
+<? if (isset($filter_text) && (module::get_var("tag_albums", "tag_index_filter"))): ?>
+<div id="g-tags-filter">
+<br/ >
+  <center><?= $filter_text; ?></center>
+</div>
+<? endif ?>
+
+<div class="g-album-grid-container">
+<ul id="g-album-grid" class="<?= $theme->get_grid_column_class(); ?>">
+<?
+  if (count($children)):
+		$siblings = $all_siblings;
+		if (($theme->disablephotopage) && (count($siblings) > count($children))):
+			$j = 0;
+			foreach ($siblings as $i => $sibling):
+				//if ($sibling->rand_key == $children[$j]->rand_key):
+                if ($sibling->id == $children[$j]->item_id):
+					//echo $theme->get_thumb_element($sibling, !$theme->hidecontextmenu);
+                    echo rw_get_thumb_element($children[$j], $theme);
+					if ($j + 1 < count($children)):
+						$j++;
+					endif;
+				else:
+					echo $theme->get_thumb_link($sibling);
+					//echo rw_get_thumb_link($sibling, $theme);
+				endif;
+			endforeach;
+		else:         
+			foreach ($children as $i => $child):
+				//echo $theme->get_thumb_element($child, !$theme->hidecontextmenu);
+                echo rw_get_thumb_element($child, $theme);
+			endforeach;
+		endif;
+	else: ?>
+  <li><?= t("There aren't any photos here yet!") ?></li>
+<? endif; ?>
+</ul>
+</div>
+
+<?= $theme->dynamic_bottom() ?>
+
+<? if (($theme->album_descmode == "bottom") and ($description)): ?>
+  <div id="g-info"><div class="g-description"><?= $theme->bb2html(html::purify($description), 1) ?></div></div>
+<? endif; ?>
+
+<?= $theme->add_paginator("bottom"); ?>
+
+<?
+  function rw_get_thumb_link($item, $theme) {
+    // This code is based on grey dragon's get_thumb_link function.
+    // Change all $this to $theme
+		if ($item->is_album()):
+		  return "";
+		endif;
+
+		/*
+	  if (access::can("view_full", $item)):
+			$direct_link = $item->file_url();
+		else:
+			$direct_link = $item->resize_url();
+		endif;*/
+						$direct_link = $child->full_or_resize_url();
+
+    return '<a title="' . $theme->bb2html(html::purify($item->title), 2) . '" style="display: none;" class="g-sb-preview" rel="g-preview" href="' . $direct_link . '">&nbsp;</a>';
+  }
+
+  function rw_get_thumb_element($child, $theme) {
+    // This code is based on grey dragon's get_thumb_element function.
+    // Change all $item to $child
+    // Change all $this to $theme
+    $thumb_item = $child;
+    if ($theme->thumb_random):
+      if ($child->is_album() && ($rnd = item::random_query()->where("parent_id", "=", $child->id)->find()) && $rnd->loaded()):
+        $thumb_item = $rnd;
+      endif;
+    endif;
+
+    $item_class = $child->is_album() ? "g-album" : "g-photo";
+    $content = '<li id="g-item-id-' . $child->id . '" class="g-item ' . $item_class . ' ' . $theme->thumb_type;
+    if ($child->is_album()):
+    	$_thumb_descmode = $theme->thumb_descmode_a;
+		else:
+    	$_thumb_descmode = $theme->thumb_descmode;
+		endif;
+
+    $content .= ($_thumb_descmode == "bottom")? " g-expanded" : " g-default";
+
+    if ($thumb_item->has_thumb()):
+      $is_portrait = ($thumb_item->thumb_height > $thumb_item->thumb_width);
+      $_shift = "";
+      switch ($theme->thumb_imgalign):
+        case "center":
+          if (($theme->crop_factor == 1) and (!$is_portrait)): 
+            $_shift = 'style="margin-top: ' . intval(($theme->_thumb_size_y - $thumb_item->thumb_height) / 2) . 'px;"';
+          elseif ($theme->crop_factor > 0): 
+            $_shift = 'style="margin-top: -' . intval(($thumb_item->thumb_height - $theme->_thumb_size_y) / 2) . 'px;"';
+          endif;
+          break;
+        case "bottom":
+          if (($theme->crop_factor == 1) and (!$is_portrait)): 
+            $_shift = 'style="margin-top: ' . intval($theme->_thumb_size_y - $thumb_item->thumb_height) . 'px;"';
+          elseif ($theme->crop_factor > 0): 
+            $_shift = 'style="margin-top: -' . intval($thumb_item->thumb_height - $theme->_thumb_size_y) . 'px;"';
+          endif;
+          break;
+        case "fit":
+          break;
+        case "top":
+        default:
+          break;
+      endswitch;
+    else:
+      $is_portrait = FALSE;
+      $_shift = 'style="margin-top: 0px;"';
+    endif;
+
+    $content .= ($is_portrait)? " g-portrait" : " g-landscape";
+    $content .= '">' . $theme->thumb_top($child);
+
+    $content .= '<div class="g-thumbslide">';
+		$thumb_content = '<p class="g-thumbcrop">';
+
+		$use_direct_link = (($theme->disablephotopage) && (!$child->is_album())); 
+		$class_name = "g-thumblink";
+		if ($use_direct_link):
+			$class_name .= ' g-sb-preview" rel="g-preview';
+		  //if (access::can("view_full", $child)):
+				//$direct_link = $child->file_url();
+			//else:
+				$direct_link = $child->full_or_resize_url();
+			//endif;
+		else:
+			$direct_link = $child->url();
+		endif;
+
+    if ($use_direct_link && module::is_active("exif") && module::info("exif")): 
+      $thumb_content .= '<a class="g-meta-exif-link g-dialog-link" href="' . url::site("exif/show/{$child->id}") . '" title="' . t("Photo details")->for_html_attr() . '">&nbsp;</a>';
+    endif;
+
+    $thumb_content .= '<a title="' . $theme->bb2html(html::purify($child->title), 2) . '" '. $_shift . ' class="' . $class_name . '" href="' . $direct_link . '">';
+    if ($thumb_item->has_thumb()):
+      if (($theme->crop_factor > 1) && ($theme->thumb_imgalign == "fit")):
+      	if ($thumb_item->thumb_height > $theme->_thumb_size_y):
+      		if ($is_portrait):
+      			$_max = $theme->_thumb_size_y;
+      		else:
+	      	  $_max = intval($theme->_thumb_size_x * ($theme->_thumb_size_y / $thumb_item->thumb_height));
+	      	endif;
+	      else:
+	        $_max = $theme->_thumb_size_x;
+        endif;
+      	$_max = min($thumb_item->thumb_width, $_max);
+        $thumb_content .= $thumb_item->thumb_img(array(), $_max);
+      else:
+        $thumb_content .= $thumb_item->thumb_img();
+      endif;
+    else:
+      $thumb_content .= '<img title="No Image" alt="No Image" src="' . $theme->url("images/missing-img.png") . '"/>';
+    endif;
+    $thumb_content .= '</a></p>';
+
+    if (($theme->thumb_metamode != "hide") and ($_thumb_descmode == "overlay_bottom")):
+      $_thumb_metamode = "merged";
+    else:
+	    $_thumb_metamode = $theme->thumb_metamode;
+    endif;
+
+    if (($_thumb_descmode == "overlay") or ($_thumb_descmode == "overlay_top") or ($_thumb_descmode == "overlay_bottom")):
+      $thumb_content .= '<ul class="g-description ';
+      if ($_thumb_descmode == "overlay_top"):
+        $thumb_content .= 'g-overlay-top';
+      endif;
+      if ($_thumb_descmode == "overlay_bottom"):
+        $thumb_content .= 'g-overlay-bottom';
+      endif;
+      $thumb_content .= '"><li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
+      if ($_thumb_metamode == "merged"): 
+        $thumb_content .= $theme->thumb_info($child);
+      endif;
+      $thumb_content .= '</ul>';
+    endif;
+
+    if (($_thumb_metamode == "default") and ($_thumb_descmode != "overlay_bottom")): 
+      $thumb_content .= '<ul class="g-metadata">' . $theme->thumb_info($child) . '</ul>';
+    endif;
+
+    if ($_thumb_descmode == "bottom"):
+      $thumb_content .= '<ul class="g-description">';
+      $thumb_content .= '<li class="g-title">' . $theme->bb2html(html::purify($child->title), 2) . '</li>';
+      if ($_thumb_metamode == "merged"): 
+        $thumb_content .= $theme->thumb_info($item);
+      endif;
+      $thumb_content .= '</ul>';
+    endif;
+
+    /*
+    if ($addcontext):
+      $_text = $this->context_menu($item, "#g-item-id-{$item->id} .g-thumbnail");
+      $thumb_content .= (stripos($_text, '<li>'))? $_text : null;
+    endif;
+    */
+		try {
+	    $view = new View("frame.html");
+	    $view->thumb_content = $thumb_content;
+	    $content .= $view;
+    } catch (Exception $e) {
+			$content .= $thumb_content;
+    }
+
+    $content .= '</div>';
+    $content .= $theme->thumb_bottom($child);
+    $content .= '</li>';
+
+    return $content;
+    //print $content;
+    // End of modified function code.
+  }
+?>
\ No newline at end of file

From 891097f1d6d52f11d72cfc03d6ef5c84c7199700 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Wed, 12 Oct 2011 20:13:49 -0400
Subject: [PATCH 02/12] Create all_siblings variable and full_or_resize_url()
 function for Shadowbox album view w/ Grey Dragon.

---
 .../tag_albums/controllers/tag_albums.php       | 12 +++++++-----
 .../tag_albums/libraries/Tag_Albums_Item.php    | 17 ++++++++++++++++-
 .../tag_albums/controllers/tag_albums.php       | 12 +++++++-----
 .../tag_albums/libraries/Tag_Albums_Item.php    | 17 ++++++++++++++++-
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/3.0/modules/tag_albums/controllers/tag_albums.php b/3.0/modules/tag_albums/controllers/tag_albums.php
index 566949b8..103dbe79 100644
--- a/3.0/modules/tag_albums/controllers/tag_albums.php
+++ b/3.0/modules/tag_albums/controllers/tag_albums.php
@@ -100,7 +100,7 @@ class tag_albums_Controller extends Controller {
       $tag_children = $this->_get_records($tag_ids, $page_size, $offset, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, true); 
       $children = Array();
       foreach ($tag_children as $one_child) {
-        $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/0/" . $id . "/" . urlencode($one_child->name)), $one_child->type);
+        $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/0/" . $id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
         $child_tag->id = $one_child->id;
         $child_tag->view_count = $one_child->view_count;
         $child_tag->owner = identity::lookup_user($one_child->owner_id);
@@ -141,6 +141,7 @@ class tag_albums_Controller extends Controller {
       $template->set_global("page_size", $page_size);
       $template->set_global("max_pages", $max_pages);
       $template->set_global("children", $children);
+      $template->set_global("all_siblings", $this->_get_records($tag_ids, $count, 0, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false));
       $template->set_global("children_count", $count);
       $template->set_global("parent_url", $parent_album->url()); // Used by Grey Dragon.
       $template->content = new View("tag_albums_album.html");
@@ -317,7 +318,7 @@ class tag_albums_Controller extends Controller {
         ->where("items_tags.tag_id", "=", $one_tag->id)
         ->order_by("items.id", "DESC")
         ->find_all(1, 0);
-      $child_tag =  new Tag_Albums_Item($one_tag->name, url::site("tag_albums/tag/" . $one_tag->id . "/" . $id . "/" . urlencode($one_tag->name)), "album");
+      $child_tag =  new Tag_Albums_Item($one_tag->name, url::site("tag_albums/tag/" . $one_tag->id . "/" . $id . "/" . urlencode($one_tag->name)), "album", 0);
       if (count($tag_item) > 0) {
         if ($tag_item[0]->has_thumb()) {
           $child_tag->set_thumb($tag_item[0]->thumb_url(), $tag_item[0]->thumb_width, $tag_item[0]->thumb_height);
@@ -430,7 +431,7 @@ class tag_albums_Controller extends Controller {
     // Create an array of "fake" items to display on the page.
     $children = Array();
     foreach ($tag_children as $one_child) {
-      $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/" . $id . "/" . $album_id . "/" . urlencode($one_child->name)), $one_child->type);
+      $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/" . $id . "/" . $album_id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
       $child_tag->id = $one_child->id;
       $child_tag->view_count = $one_child->view_count;
       $child_tag->owner = identity::lookup_user($one_child->owner_id);
@@ -491,6 +492,7 @@ class tag_albums_Controller extends Controller {
     $template->set_global("page_size", $page_size);
     $template->set_global("max_pages", $max_pages);
     $template->set_global("children", $children);
+    $template->set_global("all_siblings", $this->_get_records(Array($id), $count, 0, "items." . $sort_page_field, $sort_page_direction, "OR", false));
     $template->set_global("children_count", $count);
     $template->set_global("parent_url", $parent_url); // Used by Grey Dragon.
     $template->content = new View("tag_albums_album.html");
@@ -542,12 +544,12 @@ class tag_albums_Controller extends Controller {
       if ($position > 1) {
         $previous_item_object = $this->_get_records(Array($tag_id), 1, $position-2, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
         if (count($previous_item_object) > 0) {
-          $previous_item =  new Tag_Albums_Item($previous_item_object[0]->title, url::site("tag_albums/show/" . $previous_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($previous_item_object[0]->name)), $previous_item_object[0]->type);
+          $previous_item =  new Tag_Albums_Item($previous_item_object[0]->title, url::site("tag_albums/show/" . $previous_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($previous_item_object[0]->name)), $previous_item_object[0]->type, $previous_item_object[0]->id);
         }
       }
       $next_item_object = $this->_get_records(Array($tag_id), 1, $position, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
       if (count($next_item_object) > 0) {
-        $next_item =  new Tag_Albums_Item($next_item_object[0]->title, url::site("tag_albums/show/" . $next_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($next_item_object[0]->name)), $next_item_object[0]->type);
+        $next_item =  new Tag_Albums_Item($next_item_object[0]->title, url::site("tag_albums/show/" . $next_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($next_item_object[0]->name)), $next_item_object[0]->type, $next_item_object[0]->id);
       }
       $dynamic_siblings = $this->_get_records(Array($tag_id), null, null, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
     } else {
diff --git a/3.0/modules/tag_albums/libraries/Tag_Albums_Item.php b/3.0/modules/tag_albums/libraries/Tag_Albums_Item.php
index a90c5239..d521697a 100644
--- a/3.0/modules/tag_albums/libraries/Tag_Albums_Item.php
+++ b/3.0/modules/tag_albums/libraries/Tag_Albums_Item.php
@@ -20,6 +20,7 @@
 class Tag_Albums_Item_Core {
   public $title = "";
   public $id = -1;
+  public $item_id = 0;
   public $url = "#";
   public $thumb_url = "";
   public $thumb_width = 0;
@@ -45,6 +46,19 @@ class Tag_Albums_Item_Core {
     }
   }
 
+  public function full_or_resize_url() {
+    if ($this->item_id > 0) {
+      $item = ORM::factory("item", $this->item_id);
+      if (access::can("view_full", $item)) {
+        return $item->file_url();
+      } else {
+        return $item->resize_url();
+      }
+    } else {
+      return "";
+    }
+  }
+
   public function thumb_img($extra_attrs=array(), $max=null, $center_vertically=false) {
     list ($height, $width) = $this->scale_dimensions($max);
     if ($center_vertically && $max) {
@@ -105,10 +119,11 @@ class Tag_Albums_Item_Core {
     $this->thumb_height = $new_height;
   }
 
-  public function __construct($new_title, $new_url, $new_type) {
+  public function __construct($new_title, $new_url, $new_type, $new_id) {
     $this->title = $new_title;
     $this->url = $new_url;
     $this->item_type = $new_type;
     $this->type = $new_type;
+    $this->item_id = $new_id;
   }
 }
diff --git a/3.1/modules/tag_albums/controllers/tag_albums.php b/3.1/modules/tag_albums/controllers/tag_albums.php
index 566949b8..103dbe79 100644
--- a/3.1/modules/tag_albums/controllers/tag_albums.php
+++ b/3.1/modules/tag_albums/controllers/tag_albums.php
@@ -100,7 +100,7 @@ class tag_albums_Controller extends Controller {
       $tag_children = $this->_get_records($tag_ids, $page_size, $offset, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, true); 
       $children = Array();
       foreach ($tag_children as $one_child) {
-        $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/0/" . $id . "/" . urlencode($one_child->name)), $one_child->type);
+        $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/0/" . $id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
         $child_tag->id = $one_child->id;
         $child_tag->view_count = $one_child->view_count;
         $child_tag->owner = identity::lookup_user($one_child->owner_id);
@@ -141,6 +141,7 @@ class tag_albums_Controller extends Controller {
       $template->set_global("page_size", $page_size);
       $template->set_global("max_pages", $max_pages);
       $template->set_global("children", $children);
+      $template->set_global("all_siblings", $this->_get_records($tag_ids, $count, 0, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false));
       $template->set_global("children_count", $count);
       $template->set_global("parent_url", $parent_album->url()); // Used by Grey Dragon.
       $template->content = new View("tag_albums_album.html");
@@ -317,7 +318,7 @@ class tag_albums_Controller extends Controller {
         ->where("items_tags.tag_id", "=", $one_tag->id)
         ->order_by("items.id", "DESC")
         ->find_all(1, 0);
-      $child_tag =  new Tag_Albums_Item($one_tag->name, url::site("tag_albums/tag/" . $one_tag->id . "/" . $id . "/" . urlencode($one_tag->name)), "album");
+      $child_tag =  new Tag_Albums_Item($one_tag->name, url::site("tag_albums/tag/" . $one_tag->id . "/" . $id . "/" . urlencode($one_tag->name)), "album", 0);
       if (count($tag_item) > 0) {
         if ($tag_item[0]->has_thumb()) {
           $child_tag->set_thumb($tag_item[0]->thumb_url(), $tag_item[0]->thumb_width, $tag_item[0]->thumb_height);
@@ -430,7 +431,7 @@ class tag_albums_Controller extends Controller {
     // Create an array of "fake" items to display on the page.
     $children = Array();
     foreach ($tag_children as $one_child) {
-      $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/" . $id . "/" . $album_id . "/" . urlencode($one_child->name)), $one_child->type);
+      $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/" . $id . "/" . $album_id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
       $child_tag->id = $one_child->id;
       $child_tag->view_count = $one_child->view_count;
       $child_tag->owner = identity::lookup_user($one_child->owner_id);
@@ -491,6 +492,7 @@ class tag_albums_Controller extends Controller {
     $template->set_global("page_size", $page_size);
     $template->set_global("max_pages", $max_pages);
     $template->set_global("children", $children);
+    $template->set_global("all_siblings", $this->_get_records(Array($id), $count, 0, "items." . $sort_page_field, $sort_page_direction, "OR", false));
     $template->set_global("children_count", $count);
     $template->set_global("parent_url", $parent_url); // Used by Grey Dragon.
     $template->content = new View("tag_albums_album.html");
@@ -542,12 +544,12 @@ class tag_albums_Controller extends Controller {
       if ($position > 1) {
         $previous_item_object = $this->_get_records(Array($tag_id), 1, $position-2, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
         if (count($previous_item_object) > 0) {
-          $previous_item =  new Tag_Albums_Item($previous_item_object[0]->title, url::site("tag_albums/show/" . $previous_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($previous_item_object[0]->name)), $previous_item_object[0]->type);
+          $previous_item =  new Tag_Albums_Item($previous_item_object[0]->title, url::site("tag_albums/show/" . $previous_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($previous_item_object[0]->name)), $previous_item_object[0]->type, $previous_item_object[0]->id);
         }
       }
       $next_item_object = $this->_get_records(Array($tag_id), 1, $position, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
       if (count($next_item_object) > 0) {
-        $next_item =  new Tag_Albums_Item($next_item_object[0]->title, url::site("tag_albums/show/" . $next_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($next_item_object[0]->name)), $next_item_object[0]->type);
+        $next_item =  new Tag_Albums_Item($next_item_object[0]->title, url::site("tag_albums/show/" . $next_item_object[0]->id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($next_item_object[0]->name)), $next_item_object[0]->type, $next_item_object[0]->id);
       }
       $dynamic_siblings = $this->_get_records(Array($tag_id), null, null, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
     } else {
diff --git a/3.1/modules/tag_albums/libraries/Tag_Albums_Item.php b/3.1/modules/tag_albums/libraries/Tag_Albums_Item.php
index a90c5239..d521697a 100644
--- a/3.1/modules/tag_albums/libraries/Tag_Albums_Item.php
+++ b/3.1/modules/tag_albums/libraries/Tag_Albums_Item.php
@@ -20,6 +20,7 @@
 class Tag_Albums_Item_Core {
   public $title = "";
   public $id = -1;
+  public $item_id = 0;
   public $url = "#";
   public $thumb_url = "";
   public $thumb_width = 0;
@@ -45,6 +46,19 @@ class Tag_Albums_Item_Core {
     }
   }
 
+  public function full_or_resize_url() {
+    if ($this->item_id > 0) {
+      $item = ORM::factory("item", $this->item_id);
+      if (access::can("view_full", $item)) {
+        return $item->file_url();
+      } else {
+        return $item->resize_url();
+      }
+    } else {
+      return "";
+    }
+  }
+
   public function thumb_img($extra_attrs=array(), $max=null, $center_vertically=false) {
     list ($height, $width) = $this->scale_dimensions($max);
     if ($center_vertically && $max) {
@@ -105,10 +119,11 @@ class Tag_Albums_Item_Core {
     $this->thumb_height = $new_height;
   }
 
-  public function __construct($new_title, $new_url, $new_type) {
+  public function __construct($new_title, $new_url, $new_type, $new_id) {
     $this->title = $new_title;
     $this->url = $new_url;
     $this->item_type = $new_type;
     $this->type = $new_type;
+    $this->item_id = $new_id;
   }
 }

From 8e82da2df005d1aa20d7fb3e0c53b5f375a4bd98 Mon Sep 17 00:00:00 2001
From: bouthors <root@bouthors.fr>
Date: Sat, 15 Oct 2011 15:48:03 +0200
Subject: [PATCH 03/12] new module fittoscreen

---
 .../controllers/admin_fittoscreen.php         | 46 +++++++++++++++++++
 .../fittoscreen/helpers/fittoscreen_event.php | 13 ++++++
 .../helpers/fittoscreen_installer.php         | 14 ++++++
 .../fittoscreen/helpers/fittoscreen_theme.php |  9 ++++
 3.0/modules/fittoscreen/module.info           |  7 +++
 .../views/admin_fittoscreen.html.php          |  7 +++
 .../views/fittoscreen_photo.html.php          | 35 ++++++++++++++
 7 files changed, 131 insertions(+)
 create mode 100644 3.0/modules/fittoscreen/controllers/admin_fittoscreen.php
 create mode 100644 3.0/modules/fittoscreen/helpers/fittoscreen_event.php
 create mode 100644 3.0/modules/fittoscreen/helpers/fittoscreen_installer.php
 create mode 100644 3.0/modules/fittoscreen/helpers/fittoscreen_theme.php
 create mode 100644 3.0/modules/fittoscreen/module.info
 create mode 100644 3.0/modules/fittoscreen/views/admin_fittoscreen.html.php
 create mode 100644 3.0/modules/fittoscreen/views/fittoscreen_photo.html.php

diff --git a/3.0/modules/fittoscreen/controllers/admin_fittoscreen.php b/3.0/modules/fittoscreen/controllers/admin_fittoscreen.php
new file mode 100644
index 00000000..3a8eb456
--- /dev/null
+++ b/3.0/modules/fittoscreen/controllers/admin_fittoscreen.php
@@ -0,0 +1,46 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class Admin_fittoscreen_Controller extends Admin_Controller {
+  public function index() {
+    print $this->_get_view();
+  }
+
+  private function _get_view($form=null) {
+    $view = new Admin_View("admin.html");
+    $view->page_title = t("Fit to Screen parameters");
+
+    $view->content = new View("admin_fittoscreen.html");
+    $view->content->form = (empty($form) ? $this->_get_form() : $form) ;
+
+    return $view;
+  }
+
+  private function _get_form() {
+    $form = new Forge("admin/fittoscreen/save", "", "post", array("id" => "g-admin-form"));
+
+    $form->dropdown("width_unit")->label(t("Image width unit"))->options(array("px"=>"pixel margin","pr"=>"max pourcentage"))->selected(module::get_var("fittoscreen", "width_unit"));
+    $form->input("width")->label(t('width'))->rules("required|valid_numeric|length[1,5]")->value(module::get_var("fittoscreen", "width"));
+    $form->dropdown("height_unit")->label(t("Image height unit"))->options(array("px"=>"pixel margin","pr"=>"max pourcentage"))->selected(module::get_var("fittoscreen", "height_unit"));
+    $form->input("height")->label(t('height'))->rules("required|valid_numeric|length[1,5]")->value(module::get_var("fittoscreen", "height"));
+
+    $form->submit("submit")->value(t("Save"));
+    return $form;
+  }
+
+  public function save(){
+    access::verify_csrf();
+
+    $form = $this->_get_form();
+    if ($form->validate()) {
+      module::set_var("fittoscreen", "width_unit",  $form->width_unit->value);      
+      module::set_var("fittoscreen", "width",  $form->width->value);      
+      module::set_var("fittoscreen", "height_unit",  $form->height_unit->value);      
+      module::set_var("fittoscreen", "height",  $form->height->value);      
+
+    }
+    
+    print $this->_get_view($form);
+  }
+}
+
+?>
diff --git a/3.0/modules/fittoscreen/helpers/fittoscreen_event.php b/3.0/modules/fittoscreen/helpers/fittoscreen_event.php
new file mode 100644
index 00000000..5dbe65f7
--- /dev/null
+++ b/3.0/modules/fittoscreen/helpers/fittoscreen_event.php
@@ -0,0 +1,13 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class fittoscreen_event_Core {
+  static function admin_menu($menu, $theme) {
+    $menu->get("settings_menu")
+      ->append(Menu::factory("link")
+               ->id("fittoscreen_menu")
+               ->label(t("Fit to Screen"))
+               ->url(url::site("admin/fittoscreen")));
+  }
+}
+
+?>
diff --git a/3.0/modules/fittoscreen/helpers/fittoscreen_installer.php b/3.0/modules/fittoscreen/helpers/fittoscreen_installer.php
new file mode 100644
index 00000000..0e4b7ec0
--- /dev/null
+++ b/3.0/modules/fittoscreen/helpers/fittoscreen_installer.php
@@ -0,0 +1,14 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class fittoscreen_installer {
+  static function install() {
+    module::set_var("fittoscreen", "width",  "150");    
+    module::set_var("fittoscreen", "height",  "200");    
+    module::set_version("fittoscreen", 10);
+  }
+
+
+}
+
+?>
+
diff --git a/3.0/modules/fittoscreen/helpers/fittoscreen_theme.php b/3.0/modules/fittoscreen/helpers/fittoscreen_theme.php
new file mode 100644
index 00000000..de804e95
--- /dev/null
+++ b/3.0/modules/fittoscreen/helpers/fittoscreen_theme.php
@@ -0,0 +1,9 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class fittoscreen_theme {
+  static function photo_top($theme) {
+        return new View("fittoscreen_photo.html");
+  }
+}
+
+?>
diff --git a/3.0/modules/fittoscreen/module.info b/3.0/modules/fittoscreen/module.info
new file mode 100644
index 00000000..143fe918
--- /dev/null
+++ b/3.0/modules/fittoscreen/module.info
@@ -0,0 +1,7 @@
+name = "Fit to Screen"
+description = "Dynamicaly resize the photo size to fit the screen.<br />Version 1.0 | By <a href=http://www.bouthors.fr>Matthieu Bouthors</a> | <a href=http://codex.gallery2.org/Gallery3:Modules:fittoscreen>Visit plugin Site</a> | <a href=http://gallery.menalto.com/node/98713>Support</a> | <a href=fittoscreen>Settings</a>"
+version = 10
+author_name = "Matthieu Bouthors"
+author_url = "http://www.bouthors.fr"
+info_url = "http://codex.gallery2.org/Gallery3:Modules:Fittoscreen"
+discuss_url = "http://gallery.menalto.com/forum_module_fittoscreen"
diff --git a/3.0/modules/fittoscreen/views/admin_fittoscreen.html.php b/3.0/modules/fittoscreen/views/admin_fittoscreen.html.php
new file mode 100644
index 00000000..dffd8e8d
--- /dev/null
+++ b/3.0/modules/fittoscreen/views/admin_fittoscreen.html.php
@@ -0,0 +1,7 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="g-block">
+  <h1> <?= t("Fit to Screen parameters") ?> </h1>
+  <div class="g-block-content">
+    <?= $form ?>
+  </div>
+</div>
diff --git a/3.0/modules/fittoscreen/views/fittoscreen_photo.html.php b/3.0/modules/fittoscreen/views/fittoscreen_photo.html.php
new file mode 100644
index 00000000..762a588d
--- /dev/null
+++ b/3.0/modules/fittoscreen/views/fittoscreen_photo.html.php
@@ -0,0 +1,35 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<script type="text/javascript">
+
+function dynresize() {
+ var $maxheight = <?= $item->resize_height ?>;
+ var $maxwidth = <?= $item->resize_width ?>;
+
+ var $ratio = $maxwidth/$maxheight;
+
+ var $winwidth = $(window).width() <?= (module::get_var("fittoscreen", "width_unit")=="pr" ? "*".number_format(module::get_var("fittoscreen", "width")/100,2,".","") : "-".module::get_var("fittoscreen", "width")) ?>;
+ var $winheight = $(window).height() <?= (module::get_var("fittoscreen", "height_unit")=="pr" ? "*".number_format(module::get_var("fittoscreen", "height")/100,2,".","") : "-".module::get_var("fittoscreen", "height")) ?>;
+
+ if (($winwidth/$winheight)<$ratio) {
+    $finalwidth = ($winwidth > $maxwidth ? $maxwidth : $winwidth);
+    $finalheight = $finalwidth / $ratio;
+ }
+else {
+    $finalheight = ($winheight > $maxheight ? $maxheight : $winheight);
+    $finalwidth = $finalheight * $ratio;
+ }
+
+
+// $('body').prepend('<div>' + $finalheight + " " + $finalwidth + '</div>');
+
+ $("img.g-resize").attr({
+                                height: $finalheight,
+                                width: $finalwidth,
+                        });
+
+}
+
+$(window).resize(dynresize);
+$(document).ready(dynresize);
+</script>

From 86952783236cd706b2c81975a86036aec539813d Mon Sep 17 00:00:00 2001
From: bouthors <root@bouthors.fr>
Date: Sat, 15 Oct 2011 15:53:31 +0200
Subject: [PATCH 04/12] updated module info

---
 3.0/modules/fittoscreen/module.info | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/3.0/modules/fittoscreen/module.info b/3.0/modules/fittoscreen/module.info
index 143fe918..39067339 100644
--- a/3.0/modules/fittoscreen/module.info
+++ b/3.0/modules/fittoscreen/module.info
@@ -1,7 +1,7 @@
 name = "Fit to Screen"
-description = "Dynamicaly resize the photo size to fit the screen.<br />Version 1.0 | By <a href=http://www.bouthors.fr>Matthieu Bouthors</a> | <a href=http://codex.gallery2.org/Gallery3:Modules:fittoscreen>Visit plugin Site</a> | <a href=http://gallery.menalto.com/node/98713>Support</a> | <a href=fittoscreen>Settings</a>"
+description = "Dynamicaly resize the photo size to fit the screen.<br />Version 1.0 | By <a href=http://www.bouthors.fr>Matthieu Bouthors</a> | <a href=http://codex.gallery2.org/Gallery3:Modules:fittoscreen>Visit plugin Site</a> | <a href=http://gallery.menalto.com/node/103929>Support</a> | <a href=fittoscreen>Settings</a>"
 version = 10
 author_name = "Matthieu Bouthors"
 author_url = "http://www.bouthors.fr"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:Fittoscreen"
-discuss_url = "http://gallery.menalto.com/forum_module_fittoscreen"
+discuss_url = "http://gallery.menalto.com/node/103929"

From 6bd115f09b5f494026476b4584c9a08981619b55 Mon Sep 17 00:00:00 2001
From: matthew-b-payne <matthew.b.payne@gmail.com>
Date: Wed, 19 Oct 2011 23:23:09 -0300
Subject: [PATCH 05/12] Enabling the GuessContentType plugin is essential for
 webdav clients being about to present image previews.  mime type will now be
 sent back in the response.

http://code.google.com/p/sabredav/wiki/GuessContentType
---
 3.0/modules/webdav/controllers/webdav.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/3.0/modules/webdav/controllers/webdav.php b/3.0/modules/webdav/controllers/webdav.php
index da389d25..829de6ec 100644
--- a/3.0/modules/webdav/controllers/webdav.php
+++ b/3.0/modules/webdav/controllers/webdav.php
@@ -34,6 +34,7 @@ class WebDAV_Controller extends Controller {
     $server->setBaseUri(url::site("webdav/gallery"));
     // $server->addPlugin($lock);
     $server->addPlugin($filter);
+    $server->addPlugin(new Sabre_DAV_Browser_GuessContentType());
 
     if ($this->_authenticate()) {
       $server->exec();

From 233050b44a806dee9ae5a9e126aeea52e9118579 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 24 Oct 2011 19:30:11 -0400
Subject: [PATCH 06/12] Updated for Grey Dragon 3.1.0 support.

---
 .../tag_albums/controllers/tag_albums.php     | 32 +++++++++++++------
 .../tag_albums/controllers/tag_albums.php     | 32 +++++++++++++------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/3.0/modules/tag_albums/controllers/tag_albums.php b/3.0/modules/tag_albums/controllers/tag_albums.php
index 103dbe79..b351d2f6 100644
--- a/3.0/modules/tag_albums/controllers/tag_albums.php
+++ b/3.0/modules/tag_albums/controllers/tag_albums.php
@@ -71,7 +71,11 @@ class tag_albums_Controller extends Controller {
         $index = $this->_get_position($child->$sort_page_field, $child->id, $tag_ids, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, true);
         if ($index) {
           $page = ceil($index / $page_size);
-          url::redirect($str_page_url . "?page=$page");
+          if ($page == 1) {
+            url::redirect($str_page_url);
+          } else {
+            url::redirect($str_page_url . "?page=$page");
+          }
         }
       }
 
@@ -186,7 +190,7 @@ class tag_albums_Controller extends Controller {
       ->where("id", "=", $id)
       ->find_all();
     if (count($album_tags) == 0) {
-      $id = "";
+      $id = 0;
     }
 
     // Inherit permissions, title and description from the album that linked to this page,
@@ -195,7 +199,7 @@ class tag_albums_Controller extends Controller {
     $page_title = module::get_var("tag_albums", "tag_page_title", "All Tags");
     $page_description = "";
     $str_page_url = "";
-    if ($id == "") {
+    if ($id == 0) {
       $album = ORM::factory("item", 1);
       access::required("view", $album);
       $str_page_url = "tag_albums/";
@@ -240,7 +244,11 @@ class tag_albums_Controller extends Controller {
       }
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect("$str_page_url?page=$page");
+        if ($page == 1) {
+          url::redirect("$str_page_url");
+        } else {
+          url::redirect("$str_page_url?page=$page");
+        }
       }
     }
 
@@ -330,7 +338,7 @@ class tag_albums_Controller extends Controller {
     // Set up breadcrumbs.
     $tag_album_breadcrumbs = Array();
     $parent_url = "";
-    if ($id != "") {
+    if ($id > 0) {
       $counter = 0;
       $tag_album_breadcrumbs[$counter++] = new Tag_Albums_Breadcrumb($album->title, "");
       $parent_item = ORM::factory("item", $album->parent_id);
@@ -376,7 +384,7 @@ class tag_albums_Controller extends Controller {
       ->where("id", "=", $album_id)
       ->find_all();
     if (count($album_tags) == 0) {
-      $album_id = "";
+      $album_id = 0;
     }
 
     // Load the current tag.
@@ -399,7 +407,11 @@ class tag_albums_Controller extends Controller {
       $index = $this->_get_position($child->$sort_page_field, $child->id, Array($id), "items." . $sort_page_field, $sort_page_direction, "OR", true);
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect($str_page_url . "?page=$page");
+        if ($page == 1) {
+          url::redirect($str_page_url);
+        } else {
+          url::redirect($str_page_url . "?page=$page");
+        }
       }
     }
 
@@ -454,7 +466,7 @@ class tag_albums_Controller extends Controller {
     // Set up breadcrumbs for the page.
     $tag_album_breadcrumbs = Array();
     $parent_url = "";
-    if ($album_id != "") {
+    if ($album_id > 0) {
       $counter = 0;
       $tag_album_breadcrumbs[$counter++] = new Tag_Albums_Breadcrumb($display_tag->name, "");
       $parent_item = ORM::factory("item", $album_tags[0]->album_id);
@@ -510,7 +522,7 @@ class tag_albums_Controller extends Controller {
       ->where("id", "=", $album_id)
       ->find_all();
     if (count($album_tags) == 0) {
-      $album_id = "";
+      $album_id = 0;
     }
 
     // Load the tag and item, make sure the user has access to the item.
@@ -578,7 +590,7 @@ class tag_albums_Controller extends Controller {
 
     // Set up breadcrumbs
     $tag_album_breadcrumbs = Array();
-    if ($album_id != "") {
+    if ($album_id > 0) {
       $counter = 0;
       $tag_album_breadcrumbs[$counter++] = new Tag_Albums_Breadcrumb($item->title, "");
       if ($album_tags[0]->tags == "*") {
diff --git a/3.1/modules/tag_albums/controllers/tag_albums.php b/3.1/modules/tag_albums/controllers/tag_albums.php
index 103dbe79..b351d2f6 100644
--- a/3.1/modules/tag_albums/controllers/tag_albums.php
+++ b/3.1/modules/tag_albums/controllers/tag_albums.php
@@ -71,7 +71,11 @@ class tag_albums_Controller extends Controller {
         $index = $this->_get_position($child->$sort_page_field, $child->id, $tag_ids, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, true);
         if ($index) {
           $page = ceil($index / $page_size);
-          url::redirect($str_page_url . "?page=$page");
+          if ($page == 1) {
+            url::redirect($str_page_url);
+          } else {
+            url::redirect($str_page_url . "?page=$page");
+          }
         }
       }
 
@@ -186,7 +190,7 @@ class tag_albums_Controller extends Controller {
       ->where("id", "=", $id)
       ->find_all();
     if (count($album_tags) == 0) {
-      $id = "";
+      $id = 0;
     }
 
     // Inherit permissions, title and description from the album that linked to this page,
@@ -195,7 +199,7 @@ class tag_albums_Controller extends Controller {
     $page_title = module::get_var("tag_albums", "tag_page_title", "All Tags");
     $page_description = "";
     $str_page_url = "";
-    if ($id == "") {
+    if ($id == 0) {
       $album = ORM::factory("item", 1);
       access::required("view", $album);
       $str_page_url = "tag_albums/";
@@ -240,7 +244,11 @@ class tag_albums_Controller extends Controller {
       }
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect("$str_page_url?page=$page");
+        if ($page == 1) {
+          url::redirect("$str_page_url");
+        } else {
+          url::redirect("$str_page_url?page=$page");
+        }
       }
     }
 
@@ -330,7 +338,7 @@ class tag_albums_Controller extends Controller {
     // Set up breadcrumbs.
     $tag_album_breadcrumbs = Array();
     $parent_url = "";
-    if ($id != "") {
+    if ($id > 0) {
       $counter = 0;
       $tag_album_breadcrumbs[$counter++] = new Tag_Albums_Breadcrumb($album->title, "");
       $parent_item = ORM::factory("item", $album->parent_id);
@@ -376,7 +384,7 @@ class tag_albums_Controller extends Controller {
       ->where("id", "=", $album_id)
       ->find_all();
     if (count($album_tags) == 0) {
-      $album_id = "";
+      $album_id = 0;
     }
 
     // Load the current tag.
@@ -399,7 +407,11 @@ class tag_albums_Controller extends Controller {
       $index = $this->_get_position($child->$sort_page_field, $child->id, Array($id), "items." . $sort_page_field, $sort_page_direction, "OR", true);
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect($str_page_url . "?page=$page");
+        if ($page == 1) {
+          url::redirect($str_page_url);
+        } else {
+          url::redirect($str_page_url . "?page=$page");
+        }
       }
     }
 
@@ -454,7 +466,7 @@ class tag_albums_Controller extends Controller {
     // Set up breadcrumbs for the page.
     $tag_album_breadcrumbs = Array();
     $parent_url = "";
-    if ($album_id != "") {
+    if ($album_id > 0) {
       $counter = 0;
       $tag_album_breadcrumbs[$counter++] = new Tag_Albums_Breadcrumb($display_tag->name, "");
       $parent_item = ORM::factory("item", $album_tags[0]->album_id);
@@ -510,7 +522,7 @@ class tag_albums_Controller extends Controller {
       ->where("id", "=", $album_id)
       ->find_all();
     if (count($album_tags) == 0) {
-      $album_id = "";
+      $album_id = 0;
     }
 
     // Load the tag and item, make sure the user has access to the item.
@@ -578,7 +590,7 @@ class tag_albums_Controller extends Controller {
 
     // Set up breadcrumbs
     $tag_album_breadcrumbs = Array();
-    if ($album_id != "") {
+    if ($album_id > 0) {
       $counter = 0;
       $tag_album_breadcrumbs[$counter++] = new Tag_Albums_Breadcrumb($item->title, "");
       if ($album_tags[0]->tags == "*") {

From e0ccd97af6088470f5b3a2131a069b61af978bcb Mon Sep 17 00:00:00 2001
From: Jay Deiman <admin@splitstreams.com>
Date: Wed, 2 Nov 2011 11:52:46 -0500
Subject: [PATCH 07/12] Added import fallback of simplejson and removed a debug
 statement

---
 3.0/client/Python/pylibgal3/libg3/G3Items.py  | 11 ++++++++++-
 3.0/client/Python/pylibgal3/libg3/Gallery3.py | 11 +++++++++--
 3.0/client/Python/pylibgal3/libg3/__init__.py |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/3.0/client/Python/pylibgal3/libg3/G3Items.py b/3.0/client/Python/pylibgal3/libg3/G3Items.py
index 0fdae593..ce812551 100644
--- a/3.0/client/Python/pylibgal3/libg3/G3Items.py
+++ b/3.0/client/Python/pylibgal3/libg3/G3Items.py
@@ -22,7 +22,16 @@ __all__ = ['Album' , 'Image' , 'LocalImage' , 'RemoteImage' , 'LocalMovie' ,
     'RemoteMovie' , 'getItemFromResp' , 'getItemsFromResp']
 
 from datetime import datetime
-import json , weakref , types , os , mimetypes , re
+import weakref , types , os , mimetypes , re
+try:
+    import json
+except:
+    try:
+        import simplejson
+    except ImportError , e:
+        raise ImportError('You must have either the "json" or "simplejson"'
+            'library installed!')
+
 
 class BaseRemote(object):
     def __init__(self , respObj , weakGalObj , weakParent=None):
diff --git a/3.0/client/Python/pylibgal3/libg3/Gallery3.py b/3.0/client/Python/pylibgal3/libg3/Gallery3.py
index 6345c1a8..13409c8a 100644
--- a/3.0/client/Python/pylibgal3/libg3/Gallery3.py
+++ b/3.0/client/Python/pylibgal3/libg3/Gallery3.py
@@ -26,7 +26,15 @@ from G3Items import getItemFromResp , getItemsFromResp , BaseRemote , Album , \
     RemoteImage , Tag
 from urllib import quote , urlencode
 from uuid import uuid4
-import urllib2 , os , json
+import urllib2 , os
+try:
+    import json
+except:
+    try:
+        import simplejson
+    except ImportError , e:
+        raise ImportError('You must have either the "json" or "simplejson"'
+            'library installed!')
 
 class Gallery3(object):
     """
@@ -129,7 +137,6 @@ class Gallery3(object):
         uri(str) : The uri string defining the resource on the defined host
         """
         url = self._buildUrl(uri , kwargs)
-        print url
         return self.getRespFromUrl(url)
 
     def addAlbum(self , parent , albumName , title , description=''):
diff --git a/3.0/client/Python/pylibgal3/libg3/__init__.py b/3.0/client/Python/pylibgal3/libg3/__init__.py
index eec91668..3805ff18 100644
--- a/3.0/client/Python/pylibgal3/libg3/__init__.py
+++ b/3.0/client/Python/pylibgal3/libg3/__init__.py
@@ -21,4 +21,4 @@
 from G3Items import *
 from Gallery3 import *
 
-__version__ = '0.1.4'
+__version__ = '0.1.5'

From 8a784dd79c8a91fca239305aabb6a5ec58a1691f Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Tue, 8 Nov 2011 11:24:21 +0100
Subject: [PATCH 08/12] Squashed '3.0/themes/pear4gallery3/' changes from
 98195b4..5da2cba

5da2cba Version 2.5 * Support for elastic thumb-margins. * Support for videos.
20a4d37 Elastic padding around thumbs.
4b07153 Fix for carousel view via settings (and iron out some other bugs).
ab1cd0a Fix for carousel view via hash.
88b1fcd Video support.
99e46d8 Disabled console..
f148b5a Fix for 'View at smallest/largest photo size' both give 'Err on page' (Error line 53, Char: 15910, 'undefined' is null or not an object)
342e592 Escaping characters in title (for images).
3613146 version up
bb7c321 Edited views/album.html.php via GitHub
293feae Fix for overflowing height.
067b764 Support for photo view count, including redirects.
77c42a1 Limit of n:o thumbs to show when skimming. Support for exif data from detailview (no longer links to the photo page), breaks the view count.

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: 5da2cba5ac98a199c1cf1b614fc1c5978834ec24
---
 admin/controllers/admin_theme_options.php |   2 +-
 css/pear.css                              |   8 +-
 icons/movie.png                           | Bin 0 -> 4158 bytes
 icons/pear.css                            |  28 ++++--
 js/pear.js                                | 102 ++++++++++++----------
 theme.info                                |   2 +-
 views/album.html.php                      |  23 +++--
 views/hoverView.html.php                  |   4 +-
 views/movie.html.php                      |   7 +-
 views/page.html.php                       |   8 +-
 10 files changed, 111 insertions(+), 73 deletions(-)
 create mode 100644 icons/movie.png

diff --git a/admin/controllers/admin_theme_options.php b/admin/controllers/admin_theme_options.php
index 999334f1..cd784e24 100644
--- a/admin/controllers/admin_theme_options.php
+++ b/admin/controllers/admin_theme_options.php
@@ -87,7 +87,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
       ->checked(module::get_var("th_pear4gallery3", "hide_logo"));
     $group->dropdown("mainmenu_view")
       ->label(t("Main page View"))
-      ->options(array("grid" => t("Grid (Default)"), "mosaic" => t("Mosaic")))
+      ->options(array("grid" => t("Grid (Default)"), "mosaic" => t("Mosaic"), "carousel" => t("Carousel")))
       ->selected(module::get_var("th_pear4gallery3", "mainmenu_view"));
     $group->checkbox("show_guest_menu")
       ->label(t("Show Main Menu for Guest Users"))
diff --git a/css/pear.css b/css/pear.css
index 475a0757..2be381c2 100644
--- a/css/pear.css
+++ b/css/pear.css
@@ -1,8 +1,6 @@
 .gallery-thumb {
 	float: left;
-	margin-bottom: 5px;
-	margin-left: 5px;
-	margin-right: 5px;
+	padding: 3px 5px 7px 5px;
 	position: relative;
 	text-align: center;
 	cursor: pointer;
@@ -40,9 +38,11 @@ th, td {
 .giTitle {
 	font-size: 1.1em;
 	font-weight: bold;
-	margin: 3px 10px !important;
+	margin: 0.3em 3px !important;
 	padding: 0 0; 
 	text-align: left;
+	height: 1.2em;
+	overflow: hidden;
 }
 
 #gsNavBar div {
diff --git a/icons/movie.png b/icons/movie.png
new file mode 100644
index 0000000000000000000000000000000000000000..97793bb71abe1aa6d46fde68256d247e25b09842
GIT binary patch
literal 4158
zcmV-E5W(+>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000WZX+uL$Nkc;*
zP;zf(X>4Tx0C)kdmkBsj>mSEohOv)Hq7flvvXq@xTXxyWR$=Th_ARnp*<~kdwicqu
z&ZVq{lqIytjY5UE$S!lwA*I{x-ur+4_slcT`JVT@?>lGC=X{>uc>$mWrjCww!~g($
zysNX8f()C!fgu~&b3g?cppO_3H^sR)N^5ASLS25cE%XB-_|#K=c&_=lie3TBqwVNN
zmByHYX{w(L+G?h8hJFwLA~vXj-fA<8z}ajwE5g~s)zKB|V+?1UwW&Fj9ihzUtfM6h
z<#Z^ctTuBYoXs|KEu7tPR`A#k0FZQea~nJWWJ6FsVQ%4qgHE#n06cMy&QKpzGL)t4
z?H!=`QO}`_h3^Hlhqkj!0EoE(Kq>L9%}ED<yAA+g-hXT3wgzCg7yw12-`eIhHtr7*
z!#x*EVWExbh^VCjARQzS=CIK9!~yU*hCo=&ArL<20)Q9*pxzVb=Ip-F7rJ<2VF3Q=
zc=LaL8G(R+z)<yw<cKlEfe2<2QBo{vIZ_4rj?9PrAcZrf85KEIF|`p58BH0g5zUT%
zx+9EEmTqll75y-SIKwhy&2C?e9206!Eb~<so4w+!B&=O*S?rA*a-6$4$GPhFU*X1M
zEqE|IE4+Ptclo0Z+8weM<QAe4nilR6DHlx<^A(Rdta?QFDAO^LV^hapoM@ITl3JFD
zko7ugEvGN9q;Ob~Pl-htt#VIw<<zv=i28s=k7k=zqxP@5yYz}r7wF$G$T7?`N;6J5
zlYBPmT#`wWX_DDv^Hhs;%S@{r>l-$=Y>Up9*;U)u<69j%9iKV9c7E?N<GSij>VfuT
z_QGBe@s{>cyJ+ld>*wVk8j$=;USQRwwxEIFk0DK=s$rbr;t?v5CYN2K!lScdDq=h0
z-o~#a(k1a+kxe#EaZ8O(%TI64cztyxiy>P$M?Kf>TG;iQH(GAK%}3nYS0G(zdOP4w
zPEk|wXbH0PK$%K8z9O!&ylS<EP|H!Lc+dWRe0_Dp>n3C~e~a#eix022K51Kc#M+_s
z1k;(()!IGxl%*Hdd#x|4zvJ2Ri~TRP2LfId4GzAh9y&T~^CsnO+sO22$e6*q@b|SJ
zrY1-yu1*GiteE;R9rU~U%#oSi*~z)EPdf9G^Dh_X7h{(AmL4uYS@B!lvs$^Py*B+h
zavi(gLNFr`zVMeuNRZHy#QzKaGC$#Oy^a6LFZ`3Z?XmI)*mzpM@>dby6{HrN5_S+N
z6HSKr<0MoL3mw56MI4<x_Uw3*B%4&abhwPCtmVnma*Fa23OtI;O0>!d<wccA)i-LE
z>fIWxn)O;W+GRR-bo2DCozB!xH%Kw;HBLH{csAi&qDcbu1YE(Tm}gjITIO2av@WzM
zv8_CR&#uM(F}~Mf&~eOZ+Ih(p;f8W&^5F6m@;Y%r)!Wd=`l5$#uwSD8jezoB9t1wW
zR2d`{j0#~76$w)cKNH~`8G1P*sx-PiW;k{!9-V+q7*BLha=H?cd_AQ;bs%jqgYN2~
zOqDF_?BJZ-+{SA|*9kZG<{i&JbIZ3Nv#|d5a1o-I>#kzS`O>JelJfqFl`7V1*&3T)
zqiW0Q2JXu@@HA>Rc{OLZv_F__-P0!5j(?Q=xc13(7p7aT$LVQCZ(HBOGmhsPFMMAX
z4h#%Z{3h|*YA9*=!JCB<?opP}im~c<6Caqz)h9$JIw!}b5K|e`{=b*c*v+!c?VGFp
zR5$OkfL-KSY+349zPNH^Rdlsy4gZ;GoqN5RU`kkr`0IZ0ABBh`;U*~~RVE!pdXw>y
zJ5iWWA}Ncg45>+}OKB`odr@7q!DuP;%8m*;mz}~p=jkhUU0{%Aq-5;gor1wJ2{IA(
zJYr5|vD<rsm5z0Ut(rY%pB0BBCx&yD>+$}4?qIC>0a+dnUJ~9hzE=K%gVBfF1Pldb
zgs{SB;boC<5rSxy*fsGO3BSX3M~sfD96NTL?|8upE=gj^1*viA*D`&w9VeUQYUD4-
zFDP77ysDI<oS+h;dihkCT8MhEhPB2!%|NX{?MpgAx*>WIr!VWr8YCK~8hIOiHZC|*
za<=+hgGrldkJ$ij)O_0FwxzHY+M30N$5#BjoSnA48Q#gk-!aB1*cs*A=+f&t=C<TP
z?aAsTd_mFM*vI*zpD(3vsb9PQaKLilj!OrEWP*)C+(M(nZiTl*ltfBhW{eVv){Mc&
zM#kNWZ%ufYguKF)ESF-D8j_Zm-j*?*Nu6~lTPw#sH|1L0_2HYyJl=eb0+qt_+f8>q
z6r=A-l$ex;mKB%3s61WGSEKi<f9<WhzWb^Te2w}|mzs-P)?2CCB-$+>#dkD5+1tg|
zt={AN^iJ<@{o2o^UO2tX9q1cGLQlo{Ve2>DBc!8;$L!x_zwaNXoRFM!`&ckF{JYAm
z+Fa15+WAk5yi2&{^p)N<n$Pm<66<}0SpYWc9b6NTP)&;84;2Ih=*tU0bU0Mrpmv5l
z05oU-&^Zi<1#$r~GZqk)3WKfsK?D%cn*bVm6W{{k;1n<b79ap*f(9@OmWZf`M2Sp^
zVu%`uUJ}g{^AejAXA-|6UPCY=&LMIU<0K*^ek3<Y9+R?=I+8Xc_aI%7*~m^ZezHii
zDRM3HD)I>mHi~eH1xj<uJ}L#OTB=2AA?gB}{WLi!c2qVkCv86MB>E7#YKQEOPP#L6
zQ#<|XchMKnFYc1vHOSz_$jDf+TYvW&CYwo-DT8TdPdc*_^AbzmUL#go))uyl?BeXR
z`-(XnI6656IOn)3_xp0oW6{`G2l9Emc$N8>`DXYZ9?UxAC7>%PEJP<XC)_7eEt(}3
zBJLz%d|2s-#8K=qrsJp+h!d-lpQNUw$7SB1{2(_eKcldyNKmFwp;u);C7>pyuBBnA
z>8%x~U7*vVJFG|0-)kUgXlfJ$J(oRaS53G~waol*Mdm}6bXE%1J~m~xAMLRA=J*_k
zVW)l07B2a&)9zv(ex7X?c6sA`N-i4uBK&my^8*NhdY6iVDMBnl8^hTn0wUi=DMS~>
z(#3hlk0fd&)n0K)=1oaUqfYnB_>^gzW0>1_UGqj~o?8Bs0?oqSJBCF=cWp{$%X}-S
zDpRTt)YQ}s-}h)hHQsENZW(ODwAXYPJtlN3_ssOmJ)0R&dqo&Be}fqfeZMwdJta0%
zJukD=wPvwVKVbgIjd#KShJPn={Tu%;^!c~=|B1dOZT^q+zp}U7M*n;Ew%h6dH|%Bq
zf&Kqa{zvX%PJcxn=ANp(MLuizpV`-*svF*7|IoV)1GDeU?V0IK>z8|xIiU92-68Y0
zU0d|07w3Ey$-m<duLORezs>!x=6~n?cI&q}|Gn{FiEr4xoi=RxSJoSzLzaKf8FqZb
z@IN#DE4zQ@_NLiC^8Gur|97vq(Ix(w*9obx+26drdMDHN8{eBzf3ll@yWbFF#_f*7
zoZD+2g>SNkO^0ben}K=1BEZDoVBU6(6pn_zlZLIIbe|HNUYx0(^O=`{>93@&3&Q?y
zu94vS0VtJl4tN<m2i*CML%0Pf0UU4ucpwAppgj(3ocgij)_{M%ceU_@)?)z3Iyibc
z+gMq<vPnZLOA9t7JnkSLn~;Ej#NW@gxrT%LAkhG%OTwu(mKxrDxBUSu=JKwsi~kq^
z00lNlL_t(o3B^}mNMuzQKj+?=>x|>*j3e7Djnac6=7K4{OG3~~QVL5X;`-D}e+XJo
zVYPaSpeO0UUZOw?p$z&XBrX_jJ%m0)8A4B{n=EVY%rwr-oqOl@`%QZ<ckcY%TIhox
z_uO;7^L@YbecwIjTp|8vkq_eEvaBKKKMjllLEs9I0e%C{ft$b=Qp#gIo06so!0}aB
zdkyGq%IZHv-T;wb8|f?c6w>MRrDC!883?=w^a7$uj6?5R(=^}O*w|3(`KTFzd_F(m
z_xsl|IZ@9*6Jy_}QmJc^NQ5b>kg5c-*=&!dY2QFQRx#sWbRZf(9v&V(J2*I~d#6_r
zI6FIQhkS|r4S1FR<NGH*pYLU_jfxt8^H&-=x2#qesvz$*?s<Q{P$)d*=@VrHGMUU}
zD7@IH(9)??OVKc5R<YRHNY_0M+l$_!EF*vry@Uw?_oQlVA*Fb3YDyd&90YUOY`B_E
zjlL@r6BFD=94RA!NmKajL?bZv!Il;=J3A|H?(Aq6nM@ROl}7V84td7$j)p@Zm&^6z
zz3HkC1Og%)4vUqQ6}h~;tol{8Q&kk!Mk5(_D>wwOX$;f|TgB$X6ljP*TU(px=;#o)
zPfo<OxjFIs(NWOQ^+qX)-mkS14~GCMKhZP+OvNT8T7y9m3WWr|9HD^J!oq_5?$#|W
zpUW{N6~tYAm+UC`>;|4H6`B>FstRmYf~nw>`Nbl{>guXA4MQ0l8w*QSO;@w0C`!QY
zcL>0F_CW~H84Nk#J0r2UxM;=WaUBEcTJ}JeCum6=0)}B6(O^@8NEHFYGzI1f6rV_R
zcZ=7rUl*vQY{4)tYB{HU=$zPo+ys7RUYiw!S?Kw^$oYI?W@g4385t?&^7$kjm%g=H
zb`Ys!_rc^WITni@V^YKOn}%5_d0iJOoG&dc(YbC(dEUr*X|82$^J$AifE_UKsXb8l
ziSXmN79X##i|(GDESy&@wrVyI{xx@h*@1F;dKyAi|9~*@OsFYFp%B4mCl#MB38lIr
zcN@V1w-Npq+<j#PIB<S`J_p<HxRoAK8)aiW+11rmmgce)&`~rR{QykAdPq*)W|q9p
zIauw!CUJAw?(OXz$9NoMB)(gPPr_}{+rF>EL&?!)A6EV$iu`S_KHt3r=s?-r+@yi8
zhlhuUR8@V91OOF=e7IC-C_oKuKiVa*pYJFz6(CuHMJ<!b<ok(4;!W7Kw^{p1{}s0y
zri6Qg9|uhc2Tf#cZSB>*zP_udiy$199MJ(MyG2oCQBhO_giY)x21wrB+uM70dV2bE
z+%dWH<$wafqIF1kLuwPyaL9zPGe$7EYjkw<@%j1r+5Z0iA?*7BOp>tRo?8S#3;IQz
zbjkhw{hb>(7CyRt`_753>%0xy1b8Vm0Y}_M*hvC}#t0y+VHk}ftdGFKqiA<ePEJ07
zji)Ev-X6RhkGFzg0Zucx%%1P=?*6j1we=I&{DH!`gZY2LRtmTPvVZ~9B|t(Xz&$z8
z3PDiY4b_OC1|lfKm}OcK%QS<Cqg_A9hhj)o=2R(D*p%*}4DK0<nH0LteS*#z{yaeE
zW&4J67GQwF+z?dMkxQvtI==!F$Rqa*<y~AxHCQ1@62_-dG+<W8^0Mgo3s341Ts0k6
z<Q{z`@uq;Cb`%&1wX?HRW98#Ftp)Ev4R;}3=p@bvP{$@rCj?hZFyD3`SItFHw@j)L
zpaT2tF`JM-Dx!Wv7{0Vf)47`f9WcLiNJnfFc0|j<j($h}2F$645b{aQiU0rr07*qo
IM6N<$f>yZ*c>n+a

literal 0
HcmV?d00001

diff --git a/icons/pear.css b/icons/pear.css
index 1cb9cc07..fe2bac04 100644
--- a/icons/pear.css
+++ b/icons/pear.css
@@ -1,6 +1,17 @@
 .gallery-thumb-round {
 	background: url('rounded.png') no-repeat scroll left top;
 	position: absolute;
+	height: 200px;
+	width: 200px;
+}
+
+.p-video{
+	background: url('movie.png') no-repeat center;
+	position: absolute;
+	width: 200px;
+	height: 200px;
+	left: 0px;
+	top: 0px;
 }
 
 .skimm_div {
@@ -57,9 +68,9 @@ height:40px;
 
 #logoButton {
 	display: block;
-	z-index: 1000;
+	z-index: 100;
 background: transparent url('pear_logo_sml.png') no-repeat center left;
-width: 83px;
+width: 30px;
 height: 40px;
 border: 0px;
 padding: 0px;
@@ -84,7 +95,7 @@ background: transparent url('pear_logo_sml.png') no-repeat center left;
 	padding: 0px 0px;
 	width: auto;
 	float: right;
-	z-index: 10000;
+	z-index: 100;
 	font-size: 12px;
 	top: 11px;
 }
@@ -203,7 +214,7 @@ top: 10px;
 height: 3px;
 width: 154px;
 float: right;
-z-index: 10000;
+z-index: 100;
 }
 
 .sliderView .smaller {	
@@ -301,11 +312,11 @@ cursor: default;
 #viewControls {
 position: relative;
 color: #616161;
-width: 381px;
+width: 334px;
 float: left;
 			 margin-left: 30px;
 			 margin-top: 13px;
-			 z-index: 8000;
+			 z-index: 800;
 			 font-size: 12px;
 			 text-shadow:  #111111 0px -1px 1px;
 }
@@ -400,8 +411,9 @@ background: url('slideshow_active.png') center left no-repeat;
 	top: 0;
 	width: 100%;
 	height: 100%;
-    z-index: 99999;
+	z-index: 999;
 	background-color: #000000;
+	display: none;
 }
 
 #detailView .iMovieVideo {
@@ -535,7 +547,7 @@ background: url('slideshow_active.png') center left no-repeat;
 	bottom: 30px;
 	width: 99%;
 	text-align: center;
-	z-index: 99999;
+	z-index: 999;
 }
 
 #hoverView #hoverViewMenu {
diff --git a/js/pear.js b/js/pear.js
index 6e9c2412..30381456 100644
--- a/js/pear.js
+++ b/js/pear.js
@@ -5,9 +5,8 @@ var detailViewMode=false;
 var savedHeight = 0;
 var savedWidth = 0;
 
-$(window).resize(function (e) {
-	if (window.innerHeight == savedHeight && 
-		window.innerWidth == savedWidth) { e.stop(); }
+$(window).resize(function () {
+	if (window.innerHeight == savedHeight && window.innerWidth == savedWidth) return; 
 	savedHeight = window.innerHeight;
 	savedWidth = window.innerWidth;
 	mosaicResize();
@@ -24,7 +23,7 @@ function swatchSkin(intSkin){
 		case 'dkgrey' :
 		case 1 :
 			$('div.gallery-thumb-round').css('backgroundPosition' , "-200px 0px");
-			$('#mosaicTable').css('backgroundColor' , "#262626");
+			$('#mosaicTable,.pear').css('backgroundColor' , "#262626");
 			$('p.giTitle').css("color", "#a9a9a9");
 			$("#dkgrey").addClass("dkgrey sel dkgrey-with-sel-with-swatch");
 			bgcolor="dkgrey";
@@ -33,7 +32,7 @@ function swatchSkin(intSkin){
 		case 'ltgrey' :
 		case 2 :
 			$('div.gallery-thumb-round').css('backgroundPosition' , "-400px 0px");
-			$('#mosaicTable').css('backgroundColor' , "#d9d9d9");
+			$('#mosaicTable,.pear').css('backgroundColor' , "#d9d9d9");
 			$('p.giTitle').css("color", "#333333");
 			$("#ltgrey").addClass("ltgrey sel ltgrey-with-sel-with-swatch");
 			bgcolor="ltgrey";
@@ -42,7 +41,7 @@ function swatchSkin(intSkin){
 		case 'white' :
 		case 3 :
 			$('div.gallery-thumb-round').css('backgroundPosition' , "-600px 0px");
-			$('#mosaicTable').css('backgroundColor' , "#ffffff");
+			$('#mosaicTable,.pear').css('backgroundColor' , "#ffffff");
 			$('p.giTitle').css("color", "#444444");
 			$("#white").addClass("white sel white-with-sel-with-swatch");
 			bgcolor="white";
@@ -52,7 +51,7 @@ function swatchSkin(intSkin){
 		case 0 :
 		default:
 			$('div.gallery-thumb-round').css('backgroundPosition' , "0px 0px");
-			$('#mosaicTable').css('backgroundColor' , "#000");
+			$('#mosaicTable,.pear').css('backgroundColor' , "#000");
 			$('p.giTitle').css("color", "#a3a3a3");
 			$("#black").addClass("black sel black-with-sel-with-swatch");
 			bgcolor="black";
@@ -66,14 +65,16 @@ function scaleIt(v,sliding){
 
 	// Remap the 0-1 scale to fit the desired range
 	//v=.26+(v*(1.0-.26));
-	size = (mosaicView) ? v/2 : v;
+	var size = (mosaicView) ? v/2 : v;
 
 	toggleReflex(true);
 	$(".p-photo").each(function (i) {
 		$(this).attr({height: size+'px',width: size + 'px'});
 		$(this).css({height: size+'px',width: size+'px'});});
+	$(".g-photo").css({width: size+'px'});
 	if(!mosaicView && !sliding)
 		toggleReflex(false);
+	thumbPadding();
 }
 function setCookie(c_name,value,expiredays)
 {
@@ -148,14 +149,16 @@ function swatchImg(imageId)
 	if( detailViewMode )
 	{
 		//Image count.
-		$.get(slideshowImages[currentImg][1]);
+		$.get(slideshowImages[currentImg][6]);
 	}
 	updateHash();
+	$('#info_detail').attr('href', slideshowImages[currentImg][1]);
 }
 
-function updateHash()
+function updateHash(viewMode)
 {
-	viewMode = detailViewMode ? "detail" : (mosaicView ? "mosaic" : "grid");
+	if(typeof viewMode == 'undefined')
+		viewMode = detailViewMode ? "detail" : (mosaicView ? "mosaic" : "grid");
 	hash = "#img=" + currentImg + "&viewMode=" + viewMode + "&bgcolor=" + bgcolor;
 	window.location.hash = hash;
 }
@@ -185,8 +188,6 @@ function mosaicResize()
 		myWidth = document.body.clientWidth;
 		myHeight = document.body.clientHeight;
 	}
-	if($('#pearImageFlow').length != 0)
-		$('#pearImageFlow').css({'height' : (myHeight-87)+'px', 'width': myWidth+'px', 'minHeight': ((myHeight-70)*0.9)+'px'});
 	if($('#imageflow').length != 0)
 		$('#imageflow').css({'height': (myHeight-53)+'px', 'width': (((myWidth*0.5)<(myHeight-53)) ? myWidth : ((myHeight-65)*2)) +'px'});
 	$('#detailImageView').css({'height': myHeight-165+"px"});
@@ -195,8 +196,13 @@ function mosaicResize()
 		$('#img_detail').css({'height': iHeight+"px", 'width':iWidth+"px"});
 
 	myWidth=myWidth-7;
+	myHeight = myHeight - $('#g-site-status').outerHeight(true);
+	$('#pearFlowPadd').css({'height' : myHeight-90-(Math.round(myWidth / 2.4))+'px'});
 	($('#paginator').length != 0) ? myHeight-=165: myHeight-=138;
+	$('#g-header').css('top', $('#gsNavBar').outerHeight(true)+$('#g-site-status').outerHeight(true)-4);
 
+	if($('#g-movie').length) 
+		myHeight+=18;
 	if ( !mosaicView )
 	{
 		$('#mosaicGridContainer').css({'height': (myHeight+33)+"px", 'width': myWidth+"px"});
@@ -211,20 +217,28 @@ function mosaicResize()
 		(iRatio>(myWidth/myHeight)) ? $('#mosaicImg').attr({height: myWidth/iRatio,width: myWidth}) : $('#mosaicImg').attr({height: myHeight,width: myHeight*iRatio});
 		if(iHeight<myHeight&&iWidth<myWidth) $('#mosaicImg').attr({height:iHeight, width:iWidth});
 	}
+	thumbPadding();
+
 	if($('#conf_imageflow').length) refresh();
 }
+function thumbPadding() {
+/* Padding on thumbs to make them flow nicer */
+	var size = Math.ceil((mosaicView) ? $('#imgSlider').slider('value')/2 : $('#imgSlider').slider('value'))+10;
+	var width =$('#mosaicGridContainer').innerWidth()-15;
+	var margin = width/Math.floor(width/size)-size;
+	console.log(size, width, margin,"px" );
+	$('.gallery-thumb').css({'margin-left': Math.ceil(margin/2) + 'px', 'margin-right': Math.floor(margin/2) + 'px'});
+}
 
 function bodyLoad(viewMode, bgcolor) {
 	/* Parse hash */
 	hash = window.location.hash;
 	var h = $.parseQuery(hash.substring(1));
 	if(h.img != undefined)
-		currentImg = h.img;
+		currentImg = parseInt(h.img);
 	if(h.bgcolor != undefined)
 		swatchSkin(h.bgcolor);
-	if(h.viewMode == 'detail')
-		focusImage(currentImg);
-	else
+	if(h.viewMode != undefined)
 		viewMode = h.viewMode;
 	/* end parse hash */
 	
@@ -250,16 +264,23 @@ function bodyLoad(viewMode, bgcolor) {
 	if (co==null || co=="")
 		swatchSkin(bgcolor);
 
+if(typeof slideshowImages != 'undefined')
 	if(!slideshowImages.length) 
 		viewMode='grid';
 
 	switch (viewMode) {
+		case 'carousel':
+			startImageFlow();
+			break;
 		case 'grid':
 			switchToGrid();
 			break;
 		case 'mosaic':
 			switchToMosaic();
 			break;
+		case 'detail':
+			focusImage(currentImg, h.redirected);
+			break;
 		default:
 			mosaicResize();
 			checkCookie();
@@ -272,7 +293,7 @@ function bodyLoad(viewMode, bgcolor) {
 function switchToGrid()
 {
 	toggleReflex(true);
-	$('#pearImageFlow').hide();
+	$('#pearImageFlow,#pearFlowPadd').hide();
 	$('#mosaicTable').show();
 	if(!$('#mosaicGridContainer').length) return;
 	mosaicView=false;
@@ -283,13 +304,12 @@ function switchToGrid()
 	$('p.giTitle,div.giInfo').each(function(s){$(this).show();});
 	switchMode('grid');
 	mosaicResize();
-	updateHash();
 }
 
 function switchToMosaic()
 {
 	toggleReflex(false);
-	$('#pearImageFlow').hide(); //.hide(); 
+	$('#pearImageFlow,#pearFlowPadd').hide();
 	$('#mosaicTable').show();
 	if(!$('#mosaicGridContainer').length) return;
 	mosaicView=true;
@@ -341,7 +361,7 @@ function togglePlayPause()
 		slideShow=null;
 	}
 }
-function focusImage(id)
+function focusImage(id, redirected)
 {
 	currentImg=id;
 	$('#imageTitleLabel').html("<h2>"+slideshowImages[id][4]+"</h2>");
@@ -350,45 +370,34 @@ function focusImage(id)
 	swatchImg(id);
 	$('#detailView').fadeIn('slow');
 	hideHoverV = setTimeout("hideHoverView()",3000);
-	//Image count.
 	detailViewMode=true;
 	updateHash();
-	$.get(slideshowImages[currentImg][1]);
+	//Image count.
+	if(!redirected)
+		$.get(slideshowImages[currentImg][6]);
+	$('#info_detail').attr('href', slideshowImages[currentImg][1]);
 }
 var pearCarousel;
 function startImageFlow()
 {
 	$('#mosaicTable').hide();
 
-	$('#pearImageFlow').show();
+	$('#pearImageFlow,#pearFlowPadd').show();
 
 	toggleReflex(true);
 
-	for (var i = 0; i < slideshowImages.length; i++) {
-		var img = '<div class="item"><img class="content" src="'+slideshowImages[i][0]+'"/><div class="caption">'+$('#mosaicGridContainer img').eq(i).attr('alt')+'"</div></div>';
-		var img = '<img src="'+slideshowImages[i][0]+'" longdesc="'+i+'" width="'+slideshowImages[i][2]+'" height="'+slideshowImages[i][3]+'" alt="'+slideshowImages[i][4]+'" style="display: none;">';
-		console.log(img);
-		$('#pearImageFlow').append(img); 
-	}
 	if(!pearCarousel){
-	pearCarousel = new ImageFlow();
-	pearCarousel.init({ImageFlowID: 'pearImageFlow', aspectRatio: 2.4, imagesHeight: 0.6, opacity: true, reflections: false, startID: currentImg, onClick: function() {focusImage($(this).attr('longdesc'));}, startAnimation: true, xStep: 200, imageFocusM: 1.7, imageFocusMax: 4, opacityArray: [10, 9, 6, 2], percentOther: 130, captions: false, slider: false});
+		for (var i = 0; i < slideshowImages.length; i++) {
+			var img = '<div class="item"><img class="content" src="'+slideshowImages[i][0]+'"/><div class="caption">'+$('#mosaicGridContainer img').eq(i).attr('alt')+'"</div></div>';
+			var img = '<img src="'+slideshowImages[i][0]+'" longdesc="'+i+'" width="'+slideshowImages[i][2]+'" height="'+slideshowImages[i][3]+'" alt="'+slideshowImages[i][4]+'" style="display: none;">';
+	//		console.log(img);
+			$('#pearImageFlow').append(img); 
+		}
+		pearCarousel = new ImageFlow();
+		pearCarousel.init({ImageFlowID: 'pearImageFlow', aspectRatio: 2.4, imagesHeight: 0.6, opacity: true, reflections: false, startID: currentImg, onClick: function() {focusImage($(this).attr('longdesc'));}, startAnimation: true, xStep: 200, imageFocusM: 1.7, imageFocusMax: 4, opacityArray: [10, 9, 6, 2], percentOther: 130, captions: false, slider: false});
 	}
-/*
-	current=(currentImg)*-xstep;
-	caption_id=currentImg;
-	refresh(true);
-
-	iShow(conf_images);
-	iShow(conf_scrollbar);
-	initMouseWheel();
-	initMouseDrag();
-	mosaicResize();
-
-	moveTo(current);
-	glideTo(current, caption_id);
-*/
 	switchMode('carousel');
+	mosaicResize();
 }
 function setKeys()
 {
@@ -431,6 +440,7 @@ var hovering=false;
 function switchMode(mode){
 	$('#mosaic,#grid,#carousel').removeClass("sel sel-with-viewSwitcher");
 	$('#'+mode).addClass("sel sel-with-viewSwitcher");
+	updateHash(mode);
 }
 
 function preFetch()
diff --git a/theme.info b/theme.info
index ee4e256c..00af05f4 100644
--- a/theme.info
+++ b/theme.info
@@ -1,6 +1,6 @@
 name = ".Pear Theme"
 description = "A theme with the intention to mimic Apples mobile me gallery."
-version = 2.1
+version = 2.5
 author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
 site = 1
 admin = 0
diff --git a/views/album.html.php b/views/album.html.php
index 68f13a47..237fc3fd 100644
--- a/views/album.html.php
+++ b/views/album.html.php
@@ -30,20 +30,27 @@ $(function() {
     <? if ($child->is_photo()): ?>
       <? $img_class = "g-thumbnail p-photo"; ?>
     <? endif ?>
+    <? if ($child->is_movie()): ?>
+      <a href="<?= $child->url() ?>">
+    <? endif ?>
   <div id="g-thumb-id-<?= $child->id ?>" class="g-item gallery-thumb <?= $item_class ?>" title="<?= $child->description?>">
     <?= $theme->thumb_top($child) ?>
-    <? if ($child->is_album()): ?>
-		<div class="gallery-thumb-round" style="height: 200px; width: 200px;"></div>
+    <? if ($child->is_album() || $child->is_movie()): ?>
+		<div class="gallery-thumb-round"></div>
     <? endif ?>
       <? if ($child->has_thumb()): ?>
 		<?= $child->thumb_img(array("class" => $img_class, "id" => "thumb_$child->id", "style" => "width: 200px; height 200px;")) ?>
+    <? if ($child->is_movie()): ?>
+      <span class="p-video"></span>
+    <? endif ?>
       <? endif ?>
 <?// Begin skimming 
 if($child->is_album()):
 	$granchildren = $child->viewable()->children();
 	$offset = 0;
-	$step = round(200/count($granchildren));
+	$step = round(200/min(count($granchildren),50));
 	foreach ($granchildren as $i => $granchild):?>
+      <? if(++$i > 50) break; ?>
       <? if ($granchild->has_thumb()): ?>
       <?= $granchild->thumb_img(array("style" => "display: none;")) ?>
 	<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i?>;" id="area_<?=$granchild->id?>"></div>
@@ -52,9 +59,12 @@ if($child->is_album()):
 endforeach; 
 endif; 
 // End skimming // ?>
-	<p class="giTitle <? if(!$child->is_album()) print 'center';?>"><?= html::purify($child->title) ?> </p>
+	<p class="giTitle <? if(!$child->is_album()) print 'center';?>"><?= html::purify(text::limit_chars($child->title, 20)) ?> </p>
 	<? if($child->is_album()): ?><div class="giInfo"><?= count($granchildren)?> photos</div><? endif ?>
 </div>
+    <? if ($child->is_movie()): ?>
+      </a>
+    <? endif ?>
    <?/* <?= $theme->thumb_bottom($child) ?>
     <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
     <h2><span class="<?= $item_class ?>"></span>
@@ -68,7 +78,7 @@ endif;
   var slideshowImages = new Array();
 <? foreach ($children as $i => $child): ?>
 <? if(!($child->is_album() || $child->is_movie())): ?>
-    slideshowImages.push(['<?= $child->resize_url() ?>', '<?= $child->url() ?>', '<?= $child->width ?>','<?= $child->height ?>', '<?= $child->title ?>', '<?= $child->file_url() ?>']);
+    slideshowImages.push(['<?= $child->resize_url() ?>', '<?= url::site("exif/show/$child->id") ?>', '<?= $child->width ?>','<?= $child->height ?>', '<?= htmlentities($child->title, ENT_QUOTES) ?>', '<?= $child->file_url() ?>', '<?= $child->url() ?>']);
 	<? endif ?>
 <? endforeach ?>
 </script>
@@ -86,4 +96,5 @@ endif;
 <?= $theme->album_bottom() ?>
 
 <?= $theme->paginator() ?>
-<div id="pearImageFlow" class="imageflow"> </div>
+<div id="pearFlowPadd" class="imageflow" style="display: none;"></div>
+<div id="pearImageFlow" class="imageflow" style="display: none;"> </div>
diff --git a/views/hoverView.html.php b/views/hoverView.html.php
index 418ba664..b38ad8f7 100644
--- a/views/hoverView.html.php
+++ b/views/hoverView.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="detailView" style="display: none; z-index:99997;" onmousemove="showHoverView();">
+<div id="detailView" onmousemove="showHoverView();">
 	<div class="overlay"> </div>
 	<div class="content">
 		<div class="imageContainer">
@@ -16,7 +16,7 @@
 				<div id="pause_detail" style="display: none;" title="Pause" class="pause_detail" onclick="togglePlayPause();"> </div>
 				<div id="play_detail" style="display: none;" title="Play" class="play_detail" onclick="togglePlayPause();"> </div>
 				<div id="next_detail" title="(N)ext" class="next_detail"> </div>
-				<div id="info_detail" title="Show more information about this photo" class="info_detail" onclick="document.location=slideshowImages[currentImg][1]"> </div>
+				<div id="info_detail" title="Show more information about this photo" class="info_detail g-dialog-link"> </div>
 			</div>
 		</div>
 	</div>
diff --git a/views/movie.html.php b/views/movie.html.php
index 158857db..adab9d1b 100644
--- a/views/movie.html.php
+++ b/views/movie.html.php
@@ -1,9 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+$(function() { bodyLoad('grid',''); });
+</script>
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
   <?= $theme->paginator() ?>
-
+<div id="mosaicGridContainer">
   <div id="g-movie" class="ui-helper-clearfix">
     <?= $theme->resize_top($item) ?>
     <?= $item->movie_img(array("class" => "g-movie", "id" => "g-item-id-{$item->id}")) ?>
@@ -14,6 +17,6 @@
     <h1><?= html::purify($item->title) ?></h1>
     <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
-
+</div>
   <?= $theme->photo_bottom() ?>
 </div>
diff --git a/views/page.html.php b/views/page.html.php
index 6ed23784..22109bb5 100644
--- a/views/page.html.php
+++ b/views/page.html.php
@@ -4,7 +4,7 @@
 		if(!($child->is_album() || $child->is_movie()))
    		if($child->url() == $_SERVER['REQUEST_URI']):?>
 				<html><body>
-					<script type="text/javascript">window.location = '<? echo end($parents)->url() . "#img=$i&viewMode=detail"?>';</script>
+					<script type="text/javascript">window.location = '<? echo end($parents)->url() . "#img=$i&viewMode=detail&redirected=true"?>';</script>
 					</body></html>
 					<? die(0) ?>
 <? endif ?>
@@ -154,8 +154,8 @@
 <div id="footerWrapper">
 	<div title="Change size of photos" id="sliderView" class="sliderView">
 		<div class="sliderRightCap"></div>
-		<div title="View at smallest photo size" class="smaller" onclick="$('#slider').slider('value', 0);"></div>
-		<div title="View at largest photo size" class="larger" onclick="$('#slider').slider('value', 250);"></div>
+		<div title="View at smallest photo size" class="smaller" onclick="$('#imgSlider').slider('value', 0);"></div>
+		<div title="View at largest photo size" class="larger" onclick="$('#imgSlider').slider('value', 250);"></div>
 		<div id="imgSlider" class="track">
 		</div>
 	</div>
@@ -169,6 +169,7 @@
 	</div>
 
 	<div class="" style="" id="viewControls">
+<? if ($theme->page_subtype != "movie"): ?>
 		<div title="Display this album in a grid view" id="grid" class="grid viewSwitcher sel sel-with-viewSwitcher" onclick="switchToGrid();">
 			<div class="label">Grid</div>
 		</div>
@@ -185,6 +186,7 @@
 			<div class="label">Slideshow</div>
 		</div>
 		<div class="clear"></div>
+<? endif ?>
 	</div>
 	<? if (!module::get_var("th_pear4gallery3", "hide_logo")): ?><button id="logoButton"></button><?endif?>
 </div>

From b613daa27ba76ca695121cff7f527330ce9b56f0 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Wed, 9 Nov 2011 17:58:43 -0500
Subject: [PATCH 09/12] Make $children behave more like Gallery's $children
 variable.  Fixes issue with Custom Fields module.

---
 .../tag_albums/controllers/tag_albums.php     | 17 ++++---
 .../libraries/Tag_Albums_Children.php         | 48 +++++++++++++++++++
 .../tag_albums/controllers/tag_albums.php     | 17 ++++---
 .../libraries/Tag_Albums_Children.php         | 48 +++++++++++++++++++
 4 files changed, 116 insertions(+), 14 deletions(-)
 create mode 100644 3.0/modules/tag_albums/libraries/Tag_Albums_Children.php
 create mode 100644 3.1/modules/tag_albums/libraries/Tag_Albums_Children.php

diff --git a/3.0/modules/tag_albums/controllers/tag_albums.php b/3.0/modules/tag_albums/controllers/tag_albums.php
index b351d2f6..c234a1c5 100644
--- a/3.0/modules/tag_albums/controllers/tag_albums.php
+++ b/3.0/modules/tag_albums/controllers/tag_albums.php
@@ -102,7 +102,7 @@ class tag_albums_Controller extends Controller {
 
       // Figure out which items to display on this page and store their details in $children.
       $tag_children = $this->_get_records($tag_ids, $page_size, $offset, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, true); 
-      $children = Array();
+      $children_array = Array();
       foreach ($tag_children as $one_child) {
         $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/0/" . $id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
         $child_tag->id = $one_child->id;
@@ -111,8 +111,9 @@ class tag_albums_Controller extends Controller {
         if ($one_child->has_thumb()) {
           $child_tag->set_thumb($one_child->thumb_url(), $one_child->thumb_width, $one_child->thumb_height);
         }
-        $children[] = $child_tag;
+        $children_array[] = $child_tag;
       }
+      $children = new Tag_Albums_Children($children_array);
 
       // Set up the previous and next page buttons.
       if ($page > 1) {
@@ -318,7 +319,7 @@ class tag_albums_Controller extends Controller {
 
     // Generate an arry of "fake" items, one for each tag on the page.
     //   Grab thumbnails from the most recently uploaded item for each tag, if available.
-    $children = Array();
+    $children_array = Array();
     foreach ($display_tags as $one_tag) {
       $tag_item = ORM::factory("item")
         ->viewable()
@@ -332,8 +333,9 @@ class tag_albums_Controller extends Controller {
           $child_tag->set_thumb($tag_item[0]->thumb_url(), $tag_item[0]->thumb_width, $tag_item[0]->thumb_height);
         }
       }
-      $children[] = $child_tag;
+      $children_array[] = $child_tag;
     }
+    $children = new Tag_Albums_Children($children_array);
 
     // Set up breadcrumbs.
     $tag_album_breadcrumbs = Array();
@@ -441,7 +443,7 @@ class tag_albums_Controller extends Controller {
     $tag_children = $this->_get_records(Array($id), $page_size, $offset, "items." . $sort_page_field, $sort_page_direction, "OR", true); 
 
     // Create an array of "fake" items to display on the page.
-    $children = Array();
+    $children_array = Array();
     foreach ($tag_children as $one_child) {
       $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/" . $id . "/" . $album_id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
       $child_tag->id = $one_child->id;
@@ -450,9 +452,10 @@ class tag_albums_Controller extends Controller {
       if ($one_child->has_thumb()) {
         $child_tag->set_thumb($one_child->thumb_url(), $one_child->thumb_width, $one_child->thumb_height);
       }
-      $children[] = $child_tag;
+      $children_array[] = $child_tag;
     }
-
+    $children = new Tag_Albums_Children($children_array);
+	
     // Set up the previous and next page buttons.
     if ($page > 1) {
       $previous_page = $page - 1;
diff --git a/3.0/modules/tag_albums/libraries/Tag_Albums_Children.php b/3.0/modules/tag_albums/libraries/Tag_Albums_Children.php
new file mode 100644
index 00000000..c6ea859d
--- /dev/null
+++ b/3.0/modules/tag_albums/libraries/Tag_Albums_Children.php
@@ -0,0 +1,48 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 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.
+ */
+class Tag_Albums_Children_Core implements Iterator {
+  public $array = Array();
+  private $position = 0;
+  
+  public function __construct($children) {
+    $this->position = 0;
+    $this->array = $children;
+  }
+
+  function rewind() {
+    $this->position = 0;
+  }
+
+  function current() {
+    return $this->array[$this->position];
+  }
+
+  function key() {
+    return $this->position;
+  }
+
+  function next() {
+    ++$this->position;
+  }
+
+  function valid() {
+    return isset($this->array[$this->position]);
+  }
+}
diff --git a/3.1/modules/tag_albums/controllers/tag_albums.php b/3.1/modules/tag_albums/controllers/tag_albums.php
index b351d2f6..c234a1c5 100644
--- a/3.1/modules/tag_albums/controllers/tag_albums.php
+++ b/3.1/modules/tag_albums/controllers/tag_albums.php
@@ -102,7 +102,7 @@ class tag_albums_Controller extends Controller {
 
       // Figure out which items to display on this page and store their details in $children.
       $tag_children = $this->_get_records($tag_ids, $page_size, $offset, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, true); 
-      $children = Array();
+      $children_array = Array();
       foreach ($tag_children as $one_child) {
         $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/0/" . $id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
         $child_tag->id = $one_child->id;
@@ -111,8 +111,9 @@ class tag_albums_Controller extends Controller {
         if ($one_child->has_thumb()) {
           $child_tag->set_thumb($one_child->thumb_url(), $one_child->thumb_width, $one_child->thumb_height);
         }
-        $children[] = $child_tag;
+        $children_array[] = $child_tag;
       }
+      $children = new Tag_Albums_Children($children_array);
 
       // Set up the previous and next page buttons.
       if ($page > 1) {
@@ -318,7 +319,7 @@ class tag_albums_Controller extends Controller {
 
     // Generate an arry of "fake" items, one for each tag on the page.
     //   Grab thumbnails from the most recently uploaded item for each tag, if available.
-    $children = Array();
+    $children_array = Array();
     foreach ($display_tags as $one_tag) {
       $tag_item = ORM::factory("item")
         ->viewable()
@@ -332,8 +333,9 @@ class tag_albums_Controller extends Controller {
           $child_tag->set_thumb($tag_item[0]->thumb_url(), $tag_item[0]->thumb_width, $tag_item[0]->thumb_height);
         }
       }
-      $children[] = $child_tag;
+      $children_array[] = $child_tag;
     }
+    $children = new Tag_Albums_Children($children_array);
 
     // Set up breadcrumbs.
     $tag_album_breadcrumbs = Array();
@@ -441,7 +443,7 @@ class tag_albums_Controller extends Controller {
     $tag_children = $this->_get_records(Array($id), $page_size, $offset, "items." . $sort_page_field, $sort_page_direction, "OR", true); 
 
     // Create an array of "fake" items to display on the page.
-    $children = Array();
+    $children_array = Array();
     foreach ($tag_children as $one_child) {
       $child_tag =  new Tag_Albums_Item($one_child->title, url::site("tag_albums/show/" . $one_child->id . "/" . $id . "/" . $album_id . "/" . urlencode($one_child->name)), $one_child->type, $one_child->id);
       $child_tag->id = $one_child->id;
@@ -450,9 +452,10 @@ class tag_albums_Controller extends Controller {
       if ($one_child->has_thumb()) {
         $child_tag->set_thumb($one_child->thumb_url(), $one_child->thumb_width, $one_child->thumb_height);
       }
-      $children[] = $child_tag;
+      $children_array[] = $child_tag;
     }
-
+    $children = new Tag_Albums_Children($children_array);
+	
     // Set up the previous and next page buttons.
     if ($page > 1) {
       $previous_page = $page - 1;
diff --git a/3.1/modules/tag_albums/libraries/Tag_Albums_Children.php b/3.1/modules/tag_albums/libraries/Tag_Albums_Children.php
new file mode 100644
index 00000000..c6ea859d
--- /dev/null
+++ b/3.1/modules/tag_albums/libraries/Tag_Albums_Children.php
@@ -0,0 +1,48 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 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.
+ */
+class Tag_Albums_Children_Core implements Iterator {
+  public $array = Array();
+  private $position = 0;
+  
+  public function __construct($children) {
+    $this->position = 0;
+    $this->array = $children;
+  }
+
+  function rewind() {
+    $this->position = 0;
+  }
+
+  function current() {
+    return $this->array[$this->position];
+  }
+
+  function key() {
+    return $this->position;
+  }
+
+  function next() {
+    ++$this->position;
+  }
+
+  function valid() {
+    return isset($this->array[$this->position]);
+  }
+}

From 9600f7958b2509fcf1f79fc64ffd8f50acfeba79 Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Thu, 10 Nov 2011 15:11:09 +0100
Subject: [PATCH 10/12] Squashed '3.0/themes/pear4gallery3/' changes from
 5da2cba..996ee67

996ee67 Version up (2.6) with fix for viewMode.

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: 996ee6721478fdf8a4e580c242e8fdadeeede70b
---
 js/pear.js          | 52 +++++++++++++++++++++++++++++----------------
 theme.info          |  2 +-
 views/page.html.php |  8 +++----
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/js/pear.js b/js/pear.js
index 30381456..7f898de0 100644
--- a/js/pear.js
+++ b/js/pear.js
@@ -1,3 +1,4 @@
+var viewMode="";
 var skimimg = 0;
 var hash="";
 var bgcolor="black";
@@ -154,18 +155,24 @@ function swatchImg(imageId)
 	updateHash();
 	$('#info_detail').attr('href', slideshowImages[currentImg][1]);
 }
-
-function updateHash(viewMode)
+function getViewMode()
 {
-	if(typeof viewMode == 'undefined')
-		viewMode = detailViewMode ? "detail" : (mosaicView ? "mosaic" : "grid");
-	hash = "#img=" + currentImg + "&viewMode=" + viewMode + "&bgcolor=" + bgcolor;
+	var vm = detailViewMode ? "detail" : viewMode;
+	if(vm !== '')
+		vm = "&viewMode=" + vm;
+	return vm;
+}
+function updateHash()
+{
+	var img="";
+	if(currentImg !== 0)
+		img = "img=" + currentImg;
+	hash = "#" + img + getViewMode() + "&bgcolor=" + bgcolor;
 	window.location.hash = hash;
 }
 function getAlbumHash(img)
 {
-	viewMode = detailViewMode ? "detail" : (mosaicView ? "mosaic" : "grid");
-	return "#img=" + img + "&viewMode=" + viewMode + "&bgcolor=" + bgcolor;
+	return "#img=" + img + getViewMode() +  "&bgcolor=" + bgcolor;
 }
 
 var currentImg=0;
@@ -230,7 +237,7 @@ function thumbPadding() {
 	$('.gallery-thumb').css({'margin-left': Math.ceil(margin/2) + 'px', 'margin-right': Math.floor(margin/2) + 'px'});
 }
 
-function bodyLoad(viewMode, bgcolor) {
+function bodyLoad(vm, bgcolor) {
 	/* Parse hash */
 	hash = window.location.hash;
 	var h = $.parseQuery(hash.substring(1));
@@ -239,7 +246,7 @@ function bodyLoad(viewMode, bgcolor) {
 	if(h.bgcolor != undefined)
 		swatchSkin(h.bgcolor);
 	if(h.viewMode != undefined)
-		viewMode = h.viewMode;
+		viewMode = vm = h.viewMode;
 	/* end parse hash */
 	
 	if(navigator.appName == "Microsoft Internet Explorer") $('.track').each(function(s){$(this).css('top', '-16px');}); //Fix for IE's poor page rendering. 
@@ -266,17 +273,17 @@ function bodyLoad(viewMode, bgcolor) {
 
 if(typeof slideshowImages != 'undefined')
 	if(!slideshowImages.length) 
-		viewMode='grid';
+		vm='grid';
 
-	switch (viewMode) {
+	switch (vm) {
 		case 'carousel':
-			startImageFlow();
+			startImageFlow(false);
 			break;
 		case 'grid':
-			switchToGrid();
+			switchToGrid(false);
 			break;
 		case 'mosaic':
-			switchToMosaic();
+			switchToMosaic(false);
 			break;
 		case 'detail':
 			focusImage(currentImg, h.redirected);
@@ -290,8 +297,11 @@ if(typeof slideshowImages != 'undefined')
 	setKeys();
 }
 
-function switchToGrid()
+function switchToGrid(userSet)
 {
+	if(userSet === true) {
+		viewMode = "grid";
+	}
 	toggleReflex(true);
 	$('#pearImageFlow,#pearFlowPadd').hide();
 	$('#mosaicTable').show();
@@ -306,8 +316,11 @@ function switchToGrid()
 	mosaicResize();
 }
 
-function switchToMosaic()
+function switchToMosaic(userSet)
 {
+	if(userSet === true) {
+		viewMode = "mosaic";
+	}
 	toggleReflex(false);
 	$('#pearImageFlow,#pearFlowPadd').hide();
 	$('#mosaicTable').show();
@@ -378,8 +391,11 @@ function focusImage(id, redirected)
 	$('#info_detail').attr('href', slideshowImages[currentImg][1]);
 }
 var pearCarousel;
-function startImageFlow()
+function startImageFlow(userSet)
 {
+	if(userSet === true) {
+		viewMode = "carousel";
+	}
 	$('#mosaicTable').hide();
 
 	$('#pearImageFlow,#pearFlowPadd').show();
@@ -440,7 +456,7 @@ var hovering=false;
 function switchMode(mode){
 	$('#mosaic,#grid,#carousel').removeClass("sel sel-with-viewSwitcher");
 	$('#'+mode).addClass("sel sel-with-viewSwitcher");
-	updateHash(mode);
+	updateHash();
 }
 
 function preFetch()
diff --git a/theme.info b/theme.info
index 00af05f4..7ba4673f 100644
--- a/theme.info
+++ b/theme.info
@@ -1,6 +1,6 @@
 name = ".Pear Theme"
 description = "A theme with the intention to mimic Apples mobile me gallery."
-version = 2.5
+version = 2.6
 author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
 site = 1
 admin = 0
diff --git a/views/page.html.php b/views/page.html.php
index 22109bb5..cc06af5d 100644
--- a/views/page.html.php
+++ b/views/page.html.php
@@ -122,7 +122,7 @@
 	<? if ($theme->item()): ?>
 		<? if(!empty($parents)): ?>
 		<? $parent = end($parents) ?>
-		<button class="large push large-with-push" onclick="window.location='<?= $parent->url($parent->id == $theme->item()->parent_id ? "show={$theme->item()->id}" : null) ?>';// + '#viewMode=' + viewMode;"> <div class="outer"> <div class="label"> <?= html::purify(text::limit_chars($parent->title, module::get_var("gallery", "visible_title_length"))) ?></div> </div></button>
+		<button class="large push large-with-push" onclick="window.location='<?= $parent->url($parent->id == $theme->item()->parent_id ? "show={$theme->item()->id}" : null) ?>' + '#viewMode=' + viewMode;"> <div class="outer"> <div class="label"> <?= html::purify(text::limit_chars($parent->title, module::get_var("gallery", "visible_title_length"))) ?></div> </div></button>
 		<? endif ?>
 	</div>
 	<div class="pearTitle" title="<?= $theme->item()->description ?>"> <?= html::purify(text::limit_chars($theme->item()->title, 40)) ?> &nbsp;
@@ -170,14 +170,14 @@
 
 	<div class="" style="" id="viewControls">
 <? if ($theme->page_subtype != "movie"): ?>
-		<div title="Display this album in a grid view" id="grid" class="grid viewSwitcher sel sel-with-viewSwitcher" onclick="switchToGrid();">
+		<div title="Display this album in a grid view" id="grid" class="grid viewSwitcher sel sel-with-viewSwitcher" onclick="switchToGrid(true);">
 			<div class="label">Grid</div>
 		</div>
-		<div title="Display this album in a mosaic view" id="mosaic" class="viewSwitcher mosaic" onclick="switchToMosaic();">
+		<div title="Display this album in a mosaic view" id="mosaic" class="viewSwitcher mosaic" onclick="switchToMosaic(true);">
 			<!-- <div style="margin-top:-2px;margin-left:-4px;"> -->
 			<div class="label">Mosaic</div>
 		</div>
-		<div title="Display this album in a carousel view" id="carousel" class="carousel viewSwitcher" onclick="startImageFlow();">
+		<div title="Display this album in a carousel view" id="carousel" class="carousel viewSwitcher" onclick="startImageFlow(true);">
 			<!-- <div style="margin-top:-2px;"> -->
 			<div class="label">Carousel</div>
 		</div>

From 89fa8576007840f1cf77594559e19d19c901c64a Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Thu, 10 Nov 2011 15:32:48 +0100
Subject: [PATCH 11/12] Squashed '3.0/themes/pear4gallery3/' changes from
 996ee67..ce0987a

ce0987a Fix with click on skimming img.

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: ce0987a52d2c74033b357c281298337cc6730360
---
 theme.info           | 2 +-
 views/album.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme.info b/theme.info
index 7ba4673f..c94543d2 100644
--- a/theme.info
+++ b/theme.info
@@ -1,6 +1,6 @@
 name = ".Pear Theme"
 description = "A theme with the intention to mimic Apples mobile me gallery."
-version = 2.6
+version = 2.7
 author = "Fredrik Erlandsson <fredrik.e@gmail.com>"
 site = 1
 admin = 0
diff --git a/views/album.html.php b/views/album.html.php
index 237fc3fd..ecd4af1e 100644
--- a/views/album.html.php
+++ b/views/album.html.php
@@ -50,7 +50,7 @@ if($child->is_album()):
 	$offset = 0;
 	$step = round(200/min(count($granchildren),50));
 	foreach ($granchildren as $i => $granchild):?>
-      <? if(++$i > 50) break; ?>
+      <? if($i++ > 50) break; ?>
       <? if ($granchild->has_thumb()): ?>
       <?= $granchild->thumb_img(array("style" => "display: none;")) ?>
 	<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i?>;" id="area_<?=$granchild->id?>"></div>

From 25a103fe6ab19844448cb8e551358481a86d242d Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Thu, 10 Nov 2011 15:38:26 +0100
Subject: [PATCH 12/12] Squashed '3.0/themes/pear4gallery3/' changes from
 ce0987a..b24d37b

b24d37b Fix with click on skimming img & carousel slides to correct image.

git-subtree-dir: 3.0/themes/pear4gallery3
git-subtree-split: b24d37b1a05ee2016f3276b22bd022c1361c2b91
---
 js/pear.js           | 2 +-
 views/album.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/pear.js b/js/pear.js
index 7f898de0..54d7db70 100644
--- a/js/pear.js
+++ b/js/pear.js
@@ -410,7 +410,7 @@ function startImageFlow(userSet)
 			$('#pearImageFlow').append(img); 
 		}
 		pearCarousel = new ImageFlow();
-		pearCarousel.init({ImageFlowID: 'pearImageFlow', aspectRatio: 2.4, imagesHeight: 0.6, opacity: true, reflections: false, startID: currentImg, onClick: function() {focusImage($(this).attr('longdesc'));}, startAnimation: true, xStep: 200, imageFocusM: 1.7, imageFocusMax: 4, opacityArray: [10, 9, 6, 2], percentOther: 130, captions: false, slider: false});
+		pearCarousel.init({ImageFlowID: 'pearImageFlow', aspectRatio: 2.4, imagesHeight: 0.6, opacity: true, reflections: false, startID: currentImg+1, onClick: function() {focusImage($(this).attr('longdesc'));}, startAnimation: true, xStep: 200, imageFocusM: 1.7, imageFocusMax: 4, opacityArray: [10, 9, 6, 2], percentOther: 130, captions: false, slider: false});
 	}
 	switchMode('carousel');
 	mosaicResize();
diff --git a/views/album.html.php b/views/album.html.php
index ecd4af1e..455dba8f 100644
--- a/views/album.html.php
+++ b/views/album.html.php
@@ -50,10 +50,10 @@ if($child->is_album()):
 	$offset = 0;
 	$step = round(200/min(count($granchildren),50));
 	foreach ($granchildren as $i => $granchild):?>
-      <? if($i++ > 50) break; ?>
+      <? if(++$i > 50) break; ?>
       <? if ($granchild->has_thumb()): ?>
       <?= $granchild->thumb_img(array("style" => "display: none;")) ?>
-	<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i?>;" id="area_<?=$granchild->id?>"></div>
+	<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i-1?>;" id="area_<?=$granchild->id?>"></div>
       <? endif ?>
 <?		$offset+=$step;
 endforeach;