Merge branch 'master' of github.com:gallery/gallery3-contrib

2009-12-03 21:37:58 -07:00 · 2009-12-03 21:37:58 -07:00 · fd724e86f2
commit fd724e86f2
parent cb9482299f 4f1538d87b
94 changed files with 1334 additions and 1820 deletions
--- a/modules/google_analytics/helpers/google_analytics_theme.php
+++ b/modules/google_analytics/helpers/google_analytics_theme.php
@ -19,6 +19,11 @@
 */
 class google_analytics_theme {
  static function page_bottom($theme) {
+    $code = module::get_var("google_analytics", "code");
+    if (!$code) {
+      return;
+    }
+
    $google_code = '
  	<!-- Begin Google Analytics -->
 	<script type="text/javascript">
@ -29,7 +34,7 @@ class google_analytics_theme {
 	<script type="text/javascript">
 		try
 		{
-			var pageTracker = _gat._getTracker("'.module::get_var("google_analytics", "code").'");
+			var pageTracker = _gat._getTracker("' . $code . '");
 			pageTracker._trackPageview();
 		}
 		catch(err){}
--- a/modules/google_analytics/module.info
+++ b/modules/google_analytics/module.info
@ -1,3 +1,3 @@
 name = Google Analytics
 description = Renders the Google Analytics Code at the end of the page. Written by 'mcp'.
-version = 1.2
+version = 2
--- a/themes/greydragon/admin/controllers/admin_theme_options.php
+++ b/themes/greydragon/admin/controllers/admin_theme_options.php
@ -0,0 +1,146 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Admin_Theme_Options_Controller extends Admin_Controller {
+
+  static function get_edit_form_admin() {
+    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form"));
+
+    $group = $form->group("requirements")->label("Prerequisites checklist");
+    $group->checkbox("shadowbox")->label(t("Shadowbox module"))
+      ->checked((module::is_active("shadowbox")))->disabled(true);
+
+    $file = THEMEPATH . "greydragon/theme.info";
+    $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+
+    $group = $form->group("edit_theme")->label(t("Grey Dragon Theme") . " - " . t("v.") . $theme_info->version);
+    $group->input("row_count")->label(t("Rows per album page"))->id("g-page-size")
+      ->rules("required|valid_digit")
+      ->value(module::get_var("gallery", "page_size") / 3);
+
+    $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size")
+      ->rules("required|valid_digit")
+      ->value(module::get_var("gallery", "resize_size"));
+    $group->checkbox("build_resize")->label(t("Mark to build all resizes (from Maintenace page)"))->id("g-build-resize")->value(false);
+    $group->checkbox("build_thumbs")->label(t("Mark to build all thumbnails (200x200) (from Maintenace page)"))->id("g-build-thumb")->value(false);
+
+    $group->checkbox("photonav_top")->label(t("Show top photo navigator"))
+      ->checked(module::get_var("th_greydragon", "photonav_top"));
+    $group->checkbox("photonav_bottom")->label(t("Show bottom photo navigator"))
+      ->checked(module::get_var("th_greydragon", "photonav_bottom"));
+
+    $group->dropdown("sidebar_allowed")->label(t("Allowed SideBar Positions"))
+      ->options(array("any" => t("Any"), "left" => t("Left"), "right" => t("Right"), "none" => t("None")))
+      ->selected(module::get_var("th_greydragon", "sidebar_allowed"));
+    $group->dropdown("sidebar_visible")->label(t("Default SideBar Position"))
+      ->options(array("right" => t("Right"), "left" => t("Left"), "none" => t("None")))
+      ->selected(module::get_var("th_greydragon", "sidebar_visible"));
+
+    $group->input("header_text")->label(t("Header text"))->id("g-header-text")
+      ->value(module::get_var("gallery", "header_text"));
+    $group->input("footer_text")->label(t("Footer text"))->id("g-footer-text")
+      ->value(module::get_var("gallery", "footer_text"));
+    $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
+      ->checked(module::get_var("gallery", "show_credits"));
+
+    $group->input("copyright")->label(t("Copyright message to display on footer"))->id("g-theme-copyright")
+      ->value(module::get_var("th_greydragon", "copyright"));
+    $group->input("logo_path")->label(t("URL or path to alternate logo image"))->id("g-site-logo")
+      ->value(module::get_var("th_greydragon", "logo_path"));
+
+    module::event("theme_edit_form", $form);
+
+    $group = $form->group("buttons");
+    $group->submit("")->value(t("Save"));
+    return $form;
+  }
+
+  public function index() {
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_theme_options.html");
+    $view->content->form = self::get_edit_form_admin();
+    print $view;
+  }
+
+  public function save() {
+    access::verify_csrf();
+
+    $form = self::get_edit_form_admin();
+    if ($form->validate()) {
+      $edit_theme = $form->edit_theme;
+
+      module::set_var("gallery", "page_size", $edit_theme->row_count->value * 3);
+
+      $resize_size  = $edit_theme->resize_size->value;
+      $thumb_size   = 200;
+      $build_resize = $edit_theme->build_resize->value;
+      $build_thumbs = $edit_theme->build_thumbs->value;
+
+      if (module::get_var("gallery", "resize_size") != $resize_size) {
+        module::set_var("gallery", "resize_size", $resize_size);
+        $build_resize = true;
+      }
+      if (module::get_var("gallery", "thumb_size") != $thumb_size) {
+        module::set_var("gallery", "thumb_size", $thumb_size);
+      }
+
+      if ($build_resize) {
+        graphics::remove_rule("gallery", "resize", "gallery_graphics::resize");
+        graphics::add_rule("gallery", "resize", "gallery_graphics::resize",
+          array("width" => $resize_size, "height" => $resize_size, "master" => Image::AUTO), 100);
+      }
+
+      if ($build_thumbs) {
+        graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize");
+        graphics::add_rule("gallery", "thumb", "gallery_graphics::resize",
+          array("width" => 200, "height" => 200, "master" => Image::AUTO), 100);
+      }
+
+      module::set_var("th_greydragon", "photonav_top",    $edit_theme->photonav_top->value);
+      module::set_var("th_greydragon", "photonav_bottom", $edit_theme->photonav_bottom->value);
+
+      $sidebar_allowed = $edit_theme->sidebar_allowed->value;
+      $sidebar_visible = $edit_theme->sidebar_visible->value;    
+
+      if ($sidebar_allowed == "none")  { $sidebar_visible = "none"; }
+      if ($sidebar_allowed == "right") { $sidebar_visible = "right"; }
+      if ($sidebar_allowed == "left")  { $sidebar_visible = "left"; }
+
+      module::set_var("th_greydragon", "sidebar_allowed", $sidebar_allowed);
+      module::set_var("th_greydragon", "sidebar_visible", $sidebar_visible);
+
+      module::set_var("gallery", "header_text", $edit_theme->header_text->value);
+      module::set_var("gallery", "footer_text", $edit_theme->footer_text->value);
+      module::set_var("gallery", "show_credits", $edit_theme->show_credits->value);
+
+      module::set_var("th_greydragon", "copyright", $edit_theme->copyright->value);
+      module::set_var("th_greydragon", "logo_path", $edit_theme->logo_path->value);
+
+      module::event("theme_edit_form_completed", $form);
+
+      message::success(t("Updated theme details"));
+      url::redirect("admin/theme_options");
+    } else {
+      $view = new Admin_View("admin.html");
+      $view->content = $form;
+      print $view;
+    }
+  }
+}
+
--- a/themes/greydragon/changelog.txt
+++ b/themes/greydragon/changelog.txt
@ -0,0 +1,46 @@
+Grey Dragon Theme Changelog
+
+version 1.5.8
+- Finally admin module for theme is there. After theme installation, visit Appearance/Theme Options to configure the theme.
+  If you had older version of the theme, initial setup is also required.
+  The following settings are available:
+  	- Rows per album page - theme uses 3 columns layout for pictures, therefore default page_size is computed in x3 increments
+  	- Thumb size is restricted to 200 and therefore not available for administration
+  	- Mark to build resizes/thumbs - allows force rebuilding of images
+  	- Show/Hide top/bottom photo navigators
+  	- Specify allowed and default sidebar position
+  	- Administrator can now specify Copyright message to display in the footer
+  	- Site logo is now default to Gallery 3 logo, but admin can provide a path to custom logo.
+- Sidebar session cookie is set to expire in 365 days
+
+version 1.5.7
+- Status message has been moved into header as popup to prevent obstruction of the main view.
+  jQuery is used to fade it out in 10 sec.
+- Improved logic for dialogs on submit
+- Theme related JS has been moved out of the page.html.php
+
+version 1.5.6
+- Fixed issue with tollbar buttons not properly aligned/shown when page is resized.
+- Copyright info moved into DB. To change default settings add [th_greydragon/copyright] into VARS table.
+
+version 1.5.5
+- CSS fixes.
+- Theme adjusted to be compatible with latest Git.
+- Login links are moved into footer.
+- Pagination module redesigned to support new structure of paging data.
+
+version 1.5.4
+- CSS fixes.
+- Added support for Comments block.
+- Improved support for Modal dialogs.
+
+version 1.5.3
+- Sync to git.
+- Exif menu customization is now part of the theme.
+- Sidebar management button is disabled for current mode.
+
+version 1.5.2
+- Code, layout, css cleanup.
+- New thumbs for buttons.
+- First set of Ajax dialogs is ready and now operational: Login, user info, edit album, exit info.
+- Fixed some browser related issues.
--- a/themes/greydragon/css/forms.css
+++ b/themes/greydragon/css/forms.css
@ -0,0 +1,33 @@
+#sb-content        { padding: 0px; margin: 0; }
+
+#g-exif-data         { width: auto; min-height: 90%; margin: 10px; text-align: center; color: #ccc; background-color: #101415; overflow: auto; }
+#g-exif-data table   { border: #eee 1px solid; font-size: 10pt; }
+#g-exif-data .g-even { background-color: #aaa; color: #000; }
+#g-exif-data .g-odd  { background-color: #999; color: #fff; }
+
+/* Login dialog ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+form                    { background: #101415 url('../images/section.png') repeat-x; overflow: hidden; }
+form fieldset           { border: none; }
+form legend             { color: #bbb; padding: 6px 0 0 10px; width: 100%; }
+form ul                 { padding: 0; }
+form li                 { padding: 8px 0 0 20px; }
+form ul>fieldset>legend { display: none; }
+form label              { display: block; }
+form textarea           { width: 98%; }
+form input[type="text"],
+input[type="password"]  { width: 90%; }
+
+#sb-content.html_ajax textarea    { width: 270px; }
+#sb-content.html_ajax p.g-error              { padding-top: 4px; color: red; }
+
+#g-text { min-height: 70px; }
+
+#g-login-form                                { width: 100%; }
+#g-login form ul                             { min-height: 160px; }
+#g-edit-user-form ul                         { min-height: 276px; }
+#g-password-reset                            { margin-left: 8px; }
+#g-edit-album-form fieldset fieldset         { border: none; }
+#g-edit-album-form fieldset fieldset li      { float: left; display: inline; }
+
+#g-add-photos-form { height: 100%; }
--- a/themes/greydragon/css/layout.css
+++ b/themes/greydragon/css/layout.css
@ -0,0 +1,21 @@
+html      { overflow: auto; }
+*         { margin: 0px; }
+body      { min-width: 73em; padding: 0; margin: 0; }
+
+#g-header           { position: relative; min-width: 73em; z-index: 5; }
+#g-main, #g-main-in { min-width: 72.7em; height: auto; bottom: auto; }
+#g-footer           { position: relative; height: auto; min-width: 73em; clear: both; display: block; overflow: auto; }
+
+#g-column-left        { float: left;  width: 18em; min-height: 32em; overflow: hidden; height: 100%; }
+#g-column-right       { float: right; width: 18em; min-height: 32em; overflow: hidden; height: 100%; }
+#g-column-center      { margin: 0 19em 0 19em; min-height: 32em; overflow: hidden; height: 100%; }
+#g-column-centerleft  { margin: 0 19em 0 0;    min-height: 32em; overflow: hidden; height: 100%; }
+#g-column-centerright { margin: 0 0 0 19em;    min-height: 32em; overflow: hidden; height: 100%; } 
+#g-column-centerfull  { position: relative; margin: 0 0; min-height: 31em; overflow: hidden; height: 100%; }
+
+#g-footer-leftside    { float: left; display: inline; }
+#g-footer-rightside   { float: right; display: inline; }
+
+.g-hideitem           { display: none; }
+
+#g-main-in  { overflow: auto; height: 100%; }
--- a/themes/greydragon/css/menus.css
+++ b/themes/greydragon/css/menus.css
@ -0,0 +1,27 @@
+#g-site-menu                   { position: absolute; bottom: 0px; left: 310px; }
+#g-site-menu ul                { float: left; padding: 0px; margin: 0px; width: 100%; border: #000000 0px solid; white-space: nowrap; z-index: 100; }
+#g-site-menu a                 { display: block; padding: 3px 5px 4px 5px; text-align: center; width: auto; letter-spacing: 0px; cursor: pointer; }
+#g-site-menu li                { float: left; padding: 0px; background-color: transparent; border: transparent 1px solid; }
+#g-site-menu li a:hover        { color: #000000; cursor: pointer; background-color: #303030; }
+#g-site-menu li:hover,
+#g-site-menu li.iemhover       { border: #303030 1px solid; background-color: #303030; border-bottom: #000000 1px solid; }
+#g-site-menu li ul a           { text-align: left; padding: 4px 0px; text-indent: 8px; letter-spacing: 0px; cursor: pointer; }
+#g-site-menu li ul a:hover     { background-image: none; cursor: pointer; }
+#g-site-menu li ul             { border: #000000 1px solid; position: absolute; margin: 0px 0px 0px -1px; width: 135px; height: auto; left: -999em; }
+#g-site-menu li ul li          { border: #C0C0C0 0px solid; background-color: #212121; }
+#g-site-menu li ul li:hover,
+#g-site-menu li ul li.iemhover { border: #C0C0C0 0px solid; background-color: #303030; }
+
+#g-site-menu li li             { width: 135px; padding-right: 0px; }
+#g-site-menu li ul a           { width: 135px; }
+#g-site-menu li ul ul          { margin: -21px 0px 0px 135px; }
+#g-site-menu li:hover ul ul,
+#g-site-menu li:hover ul ul ul,
+#g-site-menu li.iemhover ul ul,
+#g-site-menu li.iemhover ul ul ul { left: -999em; }
+#g-site-menu li:hover ul,
+#g-site-menu li li:hover ul,
+#g-site-menu li li li:hover ul,
+#g-site-menu li.iemhover ul,
+#g-site-menu li li.iemhover ul,
+#g-site-menu li li li.iemhover ul { left: auto; }
--- a/themes/greydragon/css/old_ie.css
+++ b/themes/greydragon/css/old_ie.css
@ -0,0 +1,4 @@
+body { word-wrap: break-word; }
+
+.g-item .g-metadata:hover                 { padding: 0px 0 4px 6px; }
+#g-quick-search-form input[type="submit"] { padding: 60px 0 0 0; }
--- a/themes/greydragon/css/screen.css
+++ b/themes/greydragon/css/screen.css
@ -0,0 +1,211 @@
+/**
+ * Gallery 3 Grey Dragon Theme
+ * Copyright (C) 2006-2009 Serguei Dosyukov
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street
+ * - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+@import url(layout.css);
+@import url(forms.css);
+
+html { background-color: #1A2022; overflow: -moz-scrollbars-vertical; overflow-y: scroll; }
+body { background: url(../images/background.gif) #1A2022 repeat-x; color: #BBB; font: 0.8em Arial, verdana, sans-serif; }
+
+a    { color: #6392CF !important; text-decoration: none; outline: none; -moz-outline-style: none; }
+a:focus, a:active, a:hover { text-decoration: none; outline: none; }
+img  { border: none; }
+p    { font-size: small; text-indent: 0;  }
+ul   { list-style: none none; }
+input[type="submit"] { cursor: pointer; /* hand-shaped cursor */  cursor: hand; /* for IE 5.x */ }
+
+h1   { font-weight: bold; font-size: 1.2em; }
+h2   { font-weight: bold; font-size: 1.2em; }
+h3   { font-weight: bold; }
+h4   { font-weight: bold; }
+h5   { font-weight: bold; }
+
+/* Common elements ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.txtright    { text-align: right; }
+.g-metadata  { overflow: hidden; }
+
+.ui-icon                { display: inline-block; zoom: 1; width: 16px; height: 16px; background-image: url(../images/ui-icons.png); }
+.ui-icon-first          { background-position: -32px  -162px; }
+.ui-icon-first-d        { background-position: -162px -162px; }
+.ui-icon-prev           { background-position: -48px  -162px; }
+.ui-icon-prev-d					{ background-position: -178px -162px; }
+.ui-icon-next           { background-position: -64px  -162px; }
+.ui-icon-next-d         { background-position: -194px -162px; }
+.ui-icon-last           { background-position: -80px  -162px; }
+.ui-icon-last-d         { background-position: -210px -162px; }
+.ui-icon-signal-diag    { background-position: -16px  -178px; }
+.ui-icon-info           { background-position: -16px  -144px; }
+.ui-icon-comment        { background-position: -227px -219px; width: 27px; height: 20px; }
+.ui-icon-left .ui-icon  { float: left; margin-right: .2em; }
+.ui-icon-right .ui-icon { float: right; margin-left: .2em; }
+
+.g-resize { border: 1px solid #888; padding: 5px; background: #555; }
+
+/* Header section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-header { height: 90px; padding: 0; font-size: 80%; }
+#g-logo   { position: absolute; top: 8px; left: 16px; }
+
+#g-login-menu      { position: absolute; bottom: 10px; right: 14px; background-color: transparent; }
+#g-login-menu li   { display: inline; padding-left: 1.2em; }
+
+.g-breadcrumbs     { position: absolute; bottom: 4px; right: 14px; background-color: transparent; }
+.g-breadcrumbs li  { display: inline; padding-left: 1em; background: transparent url('../images/ico-separator.png') no-repeat 0 2px; }
+.g-breadcrumbs li.g-first { background-image: none; }
+
+/* Main section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-main     { display: block; margin: 0; }
+#g-main-in  { display: block; position: relative; }
+
+#g-column-center, #g-column-centerleft { padding: 6px 6px 6px 16px; }
+#g-column-centerfull  { padding: 6px 12px 6px 10px; }
+#g-column-centerright { padding: 6px 12px 6px 6px; }
+#g-column-left        { padding: 6px 4px 6px 10px; }
+#g-column-right       { padding: 6px 10px 6px 4px; }
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-paginator         { display: inline-block; width: 100%; padding: 4px 0 0 0; font-size: 80%; zoom: 1; }
+.g-paginator li      { display: inline; float: left; margin-left: 0; zoom: 1; }
+.g-paginator a       { padding: 0 0 0 2px; }
+
+.g-paginator .g-pagination { width: 80%; padding-top: 2px; }
+.g-paginator .g-navigation { text-align: right; width: 20%; }
+
+/* Album grid ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-thumbcrop                { overflow: hidden; position: relative; width: 200px; height: 150px; }
+#g-album-grid               { padding: 6px 0 0 0; width: 100%; }
+#g-album-grid .g-item       { position: relative; float: left; padding: 10px 9px 0px 9px; width: 30.5%; height: 190px; background: url('../images/image_thumb.gif') no-repeat; }
+#g-album-grid .g-item  p    { text-align: center; }
+#g-album-grid h2            { position: absolute; top: 164px; left: 12px; width: 150px; font: 100%/100% Arial, Helvetica, sans-serif; }
+#g-album-grid h2 a          { display: block; margin-top: 4px; font: bold 70% Arial, Helvetica, Verdana, Sans-Serif; letter-spacing: 0.1em; text-transform: uppercase; min-height: 2em; }
+#g-album-grid .g-album h2   { padding-left: 20px; background: url('../images/ico-album.png') no-repeat 0px 2px; }
+
+.g-item .g-metadata          { display: block; position: absolute; margin: 0; padding: 0; top: 172px; left: 198px; width: 14px; height: 14px; background: url(../images/ui-icons.png) -162px -144px; } 
+.g-item .g-metadata li       { padding: 0; margin: 0; text-indent: -9999px; font: bold 70% Arial, Helvetica, Verdana, Sans-Serif; letter-spacing: 0.1em; }
+.g-item .g-metadata:hover    { padding: 4px 0 0 6px; top: 148px; left: 6px; width: 198px; height: 32px; background: #181818 none; border: 1px #888 solid; z-index: 100; }
+.g-item .g-metadata:hover li { text-indent: 0px; }
+
+.g-item .g-context-menu          { position: absolute; margin: 0; padding: 0; top: 6px; left: 198px; width: 14px; height: 14px; background: url(../images/ui-icons.png) -178px -144px; } 
+.g-item .g-context-menu li       { width: 100%; padding: 0; margin: 0; text-indent: -9999px; font: bold 70% Arial, Helvetica, Verdana, Sans-Serif; letter-spacing: 0.1em; }
+.g-item .g-context-menu:hover    { top: 4px; left: 6px; width: 204px; height: auto; background: #181818 none; border: 1px #888 solid; z-index: 100; }
+.g-item .g-context-menu ul       { display: block; padding: 0; margin: 0; }
+.g-item .g-context-menu li li    { display: none; font-size: 100%; width: 100%; }
+.g-item .g-context-menu li li a  { display: block; padding: 4px 6px; }
+.g-item .g-context-menu:hover li li { display: block; text-indent: 0px; } 
+.g-item .g-context-menu li li a:hover { background-color: #303030; }
+
+.ul-table { text-align: center; margin: 0px auto; padding: 0; list-style-type: none; clear: both; }
+.ul-table li { float: left; text-align: center; } 
+
+#g-info                 { }
+#g-info h1              { padding-bottom: 1px; border-bottom: 1px solid #888; }
+#g-info .g-description  { display: none; }
+/* #g-info h1:hover .g-description  { position: relative; z-index: 10; top: 10px; left: 0px; width: 90%; display: block; afloat: left; border: 1px solid #888; padding: 6px; }*/
+#g-photo                { padding: 6px 0 6px 6px; text-align: center; }
+#g-albumheader h1       { padding-bottom: 1px; margin-bottom: 6px; border-bottom: 1px solid #888; }
+
+/* Footer section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-footer    { padding: 6px 6px 6px 14px; background: url('../images/footer.png') #1A2022 repeat-x top !important; zoom: 1; font-size: 80%; }
+#g-footer ul { float: left; color: #999; padding: 0; text-align: left; }
+#g-footer li { padding: 0 0 2px 0; }
+
+#g-visitors  { float: left; display: inline; margin: 3px 4px 3px 12px; }
+#g-copyright { font-size: x-small; color: #808080; }
+
+#g-footer-rightside { padding-right: 6px; text-align: right; }
+
+/* Design blocks  ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-quick-search-form       { position: absolute; top: 10px; right: 14px; background: none transparent; }
+#g-quick-search-form label { display: none; }
+#g-quick-search-form li    { display: inline; float: left; padding: 0px; }
+
+#g-quick-search-form input[type="text"]   { background-color: transparent; border: 1px solid #737373; color: #BBB; width: 150px; /* margin-left: 2px; */ }
+#g-quick-search-form input[type="submit"] { display: block; width: 23px; height: 23px; text-indent: -9999px; background: transparent url(../images/search.png) no-repeat center top; border: none; overflow: hidden; }
+
+#g-search-results h1      { border-bottom: #888 1px solid; }
+
+/* Sidebar Blocks ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+/*    Common ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-block         { margin-bottom: 0.5em; padding-bottom: 4px; border: 1px solid #737373; background-color: #101415; position: relative; } 
+.g-block h2      { padding: 4px; font-size: 1.2em; background: url('../images/section.png') repeat-x; }
+.g-block-content { margin: 4px 10px 0 10px; display: block; zoom: 1; }
+
+/*    Image Block ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-image-block>div { margin-left: 1px; margin-right: 1px; }
+.g-image-block     { text-align: center; }
+.g-image-block img { border: 1px solid #888; background: #555; padding: 5px; }
+
+/*    Feeds Block ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ul#g-feeds        { padding: 0; margin: 0; }
+
+/*    Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-tag-cloud ul            { padding: 0; font-size: 100%; }
+#g-tag-cloud ul li         { line-height: 1.2em; }
+#g-tag-cloud ul li span    { display: none; }
+#g-add-tag-form            { display: none; }
+
+/*    Comments ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-admin-comment-button      { width: 27px; right: 10px; text-indent: -900em; }
+.g-avatar                    { float: right;  }
+#g-comments-link             { background: url('../images/view-comments.png') top left no-repeat; }
+#g-comments .g-block-content { margin: 0; }
+#g-comment-detail ul         { padding: 0px; }
+#g-comment-detail > ul > li  { margin: 4px; padding: 6px; min-height: 40px; border: 1px dotted #737373; }
+#g-comment-detail div        { margin-right: 48px; margin-top: 8px; }
+
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-viewformat                    { z-index: 5; position: absolute; padding: 0; top: 6px; right: 10px; }
+#g-viewformat li                 { float: left; margin-right: 2px; }
+#g-viewformat .g-viewthumb-left  { background: url('../images/view-left.png') no-repeat left top; }
+#g-viewformat .g-viewthumb-right { background: url('../images/view-right.png') no-repeat left top; }
+#g-viewformat .g-viewthumb-full  { background: url('../images/view-full.png') no-repeat left top; }
+#g-viewformat span               { line-height: 1px; text-indent: -900em; width: 17px; display: block; height: 15px; }
+#g-viewformat span:hover,
+#g-viewformat span.g-viewthumb-current { background-position: left bottom; }
+
+#g-view-menu     { position: absolute; top: 6px; right: 70px; height: 16px; z-index: 5; zoom: 1; margin: 0 0 6px 0; padding: 0 0 4px 0; }     
+.g-toolbar       { height: 16px; zoom: 1; margin: 0 0 4px 0; padding: 0 0 3px 0; border-bottom: 1px solid #737373; }
+.g-menu          { margin: 0; padding: 0; text-align: left; }
+.g-menu li       { display: inline; }
+
+.g-menu-element,
+.g-menu-link     { display: inline; float: left; margin-right: 4px; }
+
+.g-buttonset ul           { height: 16px; }
+.g-buttonset .g-menu-link { text-indent: -99999px; width: 22px; height: 15px; }
+
+#g-slideshow-link { background: url("../images/view-slideshow.png") top left no-repeat; }
+.g-fullsize-link  { background: url("../images/view-fullsize.png")  top left no-repeat; }
+#g-exifdata-link  { background: url("../images/view-info.png")      top left no-repeat; }
+
+#g-slideshow-link:hover, .g-fullsize-link:hover, #g-exifdata-link:hover, #g-comments-link:hover { background-position: left bottom; }
+
+/* ShadowBox Skin ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#sb-body        { background: #101415 url('../images/ajax-loading.gif') no-repeat center center; }
+#sb-title-inner { display: none; }
+#sb-nav #sb-nav-close   { background-image: url('../images/close.png'); width: 60px; }
+
+.clear { clear: both; margin-top: -1px; height: 1px; overflow: hidden; }
+
+.g-message-block { position: absolute; z-index: 10; min-width: 30em; padding: 4px 6px; right: 10px; top: 34px; border: 1px #888 solid; background-color: #AAA; overflow: hidden; color: #000; font: bold 9pt Arial, verdana, sans-serif; text-align: center; }
--- a/modules/google_analytics/helpers/google_analytics_installer.php
+++ b/modules/google_analytics/helpers/google_analytics_installer.php
@ -17,13 +17,24 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
 */
-class google_analytics_installer {
-  static function install() {
-    module::set_var("google_analytics", "code", "");
-    module::set_version("google_analytics", 2);
+class exif_event_Core {
+  static function item_created($item) {
+    if (!$item->is_album()) {
+      exif::extract($item);
+    }
  }

-  static function uninstall() {
-    module::clear_var("google_analytics", "code");
+  static function item_deleted($item) {
+    Database::instance()->delete("exif_records", array("item_id" => $item->id));
+  }
+
+  static function photo_menu($menu, $theme) {
+    $item = $theme->item();
+    $menu->append(
+      Menu::factory("link")
+      ->id("exifdata-link")
+      ->label(t("Photo Details"))
+      ->url(url::site("exif/show/$item->id"))
+      ->css_id("g-exifdata-link"));
  }
 }
--- a/themes/greydragon/images/ajax-loading.gif
+++ b/themes/greydragon/images/ajax-loading.gif
--- a/themes/greydragon/images/avatar.jpg
+++ b/themes/greydragon/images/avatar.jpg
--- a/themes/greydragon/images/background.gif
+++ b/themes/greydragon/images/background.gif
--- a/themes/greydragon/images/close.png
+++ b/themes/greydragon/images/close.png
--- a/themes/greydragon/images/favicon.ico
+++ b/themes/greydragon/images/favicon.ico
--- a/themes/greydragon/images/footer.png
+++ b/themes/greydragon/images/footer.png
--- a/themes/greydragon/images/header.png
+++ b/themes/greydragon/images/header.png
--- a/themes/greydragon/images/ico-album.png
+++ b/themes/greydragon/images/ico-album.png
--- a/themes/greydragon/images/ico-separator.png
+++ b/themes/greydragon/images/ico-separator.png
--- a/themes/greydragon/images/image_thumb.gif
+++ b/themes/greydragon/images/image_thumb.gif
--- a/themes/greydragon/images/main.gif
+++ b/themes/greydragon/images/main.gif
--- a/themes/greydragon/images/search.png
+++ b/themes/greydragon/images/search.png
--- a/themes/greydragon/images/section.png
+++ b/themes/greydragon/images/section.png
--- a/themes/greydragon/images/ui-icons.png
+++ b/themes/greydragon/images/ui-icons.png
--- a/themes/greydragon/images/view-comments.png
+++ b/themes/greydragon/images/view-comments.png
--- a/themes/greydragon/images/view-full.png
+++ b/themes/greydragon/images/view-full.png
--- a/themes/greydragon/images/view-fullsize.png
+++ b/themes/greydragon/images/view-fullsize.png
--- a/themes/greydragon/images/view-info.png
+++ b/themes/greydragon/images/view-info.png
--- a/themes/greydragon/images/view-left.png
+++ b/themes/greydragon/images/view-left.png
--- a/themes/greydragon/images/view-right.png
+++ b/themes/greydragon/images/view-right.png
--- a/themes/greydragon/images/view-slideshow.png
+++ b/themes/greydragon/images/view-slideshow.png
--- a/themes/greydragon/js/dialog.js
+++ b/themes/greydragon/js/dialog.js
@ -0,0 +1,17 @@
+function setupLoginForm() {
+  setupAjaxForm('#gLoginForm');
+}
+
+function setupAjaxForm($form_id) {
+  var options = {
+    dataType: "json",
+    success: function(data) {
+      if (data.result == "success") {
+        if (data.location) { window.location = data.location; }
+        else { window.parent.Shadowbox.close(); }
+      }
+    }
+  };
+
+  $($form_id).ajaxForm(options);
+};
--- a/themes/greydragon/js/menus.js
+++ b/themes/greydragon/js/menus.js
@ -0,0 +1,14 @@
+// Javascript originally by Patrick Griffiths and Dan Webb.
+// http://htmldog.com/articles/suckerfish/dropdowns/
+
+sfHover = function() {
+  var sfEls = document.getElementById("gSiteMenu").getElementsByTagName("ul")[0].getElementsByTagName("li");
+  if (!sfEls) { return; }
+
+  for (var i=0; i<sfEls.length; i++) {
+    sfEls[i].onmouseover=function() { this.className+=" hover"; }
+    sfEls[i].onmouseout=function()  { this.className=this.className.replace(new RegExp(" hover\\b"), ""); }
+  }
+}
+
+if (window.attachEvent) window.attachEvent("onload", sfHover);
--- a/themes/greydragon/js/ui.support.js
+++ b/themes/greydragon/js/ui.support.js
@ -0,0 +1,54 @@
+/**
+ * JS support functions for the theme
+ */
+
+var myAjaxLoginSubmitOps =
+{ dataType: 'json',
+  success: function(data) {
+    if (data.result == 'error') {
+      $('#g-login').html(data.form);
+      myAjaxLoginSubmit();
+    } else {
+      Shadowbox.close();
+      window.location.reload();
+    }
+  }
+};
+
+myAjaxLoginSubmit = function() {
+  $('form#g-login-form').one('submit', function() {
+    $(this).ajaxSubmit(myAjaxLoginSubmitOps);
+    return false;
+  } )
+};
+ 
+var myAjaxSubmitOps =
+{ dataType: 'json',
+  success: function(data) {
+    if (data.result == 'error') {
+      $('#sb-content form').html(data.form);
+      myAjaxSubmit();
+    } else {
+      Shadowbox.close();
+      window.location.reload();
+    }
+  }
+};
+
+myAjaxSubmit = function() {
+  $('form').one('submit', function() {
+    $(this).ajaxSubmit(myAjaxSubmitOps);
+    return false;
+  } )
+};
+
+
+$(document).ready( function() { 
+  Shadowbox.setup("a.g-dialog-link", {player: 'ajax', width: 340, height: 316, enableKeys: false, onFinish: myAjaxSubmit});
+  Shadowbox.setup("a.g-fullsize-link", {player: 'img'});
+  Shadowbox.setup("a#g-login-link", {player: 'ajax', width: 340, height: 230, enableKeys: false, onFinish: myAjaxLoginSubmit});
+  Shadowbox.setup("a#g-exifdata-link", {player: 'ajax', width: 420, height: 400});
+  Shadowbox.setup(".g-context-menu .ui-icon-pencil", {player: 'ajax', width: 340, height: 370, enableKeys: false});
+
+  $('.g-message-block').fadeOut(10000);
+});
--- a/themes/greydragon/theme.info
+++ b/themes/greydragon/theme.info
@ -0,0 +1,6 @@
+name = "Grey Dragon Theme"
+description = "A Crisp theme uses on clear grey colors and minimized on JS overhead"
+version = 1.5.8
+author = "2009 Serguei Dosyukov"
+site = 1
+admin = 0
--- a/themes/greydragon/thumbnail.png
+++ b/themes/greydragon/thumbnail.png
--- a/themes/greydragon/views/album.html.php
+++ b/themes/greydragon/views/album.html.php
@ -1,29 +1,37 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? // @todo Set hover on AlbumGrid list items for guest users ?>
+
 <div id="g-info">
  <?= $theme->album_top() ?>
  <h1><?= html::purify($item->title) ?></h1>
-  <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
+  <div class="g-description"><?= ($item->description)? bb2html(html::purify($item->description), 1) : null; ?></div>
 </div>

-<ul id="g-album-grid" class="ui-helper-clearfix">
+<? if (module::get_var("th_greydragon", "photonav_top")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
+
+<ul id="g-album-grid">
 <? if (count($children)): ?>
  <? foreach ($children as $i => $child): ?>
    <? $item_class = "g-photo"; ?>
    <? if ($child->is_album()): ?>
      <? $item_class = "g-album"; ?>
    <? endif ?>
+
  <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>">
    <?= $theme->thumb_top($child) ?>
-    <a href="<?= $child->url() ?>">
-      <?= $child->thumb_img(array("class" => "g-thumbnail")) ?>
-    </a>
+    <p class="g-thumbcrop"><a href="<?= $child->url() ?>">
+      <?= $child->thumb_img() ?>
+    </a></p>
    <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
+    <h2><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
+    <? $_text = $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
+    <?= (stripos($_text, '<li>'))? $_text : null; ?>
+    <? if (module::is_active("info")): ?>
    <ul class="g-metadata">
-      <?= $theme->thumb_info($child) ?>
+    <?= $theme->thumb_info($child); ?>
    </ul>
+    <? endif ?>
  </li>
  <? endforeach ?>
 <? else: ?>
@ -38,4 +46,6 @@
 </ul>
 <?= $theme->album_bottom() ?>

-<?= $theme->pager() ?>
+<? if (module::get_var("th_greydragon", "photonav_bottom")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
--- a/themes/greydragon/views/block.html.php
+++ b/themes/greydragon/views/block.html.php
--- a/themes/greydragon/views/dynamic.html.php
+++ b/themes/greydragon/views/dynamic.html.php
@ -6,17 +6,21 @@
  <h1><?= html::clean($title) ?></h1>
 </div>

+<? if (module::get_var("th_greydragon", "photonav_top")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
+
 <ul id="g-album-grid">
  <? foreach ($children as $i => $child): ?>
  <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
    <?= $theme->thumb_top($child) ?>
-    <a href="<?= $child->url() ?>">
+    <p class="g-thumbcrop"><a href="<?= $child->url() ?>">
      <img id="g-photo-id-<?= $child->id ?>" class="g-thumbnail"
           alt="photo" src="<?= $child->thumb_url() ?>"
           width="<?= $child->thumb_width ?>"
           height="<?= $child->thumb_height ?>" />
-    </a>
-    <h2><?= html::purify($child->title) ?></h2>
+    </a></p>
+    <h2><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
    <?= $theme->thumb_bottom($child) ?>
    <ul class="g-metadata">
      <?= $theme->thumb_info($child) ?>
@ -26,4 +30,6 @@
 </ul>
 <?= $theme->dynamic_bottom() ?>

-<?= $theme->pager() ?>
+<? if (module::get_var("th_greydragon", "photonav_bottom")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
--- a/themes/greydragon/views/exif_sidebar.html.php
+++ b/themes/greydragon/views/exif_sidebar.html.php
@ -0,0 +1 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
--- a/themes/greydragon/views/info_block.html.php
+++ b/themes/greydragon/views/info_block.html.php
@ -0,0 +1,9 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<span class="g-metadata">
+  <? if ($item->description): ?>
+     <?= bb2html(html::purify($item->description), 1) ?>
+  <? else: ?>
+     &nbsp;
+  <? endif ?>
+</span>
--- a/themes/greydragon/views/login_ajax.html.php
+++ b/themes/greydragon/views/login_ajax.html.php
@ -0,0 +1,41 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<script type="text/javascript">
+
+  $("#g-login-form").ready(function() {
+    $("#g-password-reset").bind('click', 
+      function() {
+        $.ajax({
+          url: "<?= url::site("password/reset") ?>",
+          success: function(data) {
+            $("#g-login").html(data);
+            ajaxify_login_reset_form();
+            return false;
+          }
+        });
+      });
+  });
+
+  function ajaxify_login_reset_form() {
+    $("#g-login form").ajaxForm({
+      dataType: "json",
+      success: function(data) {
+        if (data.form) {
+          $("#g-login").replaceWith(data.form);
+          ajaxify_login_reset_form();
+        }
+        if (data.result == "success") {
+          $("#g-dialog").dialog("close");
+          window.location.reload();
+        }
+      }
+    });
+  };
+</script>
+<div id="g-login">
+  <?= $form ?>
+  <? if (identity::is_writable()): ?>
+  <a href="#" id="g-password-reset"><?= t("Forgot Your Password?") ?></a>
+  <? endif ?>
+</div>
+
--- a/themes/greydragon/views/movie.html.php
+++ b/themes/greydragon/views/movie.html.php
--- a/themes/greydragon/views/no_sidebar.html.php
+++ b/themes/greydragon/views/no_sidebar.html.php
@ -0,0 +1,3 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+  <div class="g-toolbar">&nbsp;</div>
--- a/themes/greydragon/views/page.html.php
+++ b/themes/greydragon/views/page.html.php
@ -0,0 +1,201 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? include('support/bbtohtml.php'); ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!-- Copyright (c) 2009 DragonSoft. All Rights Reserved -->
+
+<? $sidebarvisible = $_REQUEST['sb'];
+   if (empty($sidebarvisible)) {
+     if (isset($_COOKIE['gd_sidebar'])) {
+       $sidebarvisible = $_COOKIE['gd_sidebar'];
+     } else {
+       $sidebarvisible = module::get_var("th_greydragon", "sidebar_visible", "");
+     }
+   } else {
+     // Sidebar position is kept for 360 days
+     setcookie("gd_sidebar", $sidebarvisible, time() + 31536000);
+   }
+
+   $sidebarallowed = module::get_var("th_greydragon", "sidebar_allowed", "");
+
+   if ($sidebarallowed == "") { $sidebarallowed = "any"; };
+   if ($sidebarvisible == "") { $sidebarvisible = "right"; };
+   if ($sidebarallowed == "none") { $sidebarvisible = "none"; }
+   if ($sidebarallowed == "right") { $sidebarvisible = "right"; }
+   if ($sidebarallowed == "left") { $sidebarvisible = "left"; }
+?>
+
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+  <title>
+    <? if ($page_title): ?>
+<?=  $page_title ?>
+<? else: ?>
+<?   if ($theme->item()): ?>
+<?     if ($theme->item()->is_album()): ?>
+<?=      t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
+<?     elseif ($theme->item()->is_photo()): ?>
+<?=      t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
+<?     else: ?>
+<?=      t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
+<?     endif ?>
+<?   elseif ($theme->tag()): ?>
+<?=    t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
+<?   else: /* Not an item, not a tag, no page_title specified.  Help! */ ?>
+<?=    t("Gallery") ?>
+<?   endif ?>
+<? endif ?></title>
+  <meta name="robots" content="noindex, nofollow, noarchive" /> 
+  <meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet, noodp, noimageindex, notranslate" /> 
+  <meta name="slurp" content="noindex, nofollow, noarchive, nosnippet, noodp, noydir" /> 
+  <meta name="msnbot" content="noindex, nofollow, noarchive, nosnippet, noodp" />
+  <meta name="teoma" content="noindex, nofollow, noarchive" />
+  <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+
+  <?= $theme->script("jquery.js") ?>
+  <?= $theme->script("jquery.form.js") ?>
+  <?= $theme->script("jquery-ui.js") ?>
+
+<?= $theme->head() ?>
+
+  <link rel="stylesheet" href="<?= $theme->url("css/screen.css") ?>" type="text/css" media="screen,print,projection" />
+  <link rel="stylesheet" href="<?= $theme->url("css/menus.css") ?>" type="text/css" media="screen,print,projection" />
+
+  <!--[if lte IE 7]>
+    <link rel="stylesheet" href="<?= $theme->url("css/old_ie.css") ?>" type="text/css" media="screen,print,projection" />
+  <![endif]-->
+  <!--[if !IE]>
+    <link rel="stylesheet" href="<?= $theme->url("css/layout_non_ie.css") ?>" type="text/css" media="screen,print,projection" />
+  <![endif]-->
+
+  <script type="text/javascript" src="<?= $theme->url("js/ui.support.js") ?>"></script>
+</head>
+<body>
+<?= $theme->page_top() ?>
+<div id="g-header">
+  <?= $theme->header_top() ?>
+<? if ($header_text = module::get_var("gallery", "header_text")): ?>
+  <?= $header_text ?>
+<? else: ?>
+  <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+    <? $logo_path = module::get_var("th_greydragon", "logo_path", url::file("lib/images/logo.png")); ?>
+    <? // $theme->url("images/logo.png") ?>
+    <img alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= $logo_path ?>" />
+  </a>
+<? endif ?>
+
+<? if (!$user->guest): ?>
+  <div id="g-site-menu">
+  <?= $theme->site_menu() ?>
+  </div>
+<? endif ?>
+  <?= $theme->messages() ?>
+<?= $theme->header_bottom() ?>
+<? if (!empty($parents)): ?>
+  <ul class="g-breadcrumbs">
+    <? $i = 0 ?>
+    <? foreach ($parents as $parent): ?>
+    <li <? if ($i == 0) print " class=\"g-first\"" ?>>
+      <a href="<?= $parent->url($parent == $theme->item()->parent() ?
+         "show={$theme->item()->id}" : null) ?>">
+        <?= html::purify($parent->title) ?>
+      </a>
+    </li>
+    <? $i++ ?>
+    <? endforeach ?>
+    <li class="g-active <? if ($i == 0) print " g-first" ?>"><?= html::purify($theme->item()->title) ?></li>
+  </ul>
+<? endif ?>
+</div>
+<div id="g-main">
+  <div id="g-main-in">
+    <? if ($sidebarallowed == "any"): ?>
+    <ul id="g-viewformat">
+    <? if (($sidebarallowed == "left") or ($sidebarallowed == "any")): ?>
+      <? $iscurrent = ($sidebarvisible == "left"); ?>
+      <li><?= ($iscurrent) ? null : '<a title="Sidebar Left" href="' . $url . '?sb=left">'; ?><span class="g-viewthumb-left <?= ($iscurrent)? "g-viewthumb-current" : null; ?>">Sidebar Left</span><?= ($iscurrent)? null : "</a>"; ?></li>
+    <? endif ?>
+    <? if ($sidebarallowed == "any"): ?>
+      <? $iscurrent = ($sidebarvisible == "none"); ?>
+      <li><?= ($iscurrent) ? null : '<a title="No Sidebar" href="' . $url . '?sb=none">'; ?><span class="g-viewthumb-full <?= ($iscurrent)? "g-viewthumb-current" : null; ?>">No Sidebar</span><?= ($iscurrent)? null : "</a>"; ?></li>
+    <? endif ?>
+    <? if (($sidebarallowed == "right") or ($sidebarallowed == "any")): ?>
+      <? $iscurrent = ($sidebarvisible == "right"); ?>
+      <li><?= ($iscurrent) ? null : '<a title="Sidebar Right" href="' . $url . '?sb=right">'; ?><span class="g-viewthumb-right <?= ($iscurrent)? "g-viewthumb-current" : null; ?>">Sidebar Right</span><?= ($iscurrent)? null : "</a>"; ?></li>
+    <? endif ?>
+    </ul>
+    <? endif ?>
+
+    <div id="g-view-menu" class="g-buttonset">
+    <? if ($page_subtype == "album"):?>
+      <?= $theme->album_menu() ?>
+    <? elseif ($page_subtype == "photo") : ?>
+      <?= $theme->photo_menu() ?>
+    <? elseif ($page_subtype == "movie") : ?>
+      <?= $theme->movie_menu() ?>
+    <? elseif ($page_subtype == "tag") : ?>
+      <?= $theme->tag_menu() ?>
+    <? endif ?>
+    </div>
+
+<? if ($sidebarvisible=="left"): ?>
+<?= '<div id="g-column-left">' ?>
+<? elseif ($sidebarvisible=="none"): ?>
+<? else: ?>
+<?= '<div id="g-column-right">' ?>
+<? endif ?>
+    
+<? if (($theme->page_subtype != "login") && ($sidebarvisible != "none")): ?>
+<?= new View("sidebar.html") ?>
+<? endif ?>
+<?= ($sidebarvisible != "none")? "</div>" : null ?>
+
+<? if ($sidebarvisible == "left"): ?>
+<?= '<div id="g-column-centerright">' ?>
+<? elseif ($sidebarvisible == "none"): ?>
+<?= '<div id="g-column-centerfull">' ?>
+<? else: ?>
+<?= '<div id="g-column-centerleft">' ?>
+<? endif ?>
+      <?= $content ?>
+    </div>
+  </div>
+</div>
+
+<div id="g-footer">
+<?= $theme->footer() ?>
+<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
+<?=  $footer_text ?>
+<? endif ?>
+
+<? if (module::get_var("gallery", "show_credits")): ?>
+  <ul id="g-credits">
+    <?= $theme->credits() ?>
+    <?php
+      $theme_id = module::get_var("gallery", "active_site_theme"); 
+      $ini = parse_ini_file(THEMEPATH . "$theme_id/theme.info");
+      print "\n    <li>" . $ini["name"] . "</li>";
+      print "\n    <li>&copy;" . $ini["author"] . "</li>";
+    ?>
+
+  </ul>
+<? endif ?>
+<? $copyright = module::get_var("th_greydragon", "copyright"); ?>
+  <div id="g-footer-rightside"><?= ($copyright) ? $copyright : null; ?><br /><br />
+<? // <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Transitional" height="15" width="44" /></a> ?>
+  </div>
+  <?= $theme->user_menu() ?>
+</div>
+<?= $theme->page_bottom() ?>
+
+<? // <!--start player--> 
+// <embed src="/music/collection.m3u" hidden="true" autostart="true" loop="true"></embed>
+// <noembed><bgsound src="/music/collection.m3u"></noembed>
+// <!--end player-->
+//<object type="application/x-shockwave-flash" data="http://photo.dragonsoft.us/music/xspf_player/xspf_player.swf?playlist_url=http://photo.dragonsoft.us/music/collection.xspf&autoplay=true&repeat_playlist=true&player_title=KICK&playlist_size=3" width="400" height="151">
+//<param name="movie" value="http://photo.dragonsoft.us/music/xspf_player/xspf_player.swf?playlist_url=http://photo.dragonsoft.us/music/collection.xspf&autoplay=true&repeat_playlist=true&player_title=KICK&playlist_size=3" />
+//</object>
+?>
+</body>
+</html>
--- a/themes/greydragon/views/pager_photo.html.php
+++ b/themes/greydragon/views/pager_photo.html.php
@ -0,0 +1,106 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<?
+  if ($sibling_count <= 1) {
+    $pagination_msg = "&nbsp;";
+  }
+  else
+  {
+    $siblings = $item->parent()->children();
+    $pagination_msg = t("Photo:") . ' ';
+    if ($sibling_count < 13) {
+
+      for ($i = 1; $i <= $sibling_count; $i++) {
+        if ($i == $position) {
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+					
+          $pagination_msg .= '<span><a href="' . $siblings[$i-1]->url() . '" title="Photo ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < $sibling_count) { $pagination_msg .= '&middot;'; };
+      }
+
+    } elseif ($position < 9) {
+
+      for ($i = 1; $i <= 10; $i++) {
+        if ($i == $position) { 
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $siblings[$i-1]->url() . '" title="Photo ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < 10) { $pagination_msg .= '&middot;'; };
+      }
+      
+      $pagination_msg .= '&hellip;';
+      $pagination_msg .= '<span><a href="' . $siblings[$sibling_count - 2]->url() . '" title="Photo ' . t($sibling_count - 1) . '">' . t($sibling_count - 1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $siblings[$sibling_count - 1]->url() . '" title="Photo ' . t($sibling_count) . '">' . t($sibling_count) . '</a></span>';
+
+    } elseif ($position > $sibling_count - 8) {
+
+      $pagination_msg .= '<span><a href="' . $siblings[0]->url() . '" title="Photo ' . t(1) . '">' . t(1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $siblings[1]->url() . '" title="Photo ' . t(2) . '">' . t(2) . '</a></span>';
+      $pagination_msg .= '&hellip;';
+
+      for ($i = $sibling_count - 9; $i <= $sibling_count; $i++) {
+        if ($i == $position) { 
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $siblings[$i - 1]->url() . '" title="Photo ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < $sibling_count) { $pagination_msg .= '&middot;'; };
+      }
+
+    } else {
+
+      $pagination_msg .= '<span><a href="' . $siblings[0]->url() . '" title="Photo ' . t(1) . '">' . t(1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $siblings[1]->url() . '" title="Photo ' . t(2) . '">' . t(2) . '</a></span>';
+      $pagination_msg .= '&hellip;';
+
+      for ($i = $position - 5; $i <= $position + 5; $i++) {
+        if ($i == $position) { 
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $siblings[$i - 1]->url() . '" title="Photo ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < $position + 5) { $pagination_msg .= '&middot;'; };
+      }
+
+      $pagination_msg .= '&hellip;';
+      $pagination_msg .= '<span><a href="' . $siblings[$sibling_count - 2]->url() . '" title="Photo ' . t($sibling_count - 1) . '">' . t($sibling_count - 1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $siblings[$sibling_count - 1]->url() . '" title="Photo ' . t($sibling_count) . '">' . t($sibling_count) . '</a></span>';
+    }
+  }
+?>
+
+<ul class="g-pager">
+<li class="g-pagination"><?= $pagination_msg; ?></li>
+<li class="g-navigation">
+  <? if ($position > 1): ?>
+    <a href="<?= $siblings[0]->url() ?>" title="<?= t("first") ?>"><span class="ui-icon ui-icon-first">&nbsp;</span></a>
+  <? else: ?>
+    <span class="ui-icon ui-icon-first-d">&nbsp;</span>
+  <? endif ?>
+
+  <? if ($previous_item): ?>
+  <a href="<?= $previous_item->url() ?>" title="<?= t("previous") ?>"><span class="ui-icon ui-icon-prev">&nbsp;</span></a>
+  <? else: ?>
+  <span class="ui-icon ui-icon-prev-d">&nbsp;</span>
+  <? endif; ?>
+
+  <? if ($next_item): ?>
+  <a href="<?= $next_item->url() ?>" class="ui-right" title="<?= t("next") ?>"><span class="ui-icon ui-icon-next">&nbsp;</span></a>
+  <? else: ?>
+  <span class="ui-icon ui-icon-next-d">&nbsp;</span>
+  <? endif ?>
+
+  <? if (($sibling_count > 1) && ($sibling_count > $position)): ?>
+    <a href="<?= $siblings[$sibling_count-1]->url() ?>" class="ui-right" title="<?= t("last") ?>"><span class="ui-icon ui-icon-last">&nbsp;</span></a>
+  <? else: ?>
+    <span class="ui-icon ui-icon-last-d">&nbsp;</span>
+  <? endif ?>
+</li>
+</ul>
--- a/themes/greydragon/views/paginator.html.php
+++ b/themes/greydragon/views/paginator.html.php
@ -0,0 +1,154 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+// This is a generic paginator for album, photo and movie pages.  Depending on the page type,
+// there are different sets of variables available.  With this data, you can make a paginator
+// that lets you say "You're viewing photo 5 of 35", or "You're viewing photos 10 - 18 of 37"
+// for album views.
+//
+// Available variables for all page types:
+//   $page_type               - "collection", "item", or "other"
+//   $page_subtype            - "album", "movie", "photo", "tag", etc.
+//   $previous_page_url       - the url to the previous page, if there is one
+//   $next_page_url           - the url to the next page, if there is one
+//   $total                   - the total number of photos in this album
+//
+// Available for the "collection" page types:
+//   $page                    - what page number we're on
+//   $max_pages               - the maximum page number
+//   $page_size               - the page size
+//   $first_page_url          - the url to the first page, or null if we're on the first page
+//   $last_page_url           - the url to the last page, or null if we're on the last page
+//   $first_visible_position  - the position number of the first visible photo on this page
+//   $last_visible_position   - the position number of the last visible photo on this page
+//
+// Available for "item" page types:
+//   $position                - the position number of this photo
+//
+?>
+
+<?
+  if (isset($_pagelist)) {
+    unset($_pagelist);
+  }
+
+  switch ($page_type) {
+    case "collection":
+      $current_page = $page;
+   	  $total_pages = $max_pages;
+      // Prepare page url list
+      for ($i = 1; $i <= $total_pages; $i++) {
+        $_pagelist[$i] = url::site(url::merge(array("page" => $i)));
+      }
+      break;
+    case "item":
+      $current_page = $position; 
+      $total_pages = $total;
+      $siblings = $item->parent()->children();
+      for ($i = 1; $i <= $total; $i++) {
+        $_pagelist[$i] = $siblings[$i-1]->url();
+      }
+      break;
+    default:
+      $current_page = 1;
+      $total_pages = 1;
+      $_pagelist[1] = url::site();
+      break;
+  }
+
+  if ($total_pages <= 1) {
+    $pagination_msg = "&nbsp;";
+  } else {
+    $pagination_msg = t("Page:") . ' ';
+    if ($total_pages < 13) {
+      for ($i = 1; $i <= $total_pages; $i++) {
+        if ($i == $current_page) {
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $_pagelist[$i] . '" title="Page ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < $total_pages) { $pagination_msg .= '&middot;'; };
+      }
+    } elseif ($current_page < 9) {
+      for ($i = 1; $i <= 10; $i++) {
+        if ($i == $current_page) { 
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $_pagelist[$i] . '" title="Page ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < 10) { $pagination_msg .= '&middot;'; };
+      }
+      
+      $pagination_msg .= '&hellip;';
+      $pagination_msg .= '<span><a href="' . $_pagelist[$total_pages - 1] . '" title="Page ' . t($total_pages - 1) . '">' . t($total_pages - 1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $_pagelist[$total_pages] . '" title="Page ' . t($total_pages) . '">' . t($total_pages) . '</a></span>';
+
+    } elseif ($current_page > $total_pages - 8) {
+
+      $pagination_msg .= '<span><a href="' . $_pagelist[1] . '" title="Page ' . t(1) . '">' . t(1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $_pagelist[2] . '" title="Page ' . t(2) . '">' . t(2) . '</a></span>';
+      $pagination_msg .= '&hellip;';
+
+      for ($i = $total_pages - 9; $i <= $total_pages; $i++) {
+        if ($i == $current_page) { 
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $_pagelist[$i] . '" title="Page ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < $total_pages) { $pagination_msg .= '&middot;'; };
+      }
+
+    } else {
+
+      $pagination_msg .= '<span><a href="' . $_pagelist[1] . '" title="Page ' . t(1) . '">' . t(1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $_pagelist[2] . '" title="Page ' . t(2) . '">' . t(2) . '</a></span>';
+      $pagination_msg .= '&hellip;';
+
+      for ($i = $current_page - 5; $i <= $current_page + 5; $i++) {
+        if ($i == $current_page) { 
+          $pagination_msg .= '<span>' . t($i) . '</span>';
+        } else {
+          $pagination_msg .= '<span><a href="' . $_pagelist[$i] . '" title="Page ' . t($i) . '">' . t($i) . '</a></span>';
+        }
+        if ($i < $current_page + 5) { $pagination_msg .= '&middot;'; };
+      }
+
+      $pagination_msg .= '&hellip;';
+      $pagination_msg .= '<span><a href="' . $_pagelist[$total_pages - 1] . '" title="Page ' . t($total_pages - 1) . '">' . t($total_pages - 1) . '</a></span>';
+      $pagination_msg .= '&middot;';
+      $pagination_msg .= '<span><a href="' . $_pagelist[$total_pages] . '" title="Page ' . t($total_pages) . '">' . t($total_pages) . '</a></span>';
+    }
+  }
+?>
+
+<ul class="g-paginator">
+  <li class="g-pagination"><?= $pagination_msg ?></li>   
+
+  <li class="g-navigation">
+  <? if ($current_page > 1): ?>
+    <a href="<?= $_pagelist[1] ?>" title="<?= t("first") ?>"><span class="ui-icon ui-icon-first">&nbsp;</span></a>
+  <? else: ?>
+    <span class="ui-icon ui-icon-first-d">&nbsp;</span>
+  <? endif ?>
+
+  <? if (isset($previous_page_url)): ?>
+    <a href="<?= $previous_page_url ?>" title="<?= t("previous") ?>"><span class="ui-icon ui-icon-prev">&nbsp;</span></a>
+  <? else: ?>
+    <span class="ui-icon ui-icon-prev-d">&nbsp;</span>
+  <? endif ?>
+
+  <? if (isset($next_page_url)): ?>
+    <a href="<?= $next_page_url ?>" class="ui-right" title="<?= t("next") ?>"><span class="ui-icon ui-icon-next">&nbsp;</span></a>
+  <? else: ?>
+    <span class="ui-icon ui-icon-next-d">&nbsp;</span>
+  <? endif ?>
+
+  <? if ($current_page < $total_pages): ?>
+      <a href="<?= $_pagelist[$total_pages] ?>" class="ui-right" title="<?= t("last") ?>"><span class="ui-icon ui-icon-last">&nbsp;</span></a>
+  <? else: ?>
+    <span class="ui-icon ui-icon-last-d">&nbsp;</span>
+  <? endif ?>
+  </li>
+</ul>
--- a/themes/greydragon/views/photo.html.php
+++ b/themes/greydragon/views/photo.html.php
@ -0,0 +1,30 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<div id="g-item">
+  <?= $theme->photo_top() ?>
+
+  <div id="g-info">
+    <h1><?= html::purify($item->title) ?></h1>
+    <div class="g-hideitem"><?= bb2html(html::purify($item->description), 1) ?></div>
+  </div>
+<? if (module::get_var("th_greydragon", "photonav_top")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
+
+  <div id="g-photo">
+    <?= $theme->resize_top($item) ?>
+    <? if (access::can("view_full", $item)): ?>
+       <a href="<?= $item->file_url() ?>" rel="shadowbox;player=img" title="<?= html::purify($item->title) ?>">
+    <? endif ?>
+    <?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
+    <? if (access::can("view_full", $item)): ?>
+      </a>
+    <? endif ?>
+    <?= $theme->resize_bottom($item) ?>
+  </div>
+  
+<? if (module::get_var("th_greydragon", "photonav_bottom")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
+  <?= $theme->photo_bottom() ?>
+</div>
--- a/themes/greydragon/views/rss_block.html.php
+++ b/themes/greydragon/views/rss_block.html.php
@ -0,0 +1,13 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<ul id="g-feeds">
+<? foreach($feeds as $url => $title): ?>
+  <li style="clear: both;">
+    <span class="ui-icon-left">
+    <a href="<?= rss::url($url) ?>">
+      <span class="ui-icon ui-icon-signal-diag">&nbsp;</span>
+      <?= html::purify($title) ?>
+    </a>
+    </span>
+  </li>
+<? endforeach ?>
+</ul>
--- a/themes/greydragon/views/search.html.php
+++ b/themes/greydragon/views/search.html.php
@ -0,0 +1,37 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+
+<div id="g-search-results">
+  <h1><?= t("Search Results for \"%term\"", array("term" => $q)) ?> </h1>
+
+  <? if (count($items)): ?>
+
+<? if (module::get_var("th_greydragon", "photonav_top")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
+
+  <ul id="g-album-grid">
+    <? foreach ($items as $item): ?>
+      <? $item_class = "g-photo"; ?>
+      <? if ($item->is_album()): ?>
+        <? $item_class = "g-album"; ?>
+      <? endif ?>
+    <li class="g-item <?= $item_class ?>">
+      <p class="g-thumbcrop"><a href="<?= $item->url() ?>">
+        <?= $item->thumb_img() ?>
+      </a></p>
+      <h2><a href="<?= $item->url() ?>"><?= html::purify($item->title) ?></a></h2>
+    </li>
+    <? endforeach ?>
+  </ul>
+
+<? if (module::get_var("th_greydragon", "photonav_bottom")): ?>
+<?= $theme->paginator() ?>
+<? endif ?>
+
+  <? else: ?>
+  <p>&nbsp;</p>
+  <p><?= t("No results found for <b>%term</b>", array("term" => $q)) ?></p>
+
+  <? endif; ?>
+</div>
+
--- a/themes/greydragon/views/sidebar.html.php
+++ b/themes/greydragon/views/sidebar.html.php
@ -0,0 +1,5 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->sidebar_top() ?>
+<div class="g-toolbar">&nbsp;</div>
+<?= $theme->sidebar_blocks() ?>
+<?= $theme->sidebar_bottom() ?>
--- a/themes/greydragon/views/support/bbtohtml.php
+++ b/themes/greydragon/views/support/bbtohtml.php
@ -0,0 +1,63 @@
+<?php
+
+// Syntax Sample:
+// --------------
+// [img]http://elouai.com/images/star.gif[/img]
+// [url="http://elouai.com"]eLouai[/url]
+// [size="25"]HUGE[/size]
+// [color="red"]RED[/color]
+// [b]bold[/b]
+// [i]italic[/i]
+// [u]underline[/u]
+// [list][*]item[*]item[*]item[/list]
+// [code]value="123";[/code]
+// [quote]John said yadda yadda yadda[/quote]
+
+function bb2html($text, $mixmode)	{
+
+  static $bbcode_mappings = array(
+    "#\\[b\\](.*?)\\[/b\\]#" => "<strong>$1</strong>",
+    "#\\[i\\](.*?)\\[/i\\]#" => "<em>$1</em>",
+    "#\\[u\\](.*?)\\[/u\\]#" => "<u>$1</u>",
+    "#\\[s\\](.*?)\\[/s\\]#" => "<strike>$1</strike>",
+    "#\\[o\\](.*?)\\[/o\\]#" => "<overline>$1</overline>",
+    "#\\[url\\](.*?)\[/url\\]#" => "<a href=\"$1\">$1</a>",
+    "#\\[url=(.*?)\\](.*?)\[/url\\]#" => "<a href=\"$1\" target=\"_blank\">$2</a>",
+    "#\\[mail=(.*?)\\](.*?)\[/mail\\]#" => "<a href=\"mailto:$1\" target=\"_blank\">$2</a>",
+    "#\\[img\\](.*?)\\[/img\\]#" => "<img src=\"$1\" alt=\"\" />",
+    "#\\[img=(.*?)\\](.*?)\[/img\\]#" => "<img src=\"$1\" alt=\"$2\" />",
+    "#\\[quote\\](.*?)\\[/quote\\]#" => "<blockquote><p>$1</p></blockquote>",
+    "#\\[code\\](.*?)\\[/code\\]#" => "<pre>$1</pre>",
+    "#\\[size=([^\\[]*)\\]([^\\[]*)\\[/size\\]#" => "<span style=\"font-size: $1;\">$2</span>",
+    "#\\[color=([^\\[]*)\\]([^\\[]*)\\[/color\\]#" => "<span style=\"color: $1;\">$2</span>",
+    "#\\[class=([^\\[]*)\\]([^\\[]*)\\[/class\\]#" => "<span class=\"$1\">$2</span>",
+    "#\\[center\\](.*?)\\[/center\\]#" => "<div style=\"text-align: center;\">$1</div>",
+    "#\\[list\\](.*?)\\[/list\\]#" => "<ul>$1</ul>",
+    "#\\[ul\\](.*?)\\[/ul\\]#" => "<ul>$1</ul>",
+    "#\\[li\\](.*?)\\[/li\\]#" => "<li>$1</li>",
+  );
+
+  // Replace any html brackets with HTML Entities to prevent executing HTML or script 
+  // Don't use strip_tags here because it breaks [url] search by replacing & with amp
+  if ($mixmode == 1)
+  {
+    $newtext = str_replace("&lt;", "<", $text); 
+    $newtext = str_replace("&gt;", ">", $newtext); 
+    $newtext = str_replace("&quot;", "\"", $newtext); 
+  } else {
+    $newtext = str_replace("<", "&lt;", $text); 
+    $newtext = str_replace(">", "&gt;", $newtext); 
+    $newtext = str_replace("&amp;quot;", "&quot;", $newtext); 
+  }
+
+  // Convert new line chars to html <br /> tags 
+  $newtext = nl2br($newtext);  
+
+  if (strpos($text, "[") !== false) {
+    $newtext = preg_replace(array_keys($bbcode_mappings), array_values($bbcode_mappings), $newtext);
+  }
+
+  return stripslashes($newtext);  //stops slashing, useful when pulling from db
+}
+
+?>
--- a/themes/greydragon/views/support/pagination.php
+++ b/themes/greydragon/views/support/pagination.php
--- a/themes/greydragon/views/tag_block.html.php
+++ b/themes/greydragon/views/tag_block.html.php
@ -0,0 +1,17 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script language="text/javascript" type="text/javascript">
+  $("#g-add-tag-form").ready(function() {
+    var url = $("#g-tag-cloud").attr("title") + "/autocomplete";
+    $("#g-add-tag-form input:text").autocomplete(
+      url, {
+        max: 30,
+        multiple: true,
+          multipleSeparator: ',',
+          cacheLength: 1}
+    );
+  });
+</script>
+<div id="g-tag-cloud" title="<?= url::site("tags") ?>">
+  <?= $cloud ?>
+</div>
+<?= $form ?>
--- a/themes/night_wind/css/fix-ie.css
+++ b/themes/night_wind/css/fix-ie.css
@ -1,29 +0,0 @@
-/**
- * Fix display in IE 6, 7
- */
-
-#g-banner {
-  z-index: 2;
-}
-
-input.submit {
-  clear: none !important;
-  display: inline !important;
-}
-
-#g-add-tag-form input.textbox {
-  width: 110px;
-}
-
-#g-dialog .g-cancel {
-  display: inline-block !important;
-  float: none !important;
-}
-
-.g-pager .g-text-right {
-  width: 29%;
-}
-
-.g-pager .ui-icon-right {
-  width: 60px;
-}
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@ -1,817 +0,0 @@
-/**
- * Gallery 3 Default Theme Screen Styles
- *
- * @requires YUI reset, font, grids CSS
- *
- * Sheet organization:
- *  1)  Basic HTML elements
- *  2)  Reusable content blocks
- *  3)  Page layout containers
- *  4)  Content blocks in specific layout containers
- *  5)  Navigation and menus
- *  6)  Browser hacks
- *  7)  jQuery and jQuery UI
- *  8)  Right-to-left language styles
- */
-
-/** *******************************************************************
- * 1) Basic HTML elements
- **********************************************************************/
-
-body, html {
-  background-color: #333;
-  font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-}
-
-p {
-  margin-bottom: 1em;
-}
-
-em {
-  font-style: oblique;
-}
-
-h1, h2, h3, h4, h5, strong, th {
-  font-weight: bold;
-}
-
-h1 {
-  font-size: 1.7em;
-}
-
-#g-search-results h1 {
-  margin-bottom: 1em;
-}
-
-#g-progress h1 {
-  font-size: 1.1em;
-}
-
-h2 {
-  font-size: 1.4em;
-}
-
-#g-sidebar .g-block h2 {
-  font-size: 1.2em;
-}
-
-#g-sidebar .g-block li {
-  margin-bottom: .6em;
-}
-
-h3 {
-  font-size: 1.2em;
-}
-
-/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-a,
-.g-menu a,
-#g-dialog a,
-.g-button,
-.g-button:hover,
-.g-button:active,
-a.ui-state-hover,
-input.ui-state-hover,
-button.ui-state-hover {
-  color: #fff !important;
-  cursor: pointer !important;
-  text-decoration: none;
-  -moz-outline-style: none;
-}
-
-a:hover,
-#g-dialog a:hover {
-  text-decoration: underline;
-}
-
-.g-menu a:hover {
-  text-decoration: none;
-}
-
-#g-dialog #g-action-status li {
-  width: 400px;
-  white-space: normal;
-  padding-left: 32px;
-}
-
-/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-table {
-  width: 100%;
-}
-
-#g-content table {
-  margin: 1em 0;
-}
-
-caption,
-th {
-  text-align: left;
-}
-
-th,
-td {
-  border: none;
-  border-bottom: 1px solid #ccc;
-  padding: .5em;
-  vertical-align: top;
-}
-
-/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-fieldset {
-  border: 1px solid #ccc;
-  padding-bottom: .8em;
-}
-
-#g-banner fieldset,
-#g-sidebar fieldset,
-.g-short-form fieldset {
-  border: none;
-}
-
-legend {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-#g-banner legend,
-#g-sidebar legend,
-#g-content #g-search-form legend,
-input[type="hidden"],
-.g-short-form label {
-  display: none;
-}
-
-label {
-  cursor: help;
-}
-
-input[type="text"],
-input[type="password"] {
-  width: 50%;
-}
-
-input[type="text"],
-input[type="password"],
-textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-}
-
-textarea {
-  width: 100%;
-  height: 12em;
-}
-
-input:focus,
-textarea:focus,
-option:focus {
-  background-color: #ffc;
-  color: #000;
-}
-
-/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form li {
-  margin: 0 !important;
-  padding: .3em 1.5em .3em 1em;
-}
-
-form ul ul {
-  clear: both;
-}
-
-form ul ul li {
-  float: left;
-}
-
-input,
-select,
-textarea {
-  display: block;
-  clear: both;
-  padding: .2em;
-}
-
-input[type="submit"],
-input[type="reset"] {
-  display: inline;
-  clear: none;
-  float: left;
-}
-
-/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form.g-error input[type="text"],
-li.g-error input[type="text"],
-form.g-error input[type="password"],
-li.g-error input[type="password"],
-form.g-error input[type="checkbox"],
-li.g-error input[type="checkbox"],
-form.g-error input[type="radio"],
-li.g-error input[type="radio"],
-form.g-error textarea,
-li.g-error textarea,
-form.g-error select,
-li.g-error select {
-  border: 2px solid red;
-}
-
-/** *******************************************************************
- * 2) Reusable content blocks
- *********************************************************************/
-
-.g-block h2 {
-  background-color: #333;
-  padding: .3em .8em;
-}
-
-.g-block-content {
-  margin-top: 1em;
-}
-
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.g-short-form li {
-  float: left;
-  padding: .4em 0;
-}
-
-.g-short-form input[type="text"] {
-  color: #666;
-  padding: .3em .6em;
-  width: 11em;
-}
-
-/*** ******************************************************************
- * 3) Page layout containers
- *********************************************************************/
-
-/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.g-view {
-  background-color: #000;
-  border: 1px solid #333;
-  border-bottom: none;
-  color: #fff;
-}
-
-/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-header {
-  margin-bottom: 1em;
-}
-
-#g-banner {
-  background-color: #000;
-  border-bottom: 1px solid #333;
-  font-size: .8em;
-  min-height: 5em;
-  padding: 1em 20px;
-  position: relative;
-}
-
-#g-content {
-  font-size: 1.2em;
-  padding-left: 20px;
-  position: relative;
-  width: 696px;
-}
-
-#g-sidebar {
-  font-size: .9em;
-  padding: 0 20px;
-  width: 220px;
-}
-
-#g-footer {
-  background-color: #000;
-  border-top: 1px solid #333;
-  font-size: .8em;
-  margin-top: 20px;
-  padding: 10px 20px;
-}
-
-/** *******************************************************************
- * 4) Content blocks in specific layout containers
- *********************************************************************/
-
-/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-banner #g-logo img {
-  margin: 0;
-}
-
-#g-banner #g-quick-search-form {
-  clear: right;
-  float: right;
-  margin-top: 1em;
-}
-
-#g-banner #g-quick-search-form input[type='text'] {
-  width: 17em;
-}
-
-#g-content .g-block h2 {
-  background-color: transparent;
-  padding-left: 0;
-}
-
-#g-sidebar .g-block-content {
-  padding-left: 1em;
-}
-
-/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-content #g-album-grid {
-  margin: 1em 0;
-  position: relative;
-  z-index: 1;
-}
-
-#g-content #g-album-grid .g-item {
-  background-color: #000;
-  border: 1px solid #000;
-  float: left;
-  font-size: .7em;
-  padding: .6em 8px;
-  position: relative;
-  text-align: center;
-  width: 213px;
-  z-index: 1;
-}
-
-#g-content #g-album-grid .g-item h2 {
-  margin: 5px 0;
-}
-
-#g-content .g-photo h2,
-#g-content .g-item .g-metadata {
-  display: none;
-  margin-bottom: .6em;
-}
-
-#g-content #g-album-grid .g-album {
-  background-color: #e8e8e8;
-}
-
-#g-content #g-album-grid .g-album h2 span {
-  background: transparent url('../images/ico-album.png') no-repeat top left;
-  display: inline-block;
-  height: 16px;
-  margin-right: 5px;
-  width: 16px;
-}
-
-#g-content #g-album-grid .g-hover-item {
-  border: 1px solid #000;
-  position: absolute !important;
-  z-index: 1000 !important;
-}
-
-#g-content .g-hover-item h2,
-#g-content .g-hover-item .g-metadata {
-  display: block;
-}
-
-#g-content #g-album-grid #g-place-holder {
-  position: relative;
-  visibility: hidden;
-  z-index: 1;
-}
-
-/* Individual photo content ~~~~~~~~~~~~~~ */
-
-#g-content #g-item {
-  position: relative;
-  width: 100%;
-}
-
-#g-content #g-photo {
-  position: relative;
-}
-
-#g-content #g-item .g-fullsize-link img {
-  display: block;
-  margin: 1em auto;
-}
-
-#g-content #g-comments {
-  margin-top: 2em;
-  position: relative;
-}
-
-#g-content #g-comments ul li {
-  margin: 1em 0;
-}
-
-#g-content #g-comments .g-author {
-  border-bottom: 1px solid #ccc;
-  color: #999;
-  height: 32px;
-  line-height: 32px;
-}
-
-#g-content #g-comments ul li div {
-  padding: 0 8px 8px 43px;
-}
-
-#g-content #g-comments ul li #g-recaptcha {
-  padding: 0;
-}
-
-#g-content #g-comments ul li #g-recaptcha div {
-  padding: 0;
-}
-
-#g-content #g-comments .g-avatar {
-  height: 32px;
-  margin-right: .4em;
-  width: 32px;
-}
-
-#g-admin-comment-button {
-  position: absolute;
-  right: 0;
-  top: 2px;
-}
-
-#g-content #g-comment-form {
-  margin-top: 2em;
-}
-
-/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-footer #g-credits li {
-  padding-right: 1.2em;
-}
-
-#g-content #g-search-results {
-  margin-top: 1em;
-  padding-top: 1em;
-}
-
-/* In-line editing  ~~~~~~~~~~~~~~~~~~~~~~ */
-#g-in-place-edit-message {
-  background-color: #FFF;
-}
-
-/** *******************************************************************
- * 5) Navigation and menus
- *********************************************************************/
-
-#g-site-menu,
-#g-tag-cloud ul {
-  font-size: 1.2em;
-}
-
-/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-banner #g-login-menu {
-  color: #999;
-  float: right;
-}
-
-#g-banner #g-login-menu li {
-  padding-left: 1.2em;
-}
-
-/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-site-menu {
-  bottom: 0;
-  display: none;
-  left: 140px;
-  position: absolute;
-}
-
-#g-site-menu ul {
-  margin-bottom: 0 !important;
-}
-
-/* Context Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-.g-context-menu {
-  background-color: #fff;
-  bottom: 0;
-  left: 0;
-  position: absolute;
-}
-
-.g-item .g-context-menu {
-  display: none;
-  margin-top: 2em;
-  width: 100%;
-}
-
-#g-item .g-context-menu {
-  font-size: .7em;
-}
-
-#g-item .g-context-menu ul {
-  display: none;
-}
-
-.g-context-menu li {
-  border-left: none;
-  border-right: none;
-  border-bottom: none;
-}
-
-.g-context-menu li a {
-  display: block;
-  line-height: 1.6em;
-}
-
-.g-hover-item .g-context-menu {
-  display: block;
-}
-
-.g-hover-item .g-context-menu li {
-  text-align: left;
-}
-
-.g-hover-item .g-context-menu a:hover {
-  text-decoration: none;
-}
-
-/* View Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-view-menu {
-  margin-bottom: 1em;
-}
-
-#g-view-menu a {
-  background-repeat: no-repeat;
-  background-position: 50% 50%;
-  height: 28px !important;
-  width: 43px !important;
-}
-
-#g-view-menu #g-slideshow-link {
-  background-image: url('../images/ico-view-slideshow.png');
-}
-
-#g-view-menu .g-fullsize-link {
-  background-image: url('../images/ico-view-fullsize.png');
-}
-
-#g-view-menu #g-comments-link {
-  background-image: url('../images/ico-view-comments.png');
-}
-
-#g-view-menu #g-print-digibug-link {
-  background-image: url('../images/ico-print.png');
-}
-
-/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-tag-cloud ul {
-  text-align: justify;
-}
-
-#g-tag-cloud ul li {
-  display: inline;
-  line-height: 1.5em;
-  text-align: justify;
-}
-
-#g-tag-cloud ul li a {
-  text-decoration: none;
-}
-
-#g-tag-cloud ul li span {
-  display: none;
-}
-
-#g-tag-cloud ul li.size1 a {
-  color: #9cf;
-  font-size: 80%;
-  font-weight: 100;
-}
-
-#g-tag-cloud ul li.size2 a {
-  color: #69f;
-  font-size: 90%;
-  font-weight: 300;
-}
-
-#g-tag-cloud ul li.size3 a {
-  color: #69c;
-  font-size: 100%;
-  font-weight: 500;
-}
-
-#g-tag-cloud ul li.size4 a {
-  color: #369;
-  font-size: 110%;
-  font-weight: 700;
-}
-
-#g-tag-cloud ul li.size5 a {
-  color: #0e2b52;
-  font-size: 120%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li.size6 a {
-  color: #0e2b52;
-  font-size: 130%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li.size7 a {
-  color: #0e2b52;
-  font-size: 140%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li a:hover {
-  color: #f30;
-  text-decoration: underline;
-}
-
-#g-welcome-message p {
-  padding-bottom: 1em;
-}
-
-/** *******************************************************************
- * 6) jQuery and jQuery UI
- *********************************************************************/
-
-/* Superfish menu overrides ~~~~~~~~~~~~~~ */
-
-.sf-menu a {
-  border-left: 1px solid #CCC;
-  border-top: 1px solid #CCC;
-}
-
-.sf-menu li {
-  color: #fff;
-  background-color: #333;
-}
-
-.sf-menu li li, .sf-menu li li ul li {
-  color: #fff;
-  background-color: #333;
-}
-
-.sf-menu li:hover {
-  color: #fff;
-  background-color: #777;
-}
-
-.sf-menu li:hover, .sf-menu li.sfHover,
-.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
-	background:		#777;
-}
-
-/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
-
-.ui-widget-overlay {
-  background: #000;
-  opacity: .7;
-}
-
-/* jQuery UI ThemeRoller buttons */
-
-.g-buttonset {
-  padding-left: 1px;
-}
-
-.g-buttonset li {
-  float: left;
-}
-
-.g-buttonset .g-button {
-  margin: 0;
-}
-
-.ui-icon-left .ui-icon {
-  float: left;
-  margin-right: .2em;
-}
-
-.ui-icon-right .ui-icon {
-  float: right;
-  margin-left: .2em;
-}
-
-.ui-icon-rotate-ccw {
-  background-position: -192px -64px;
-}
-
-.ui-icon-rotate-cw {
-  background-position: -208px -64px;
-}
-
-/* STUFF THAT NEEDS A HOME */
-
-#g-move ul {
-  padding-left: 1em;
-}
-
-#g-move .selected {
-  background: #999;
-}
-
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-edit-permissions-form {
-	clear: both;
-}
-
-#g-edit-permissions-form td {
-  background-image: none;
-}
-
-#g-edit-permissions-form fieldset {
-	border: 1px solid #ccc;
-	padding: 0;
-}
-
-#g-permissions .g-denied,
-#g-permissions .g-allowed {
-  text-align: center;
-  vertical-align: middle;
-}
-
-#g-permissions .g-denied {
-  background-color: #fcc;
-}
-
-#g-permissions .g-allowed {
-  background-color: #cfc;
-}
-
-/*************** STUFF THAT NEEDS A HOME ****************/
-
-#g-admin-g2-import-notes {
-  padding-bottom: 20px;
-}
-
-#g-admin-g2-import-details {
-  padding-top: 20px;
-}
-
-#g-admin-g2-import-details .g-warning {
-  margin-top: 4px;
-}
-
-#g-admin-g2-import-details .g-info {
-  padding: 2px;
-  border: 1px solid #999;
-  margin-bottom: 10px;
-}
-
-#g-admin-g2-import-notes p,
-#g-admin-g2-import-details .g-info p {
-  padding: 0;
-  margin: 0;
-}
-
-#g-admin-g2-import-notes ul li,
-#g-admin-g2-import .g-info ul li {
-  padding-left: 0;
-  margin-left: 20px;
-  list-style-type: disc;
-}
-
-/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
-
-.rtl {
-  direction: rtl;
-}
-
-.rtl caption,
-.rtl th,
-.rtl #g-dialog {
-  text-align: right;
-}
-
-.rtl .g-right,
-.rtl #g-header #g-quick-search-form,
-.rtl #g-header #g-login-menu,
-.rtl .ui-icon-right .ui-icon {
-  clear: left;
-  float: left;
-}
-
-.rtl .g-left,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
-.rtl .g-short-form li,
-.rtl #g-header #g-logo img,
-.rtl #g-content #g-album-grid .g-item,
-.rtl #g-site-menu,
-.rtl .g-breadcrumbs li,
-.rtl .g-pager li,
-.rtl .g-buttonset li,
-.rtl .ui-icon-left .ui-icon {
-  float: right;
-}
--- a/themes/night_wind/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png
--- a/themes/night_wind/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png
+++ b/themes/night_wind/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_222222_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_222222_256x240.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_444444_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_444444_256x240.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_666666_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_666666_256x240.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_aaaaaa_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_aaaaaa_256x240.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_bbbbbb_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_bbbbbb_256x240.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_cccccc_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_cccccc_256x240.png
--- a/themes/night_wind/css/themeroller/images/ui-icons_cd0a0a_256x240.png
+++ b/themes/night_wind/css/themeroller/images/ui-icons_cd0a0a_256x240.png
--- a/themes/night_wind/css/themeroller/ui.base.css
+++ b/themes/night_wind/css/themeroller/ui.base.css
@ -1,406 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
-/* Layout helpers
----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Helvetica,%20Arial,%20sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=888888&bgTextureHeader=04_highlight_hard.png&bgImgOpacityHeader=15&borderColorHeader=404040&fcHeader=ffffff&iconColorHeader=cccccc&bgColorContent=121212&bgTextureContent=12_gloss_wave.png&bgImgOpacityContent=16&borderColorContent=404040&fcContent=eeeeee&iconColorContent=bbbbbb&bgColorDefault=adadad&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=35&borderColorDefault=cccccc&fcDefault=333333&iconColorDefault=666666&bgColorHover=dddddd&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=60&borderColorHover=dddddd&fcHover=000000&iconColorHover=444444&bgColorActive=121212&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=15&borderColorActive=000000&fcActive=ffffff&iconColorActive=222222&bgColorHighlight=555555&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=55&borderColorHighlight=404040&fcHighlight=cccccc&iconColorHighlight=aaaaaa&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-*/
-
-
-/* Component containers
----------------------------------*/
-.ui-widget { font-family: Helvetica, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Helvetica, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #404040; background: #121212 url(images/ui-bg_gloss-wave_16_121212_500x100.png) 50% top repeat-x; color: #eeeeee; }
-.ui-widget-content a { color: #eeeeee; }
-.ui-widget-header { border: 1px solid #404040; background: #888888 url(images/ui-bg_highlight-hard_15_888888_1x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #cccccc; background: #adadad url(images/ui-bg_highlight-soft_35_adadad_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #333333; outline: none; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #333333; text-decoration: none; outline: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #dddddd; background: #dddddd url(images/ui-bg_highlight-soft_60_dddddd_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #000000; outline: none; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #000000; text-decoration: none; outline: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #000000; background: #121212 url(images/ui-bg_inset-soft_15_121212_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; outline: none; text-decoration: none; }
-
-/* Interaction Cues
----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #404040; background: #555555 url(images/ui-bg_highlight-hard_55_555555_1x100.png) 50% top repeat-x; color: #cccccc; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #cccccc; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-
-/* Icons
----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_bbbbbb_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_bbbbbb_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_cccccc_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_666666_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_444444_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_aaaaaa_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
----------------------------------*/
-
-/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; }
-.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
-.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
-.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
-.ui-corner-right {  -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
-.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
-.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion
----------------------------------*/
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/* Dialog
----------------------------------*/
-.ui-dialog { position: relative; padding: .2em; width: 300px; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/* Progressbar
----------------------------------*/
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
----------------------------------*/
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
----------------------------------*/
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
----------------------------------*/
-.ui-tabs { padding: .2em; zoom: 1; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
-.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
--- a/themes/night_wind/images/avatar.jpg
+++ b/themes/night_wind/images/avatar.jpg
--- a/themes/night_wind/images/ico-album.png
+++ b/themes/night_wind/images/ico-album.png
--- a/themes/night_wind/images/ico-help.png
+++ b/themes/night_wind/images/ico-help.png
--- a/themes/night_wind/images/ico-print.png
+++ b/themes/night_wind/images/ico-print.png
--- a/themes/night_wind/images/ico-view-comments.png
+++ b/themes/night_wind/images/ico-view-comments.png
--- a/themes/night_wind/images/ico-view-fullsize.png
+++ b/themes/night_wind/images/ico-view-fullsize.png
--- a/themes/night_wind/images/ico-view-slideshow.png
+++ b/themes/night_wind/images/ico-view-slideshow.png
--- a/themes/night_wind/images/select-photos-backg.png
+++ b/themes/night_wind/images/select-photos-backg.png
--- a/themes/night_wind/js/ui.init.js
+++ b/themes/night_wind/js/ui.init.js
@ -1,111 +0,0 @@
-/**
- * Initialize jQuery UI and Gallery Plugin elements
- */
-
-$(document).ready(function() {
-
-  // Initialize Superfish menus
-  $("ul.g-menu").addClass("sf-menu");
-  $('ul.sf-menu').superfish({
-    delay: 500,
-    animation: {
-      opacity:'show',
-      height:'show'
-    },
-    speed: 'fast'
-  });
-  $("#g-site-menu").css("display", "block");
-
-  // Initialize status message effects
-  $("#g-action-status li").gallery_show_message();
-
-  // Initialize dialogs
-  $("#g-login-link").addClass("g-dialog-link");
-  $(".g-dialog-link").gallery_dialog();
-
-  // Initialize view menu
-  if ($("#g-view-menu").length) {
-    $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
-    $("#g-view-menu a").addClass("ui-icon");
-  }
-
-  // Apply jQuery UI button css to submit inputs
-  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
-
-  // Apply styles and icon classes to g-context-menu
-  if ($(".g-context-menu").length) {
-    $(".g-context-menu li").addClass("ui-state-default");
-    $(".g-context-menu a").addClass("g-button ui-icon-left");
-    $(".g-context-menu a").prepend("<span class=\"ui-icon\"></span>");
-    $(".g-context-menu a span").each(function() {
-      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
-      $(this).addClass(iconClass);
-    });
-  }
-
-  // Album view only
-  if ($("#g-album-grid").length) {
-    // Set equal height for album items and vertically align thumbnails/metadata
-    $('.g-item').equal_heights().gallery_valign();
-
-    // Initialize thumbnail hover effect
-    $(".g-item").hover(
-      function() {
-        // Insert a placeholder to hold the item's position in the grid
-        var placeHolder = $(this).clone().attr("id", "g-place-holder");
-        $(this).after($(placeHolder));
-        // Style and position the hover item
-        var position = $(this).position();
-        $(this).css("top", position.top).css("left", position.left);
-        $(this).addClass("g-hover-item");
-        // Initialize the contextual menu
-        $(this).gallery_context_menu();
-        // Set the hover item's height
-        $(this).height("auto");
-        var context_menu = $(this).find(".g-context-menu");
-        var adj_height = $(this).height() + context_menu.height(); 
-        $(this).height(adj_height); 
-      },
-      function() {
-        // Reset item height and position
-        if ($(this).next().height()) {
-          var sib_height = $(this).next().height();
-        } else {
-          var sib_height = $(this).prev().height();
-        }
-        if ($.browser.msie && $.browser.version >= 8) {
-          sib_height = sib_height + 1;
-        }
-        $(this).css("height", sib_height);
-        $(this).css("position", "relative");
-        $(this).css("top", 0).css("left", 0);
-        // Remove the placeholder and hover class from the item
-        $(this).removeClass("g-hover-item");
-        $("#g-place-holder").remove();
-      }
-    );
-  }
-
-  // Photo/Item item view
-  if ($("#g-item").length) {
-    // Ensure the resized image fits within its container
-    $("#g-item").gallery_fit_photo();
-
-    // Initialize context menus
-    var resize = $("#g-item").gallery_get_photo();
-    $(resize).hover(function(){
-      $(this).gallery_context_menu();
-    });
-
-    // Add scroll effect for links to named anchors
-    $.localScroll({
-      queue: true,
-      duration: 1000,
-      hash: true
-    });
-  }
-
-  // Initialize button hover effect
-  $.fn.gallery_hover_init();
-
-});
--- a/themes/night_wind/theme.info
+++ b/themes/night_wind/theme.info
@ -1,6 +0,0 @@
-name = "Night Wind"
-description = "The same crisp and distinctive theme that uses large fonts and icons for easy navigation as Gallery Wind except the color scheme is based on night shades to enhance the browsing experience."
-version = 1
-author = "Gallery Team"
-site = 1
-admin = 0
--- a/themes/night_wind/thumbnail.png
+++ b/themes/night_wind/thumbnail.png
--- a/themes/night_wind/views/movie.html.php
+++ b/themes/night_wind/views/movie.html.php
@ -1,37 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-item">
-  <?= $theme->photo_top() ?>
-
-  <ul class="g-pager">
-    <li>
-      <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("Previous") ?></a>
-      <? else: ?>
-      <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("Previous") ?></a>
-      <? endif; ?>
-    </li>
-    <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="g-text-right">
-      <? if ($next_item): ?>
-      <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
-      <? else: ?>
-      <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
-      <? endif ?>
-    </li>
-  </ul>
-
-
-  <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
-
-  <div id="g-info">
-    <h1><?= html::purify($item->title) ?></h1>
-       <div><?= nl2br(html::purify($item->description)) ?></div>
-  </div>
-
-  <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
-</div>
--- a/themes/night_wind/views/no_sidebar.html.php
+++ b/themes/night_wind/views/no_sidebar.html.php
@ -1,6 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul class="g-message-block">
-  <li class="g-warning"><?= t("No active sidebar blocks.<br/>
-      <a href=\"%url\">Add blocks</a>",
-          array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li>
-</ul>
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@ -1,145 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>
-      <? if ($page_title): ?>
-        <?= $page_title ?>
-      <? else: ?>
-        <? if ($theme->item()): ?>
-          <? if ($theme->item()->is_album()): ?>
-          <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
-          <? elseif ($theme->item()->is_photo()): ?>
-          <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
-          <? else: ?>
-          <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
-          <? endif ?>
-        <? elseif ($theme->tag()): ?>
-          <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
-        <? else: /* Not an item, not a tag, no page_title specified.  Help! */ ?>
-          <?= t("Gallery") ?>
-        <? endif ?>
-      <? endif ?>
-    </title>
-    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
-    <?= $theme->css("yui/reset-fonts-grids.css") ?>
-    <?= $theme->css("superfish/css/superfish.css") ?>
-    <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("gallery.common.css") ?>
-    <?= $theme->css("screen.css") ?>
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
-    <? if ($theme->page_type == 'collection'): ?>
-      <? if ($thumb_proportion != 1): ?>
-        <? $new_width = $thumb_proportion * 213 ?>
-        <? $new_height = $thumb_proportion * 240 ?>
-    <style type="text/css">
-    #g-content #g-album-grid .g-item {
-      width: <?= $new_width ?>px;
-      height: <?= $new_height ?>px;
-      /* <?= $thumb_proportion ?> */
-    }
-    </style>
-      <? endif ?>
-    <? endif ?>
-    <?= $theme->script("jquery.js") ?>
-    <?= $theme->script("jquery.form.js") ?>
-    <?= $theme->script("jquery-ui.js") ?>
-    <?= $theme->script("gallery.common.js") ?>
-    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
-    <script type="text/javascript">
-    var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
-    </script>
-    <?= $theme->script("gallery.ajax.js") ?>
-    <?= $theme->script("gallery.dialog.js") ?>
-    <?= $theme->script("superfish/js/superfish.js") ?>
-    <?= $theme->script("jquery.localscroll.js") ?>
-    <?= $theme->script("ui.init.js") ?>
-
-    <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
-    <? if ($theme->page_subtype == "photo"): ?>
-    <?= $theme->script("jquery.scrollTo.js") ?>
-    <?= $theme->script("gallery.show_full_size.js") ?>
-    <? elseif ($theme->page_subtype == "movie"): ?>
-    <?= $theme->script("flowplayer.js") ?>
-    <? endif ?>
-
-    <?= $theme->head() ?>
-  </head>
-
-  <body <?= $theme->body_attributes() ?>>
-    <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 g-view">
-      <?= $theme->site_status() ?>
-      <div id="g-header" class="ui-helper-clearfix">
-        <div id="g-banner">
-          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
-          <?= $header_text ?>
-          <? else: ?>
-          <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
-            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
-          </a>
-          <? endif ?>
-          <?= $theme->user_menu() ?>
-          <?= $theme->header_top() ?>
-          <div id="g-site-menu">
-          <?= $theme->site_menu() ?>
-          </div>
-          <?= $theme->header_bottom() ?>
-        </div>
-
-        <? if (!empty($parents)): ?>
-        <ul class="g-breadcrumbs">
-          <? $i = 0 ?>
-          <? foreach ($parents as $parent): ?>
-          <li<? if ($i == 0) print " class=\"g-first\"" ?>>
-            <!-- Adding ?show=<id> causes Gallery3 to display the page
-                 containing that photo.  For now, we just do it for
-                 the immediate parent so that when you go back up a
-                 level you're on the right page. -->
-            <a href="<?= $parent->url($parent == $theme->item()->parent() ?
-                     "show={$theme->item()->id}" : null) ?>">
-              <?= html::purify($parent->title) ?>
-            </a>
-          </li>
-          <? $i++ ?>
-          <? endforeach ?>
-          <li class="g-active"><?= html::purify($theme->item()->title) ?></li>
-        </ul>
-        <? endif ?>
-      </div>
-      <div id="bd">
-        <div id="yui-main">
-          <div class="yui-b">
-            <div id="g-content" class="yui-g">
-              <?= $theme->messages() ?>
-              <?= $content ?>
-            </div>
-          </div>
-        </div>
-        <div id="g-sidebar" class="yui-b">
-          <? if ($theme->page_subtype != "login"): ?>
-          <?= new View("sidebar.html") ?>
-          <? endif ?>
-        </div>
-      </div>
-      <div id="g-footer" class="ui-helper-clearfix">
-        <?= $theme->footer() ?>
-        <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
-        <?= $footer_text ?>
-        <? endif ?>
-
-        <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="g-credits" class="g-inline">
-          <?= $theme->credits() ?>
-        </ul>
-        <? endif ?>
-      </div>
-    </div>
-    <?= $theme->page_bottom() ?>
-  </body>
-</html>
--- a/themes/night_wind/views/pager.html.php
+++ b/themes/night_wind/views/pager.html.php
@ -1,44 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager ui-helper-clearfix">
-  <? /* @todo This message isn't easily localizable */
-     $from_to_msg = t2("Photo %from_number of %count",
-                       "Photos %from_number - %to_number of %count",
-                       $total_items,
-                       array("from_number" => $current_first_item,
-                             "to_number" => $current_last_item,
-                             "count" => $total_items)) ?>
-  <li>
-  <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
-  <? else: ?>
-    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a>
-  <? endif ?>
-  <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
-  <? else: ?>
-    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("Previous") ?></a>
-  <? endif ?>
-  </li>
-  <li class="g-info"><?= $from_to_msg ?></li>
-  <li class="g-text-right">
-  <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
-  <? else: ?>
-    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
-  <? endif ?>
-  <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
-  <? else: ?>
-    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("Last") ?></a>
-  <? endif ?>
-  </li>
-</ul>
--- a/themes/night_wind/views/photo.html.php
+++ b/themes/night_wind/views/photo.html.php
@ -1,59 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-
-<? if (access::can("view_full", $theme->item())): ?>
-<!-- Use javascript to show the full size as an overlay on the current page -->
-<script type="text/javascript">
-  $(document).ready(function() {
-    $(".g-fullsize-link").click(function() {
-      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
-      return false;
-    });
-  });
-</script>
-<? endif ?>
-
-<div id="g-item">
-  <?= $theme->photo_top() ?>
-
-  <ul class="g-pager ui-helper-clearfix">
-    <li>
-      <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
-      <? else: ?>
-      <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
-      <? endif; ?>
-    </li>
-    <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="g-text-right">
-      <? if ($next_item): ?>
-      <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-      <? else: ?>
-      <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-      <? endif ?>
-    </li>
-  </ul>
-
-  <div id="g-photo">
-    <?= $theme->resize_top($item) ?>
-    <? if (access::can("view_full", $item)): ?>
-    <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
-      <? endif ?>
-      <?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
-      <? if (access::can("view_full", $item)): ?>
-    </a>
-    <? endif ?>
-    <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item, "#g-photo-id-{$item->id}") ?>
-  </div>
-
-  <div id="g-info">
-    <h1><?= html::purify($item->title) ?></h1>
-    <div><?= nl2br(html::purify($item->description)) ?></div>
-  </div>
-
-  <?= $theme->photo_bottom() ?>
-</div>
--- a/themes/night_wind/views/sidebar.html.php
+++ b/themes/night_wind/views/sidebar.html.php
@ -1,16 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->sidebar_top() ?>
-<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
-  <? if ($page_subtype == "album"):?>
-    <?= $theme->album_menu() ?>
-  <? elseif ($page_subtype == "photo") : ?>
-    <?= $theme->photo_menu() ?>
-  <? elseif ($page_subtype == "movie") : ?>
-    <?= $theme->movie_menu() ?>
-  <? elseif ($page_subtype == "tag") : ?>
-    <?= $theme->tag_menu() ?>
-  <? endif ?>
-</div>
-
-<?= $theme->sidebar_blocks() ?>
-<?= $theme->sidebar_bottom() ?>
--- a/themes/three_nids/README
+++ b/themes/three_nids/README
@ -18,7 +18,7 @@ Installation:

 *********
 Configuration:
-Go to admin -> content -> Theme 3nids settings to configure the theme properly.
+Go to Admin -> Appearance -> Theme Options to configure the theme properly.

 *********
 Use:
--- a/themes/three_nids/admin/controllers/admin_three_nids.php
+++ b/themes/three_nids/admin/controllers/admin_three_nids.php
@ -1,77 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-class Admin_Three_Nids_Controller extends Admin_Controller {
-  public function index() {
-    // Generate a new admin page.
-    $view = new Admin_View("admin.html");
-    $view->content = new View("admin_three_nids.html");
-
-    // Generate a form for Google Maps Settings.
-    $view->content->theme_form = $this->_get_three_nids_form();
-
-    // Display the page.
-    print $view;
-  }
-
-  private function _get_three_nids_form() {
-    // Make a new form for inputing information associated with google maps.
-    $form = new Forge("admin/three_nids/savethree_nidsprefs", "", "post",
-                      array("id" => "gTagsMapAdminForm"));
-
-    // Input box for the Maps API Key
-    $form->input("title")
-      ->label(t("item title : parent or item."))
-      ->value(module::get_var("three_nids", "title"));
-    $form->input("description")
-      ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used."))
-      ->value(module::get_var("three_nids", "description"));
-    $form->input("photo_size")
-      ->label(t("Photo size: resize or full."))
-      ->value(module::get_var("three_nids", "photo_size"));
-
-    // Add a save button to the form.
-    $form->submit("SaveSettings")->value(t("Save"));
-
-    // Return the newly generated form.
-    return $form;
-  }
-
-  public function savethree_nidsprefs() {
-    // Save information associated with Google Maps to the database.
-
-    // Prevent Cross Site Request Forgery
-    access::verify_csrf();
-
-    // Figure out the values of the text boxes
-    $description = Input::instance()->post("description");
-    $title = Input::instance()->post("title");
-    $photo_size = Input::instance()->post("photo_size");
-
-    // Save Settings.
-    module::set_var("three_nids", "description", $description);
-    module::set_var("three_nids", "title", $title);
-    module::set_var("three_nids", "photo_size", $photo_size);
-
-    // Display a success message and redirect back to the TagsMap admin page.
-    message::success(t("Your Settings Have Been Saved."));
-    url::redirect("admin/three_nids");
-  }
-}
--- a/themes/three_nids/admin/helpers/three_nids_event.php
+++ b/themes/three_nids/admin/helpers/three_nids_event.php
@ -18,12 +18,25 @@
 * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
 */
 class three_nids_event_Core {
-  static function admin_menu($menu, $theme) {
-    // Add a link to the three_nids admin page to the Content menu.
-    $menu->get("appearance_menu")
-      ->append(Menu::factory("link")
-               ->id("three_nids")
-               ->label(t("3nids settings"))
-               ->url(url::site("admin/three_nids")));
+  static function theme_edit_form($form) {
+    $group = $form->group("three_nids")->label(t("3nids Theme Settings"));
+    $group->input("title")
+      ->rules("required")
+      ->label(t("item title : parent or item."))
+      ->value(module::get_var("three_nids", "title"));
+    $group->input("description")
+      ->rules("required")
+      ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used."))
+      ->value(module::get_var("three_nids", "description"));
+    $group->input("photo_size")
+      ->rules("required")
+      ->label(t("Photo size: resize or full."))
+      ->value(module::get_var("three_nids", "photo_size"));
+  }
+
+  static function theme_edit_form_completed($form) {
+    module::set_var("three_nids", "description", $form->three_nids->description->value);
+    module::set_var("three_nids", "title", $form->three_nids->title->value);
+    module::set_var("three_nids", "photo_size", $form->three_nids->photo_size->value);
  }
 }
--- a/themes/three_nids/admin/views/admin_three_nids.html.php
+++ b/themes/three_nids/admin/views/admin_three_nids.html.php
@ -1,8 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<h2>
-  <?= t("3nids Theme Settings") ?>
-</h2>
-<div class="g-block">
-  <?= $theme_form ?>
-</div>
-
--- a/themes/three_nids/helpers/three_nids_event.php
+++ b/themes/three_nids/helpers/three_nids_event.php
@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class three_nids_event_Core {
-  static function admin_menu($menu, $theme) {
-    // Add a link to the three_nids admin page to the Content menu.
-    $menu->get("appearance_menu")
-      ->append(Menu::factory("link")
-               ->id("three_nids")
-               ->label(t("3nids settings"))
-               ->url(url::site("admin/three_nids")));
-  }
-}
				`@ -0,0 +1 @@`
				`<?php defined("SYSPATH") or die("No direct script access.") ?>`