Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/controllers/albums.php

7 files changed, 33 insertions, 6 deletions

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 33cc6733..de6d436e 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -1034,6 +1034,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: right;
 }
 
+#gRenameTagForm input[type="text"].gError {
+  border: 2px solid red;
+  background: none;
+}
+
 #gRenameTagForm input[type="submit"] {
   height: 25px;
 }
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index f77881bb..ef15ed25 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -43,7 +43,7 @@
       <div id="gHeader">
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor(item::root()->url(), "&larr; ".t("Back to the Gallery")) ?></li>
+          <li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
diff --git a/themes/admin_default/views/block.html.php b/themes/admin_default/views/block.html.php
index 21512d02..6cbea76e 100644
--- a/themes/admin_default/views/block.html.php
+++ b/themes/admin_default/views/block.html.php
@@ -1,4 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if ($anchor): ?>
+<a name="<?= $anchor ?>"></a>
+<? endif ?>
 <div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget">
   <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right">
     <? if ($css_id != "gBlockAdder"): ?>
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 949933e9..e645eb71 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -2,7 +2,7 @@
  * Initialize jQuery UI and Gallery Plugin elements
  */
 
-var shortForms = new Array(
+var short_forms = new Array(
   "#gQuickSearchForm",
   "#gAddTagForm",
   "#gSearchForm"
@@ -36,7 +36,10 @@ $(document).ready(function() {
   }
 
   // Initialize short forms
-  handleShortFormEvent(shortForms);
+  for (var i in short_forms) {
+    short_form_init(short_forms[i]);
+    $(short_forms[i]).addClass("gShortForm");
+  }
   $(".gShortForm input[type=text]").addClass("ui-corner-left");
   $(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right");
 
@@ -88,12 +91,19 @@ $(document).ready(function() {
       },
       function() {
         // Reset item height, position, and z-index
-        var sib_height = $(this).next().height();
+        if ($(this).next().height()) {
+          var sib_height = $(this).next().height();
+        } else {
+          var sib_height = $(this).prev().height();
+        }
+        if ($.browser.msie && $.browser.version >= 8) {
+          sib_height = sib_height + 1;
+        }
         $(this).css("height", sib_height);
         $(this).css("position", "relative");
         $(this).css("top", null);
         $(this).css("left", null);
-        $(this).css("z-index", null);
+        $(this).css("z-index", 1);
         // Remove the placeholder and hover class from the item
         $("#gPlaceHolder").remove();
         $(this).removeClass("gHoverItem");
diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php
index 37504861..e8cff833 100644
--- a/themes/default/views/block.html.php
+++ b/themes/default/views/block.html.php
@@ -1,5 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
+<? endif ?>
 <div id="<?= $css_id ?>" class="gBlock">
   <h2><?= $title ?></h2>
   <div class="gBlockContent">
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 733534ea..19d8cc00 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,7 +95,12 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= $parent->url("show={$theme->item()->id}") ?>">
+            <!-- Adding ?show=<id> causes Gallery3 to display the page
+                 containing that photo.  For now, we just do it for
+                 the immediate parent so that when you go back up a
+                 level you're on the right page. -->
+            <a href="<?= $parent->url($parent == $theme->item()->parent() ?
+                     "show={$theme->item()->id}" : null) ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index 928ecb93..04379eb6 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -6,6 +6,8 @@
       <?= $theme->album_menu() ?>
     <? elseif ($page_type == "photo") : ?>
       <?= $theme->photo_menu() ?>
+    <? elseif ($page_type == "movie") : ?>
+      <?= $theme->movie_menu() ?>
     <? elseif ($page_type == "tag") : ?>
       <?= $theme->tag_menu() ?>
     <? endif ?>