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

9 files changed, 312 insertions, 324 deletions

diff --git a/lib/jquery.localscroll.js b/lib/jquery.localscroll.js
index 3f8d64cc..fa583a45 100644
--- a/lib/jquery.localscroll.js
+++ b/lib/jquery.localscroll.js
@@ -1,9 +1,9 @@
-/**

- * jQuery.LocalScroll - Animated scrolling navigation, using anchors.

- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com

- * Dual licensed under MIT and GPL.

- * Date: 3/11/2009

- * @author Ariel Flesler

- * @version 1.2.7

- **/

+/**
+ * jQuery.LocalScroll - Animated scrolling navigation, using anchors.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 3/11/2009
+ * @author Ariel Flesler
+ * @version 1.2.7
+ **/
 ;(function($){var l=location.href.replace(/#.*/,'');var g=$.localScroll=function(a){$('body').localScroll(a)};g.defaults={duration:1e3,axis:'y',event:'click',stop:true,target:window,reset:true};g.hash=function(a){if(location.hash){a=$.extend({},g.defaults,a);a.hash=false;if(a.reset){var e=a.duration;delete a.duration;$(a.target).scrollTo(0,a);a.duration=e}i(0,location,a)}};$.fn.localScroll=function(b){b=$.extend({},g.defaults,b);return b.lazy?this.bind(b.event,function(a){var e=$([a.target,a.target.parentNode]).filter(d)[0];if(e)i(a,e,b)}):this.find('a,area').filter(d).bind(b.event,function(a){i(a,this,b)}).end().end();function d(){return!!this.href&&!!this.hash&&this.href.replace(this.hash,'')==l&&(!b.filter||$(this).is(b.filter))}};function i(a,e,b){var d=e.hash.slice(1),f=document.getElementById(d)||document.getElementsByName(d)[0];if(!f)return;if(a)a.preventDefault();var h=$(b.target);if(b.lock&&h.is(':animated')||b.onBefore&&b.onBefore.call(b,a,f,h)===false)return;if(b.stop)h.stop(true);if(b.hash){var j=f.id==d?'id':'name',k=$('<a> </a>').attr(j,d).css({position:'absolute',top:$(window).scrollTop(),left:$(window).scrollLeft()});f[j]='';$('body').prepend(k);location=e.hash;k.remove();f[j]=d}h.scrollTo(f,b).trigger('notify.serialScroll',[f])}})(jQuery);
\ No newline at end of file
diff --git a/lib/jquery.scrollTo.js b/lib/jquery.scrollTo.js
index 73a33418..5e787781 100644
--- a/lib/jquery.scrollTo.js
+++ b/lib/jquery.scrollTo.js
@@ -1,11 +1,11 @@
-/**

- * jQuery.ScrollTo - Easy element scrolling using jQuery.

- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com

- * Dual licensed under MIT and GPL.

- * Date: 5/25/2009

- * @author Ariel Flesler

- * @version 1.4.2

- *

- * http://flesler.blogspot.com/2007/10/jqueryscrollto.html

- */

+/**
+ * jQuery.ScrollTo - Easy element scrolling using jQuery.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 5/25/2009
+ * @author Ariel Flesler
+ * @version 1.4.2
+ *
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ */
 ;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
\ No newline at end of file
diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index bab1d0ed..ecec859d 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -5,8 +5,8 @@
 /* $Id: l10n_client.css,v 1.6 2008/09/09 10:48:20 goba Exp $ */
 
 /* width percentages add to 99% rather than 100% to prevent float
-overflows from occurring in an unnamed browser that can't decide
-how it wants to round. */
+   overflows from occurring in an unnamed browser that can't decide
+   how it wants to round. */
 
 /* l10n_client container */
 #l10n-client {
@@ -19,8 +19,8 @@ how it wants to round. */
   bottom:0px; left:0px;
   overflow:hidden;}
 
-  * html #l10n-client {
-    position:static;}
+* html #l10n-client {
+  position:static;}
 
 #l10n-client-string-select .string-list,
 #l10n-client-string-editor .source,
@@ -34,38 +34,38 @@ how it wants to round. */
   color:#fff;
   background:#37a;}
 
-  #l10n-client .labels .label {
-    display:none;}
+#l10n-client .labels .label {
+  display:none;}
 
-  /* Panel toggle button (span) */
-  #l10n-client .labels .toggle {
-    cursor:pointer;
-    display:block;
-    position:absolute; right:0em;
-    padding: 0em .75em; height:2em; line-height:2em;
-    text-transform:uppercase;
-    text-align:center; background:#000;}
+/* Panel toggle button (span) */
+#l10n-client .labels .toggle {
+  cursor:pointer;
+  display:block;
+  position:absolute; right:0em;
+  padding: 0em .75em; height:2em; line-height:2em;
+  text-transform:uppercase;
+  text-align:center; background:#000;}
 
-  /* Panel labels */
-  #l10n-client h2 {
-    border-left:1px solid #fff;
-    height:1em; line-height:1em;
-    padding: .5em; margin:0px;
-    font-size:1em;
-    text-transform:uppercase;}
+/* Panel labels */
+#l10n-client h2 {
+  border-left:1px solid #fff;
+  height:1em; line-height:1em;
+  padding: .5em; margin:0px;
+  font-size:1em;
+  text-transform:uppercase;}
 
