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

15 files changed, 355 insertions, 424 deletions

diff --git a/.build_number b/.build_number
index 34f951d0..d633328b 100644
--- a/.build_number
+++ b/.build_number
@@ -3,4 +3,4 @@
 ; process.  You don't need to edit it.  In fact..
 ;
 ;     DO NOT EDIT THIS FILE BY HAND!
-build_number=96
+build_number=102
diff --git a/installer/install.sql b/installer/install.sql
index ff29e1a0..de5250d1 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS {access_caches};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {access_caches} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -13,11 +13,11 @@ CREATE TABLE {access_caches} (
   PRIMARY KEY (`id`),
   KEY `item_id` (`item_id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_caches} VALUES (1,1,'1','0','0','1','0','0');
 DROP TABLE IF EXISTS {access_intents};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {access_intents} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -31,11 +31,11 @@ CREATE TABLE {access_intents} (
   `add_2` binary(1) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {access_intents} VALUES (1,1,'1','1','0','0','1','1','0','0');
 DROP TABLE IF EXISTS {caches};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {caches} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` varchar(255) NOT NULL,
@@ -46,10 +46,10 @@ CREATE TABLE {caches} (
   UNIQUE KEY `key` (`key`),
   KEY `tags` (`tags`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {comments};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {comments} (
   `author_id` int(9) DEFAULT NULL,
   `created` int(9) NOT NULL,
@@ -75,10 +75,10 @@ CREATE TABLE {comments} (
   `updated` int(9) NOT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {failed_auths};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {failed_auths} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `count` int(9) NOT NULL,
@@ -86,10 +86,10 @@ CREATE TABLE {failed_auths} (
   `time` int(9) NOT NULL,
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {graphics_rules};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {graphics_rules} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `active` tinyint(1) DEFAULT '0',
@@ -100,12 +100,12 @@ CREATE TABLE {graphics_rules} (
   `target` varchar(32) NOT NULL,
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'thumb');
 INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:640;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'resize');
 DROP TABLE IF EXISTS {groups};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {groups} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` char(64) DEFAULT NULL,
@@ -113,25 +113,25 @@ CREATE TABLE {groups} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {groups} VALUES (1,'Everybody',1);
 INSERT INTO {groups} VALUES (2,'Registered Users',1);
 DROP TABLE IF EXISTS {groups_users};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {groups_users} (
   `group_id` int(9) NOT NULL,
   `user_id` int(9) NOT NULL,
   PRIMARY KEY (`group_id`,`user_id`),
   UNIQUE KEY `user_id` (`user_id`,`group_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {groups_users} VALUES (1,1);
 INSERT INTO {groups_users} VALUES (1,2);
 INSERT INTO {groups_users} VALUES (2,2);
 DROP TABLE IF EXISTS {incoming_translations};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {incoming_translations} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` char(32) NOT NULL,
@@ -143,10 +143,10 @@ CREATE TABLE {incoming_translations} (
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {items};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {items} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `album_cover_item_id` int(9) DEFAULT NULL,
@@ -188,11 +188,11 @@ CREATE TABLE {items} (
   KEY `weight` (`weight`),
   KEY `left_ptr` (`left_ptr`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,2,0,NULL,'','',1,NULL,NULL,2,NULL,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1');
 DROP TABLE IF EXISTS {items_tags};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {items_tags} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) NOT NULL,
@@ -201,10 +201,10 @@ CREATE TABLE {items_tags} (
   KEY `tag_id` (`tag_id`,`id`),
   KEY `item_id` (`item_id`,`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {logs};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {logs} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `category` varchar(64) DEFAULT NULL,
@@ -217,10 +217,10 @@ CREATE TABLE {logs} (
   `user_id` int(9) DEFAULT '0',
   PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {messages};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {messages} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `key` varchar(255) DEFAULT NULL,
@@ -229,10 +229,10 @@ CREATE TABLE {messages} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `key` (`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {modules};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {modules} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `active` tinyint(1) DEFAULT '0',
@@ -243,8 +243,8 @@ CREATE TABLE {modules} (
   UNIQUE KEY `name` (`name`),
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-INSERT INTO {modules} VALUES (1,1,'gallery',47,1);
+/*!40101 SET character_set_client = @saved_cs_client */;
+INSERT INTO {modules} VALUES (1,1,'gallery',48,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',4,3);
 INSERT INTO {modules} VALUES (4,1,'organize',4,4);
@@ -254,8 +254,8 @@ INSERT INTO {modules} VALUES (7,1,'search',1,7);
 INSERT INTO {modules} VALUES (8,1,'slideshow',2,8);
 INSERT INTO {modules} VALUES (9,1,'tag',3,9);
 DROP TABLE IF EXISTS {outgoing_translations};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {outgoing_translations} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `base_revision` int(9) DEFAULT NULL,
@@ -267,10 +267,10 @@ CREATE TABLE {outgoing_translations} (
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {permissions};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {permissions} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `display_name` varchar(64) DEFAULT NULL,
@@ -278,14 +278,14 @@ CREATE TABLE {permissions} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {permissions} VALUES (1,'View','view');
 INSERT INTO {permissions} VALUES (2,'View full size','view_full');
 INSERT INTO {permissions} VALUES (3,'Edit','edit');
 INSERT INTO {permissions} VALUES (4,'Add','add');
 DROP TABLE IF EXISTS {search_records};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {search_records} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `item_id` int(9) DEFAULT NULL,
@@ -295,21 +295,21 @@ CREATE TABLE {search_records} (
   KEY `item_id` (`item_id`),
   FULLTEXT KEY `data` (`data`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {search_records} VALUES (1,1,0,'  Gallery');
 DROP TABLE IF EXISTS {sessions};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {sessions} (
   `session_id` varchar(127) NOT NULL,
   `data` text NOT NULL,
   `last_activity` int(10) unsigned NOT NULL,
   PRIMARY KEY (`session_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {tags};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {tags} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(128) NOT NULL,
@@ -317,10 +317,10 @@ CREATE TABLE {tags} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {tasks};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {tasks} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `callback` varchar(128) DEFAULT NULL,
@@ -335,10 +335,10 @@ CREATE TABLE {tasks} (
   PRIMARY KEY (`id`),
   KEY `owner_id` (`owner_id`)
 ) DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS {themes};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {themes} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(64) DEFAULT NULL,
@@ -346,12 +346,12 @@ CREATE TABLE {themes} (
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {themes} VALUES (1,'wind',1);
 INSERT INTO {themes} VALUES (2,'admin_wind',1);
 DROP TABLE IF EXISTS {users};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {users} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `name` varchar(32) NOT NULL,
@@ -369,12 +369,12 @@ CREATE TABLE {users} (
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `hash` (`hash`)
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {users} VALUES (1,'guest','Guest User','',0,0,NULL,0,1,NULL,NULL,NULL);
 INSERT INTO {users} VALUES (2,'admin','Gallery Administrator','',0,0,'unknown@unknown.com',1,0,NULL,NULL,NULL);
 DROP TABLE IF EXISTS {vars};
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE {vars} (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `module_name` varchar(64) NOT NULL,
@@ -382,8 +382,8 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=42 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
+) AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','page_size','9');
@@ -413,6 +413,7 @@ INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
 INSERT INTO {vars} VALUES (NULL,'gallery','show_user_profiles_to','registered_users');
 INSERT INTO {vars} VALUES (NULL,'gallery','extra_binary_paths','/usr/local/bin:/opt/local/bin:/opt/bin');
+INSERT INTO {vars} VALUES (NULL,'gallery','timezone','PST8PDT');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:10;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:11;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:12;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:13;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
 INSERT INTO {vars} VALUES (NULL,'user','mininum_password_length','5');
diff --git a/lib/jquery-ui.js b/lib/jquery-ui.js
index 3398b9e4..74515a5b 100644
--- a/lib/jquery-ui.js
+++ b/lib/jquery-ui.js
@@ -18,7 +18,7 @@ this.started=false;},_mouseDestroy:function(){this.element.unbind('.'+this.widge
 (this._mouseStarted&&this._mouseUp(event));this._mouseDownEvent=event;var self=this,btnIsLeft=(event.which==1),elIsCancel=(typeof this.options.cancel=="string"?$(event.target).parents().add(event.target).filter(this.options.cancel).length:false);if(!btnIsLeft||elIsCancel||!this._mouseCapture(event)){return true;}
 this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){self.mouseDelayMet=true;},this.options.delay);}
 if(this._mouseDistanceMet(event)&&this._mouseDelayMet(event)){this._mouseStarted=(this._mouseStart(event)!==false);if(!this._mouseStarted){event.preventDefault();return true;}}
-this._mouseMoveDelegate=function(event){return self._mouseMove(event);};this._mouseUpDelegate=function(event){return self._mouseUp(event);};$(document).bind('mousemove.'+this.widgetName,this._mouseMoveDelegate).bind('mouseup.'+this.widgetName,this._mouseUpDelegate);($.browser.safari||event.preventDefault());event.originalEvent.mouseHandled=true;return true;},_mouseMove:function(event){if($.browser.msie&&!event.button){return this._mouseUp(event);}
+this._mouseMoveDelegate=function(event){return self._mouseMove(event);};this._mouseUpDelegate=function(event){return self._mouseUp(event);};$(document).bind('mousemove.'+this.widgetName,this._mouseMoveDelegate).bind('mouseup.'+this.widgetName,this._mouseUpDelegate);($.browser.safari||event.preventDefault());event.originalEvent.mouseHandled=true;return true;},_mouseMove:function(event){if($.browser.msie&&!(document.documentMode>=9)&&!event.button){return this._mouseUp(event);}
 if(this._mouseStarted){this._mouseDrag(event);return event.preventDefault();}
 if(this._mouseDistanceMet(event)&&this._mouseDelayMet(event)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,event)!==false);(this._mouseStarted?this._mouseDrag(event):this._mouseUp(event));}
 return!this._mouseStarted;},_mouseUp:function(event){$(document).unbind('mousemove.'+this.widgetName,this._mouseMoveDelegate).unbind('mouseup.'+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(event.target==this._mouseDownEvent.target);this._mouseStop(event);}
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index 55a75a3b..cf68d911 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -94,6 +94,18 @@ class Admin_g2_import_Controller extends Admin_Controller {
     print $view;
   }
 
+  public function autocomplete() {
+    $directories = array();
+    $path_prefix = Input::instance()->get("q");
+    foreach (glob("{$path_prefix}*") as $file) {
+      if (is_dir($file) && !is_link($file)) {
+        $directories[] = $file;
+      }
+    }
+
+    print implode("\n", $directories);
+  }
+
   private function _get_import_form() {
     $embed_path = module::get_var("g2_import", "embed_path", "");
     $form = new Forge(
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 20b243d5..1094524f 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,4 +1,17 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->css("jquery.autocomplete.css") ?>
+<?= $theme->script("jquery.autocomplete.js") ?>
+<script type="text/javascript">
+$("document").ready(function() {
+  $("form input[name=embed_path]").autocomplete(
+    "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/g2_import/autocomplete"),
+    {
+      max: 256,
+      loadingClass: "g-loading-small",
+    });
+});
+</script>
+
 <div id="g-admin-g2-import" class="g-block">
   <h1> <?= t("Gallery 2 import") ?> </h1>
   <p>
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 0509e45f..13de9098 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -29,14 +29,10 @@
 $config['language'] = array('en_US', 'English_United States');
 
 /**
- * Locale timezone. Defaults to use the server timezone.
+ * Locale timezone.  Set in 'Advanced' settings, falling back to the server's zone.
  * @see http://php.net/timezones
  */
-$config['timezone'] = ini_get('date.timezone');
-if (empty($config['timezone'])) {
-  // This is a required field.  Pick something as a default.
-  $config['timezone'] = "America/Los_Angeles";
-}
+$config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get());
 
 // i18n settings
 
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 20de1fea..83c5ed71 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -311,8 +311,9 @@ class gallery_installer {
     module::set_var("gallery", "email_header_separator", serialize("\n"));
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
+    module::set_var("gallery", "timezone", Kohana::config("locale.timezone"));
 
-    module::set_version("gallery", 47);
+    module::set_version("gallery", 48);
   }
 
   static function upgrade($version) {
@@ -683,6 +684,13 @@ class gallery_installer {
       module::set_var("gallery", "apple_touch_icon_url", "lib/images/apple-touch-icon.png");
       module::set_version("gallery", $version = 47);
     }
+
+    if ($version == 47) {
+      // Add configuration variable to set timezone.  Defaults to the currently
+      // used timezone (from PHP configuration).
+      module::set_var("gallery", "timezone", Kohana::config("locale.timezone"));
+      module::set_version("gallery", $version = 48);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 77e3d204..1395686c 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -136,6 +136,9 @@ class Gallery_View_Core extends View {
     }
 
     unset($this->combine_queue[$type][$group]);
+    if (empty($this->combine_queue[$type])) {
+      unset($this->combine_queue[$type]);
+    }
 
     if ($type == "css") {
       return html::stylesheet("combined/css/$key", "screen,print,projection", true);
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index aa1dc341..807d08fd 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 47
+version = 48
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 50c050a8..cfca5901 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -24,20 +24,4 @@ class server_add_theme_Core {
         . $theme->script("server_add.js");
     }
   }
-
-  static function admin_head($theme) {
-    $buf = "";
-    if (strpos(Router::$current_uri, "admin/server_add") !== false) {
-      $buf .= $theme->css("server_add.css")
-        . $theme->css("jquery.autocomplete.css");
-      $base = url::site("__ARGS__");
-      $csrf = access::csrf_token();
-      $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
-
-      $buf .= $theme->script("jquery.autocomplete.js")
-        . $theme->script("admin.js");
-    }
-
-    return $buf;
-  }
 }
\ No newline at end of file
diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
deleted file mode 100644
index 9d7bd181..00000000
--- a/modules/server_add/js/admin.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Set up autocomplete on the server path list
- *
- */
-$("document").ready(function() {
-  $("#g-path").autocomplete(
-    base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
-});
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
deleted file mode 100644
index 02dda4c0..00000000
--- a/modules/server_add/js/server_add.js
+++ /dev/null
@@ -1,125 +0,0 @@
-(function($) {
-   $.widget("ui.gallery_server_add",  {
-     _init: function() {
-       var self = this;
-       $("#g-server-add-add-button", this.element).click(function(event) {
-         event.preventDefault();
-         $(".g-progress-bar", this.element).
-           progressbar().
-           progressbar("value", 0);
-         $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); });
-       });
-       $("#g-server-add-pause-button", this.element).click(function(event) {
-         self.pause = true;
-         $("#g-server-add-pause-button", this.element).hide();
-         $("#g-server-add-continue-button", this.element).show();
-       });
-       $("#g-server-add-continue-button", this.element).click(function(event) {
-         self.pause = false;
-         $("#g-server-add-pause-button", this.element).show();
-         $("#g-server-add-continue-button", this.element).hide();
-         self.run_add();
-       });
-       $("#g-server-add-close-button", this.element).click(function(event) {
-         $("#g-dialog").dialog("close");
-         window.location.reload();
-       });
-       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
-         self.open_dir(event);
-       });
-       $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
-         self.select_file(event);
-       });
-       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
-         self.open_dir(event);
-       });
-       $("#g-dialog").bind("dialogclose", function(event, ui) {
-         window.location.reload();
-       });
-     },
-
-     taskURL: null,
-     pause: false,
-
-     start_add: function() {
-       var self = this;
-       var paths = [];
-       $.each($("span.selected", self.element), function () {
-	 paths.push($(this).attr("ref"));
-       });
-
-       $("#g-server-add-add-button", this.element).hide();
-       $("#g-server-add-pause-button", this.element).show();
-
-       $.ajax({
-         url: START_URL,
-         type: "POST",
-         async: false,
-         data: { "paths[]": paths },
-         dataType: "json",
-         success: function(data, textStatus) {
-           $("#g-status").html(data.status);
-           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
-           self.taskURL = data.url;
-           setTimeout(function() { self.run_add(); }, 25);
-         }
-       });
-       return false;
-     },
-
-     run_add: function () {
-       var self = this;
-       $.ajax({
-         url: self.taskURL,
-         async: false,
-         dataType: "json",
-         success: function(data, textStatus) {
-           $("#g-status").html(data.status);
-           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
-           if (data.done) {
-	     $("#g-server-add-progress", this.element).slideUp();
-             $("#g-server-add-add-button", this.element).show();
-             $("#g-server-add-pause-button", this.element).hide();
-             $("#g-server-add-continue-button", this.element).hide();
-           } else {
-             if (!self.pause) {
-               setTimeout(function() { self.run_add(); }, 25);
-             }
-           }
-         }
-       });
-     },
-
-     /**
-      * Load a new directory
-      */
-     open_dir: function(event) {
-       var self = this;
-       var path = $(event.target).attr("ref");
-       $.ajax({
-         url: GET_CHILDREN_URL.replace("__PATH__", path),
-         success: function(data, textStatus) {
-           $("#g-server-add-tree", self.element).html(data);
-           $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) {
-             self.open_dir(event);
-           });
-           $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
-             self.select_file(event);
-           });
-         }
-       });
-     },
-
-     /**
-      * Manage file selection state.
-      */
-     select_file:  function (event) {
-       $(event.target).toggleClass("selected");
-       if ($("#g-server-add span.selected").length) {
-         $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled");
-       } else {
-         $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled");
-       }
-     }
-  });
-})(jQuery);
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 933ab7f8..474ad428 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,4 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->css("server_add.css") ?>
+<?= $theme->css("jquery.autocomplete.css") ?>
+<?= $theme->script("jquery.autocomplete.js") ?>
+<script type="text/javascript">
+$("document").ready(function() {
+  $("#g-path").autocomplete(
+    "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/server_add/autocomplete"),
+    {
+      max: 256,
+      loadingClass: "g-loading-small",
+    });
+});
+</script>
+
 <div class="g-block">
   <h1> <?= t("Add from server administration") ?> </h1>
   <div class="g-block-content">