-    #l10n-client .strings h2 {
-      border:0px;}
+#l10n-client .strings h2 {
+  border:0px;}
 
-  /* 25 + 37 + 37 = 99 */
-  #l10n-client .strings {
-    width:25%; float:left;}
+/* 25 + 37 + 37 = 99 */
+#l10n-client .strings {
+  width:25%; float:left;}
 
-  #l10n-client .source {
-    width:37%; float:left;}
+#l10n-client .source {
+  width:37%; float:left;}
 
-  #l10n-client .translation {
-    width:37%; float:left;}
+#l10n-client .translation {
+  width:37%; float:left;}
 
 /* Translatable string list */
 #l10n-client-string-select {
@@ -75,77 +75,77 @@ how it wants to round. */
   direction: ltr;
 }
 
-  #l10n-client .string-list {
-    height:17em;
-    overflow:auto;
-    list-style:none; list-style-image:none;
-    margin:0em; padding:0em;}
-
-  #l10n-client .string-list li {
-    font-size:.9em;
-    line-height:1.5em;
-    cursor:default;
-    background:transparent;
-    list-style:none; list-style-image:none;
-    border-bottom:1px solid #ddd;
-    padding:.25em .5em;
-    margin:0em;}
-
-  /* Green for translated */
-  #l10n-client .string-list li.translated {
-    border-bottom-color:#9c3;
-    background:#cf6; color:#360;}
-
-    #l10n-client .string-list li.translated:hover {
-      background: #df8;}
-
-    #l10n-client .string-list li.translated:active {
-      background: #9c3;}
-
-  #l10n-client .string-list li.hidden {
-    display:none;}
-
-  /* Gray + Blue hover for untranslated */
-  #l10n-client .string-list li.untranslated {}
-
-    #l10n-client .string-list li.untranslated:hover {
-      background: #ace;}
-
-    #l10n-client .string-list li.untranslated:active {
-      background: #8ac;}
-
-  /* Selected string is indicated by bold text */
-  #l10n-client .string-list li.active {
-    font-weight:bold;}
-
-  #l10n-client #gL10nSearchForm {
-    background:#eee;
-    text-align:center;
-    height:2em; line-height:2em;
-    margin:0em; padding:.5em .5em;
-  }
-
-  #l10n-client #gL10nSearchForm .form-item,
-  #l10n-client #gL10nSearchForm input.form-text,
-  #l10n-client #gL10nSearchForm #search-filter-go,
-  #l10n-client #gL10nSearchForm #search-filter-clear {
-    display:inline;
-    vertical-align:middle;
-  }
-
-    #l10n-client #gL10nSearchForm .form-item {
-      margin:0em;
-      padding:0em;
-    }
-
-    #l10n-client #gL10nSearchForm input.form-text {
-      width:80%;
-    }
-
-    #l10n-client #gL10nSearchForm #search-filter-clear {
-      width:10%;
-      margin:0em;
-    }
+#l10n-client .string-list {
+  height:17em;
+  overflow:auto;
+  list-style:none; list-style-image:none;
+  margin:0em; padding:0em;}
+
+#l10n-client .string-list li {
+  font-size:.9em;
+  line-height:1.5em;
+  cursor:default;
+  background:transparent;
+  list-style:none; list-style-image:none;
+  border-bottom:1px solid #ddd;
+  padding:.25em .5em;
+  margin:0em;}
+
+/* Green for translated */
+#l10n-client .string-list li.translated {
+  border-bottom-color:#9c3;
+  background:#cf6; color:#360;}
+
+#l10n-client .string-list li.translated:hover {
+  background: #df8;}
+
+#l10n-client .string-list li.translated:active {
+  background: #9c3;}
+
+#l10n-client .string-list li.hidden {
+  display:none;}
+
+/* Gray + Blue hover for untranslated */
+#l10n-client .string-list li.untranslated {}
+
+#l10n-client .string-list li.untranslated:hover {
+  background: #ace;}
+
+#l10n-client .string-list li.untranslated:active {
+  background: #8ac;}
+
+/* Selected string is indicated by bold text */
+#l10n-client .string-list li.active {
+  font-weight:bold;}
+
+#l10n-client #gL10nSearchForm {
+  background:#eee;
+  text-align:center;
+  height:2em; line-height:2em;
+  margin:0em; padding:.5em .5em;
+}
+
+#l10n-client #gL10nSearchForm .form-item,
+#l10n-client #gL10nSearchForm input.form-text,
+#l10n-client #gL10nSearchForm #search-filter-go,
+#l10n-client #gL10nSearchForm #search-filter-clear {
+  display:inline;
+  vertical-align:middle;
+}
+
+#l10n-client #gL10nSearchForm .form-item {
+  margin:0em;
+  padding:0em;
+}
+
+#l10n-client #gL10nSearchForm input.form-text {
+  width:80%;
+}
+
+#l10n-client #gL10nSearchForm #search-filter-clear {
+  width:10%;
+  margin:0em;
+}
 
 #l10n-client-string-editor {
   display:none;
@@ -153,22 +153,22 @@ how it wants to round. */
   width:74%;}
 
 #l10n-client-string-editor .source {
-    overflow:hidden;
-    width:50%; float:left;}
+  overflow:hidden;
+  width:50%; float:left;}
 
 #l10n-client-string-editor .source .source-text {
-      line-height:1.5em;
-      background:#eee;
-      font-family: monospace;
-      text-align: left;
-      height:16em; margin:1em; padding:1em;
-      overflow:auto;
-      direction: ltr;
+  line-height:1.5em;
+  background:#eee;
+  font-family: monospace;
+  text-align: left;
+  height:16em; margin:1em; padding:1em;
+  overflow:auto;
+  direction: ltr;
 }
 
-  #l10n-client-string-editor .translation {
-    overflow:hidden;
-    width:49%; float:right;}
+#l10n-client-string-editor .translation {
+  overflow:hidden;
+  width:49%; float:right;}
 
 #gL10nClientSaveForm {
   padding:0em;}
diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css
index 6bd16064..b877df49 100644
--- a/modules/gallery/css/upgrader.css
+++ b/modules/gallery/css/upgrader.css
@@ -1,117 +1,117 @@
 body {
-    background: #eee;
-    font-family: Trebuchet MS;
-    font-size: 1.1em;
+  background: #eee;
+  font-family: Trebuchet MS;
+  font-size: 1.1em;
 }
 
 h1 {
-    font-size: 1.4em;
+  font-size: 1.4em;
 }
 
 div#outer {
-    width: 650px;
-    background: white;
-    border: 1px solid #999;
-    margin: 0 auto;
-    padding: -10px;
+  width: 650px;
+  background: white;
+  border: 1px solid #999;
+  margin: 0 auto;
+  padding: -10px;
 }
 
 div#inner {
-    padding: 0 1em 0 1em;
-    margin: 0px;
+  padding: 0 1em 0 1em;
+  margin: 0px;
 }
 
 div#footer {
-    border-top: 1px solid #ccc;
-    margin: 1em;
+  border-top: 1px solid #ccc;
+  margin: 1em;
 }
 
 td.name {
-    text-align: left;
-    padding-left: 30px;
+  text-align: left;
+  padding-left: 30px;
 }
 
 td {
-    text-align: center;
-    border-bottom: 1px solid #eee;
+  text-align: center;
+  border-bottom: 1px solid #eee;
 }
 
 tr.current td {
-    color: #999;
-    font-style: italic;
+  color: #999;
+  font-style: italic;
 }
 
 tr.current td.gallery {
-    color: #00d;
+  color: #00d;
 }
 
 tr.upgradeable td {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 tr.upgradeable td.gallery {
-    color: #00d;
+  color: #00d;
 }
 
 table {
-    width: 600px;
-    margin-bottom: 10px;
+  width: 600px;
+  margin-bottom: 10px;
 }
 
 p {
-    font-size: .9em;
+  font-size: .9em;
 }
 
 ul {
-    font-size: .9em;
-    list-style: none;
+  font-size: .9em;
+  list-style: none;
 }
 
 li {
-    display: inline;
+  display: inline;
 }
 
 li:before {
-    content: "\00BB \0020";
+  content: "\00BB \0020";
 }
 
 div.button {
-    margin: 0 auto;
-    width: 120px;
-    text-align: center;
-    border: 1px solid #999;
-    background: #eee;
+  margin: 0 auto;
+  width: 120px;
+  text-align: center;
+  border: 1px solid #999;
+  background: #eee;
 }
 
 div.button a {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 div.button:hover {
-    background: #ccc;
+  background: #ccc;
 }
 
 div#confirmation {
-    position: absolute;
-    background: blue;
-    z-index: 1000;
-    margin: 10px;
-    text-align: center;
+  position: absolute;
+  background: blue;
+  z-index: 1000;
+  margin: 10px;
+  text-align: center;
 }
 
 div#confirmation div {
-    margin: 2px;
-    padding: 20px;
-    border: 2px solid #999;
-    background: #eee;
+  margin: 2px;
+  padding: 20px;
+  border: 2px solid #999;
+  background: #eee;
 }
 
 .gray_on_done {
-    opacity: <?= $done ? "0.5" : "1" ?>;
+  opacity: <?= $done ? "0.5" : "1" ?>;
 }
 
 pre {
-    display: inline;
-    margin: 0px;
-    padding: 0px;
+  display: inline;
+  margin: 0px;
+  padding: 0px;
 }
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 24d24b38..001b7d26 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -33,7 +33,7 @@ class Gallery_Installer_Test extends Unit_Test_Case {
     $this->assert_equal("gallery", $gallery->name);
 
     // This is probably too volatile to keep for long
-    $this->assert_equal(1, $gallery->version);
+    $this->assert_equal(2, $gallery->version);
   }
 
   public function install_creates_root_item_test() {
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index f47ae0dc..6133b025 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -37,9 +37,26 @@ modules/comment/views/admin_comments.html.php                194 DIRTY $pager
 modules/comment/views/comment.html.php                       2   DIRTY $comment->id
 modules/comment/views/comment.html.php                       5   DIRTY $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true))
 modules/comment/views/comment.html.php                       7         $comment->author_name()