@@ -8,12 +22,17 @@
       <? if (empty($paths)): ?>
       <li class="g-module-status g-info"><?= t("No authorized image source paths defined yet") ?></li>
       <? endif ?>
+
       <? foreach ($paths as $id => $path): ?>
       <li>
         <?= html::clean($path) ?>
-        <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
+        <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=<?= access::csrf_token() ?>") ?>"
            id="icon_<?= $id ?>"
-           class="g-remove-dir g-button"><span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
+           class="g-remove-dir g-button">
+          <span class="ui-icon ui-icon-trash">
+            <?= t("delete") ?>
+          </span>
+        </a>
       </li>
       <? endforeach ?>
     </ul>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index a5376ff6..c96c5753 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -88,6 +88,7 @@ a:hover,
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 form {
   margin: 0;
 }
@@ -296,6 +297,7 @@ th {
 }
 
 /* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 .g-text-small {
   font-size: .8em;
 }
@@ -333,10 +335,6 @@ th {
   padding: 0;
 }
 
-#g-sidebar .g-block-content {
-  padding: 0;
-}
-
 #g-content .g-selected,
 #g-content .g-available .g-block {
   border: 1px solid #ccc;
@@ -407,7 +405,9 @@ ul.enumeration li {
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/
+
 /* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+
 .g-one-quarter {
   width: 25%;
 }
@@ -602,11 +602,13 @@ ul.enumeration li {
 }
 
 /* In-line editing  ~~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-in-place-edit-message {
   background-color: #FFF;
 }
 
-/* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Language options  ~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-share-translations-form fieldset {
   border: 0px;
   margin: 0px;
@@ -703,11 +705,11 @@ tr.g-error td.g-error,
 }
 
 tr.g-success {
-	background-image: none;
+  background-image: none;
 }
 
 tr.g-success td.g-success {
-	background-image: url('../images/ico-success.png');
+  background-image: url('../images/ico-success.png');
 }
 
 .g-warning,
@@ -731,8 +733,8 @@ form .g-error {
 }
 
 .g-default {
-	background-color: #c5dbec;
-	font-weight: bold;
+  background-color: #c5dbec;
+  font-weight: bold;
 }
 
 .g-draggable {
@@ -810,6 +812,7 @@ form .g-error {
 /** *******************************************************************
  *  8) jQuery and jQuery UI
  *********************************************************************/
+
 /* Generic block container ~~~~~~~~~~~~~~~ */
 
 .g-block {
@@ -993,18 +996,19 @@ div#g-action-status {
 }
 
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
 .sf-menu ul {
-	width: 12em;
+  width: 12em;
 }
 
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:	12em;
+  left: 12em;
 }
 
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left: 12em;
+  left: 12em;
 }
 
 
@@ -1018,6 +1022,7 @@ ul.sf-menu li li li.sfHover ul {
 }
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
 .ui-widget-overlay {
   background: #000;
   opacity: .7;
@@ -1041,6 +1046,7 @@ ul.sf-menu li li li.sfHover ul {
 /** *******************************************************************
  *  9) Right to left styles
  *********************************************************************/
+
 .rtl {
   direction: rtl;
 }
@@ -1112,7 +1118,7 @@ ul.sf-menu li li li.sfHover ul {
 }
 
 .rtl .g-breadcrumbs li {
-  background: transparent url('..images/ico-separator-rtl.gif') no-repeat scroll right center;
+  background: transparent url('../images/ico-separator-rtl.gif') no-repeat scroll right center;
   padding: 1em 18px 1em 8px;
 }
 
@@ -1139,149 +1145,154 @@ ul.sf-menu li li li.sfHover ul {
 }
 
 /* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+
 .rtl .g-buttonset .ui-corner-tl {
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-left-radius: 0;
-	border-top-left-radius: 0;
-	-moz-border-radius-topright: 5px !important;
-	-webkit-border-top-right-radius: 5px !important;
-	border-top-right-radius: 5px !important;
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 5px !important;
+  -webkit-border-top-right-radius: 5px !important;
+  border-top-right-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-tr {
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-right-radius: 0;
-	border-top-right-radius: 0;
-	-moz-border-radius-topleft: 5px !important;
-	-webkit-border-top-left-radius: 5px !important;
-	border-top-left-radius: 5px !important;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-topleft: 5px !important;
+  -webkit-border-top-left-radius: 5px !important;
+  border-top-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-bl {
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-bottom-left-radius: 0;
-	border-bottom-left-radius: 0;
-	-moz-border-radius-bottomright: 5px !important;
-	-webkit-border-bottom-right-radius: 5px !important;
-	border-bottom-right-radius: 5px !important;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-bottomright: 5px !important;
+  -webkit-border-bottom-right-radius: 5px !important;
+  border-bottom-right-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-br {
-	-moz-border-radius-bottomright: 0;
-	-webkit-border-bottom-right-radius: 0;
-	border-bottom-right-radius: 0;
-	-moz-border-radius-bottomleft: 5px !important;
-	-webkit-border-bottom-left-radius: 5px !important;
-	border-bottom-left-radius: 5px !important;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 5px !important;
+  -webkit-border-bottom-left-radius: 5px !important;
+  border-bottom-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-right,
 .rtl .ui-progressbar .ui-corner-right {
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-right-radius: 0;
-	border-top-right-radius: 0;
-	-moz-border-radius-topleft: 5px !important;
-	-webkit-border-top-left-radius: 5px !important;
-	border-top-left-radius: 5px !important;
-	-moz-border-radius-bottomright: 0;
-	-webkit-border-bottom-right-radius: 0;
-	border-bottom-right-radius: 0;
-	-moz-border-radius-bottomleft: 5px !important;
-	-webkit-border-bottom-left-radius: 5px !important;
-	border-bottom-left-radius: 5px !important;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-topleft: 5px !important;
+  -webkit-border-top-left-radius: 5px !important;
+  border-top-left-radius: 5px !important;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 5px !important;
+  -webkit-border-bottom-left-radius: 5px !important;
+  border-bottom-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-left,
 .rtl .ui-progressbar .ui-corner-left {
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-left-radius: 0;
-	border-top-left-radius: 0;
-	-moz-border-radius-topright: 5px !important;
-	-webkit-border-top-right-radius: 5px !important;
-	border-top-right-radius: 5px !important;
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-bottom-left-radius: 0;
-	border-bottom-left-radius: 0;
-	-moz-border-radius-bottomright: 5px !important;
-	-webkit-border-bottom-right-radius: 5px !important;
-	border-bottom-right-radius: 5px !important;
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 5px !important;
+  -webkit-border-top-right-radius: 5px !important;
+  border-top-right-radius: 5px !important;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-bottomright: 5px !important;
+  -webkit-border-bottom-right-radius: 5px !important;
+  border-bottom-right-radius: 5px !important;
 }
 
 /* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .rtl .sf-menu a {
-    border-left: none;
-	border-right:1px solid #fff;
+  border-left: none;
+  border-right:1px solid #fff;
 }
 
 .rtl .sf-menu a.sf-with-ul {
-	padding-left: 2.25em;
-	padding-right: 1em;
+  padding-left: 2.25em;
+  padding-right: 1em;
 }
 
 .rtl .sf-sub-indicator {
-	left: .75em !important;
-    right: auto;
-	background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+  left: .75em !important;
+  right: auto;
+  background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px;
 }
-.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
-	top:			.8em;
-	background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+
+.rtl a > .sf-sub-indicator {
+  top: .8em;
+  background-position: -10px -100px;
 }
-/* apply hovers to modern browsers */
+
 .rtl a:focus > .sf-sub-indicator,
 .rtl a:hover > .sf-sub-indicator,
 .rtl a:active > .sf-sub-indicator,
 .rtl li:hover > a > .sf-sub-indicator,
 .rtl li.sfHover > a > .sf-sub-indicator {
-	background-position: 0 -100px; /* arrow hovers for modern browsers*/
+  background-position: 0 -100px;
+}
+
+.rtl .sf-menu ul .sf-sub-indicator {
+  background-position: 0 0;
+}
+
+.rtl .sf-menu ul a > .sf-sub-indicator {
+  background-position: -10px 0;
 }
 
-/* point right for anchors in subs */
-.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
-.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
-/* apply hovers to modern browsers */
 .rtl .sf-menu ul a:focus > .sf-sub-indicator,
 .rtl .sf-menu ul a:hover > .sf-sub-indicator,
 .rtl .sf-menu ul a:active > .sf-sub-indicator,
 .rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
 .rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
-	background-position: 0 0; /* arrow hovers for modern browsers*/
+  background-position: 0 0;
 }
 
 .rtl .sf-menu li:hover ul,
 .rtl .sf-menu li.sfHover ul {
-	right: 0;
-	left: auto;
+  right: 0;
+  left: auto;
 }
 
 .rtl ul.sf-menu li li:hover ul,
 .rtl ul.sf-menu li li.sfHover ul {
-	right:	12em; /* match ul width */
-	left: auto;
+  right: 12em;
+  left: auto;
 }
 .rtl ul.sf-menu li li li:hover ul,
 .rtl ul.sf-menu li li li.sfHover ul {
-	right:	12em; /* match ul width */
-	left: auto;
+  right: 12em;
+  left: auto;
 }
 
-/*** shadows for all but IE6 ***/
 .rtl .sf-shadow ul {
-	background:	url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
-	padding: 0 0 9px 8px;
-	border-top-right-radius: 0;
-	border-bottom-left-radius: 0;
-	-moz-border-radius-topright: 0;
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-top-right-radius: 0;
-	-webkit-border-bottom-left-radius: 0;
-	-moz-border-radius-topleft: 17px;
-	-moz-border-radius-bottomright: 17px;
-	-webkit-border-top-left-radius: 17px;
-	-webkit-border-bottom-right-radius: 17px;
-	border-top-left-radius: 17px;
-	border-bottom-right-radius: 17px;
+  background:	url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
+  padding: 0 0 9px 8px;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-top-right-radius: 0;
+  -webkit-border-bottom-left-radius: 0;
+  -moz-border-radius-topleft: 17px;
+  -moz-border-radius-bottomright: 17px;
+  -webkit-border-top-left-radius: 17px;
+  -webkit-border-bottom-right-radius: 17px;
+  border-top-left-radius: 17px;
+  border-bottom-right-radius: 17px;
 }
 
 /* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -1331,6 +1342,11 @@ ul.sf-menu li li li.sfHover ul {
   padding-right: 1.2em;
 }
 
+.rtl #g-sidebar .g-block-content {
+  padding-left: 0em;
+  padding-right: 1em;
+}
+
 .rtl .g-selected img,
 .rtl .g-available .g-block img {
   margin: 0 0 1em 1em;
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index a49b8c28..b470ab1c 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -106,12 +106,13 @@ a:hover,
 }
 
 #g-dialog #g-action-status li {
-  width: 400px;
+  width: 434px;
   white-space: normal;
   padding-left: 32px;
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 form {
   margin: 0;
 }
@@ -302,6 +303,7 @@ td {
 }
 
 /* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 .g-text-small {
   font-size: .8em;
 }
@@ -332,6 +334,7 @@ td {
  *********************************************************************/
 
 /* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
+
 .g-one-quarter {
   width: 25%;
 }
@@ -523,7 +526,8 @@ td {
   background-color: #fff;
 }
 
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #g-edit-permissions-form td {
   background-image: none;
 }
@@ -635,11 +639,11 @@ tr.g-error td.g-error,
 }
 
 tr.g-success {
-	background-image: none;
+  background-image: none;
 }
 
 tr.g-success td.g-success {
-	background-image: url('../images/ico-success.png');
+  background-image: url('../images/ico-success.png');
 }
 
 .g-warning,
@@ -823,6 +827,7 @@ form .g-error {
 /** *******************************************************************
  *  8) jQuery and jQuery UI
  *********************************************************************/
+
 /* Generic block container ~~~~~~~~~~~~~~~ */
 
 .g-block {
@@ -834,18 +839,19 @@ form .g-error {
 }
 
 /* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
 .sf-menu ul {
-	width: 12em;
+  width: 12em;
 }
 
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:	12em;
+  left: 12em;
 }
 
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left: 12em;
+  left: 12em;
 }
 
 .sf-menu li li,
@@ -1037,6 +1043,7 @@ div#g-action-status {
 }
 
 /* Autocomplete  ~~~~~~~~~~ */
+
 .ac_loading {
   background: white url('../images/loading-small.gif') right center no-repeat !important;
 }
@@ -1143,149 +1150,154 @@ div#g-action-status {
 }
 
 /* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
+
 .rtl .g-buttonset .ui-corner-tl {
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-left-radius: 0;
-	border-top-left-radius: 0;
-	-moz-border-radius-topright: 5px !important;
-	-webkit-border-top-right-radius: 5px !important;
-	border-top-right-radius: 5px !important;
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 5px !important;
+  -webkit-border-top-right-radius: 5px !important;
+  border-top-right-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-tr {
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-right-radius: 0;
-	border-top-right-radius: 0;
-	-moz-border-radius-topleft: 5px !important;
-	-webkit-border-top-left-radius: 5px !important;
-	border-top-left-radius: 5px !important;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-topleft: 5px !important;
+  -webkit-border-top-left-radius: 5px !important;
+  border-top-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-bl {
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-bottom-left-radius: 0;
-	border-bottom-left-radius: 0;
-	-moz-border-radius-bottomright: 5px !important;
-	-webkit-border-bottom-right-radius: 5px !important;
-	border-bottom-right-radius: 5px !important;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-bottomright: 5px !important;
+  -webkit-border-bottom-right-radius: 5px !important;
+  border-bottom-right-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-br {
-	-moz-border-radius-bottomright: 0;
-	-webkit-border-bottom-right-radius: 0;
-	border-bottom-right-radius: 0;
-	-moz-border-radius-bottomleft: 5px !important;
-	-webkit-border-bottom-left-radius: 5px !important;
-	border-bottom-left-radius: 5px !important;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 5px !important;
+  -webkit-border-bottom-left-radius: 5px !important;
+  border-bottom-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-right,
 .rtl .ui-progressbar .ui-corner-right {
-	-moz-border-radius-topright: 0;
-	-webkit-border-top-right-radius: 0;
-	border-top-right-radius: 0;
-	-moz-border-radius-topleft: 5px !important;
-	-webkit-border-top-left-radius: 5px !important;
-	border-top-left-radius: 5px !important;
-	-moz-border-radius-bottomright: 0;
-	-webkit-border-bottom-right-radius: 0;
-	border-bottom-right-radius: 0;
-	-moz-border-radius-bottomleft: 5px !important;
-	-webkit-border-bottom-left-radius: 5px !important;
-	border-bottom-left-radius: 5px !important;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+  -moz-border-radius-topleft: 5px !important;
+  -webkit-border-top-left-radius: 5px !important;
+  border-top-left-radius: 5px !important;
+  -moz-border-radius-bottomright: 0;
+  -webkit-border-bottom-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 5px !important;
+  -webkit-border-bottom-left-radius: 5px !important;
+  border-bottom-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-left,
 .rtl .ui-progressbar .ui-corner-left {
-	-moz-border-radius-topleft: 0;
-	-webkit-border-top-left-radius: 0;
-	border-top-left-radius: 0;
-	-moz-border-radius-topright: 5px !important;
-	-webkit-border-top-right-radius: 5px !important;
-	border-top-right-radius: 5px !important;
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-bottom-left-radius: 0;
-	border-bottom-left-radius: 0;
-	-moz-border-radius-bottomright: 5px !important;
-	-webkit-border-bottom-right-radius: 5px !important;
-	border-bottom-right-radius: 5px !important;
+  -moz-border-radius-topleft: 0;
+  -webkit-border-top-left-radius: 0;
+  border-top-left-radius: 0;
+  -moz-border-radius-topright: 5px !important;
+  -webkit-border-top-right-radius: 5px !important;
+  border-top-right-radius: 5px !important;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-bottom-left-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-bottomright: 5px !important;
+  -webkit-border-bottom-right-radius: 5px !important;
+  border-bottom-right-radius: 5px !important;
 }
 
 /* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .rtl .sf-menu a {
-    border-left: none;
-	border-right:1px solid #fff;
+  border-left: none;
+  border-right:1px solid #fff;
 }
 
 .rtl .sf-menu a.sf-with-ul {
-	padding-left: 2.25em;
-	padding-right: 1em;
+  padding-left: 2.25em;
+  padding-right: 1em;
 }
 
 .rtl .sf-sub-indicator {
-	left: .75em !important;
-    right: auto;
-	background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+  left: .75em !important;
+  right: auto;
+  background: url('../../../lib/superfish/images/arrows-ffffff-rtl.png') no-repeat -10px -100px;
 }
-.rtl a > .sf-sub-indicator {  /* give all except IE6 the correct values */
-	top:			.8em;
-	background-position: -10px -100px; /* use translucent arrow for modern browsers*/
+
+.rtl a > .sf-sub-indicator {
+  top: .8em;
+  background-position: -10px -100px;
 }
-/* apply hovers to modern browsers */
+
 .rtl a:focus > .sf-sub-indicator,
 .rtl a:hover > .sf-sub-indicator,
 .rtl a:active > .sf-sub-indicator,
 .rtl li:hover > a > .sf-sub-indicator,
 .rtl li.sfHover > a > .sf-sub-indicator {
-	background-position: 0 -100px; /* arrow hovers for modern browsers*/
+  background-position: 0 -100px;
+}
+
+.rtl .sf-menu ul .sf-sub-indicator {
+  background-position:  0 0;
+}
+
+.rtl .sf-menu ul a > .sf-sub-indicator {
+  background-position: -10px 0;
 }
 
-/* point right for anchors in subs */
-.rtl .sf-menu ul .sf-sub-indicator { background-position:  0 0; }
-.rtl .sf-menu ul a > .sf-sub-indicator { background-position:  -10px 0; }
-/* apply hovers to modern browsers */
 .rtl .sf-menu ul a:focus > .sf-sub-indicator,
 .rtl .sf-menu ul a:hover > .sf-sub-indicator,
 .rtl .sf-menu ul a:active > .sf-sub-indicator,
 .rtl .sf-menu ul li:hover > a > .sf-sub-indicator,
 .rtl .sf-menu ul li.sfHover > a > .sf-sub-indicator {
-	background-position: 0 0; /* arrow hovers for modern browsers*/
+  background-position: 0 0;
 }
 
 .rtl .sf-menu li:hover ul,
 .rtl .sf-menu li.sfHover ul {
-	right: 0;
-	left: auto;
+  right: 0;
+  left: auto;
 }
 
 .rtl ul.sf-menu li li:hover ul,
 .rtl ul.sf-menu li li.sfHover ul {
-	right:	12em; /* match ul width */
-	left: auto;
+  right: 12em;
+  left: auto;
 }
 .rtl ul.sf-menu li li li:hover ul,
 .rtl ul.sf-menu li li li.sfHover ul {
-	right:	12em; /* match ul width */
-	left: auto;
+  right: 12em;
+  left: auto;
 }
 
-/*** shadows for all but IE6 ***/
 .rtl .sf-shadow ul {
-	background:	url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
-	padding: 0 0 9px 8px;
-	border-top-right-radius: 0;
-	border-bottom-left-radius: 0;
-	-moz-border-radius-topright: 0;
-	-moz-border-radius-bottomleft: 0;
-	-webkit-border-top-right-radius: 0;
-	-webkit-border-bottom-left-radius: 0;
-	-moz-border-radius-topleft: 17px;
-	-moz-border-radius-bottomright: 17px;
-	-webkit-border-top-left-radius: 17px;
-	-webkit-border-bottom-right-radius: 17px;
-	border-top-left-radius: 17px;
-	border-bottom-right-radius: 17px;
+  background:	url('../../../lib/superfish/images/shadow.png') no-repeat bottom left;
+  padding: 0 0 9px 8px;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
+  -moz-border-radius-topright: 0;
+  -moz-border-radius-bottomleft: 0;
+  -webkit-border-top-right-radius: 0;
+  -webkit-border-bottom-left-radius: 0;
+  -moz-border-radius-topleft: 17px;
+  -moz-border-radius-bottomright: 17px;
+  -webkit-border-top-left-radius: 17px;
+  -webkit-border-bottom-right-radius: 17px;
+  border-top-left-radius: 17px;
+  border-bottom-right-radius: 17px;
 }
 
 /* RTL ThemeRoller ~~~~~~~~~~~~~~~~~~~~~~~~ */