-modules/comment/views/comment.html.php                       11  DIRTY $comment->created
-modules/comment/views/comment.html.php                       12        $comment->author_name()
-modules/comment/views/comment.html.php                       15        $comment->text
+modules/comment/views/comment.html.php                       12  DIRTY $comment->created
+modules/comment/views/comment.html.php                       13        $comment->author_name()
+modules/comment/views/comment.html.php                       16        $comment->text
+modules/comment/views/comment.mrss.php                       9         $feed->title
+modules/comment/views/comment.mrss.php                       10  DIRTY $feed->uri
+modules/comment/views/comment.mrss.php                       11        $feed->description
+modules/comment/views/comment.mrss.php                       13  DIRTY $feed->uri
+modules/comment/views/comment.mrss.php                       16  DIRTY $feed->previous_page_uri
+modules/comment/views/comment.mrss.php                       19  DIRTY $feed->next_page_uri
+modules/comment/views/comment.mrss.php                       21  DIRTY $pub_date
+modules/comment/views/comment.mrss.php                       22  DIRTY $pub_date
+modules/comment/views/comment.mrss.php                       25        $child->title
+modules/comment/views/comment.mrss.php                       26        $child->item_uri
+modules/comment/views/comment.mrss.php                       27        $child->author
+modules/comment/views/comment.mrss.php                       28  DIRTY $child->item_uri
+modules/comment/views/comment.mrss.php                       29  DIRTY $child->pub_date
+modules/comment/views/comment.mrss.php                       32        $child->text
+modules/comment/views/comment.mrss.php                       34  DIRTY $child->thumb_url
+modules/comment/views/comment.mrss.php                       35  DIRTY $child->thumb_height
+modules/comment/views/comment.mrss.php                       35  DIRTY $child->thumb_width
 modules/comment/views/comments.html.php                      10  DIRTY $comment->id
 modules/comment/views/comments.html.php                      13  DIRTY $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true))
 modules/comment/views/comments.html.php                      15        $comment->author_name()
@@ -55,18 +72,19 @@ modules/exif/views/exif_dialog.html.php                      21  DIRTY $i
 modules/exif/views/exif_dialog.html.php                      24        $details
 modules/exif/views/exif_dialog.html.php                      24        $i
 modules/exif/views/exif_sidebar.html.php                     2   DIRTY $item->id
-modules/g2_import/views/admin_g2_import.html.php             8   DIRTY $form
-modules/g2_import/views/admin_g2_import.html.php             26  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             29  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             32  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             35  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             38  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             41  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             45  DIRTY $g2_stats
-modules/g2_import/views/admin_g2_import.html.php             53  DIRTY $g2_sizes
-modules/g2_import/views/admin_g2_import.html.php             54  DIRTY $thumb_size
-modules/g2_import/views/admin_g2_import.html.php             62  DIRTY $g2_sizes
-modules/g2_import/views/admin_g2_import.html.php             63  DIRTY $resize_size
+modules/g2_import/views/admin_g2_import.html.php             28  DIRTY $form
+modules/g2_import/views/admin_g2_import.html.php             40  DIRTY $g2_sizes
+modules/g2_import/views/admin_g2_import.html.php             41  DIRTY $thumb_size
+modules/g2_import/views/admin_g2_import.html.php             49  DIRTY $g2_sizes
+modules/g2_import/views/admin_g2_import.html.php             50  DIRTY $resize_size
+modules/g2_import/views/admin_g2_import.html.php             62  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             65  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             68  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             71  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             74  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             77  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             81  DIRTY $g2_stats
+modules/g2_import/views/admin_g2_import.html.php             88  DIRTY $csrf
 modules/gallery/views/admin_advanced_settings.html.php       22  DIRTY $var->module_name
 modules/gallery/views/admin_advanced_settings.html.php       23        $var->name
 modules/gallery/views/admin_advanced_settings.html.php       25  DIRTY $var->module_name
@@ -140,13 +158,14 @@ modules/gallery/views/admin_maintenance.html.php             171 DIRTY $task->id
 modules/gallery/views/admin_maintenance.html.php             171 DIRTY $csrf
 modules/gallery/views/admin_maintenance_task.html.php        5   DIRTY $task->id
 modules/gallery/views/admin_maintenance_task.html.php        5   DIRTY $csrf
+modules/gallery/views/admin_maintenance_task.html.php        26  DIRTY $task->name
 modules/gallery/views/admin_modules.html.php                 19  DIRTY $i
 modules/gallery/views/admin_modules.html.php                 22  DIRTY $data
 modules/gallery/views/admin_modules.html.php                 22  DIRTY $module_name
 modules/gallery/views/admin_modules.html.php                 23  DIRTY $module_info->name
 modules/gallery/views/admin_modules.html.php                 24  DIRTY $module_info->version
 modules/gallery/views/admin_modules.html.php                 25  DIRTY $module_info->description
-modules/gallery/views/admin_theme_details.html.php           5   DIRTY $form
+modules/gallery/views/admin_theme_options.html.php           5   DIRTY $form
 modules/gallery/views/admin_themes.html.php                  5   DIRTY $csrf
 modules/gallery/views/admin_themes.html.php                  18  DIRTY $site
 modules/gallery/views/admin_themes.html.php                  19  DIRTY $themes
@@ -187,13 +206,13 @@ modules/gallery/views/kohana_error_page.php                  100 DIRTY $line
 modules/gallery/views/kohana_error_page.php                  112 DIRTY $trace
 modules/gallery/views/kohana_profiler.php                    32  DIRTY $profile->render()
 modules/gallery/views/kohana_profiler.php                    34  DIRTY $execution_time
-modules/gallery/views/l10n_client.html.php                   13  DIRTY $string
-modules/gallery/views/l10n_client.html.php                   15  DIRTY $string
-modules/gallery/views/l10n_client.html.php                   16  DIRTY $string
-modules/gallery/views/l10n_client.html.php                   18  DIRTY $string
-modules/gallery/views/l10n_client.html.php                   24  DIRTY $l10n_search_form
-modules/gallery/views/l10n_client.html.php                   65  DIRTY $string_list
-modules/gallery/views/l10n_client.html.php                   66  DIRTY $plural_forms
+modules/gallery/views/l10n_client.html.php                   17  DIRTY $string
+modules/gallery/views/l10n_client.html.php                   19  DIRTY $string
+modules/gallery/views/l10n_client.html.php                   20  DIRTY $string
+modules/gallery/views/l10n_client.html.php                   22  DIRTY $string
+modules/gallery/views/l10n_client.html.php                   28  DIRTY $l10n_search_form
+modules/gallery/views/l10n_client.html.php                   70  DIRTY $string_list
+modules/gallery/views/l10n_client.html.php                   71  DIRTY $plural_forms
 modules/gallery/views/move_browse.html.php                   4   DIRTY $source->id
 modules/gallery/views/move_browse.html.php                   39  DIRTY $tree
 modules/gallery/views/move_browse.html.php                   42  DIRTY $source->id
@@ -244,48 +263,29 @@ modules/gallery/views/permissions_form.html.php              74  DIRTY $item->id
 modules/gallery/views/permissions_form.html.php              79  DIRTY $group->id
 modules/gallery/views/permissions_form.html.php              79  DIRTY $permission->id
 modules/gallery/views/permissions_form.html.php              79  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    9   DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    9   DIRTY $page_type
-modules/gallery/views/quick_pane.html.php                    10  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    12  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    17  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    17  DIRTY $csrf
-modules/gallery/views/quick_pane.html.php                    17  DIRTY $page_type
-modules/gallery/views/quick_pane.html.php                    24  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    24  DIRTY $csrf
-modules/gallery/views/quick_pane.html.php                    24  DIRTY $page_type
-modules/gallery/views/quick_pane.html.php                    41  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    42  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    44  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    61  DIRTY $disabledState
-modules/gallery/views/quick_pane.html.php                    61  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    61  DIRTY $csrf
-modules/gallery/views/quick_pane.html.php                    61  DIRTY $page_type
-modules/gallery/views/quick_pane.html.php                    62  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    64  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    78  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    78  DIRTY $csrf
-modules/gallery/views/quick_pane.html.php                    78  DIRTY $page_type
-modules/gallery/views/quick_pane.html.php                    78  DIRTY $message
-modules/gallery/views/quick_pane.html.php                    78  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    80  DIRTY $title
-modules/gallery/views/quick_pane.html.php                    93  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    98  DIRTY $item->id
-modules/gallery/views/quick_pane.html.php                    103 DIRTY $item->id
+modules/gallery/views/quick_pane.html.php                    3   DIRTY $button->class
+modules/gallery/views/quick_pane.html.php                    3   DIRTY $button->href
+modules/gallery/views/quick_pane.html.php                    4   DIRTY $button->title
+modules/gallery/views/quick_pane.html.php                    5   DIRTY $button->icon
+modules/gallery/views/quick_pane.html.php                    6   DIRTY $button->title
+modules/gallery/views/quick_pane.html.php                    20  DIRTY $button->class
+modules/gallery/views/quick_pane.html.php                    20  DIRTY $button->href
+modules/gallery/views/quick_pane.html.php                    21  DIRTY $button->title
+modules/gallery/views/quick_pane.html.php                    22  DIRTY $button->title
 modules/gallery/views/simple_uploader.html.php               6   DIRTY $csrf
 modules/gallery/views/simple_uploader.html.php               8         $item->title
 modules/gallery/views/simple_uploader.html.php               28        $parent->title
 modules/gallery/views/simple_uploader.html.php               30        $item->title
 modules/gallery/views/simple_uploader.html.php               77  DIRTY $item->id
 modules/gallery/views/simple_uploader.html.php               81  DIRTY $csrf
-modules/gallery/views/upgrader.html.php                      94  DIRTY $done
-modules/gallery/views/upgrader.html.php                      124 DIRTY $module->version
-modules/gallery/views/upgrader.html.php                      124 DIRTY $module->code_version
-modules/gallery/views/upgrader.html.php                      125 DIRTY $id
-modules/gallery/views/upgrader.html.php                      126 DIRTY $module->name
-modules/gallery/views/upgrader.html.php                      129 DIRTY $module->version
-modules/gallery/views/upgrader.html.php                      132 DIRTY $module->code_version
-modules/gallery/views/upgrader.html.php                      155 DIRTY $module->name
+modules/gallery/views/upgrader.html.php                      43  DIRTY $module->version
+modules/gallery/views/upgrader.html.php                      43  DIRTY $module->code_version
+modules/gallery/views/upgrader.html.php                      44  DIRTY $id
+modules/gallery/views/upgrader.html.php                      45  DIRTY $module->name
+modules/gallery/views/upgrader.html.php                      48  DIRTY $module->version
+modules/gallery/views/upgrader.html.php                      51  DIRTY $module->code_version
+modules/gallery/views/upgrader.html.php                      74  DIRTY $module->name
+modules/gallery/views/upgrader.html.php                      83  DIRTY $upgrade_token
 modules/image_block/views/image_block_block.html.php         3   DIRTY $item->url()
 modules/image_block/views/image_block_block.html.php         4   DIRTY $item->thumb_img(array("class" => "gThumbnail"))
 modules/info/views/info_block.html.php                       6         $item->title
@@ -354,29 +354,12 @@ modules/recaptcha/views/admin_recaptcha.html.php             6   DIRTY $form->ge
 modules/recaptcha/views/admin_recaptcha.html.php             10  DIRTY $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY $public_key
-modules/rss/views/comment.mrss.php                           9         $title
-modules/rss/views/comment.mrss.php                           10  DIRTY $link
-modules/rss/views/comment.mrss.php                           11        $description
-modules/rss/views/comment.mrss.php                           13  DIRTY $feed_link
-modules/rss/views/comment.mrss.php                           16  DIRTY $previous_page_link
-modules/rss/views/comment.mrss.php                           19  DIRTY $next_page_link
-modules/rss/views/comment.mrss.php                           21  DIRTY $pub_date
-modules/rss/views/comment.mrss.php                           22  DIRTY $pub_date
-modules/rss/views/comment.mrss.php                           25        $child
-modules/rss/views/comment.mrss.php                           26        $child
-modules/rss/views/comment.mrss.php                           27        $child
-modules/rss/views/comment.mrss.php                           28  DIRTY $child
-modules/rss/views/comment.mrss.php                           29  DIRTY $child
-modules/rss/views/comment.mrss.php                           32        $child
-modules/rss/views/comment.mrss.php                           34  DIRTY $child
-modules/rss/views/comment.mrss.php                           35  DIRTY $child
-modules/rss/views/comment.mrss.php                           35  DIRTY $child
-modules/rss/views/feed.mrss.php                              9         $title
-modules/rss/views/feed.mrss.php                              10  DIRTY $link
-modules/rss/views/feed.mrss.php                              11        $description
-modules/rss/views/feed.mrss.php                              13  DIRTY $feed_link
-modules/rss/views/feed.mrss.php                              16  DIRTY $previous_page_link
-modules/rss/views/feed.mrss.php                              19  DIRTY $next_page_link
+modules/rss/views/feed.mrss.php                              9         $feed->title
+modules/rss/views/feed.mrss.php                              10  DIRTY $feed->uri
+modules/rss/views/feed.mrss.php                              11        $feed->description
+modules/rss/views/feed.mrss.php                              13  DIRTY $feed->uri
+modules/rss/views/feed.mrss.php                              16  DIRTY $feed->previous_page_uri
+modules/rss/views/feed.mrss.php                              19  DIRTY $feed->next_page_uri
 modules/rss/views/feed.mrss.php                              21  DIRTY $pub_date
 modules/rss/views/feed.mrss.php                              22  DIRTY $pub_date
 modules/rss/views/feed.mrss.php                              25        $child->title
@@ -519,14 +502,14 @@ themes/admin_default/views/block.html.php                    5   DIRTY $id
 themes/admin_default/views/block.html.php                    5   DIRTY $csrf
 themes/admin_default/views/block.html.php                    10  DIRTY $title
 themes/admin_default/views/block.html.php                    13  DIRTY $content
-themes/admin_default/views/pager.html.php                    9   DIRTY $from_to_msg
 themes/admin_default/views/pager.html.php                    11  DIRTY $url
-themes/admin_default/views/pager.html.php                    16  DIRTY $previous_page
-themes/admin_default/views/pager.html.php                    16  DIRTY $url
-themes/admin_default/views/pager.html.php                    21  DIRTY $next_page
-themes/admin_default/views/pager.html.php                    21  DIRTY $url
-themes/admin_default/views/pager.html.php                    26  DIRTY $last_page
-themes/admin_default/views/pager.html.php                    26  DIRTY $url
+themes/admin_default/views/pager.html.php                    18  DIRTY $previous_page
+themes/admin_default/views/pager.html.php                    18  DIRTY $url
+themes/admin_default/views/pager.html.php                    25  DIRTY $from_to_msg
+themes/admin_default/views/pager.html.php                    28  DIRTY $next_page
+themes/admin_default/views/pager.html.php                    28  DIRTY $url
+themes/admin_default/views/pager.html.php                    35  DIRTY $last_page
+themes/admin_default/views/pager.html.php                    35  DIRTY $url
 themes/default/views/album.html.php                          4   DIRTY $theme->album_top()
 themes/default/views/album.html.php                          5         $item->title
 themes/default/views/album.html.php                          6         $item->description
@@ -584,29 +567,29 @@ themes/default/views/movie.html.php                          18  DIRTY $item->he
 themes/default/views/movie.html.php                          21  DIRTY $item->id
 themes/default/views/movie.html.php                          35        $item->title
 themes/default/views/movie.html.php                          36        $item->description
-themes/default/views/movie.html.php                          39  DIRTY $theme->photo_bottom()
-themes/default/views/page.html.php                           11        $item->title
-themes/default/views/page.html.php                           14  DIRTY $page_title
-themes/default/views/page.html.php                           16  DIRTY $theme->page_type
-themes/default/views/page.html.php                           18  DIRTY $theme->url("images/favicon.ico")
-themes/default/views/page.html.php                           25  DIRTY $theme->url("css/screen.css")
-themes/default/views/page.html.php                           28  DIRTY $theme->url("css/fix-ie.css")
-themes/default/views/page.html.php                           37  DIRTY $new_width
-themes/default/views/page.html.php                           38  DIRTY $new_height
-themes/default/views/page.html.php                           39  DIRTY $thumb_proportion
-themes/default/views/page.html.php                           51  DIRTY $theme->url("js/jquery.scrollTo.js")
-themes/default/views/page.html.php                           52  DIRTY $theme->url("js/jquery.localscroll.js")
-themes/default/views/page.html.php                           53  DIRTY $theme->url("js/ui.init.js")
-themes/default/views/page.html.php                           54  DIRTY $theme->head()
-themes/default/views/page.html.php                           57  DIRTY $theme->body_attributes()
-themes/default/views/page.html.php                           58  DIRTY $theme->page_top()
-themes/default/views/page.html.php                           60  DIRTY $theme->site_status()
-themes/default/views/page.html.php                           62  DIRTY $theme->display("header.html")
-themes/default/views/page.html.php                           68  DIRTY $theme->messages()
-themes/default/views/page.html.php                           69  DIRTY $content
-themes/default/views/page.html.php                           74  DIRTY $theme->display("sidebar.html")
-themes/default/views/page.html.php                           78  DIRTY $theme->display("footer.html")
-themes/default/views/page.html.php                           81  DIRTY $theme->page_bottom()
+themes/default/views/movie.html.php                          42  DIRTY $theme->photo_bottom()
+themes/default/views/page.html.php                           9   DIRTY $page_title
+themes/default/views/page.html.php                           13        $theme->item()->title
+themes/default/views/page.html.php                           15        $theme->item()->title
+themes/default/views/page.html.php                           17        $theme->item()->title
+themes/default/views/page.html.php                           20        $theme->tag()->name
+themes/default/views/page.html.php                           26  DIRTY $theme->url("images/favicon.ico")
+themes/default/views/page.html.php                           33  DIRTY $theme->url("css/screen.css")
+themes/default/views/page.html.php                           36  DIRTY $theme->url("css/fix-ie.css")
+themes/default/views/page.html.php                           45  DIRTY $new_width
+themes/default/views/page.html.php                           46  DIRTY $new_height
+themes/default/views/page.html.php                           47  DIRTY $thumb_proportion
+themes/default/views/page.html.php                           63  DIRTY $theme->url("js/ui.init.js")
+themes/default/views/page.html.php                           64  DIRTY $theme->head()
+themes/default/views/page.html.php                           67  DIRTY $theme->body_attributes()
+themes/default/views/page.html.php                           68  DIRTY $theme->page_top()
+themes/default/views/page.html.php                           70  DIRTY $theme->site_status()
+themes/default/views/page.html.php                           72  DIRTY $theme->display("header.html")
+themes/default/views/page.html.php                           78  DIRTY $theme->messages()
+themes/default/views/page.html.php                           79  DIRTY $content
+themes/default/views/page.html.php                           85  DIRTY $theme->display("sidebar.html")
+themes/default/views/page.html.php                           90  DIRTY $theme->display("footer.html")
+themes/default/views/page.html.php                           93  DIRTY $theme->page_bottom()
 themes/default/views/pager.html.php                          11  DIRTY $url
 themes/default/views/pager.html.php                          18  DIRTY $previous_page
 themes/default/views/pager.html.php                          18  DIRTY $url
@@ -615,19 +598,24 @@ themes/default/views/pager.html.php                          28  DIRTY $next_pag
 themes/default/views/pager.html.php                          28  DIRTY $url
 themes/default/views/pager.html.php                          35  DIRTY $last_page
 themes/default/views/pager.html.php                          35  DIRTY $url
-themes/default/views/photo.html.php                          3   DIRTY $theme->photo_top()
-themes/default/views/photo.html.php                          8   DIRTY $previous_item->url()
-themes/default/views/photo.html.php                          15  DIRTY $position
-themes/default/views/photo.html.php                          15  DIRTY $sibling_count
-themes/default/views/photo.html.php                          18  DIRTY $next_item->url()
-themes/default/views/photo.html.php                          28  DIRTY $theme->resize_top($item)
-themes/default/views/photo.html.php                          32  DIRTY $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize"))
-themes/default/views/photo.html.php                          36  DIRTY $theme->resize_bottom($item)
-themes/default/views/photo.html.php                          40        $item->title
-themes/default/views/photo.html.php                          41        $item->description
-themes/default/views/photo.html.php                          47  DIRTY $theme->photo_bottom()
+themes/default/views/photo.html.php                          9   DIRTY $theme->item()->file_url()
+themes/default/views/photo.html.php                          9   DIRTY $theme->item()->width
+themes/default/views/photo.html.php                          9   DIRTY $theme->item()->height
+themes/default/views/photo.html.php                          17  DIRTY $theme->photo_top()
+themes/default/views/photo.html.php                          22  DIRTY $previous_item->url()
+themes/default/views/photo.html.php                          29  DIRTY $position
+themes/default/views/photo.html.php                          29  DIRTY $sibling_count
+themes/default/views/photo.html.php                          32  DIRTY $next_item->url()
+themes/default/views/photo.html.php                          42  DIRTY $theme->resize_top($item)
+themes/default/views/photo.html.php                          44  DIRTY $item->file_url()
+themes/default/views/photo.html.php                          46  DIRTY $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize"))
+themes/default/views/photo.html.php                          50  DIRTY $theme->resize_bottom($item)
+themes/default/views/photo.html.php                          54        $item->title
+themes/default/views/photo.html.php                          55        $item->description
+themes/default/views/photo.html.php                          61  DIRTY $theme->photo_bottom()
 themes/default/views/sidebar.html.php                        2   DIRTY $theme->sidebar_top()
 themes/default/views/sidebar.html.php                        6   DIRTY $theme->album_menu()
 themes/default/views/sidebar.html.php                        8   DIRTY $theme->photo_menu()
-themes/default/views/sidebar.html.php                        13  DIRTY $theme->sidebar_blocks()
-themes/default/views/sidebar.html.php                        14  DIRTY $theme->sidebar_bottom()
+themes/default/views/sidebar.html.php                        10  DIRTY $theme->tag_menu()
+themes/default/views/sidebar.html.php                        15  DIRTY $theme->sidebar_blocks()
+themes/default/views/sidebar.html.php                        16  DIRTY $theme->sidebar_bottom()
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 0fdf5aef..1e608beb 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -222,7 +222,7 @@
 #gOrganizeEditForm {
   float: right;
   width: 79%;
-//  height: 100px;
+  //  height: 100px;
 }
 
 #gOrganizeFormThumbs {
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index de4d2413..862f1fc1 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -77,14 +77,14 @@
  **********************************************************************/
 
 .gView {
-	min-width: 974px !important;
+  min-width: 974px !important;
 }
 
 #gHeader {
-	background-color: #e8e8e8;
-	border-bottom: 1px solid #ccc;
+  background-color: #e8e8e8;
+  border-bottom: 1px solid #ccc;
   margin-bottom: 20px;
-	padding: 0 20px;
+  padding: 0 20px;
 }
 
 #gContent {
@@ -171,7 +171,7 @@
 }
 
 #gSiteStatus {
-	margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 #gContent .gItem {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index b6d5bdb9..a450356c 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -330,7 +330,7 @@ form p.gError,
 }
 
 form .gError {
-	color: #f00;
+  color: #f00;
 }
 
 #gSiteStatus .gError,
@@ -368,7 +368,7 @@ form p.gError {
 
 form .gError,
 .gPager .gInfo {
-	background-color: #fff;
+  background-color: #fff;
 }
 
 #gAdminMaintenance .gError,
@@ -414,7 +414,7 @@ form .gError,
 /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
 
 #gHeader {
-	background-color: #e8e8e8;
+  background-color: #e8e8e8;
   border-bottom: 1px solid #fff;
   font-size: .8em;
   margin-bottom: 1em;
@@ -435,7 +435,7 @@ form .gError,
 }
 
 #gFooter {
-	background-color: #e8e8e8;
+  background-color: #e8e8e8;
   border-top: 1px solid #ccc;
   font-size: .8em;
   margin-top: 20px;
@@ -700,7 +700,7 @@ form .gError,
 }
 
 #gAddPhotos .gBreadcrumbs {
-	font-size: .9em;
+  font-size: .9em;
 }
 
 /* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -833,14 +833,14 @@ form .gError,
 }
 
 .gDraggable {
-	cursor: move;
+  cursor: move;
 }
 
 .gDropTarget {
-	background-color: #cfdeff;
-	border: 1px dotted #999;
-	height: 100px;
-	margin: 1em 0;
+  background-color: #cfdeff;
+  border: 1px dotted #999;
+  height: 100px;
+  margin: 1em 0;
 }
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
@@ -864,7 +864,7 @@ form .gError,
 }
 
 #gDialog li {
-	padding-left: 0;
+  padding-left: 0;
 }
 
 #gDialog form input[type="text"],
@@ -1015,7 +1015,7 @@ form .gError,
 
 /*************** STUFF THAT NEEDS A HOME ****************/
 #gProgress h1 {
- font-size: 1.1em;
+  font-size: 1.1em;
 }
 
 .gProgressBar {