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

16 files changed, 795 insertions, 401 deletions

diff --git a/themes/admin_default/css/fix-ie.css b/themes/admin_default/css/fix-ie.css
index 97c619eb..6bc2334c 100644
--- a/themes/admin_default/css/fix-ie.css
+++ b/themes/admin_default/css/fix-ie.css
@@ -1,9 +1,8 @@
 /**
- * Fix display in IE
+ * Fix display in IE 6 and 7
  */
 
 #gHeader,
-#gAdminMenu,
 #gGroupAdmin,
 #gDeveloperTools,
 .gAvailable .gBlock {
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index d408acf0..33cc6733 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -1,30 +1,276 @@
 /**
- * Gallery 3 Default Admin Theme Screen Styles
+ * Gallery 3 Default Theme Screen Styles
  *
- * Extends themes/default/css/screen.css
+ * @requires YUI reset, font, grids CSS
  *
- * 1)  Basic HTML elements
- * 2) Reusable content blocks
- * 3) Page layout containers
- * 4) Content blocks in specific layout containers
- * 5) Browser hacks
- * 6) jQuery and jQuery UI
- * 7) Server Add
- * 8) Digibug Print Administration
+ * Sheet organization:
+ *  1)  Basic HTML elements
+ *  2)  Reusable classes
+ *  3)  Reusable content blocks
+ *  4)  Page layout containers
+ *  5)  Content blocks in specific layout containers
+ *  6)  Navigation and menus
+ *  7)  Browser hacks
+ *  8)  jQuery and jQuery UI
+ *  9)  Right-to-left language styles
  */
 
 /** *******************************************************************
  * 1) Basic HTML elements
  **********************************************************************/
 
+body, html {
+  background-color: #ccc;
+  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;
+}
+
+#gSearchResults h1 {
+  margin-bottom: 1em;
+}
+
+#gProgress h1 {
+  font-size: 1.1em;
+}
+
+h2 {
+  font-size: 1.4em;
+}
+
+#gSidebar .gBlock h2 {
+  font-size: 1.2em;
+}
+
+#gSidebar .gBlock li {
+  margin-bottom: .6em;
+}
+
+h3 {
+  font-size: 1.2em;
+}
+
+/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+a,
+.gMenu a,
+#gDialog a,
+.gButtonLink,
+.gButtonLink:hover,
+.gButtonLink:active,
+a.ui-state-hover,
+input.ui-state-hover,
+button.ui-state-hover {
+  color: #5382BF !important;
+  text-decoration: none;
+  -moz-outline-style: none;
+}
+
+a:hover,
+#gDialog a:hover {
+  text-decoration: underline;
+}
+
+.gMenu a:hover {
+  text-decoration: none;
+}
+
+#gDialog .gCancel {
+  clear: none;
+  float: left;
+  margin: .3em 1em;
+}
+
+#gForgotPasswordLink {
+  float: right;
+  font-size: .9em;
+}
+
+#gDialog .gCancel {
+  float: left;
+}
+
+/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+table {
+  width: 100%;
+}
+
+#gContent table {
+  margin: 1em 0 3em 0;
+}
+
+caption,
+th {
+  text-align: left;
+}
+
+th,
+td {
+  border: none;
+  border-bottom: 1px solid #ccc;
+  padding: .5em;
+  vertical-align: top;
+}
+
+#gAdminMaintenance td {
+  vertical-align: middle;
+}
+
+/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+fieldset {
+  border: 1px solid #ccc;
+  padding-bottom: .8em;
+}
+
+#gHeader fieldset,
+#gSidebar fieldset,
+.gShortForm fieldset {
+  border: none;
+}
+
+legend {
+  font-weight: bold;
+  margin-left: 1em;
+}
+
+#gHeader legend,
+#gSidebar legend,
+#gContent #gSearchForm legend,
+input[type="hidden"],
+.gShortForm 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 ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.gValidationRule {
+  font-size: 80%;
+  margin-top: .5em;
+}
+
+form.gError input[type="text"],
+li.gError input[type="text"],
+form.gError input[type="password"],
+li.gError input[type="password"],
+form.gError input[type="checkbox"],
+li.gError input[type="checkbox"],
+form.gError input[type="radio"],
+li.gError input[type="radio"],
+form.gError textarea,
+li.gError textarea,
+form.gError select,
+li.gError select {
+  border: 2px solid red;
+}
+
 /** *******************************************************************
- * 2) Reusable content blocks
- **********************************************************************/
+ * 2) Reusable generic classes
+ *********************************************************************/
+
+.inactive, .understate {
+  color: #ccc;
+  font-weight: normal;
+}
+
+.left {
+  float: left;
+  margin: 1em 1em 1em 0;
+}
+
+.right {
+  float: right;
+  margin: 1em 0 1em 1em;
+}
+
+.txtright {
+  text-align: right;
+}
+
+/** *******************************************************************
+ * 3) Reusable content blocks
+ *********************************************************************/
 
 .gBlock {
   background-color: #fff;
   border: 1px solid #ccc;
-  margin-bottom: 1em;
+  clear: both;
+  margin-bottom: 2.5em;
   padding: 1em;
 }
 
@@ -32,16 +278,24 @@
   padding: 0;
 }
 
+.gBlock h2 {
+  background-color: #e8e8e8;
+  padding: .3em .8em;
+}
+
+.gBlockContent {
+  margin-top: 1em;
+}
+
 .gSelected img,
 .gAvailable .gBlock img {
   float: left;
-  margin-right: 1em;
+  margin: 0 1em 1em 0;
 }
 
 .rtl .gSelected img,
 .rtl .gAvailable .gBlock img {
   float: right;
-  margin-left: 1em;
 }
 
 .gSelected {
@@ -74,68 +328,192 @@
   background-color: #fff;
 }
 
-/** *******************************************************************
- * 3) Page layout containers
- **********************************************************************/
+/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gMessage {
+  width: 100%;
+}
+
+#gSiteStatus li,
+#gMessage li,
+.gModuleStatus {
+  border: 1px solid #ccc;
+  margin-bottom: .4em;
+}
+
+#gSiteStatus li {
+  margin-bottom: 0;
+  border: none;
+  border-bottom: 1px solid #ccc;
+}
+
+.gModuleStatus {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.gError,
+.gInfo,
+.gSuccess,
+.gWarning {
+  padding: .4em .5em .4em 30px;
+}
+
+.gError, tr.gError td.gError {
+  background: #f6cbca url('../images/ico-error.png') no-repeat .4em 50%;
+}
+
+.gInfo {
+  background: #e8e8e8 url('../images/ico-info.png') no-repeat .4em 50%;
+}
+
+.gSuccess {
+  background: #d9efc2  url('../images/ico-success.png') no-repeat .4em 50%;
+}
+
+.gWarning, tr.gWarning td.gWarning {
+  background: #fcf9ce url('../images/ico-warning.png') no-repeat .4em 50%;
+}
+
+.gPager .gInfo,
+tr.gError,
+tr.gInfo,
+tr.gSuccess,
+tr.gWarning {
+  background: none;
+}
+
+.gInfo td.gInfo {
+  background-color: transparent;
+}
+
+.gSuccess td.gSuccess {
+  background-color: transparent;
+}
+
+.gError td {
+  background-color: #f6cbca;
+}
+
+.gWarning td {
+  background-color: #fcf9ce;
+}
+
+/* Inline layout (forms, lists) ~~~~~~~~~~ */
+
+.gShortForm li {
+  float: left;
+  padding: .4em 0;
+}
+
+.gShortForm input[type="text"] {
+  color: #666;
+  padding: .3em .6em;
+  width: 11em;
+}
+
+/*** ******************************************************************
+ * 4) Page layout containers
+ *********************************************************************/
+
+/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gView {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-bottom: none;
   min-width: 974px !important;
 }
 
+/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
+
 #gHeader {
   background-color: #e8e8e8;
   border-bottom: 1px solid #ccc;
+  font-size: .8em;
   margin-bottom: 20px;
   padding: 0 20px;
+  position: relative;
 }
 
 #gContent {
   font-size: 1.1em;
+  padding-left: 20px;
   width: 96%;
 }
 
+#gSidebar {
+  background-color: #fff;
+  font-size: .9em;
+  padding: 0 20px;
+  width: 220px;
+}
+
+#gFooter {
+  background-color: #e8e8e8;
+  border-top: 1px solid #ccc;
+  font-size: .8em;
+  margin-top: 20px;
+  padding: 10px 20px;
+}
+
 /** *******************************************************************
- * 4) Content blocks in specific layout containers
+ * 5) Content blocks in specific layout containers
  *********************************************************************/
 
+/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #gHeader #gLogo {
-  float: left;
-  margin: -22px 10px 0 0;
+  background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
+  color: #A5A5A5 !important;
   display: block;
-  padding-left: 2px;
-  width: 105px; /* 107px - padding-left */
-  height: 48px;
-  background-image: url('../../default/images/logo.png');
-  color: #A5A5A5 ! important;
+  height: 55px;
+  padding-top: 5px;
+  width: 105px;
 }
+
 #gHeader #gLogo:hover {
-  color: #FF6600 ! important;
+  color: #f60 !important;
   text-decoration: none;
 }
 
-#gHeader #gLoginMenu {
-  float: none;
-  margin: 0;
-  padding: 5px 0 10px 0;
-  text-align: right;
+#gHeader #gQuickSearchForm {
+  clear: right;
+  float: right;
+  margin: 1em 0;
 }
 
+#gHeader #gQuickSearchForm input[type='text'] {
+  width: 17em;
+}
 
-.rtl #gHeader #gLoginMenu {
-  text-align: left;
+#gContent .gBlock h2 {
+  background-color: transparent;
+  padding-left: 0;
 }
 
-#gHeader #gSiteAdminMenu {
-  float: left;
-  font-size: 1.2em;
+#gSidebar .gBlockContent {
+  padding-left: 1em;
 }
 
-.rtl #gHeader #gSiteAdminMenu {
-  float: right;
+/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gHeader #gLoginMenu li,
+#gFooter #gCredits li {
+  display: inline;
 }
 
-#gHeader #gSiteAdminMenu ul {
-  margin-bottom: 0;
+#gHeader #gLoginMenu li {
+  padding-left: 1.2em;
+}
+
+#gFooter #gCredits li {
+  padding-right: 1.2em;
+}
+
+#gContent #gSearchResults {
+  margin-top: 1em;
+  padding-top: 1em;
 }
 
 .gBlock .ui-dialog-titlebar {
@@ -202,7 +580,7 @@
 #gAdminGraphics .gAvailable .gBlock {
   clear: none;
   float: left;
-  height: 16em;
+  height: 17em;
   margin-right: 1em;
   width: 30%;
 }
@@ -263,8 +641,8 @@ li.gGroup {
 }
 
 li.gGroup h4 {
-  background-color: #EEEEEE;
-  border-bottom: 1px dashed #CCCCCC;
+  background-color: #eee;
+  border-bottom: 1px dashed #ccc;
   padding: .5em 0 .5em .5em;
 }
 li.gGroup .gButtonLink {
@@ -297,9 +675,66 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 }
 
 /** *******************************************************************
- * 5) Browser hacks
+ * 5) Navigation and menus
+ *********************************************************************/
+
+#gSiteAdminMenu,
+#gTagCloud ul {
+  font-size: 1.2em;
+}
+
+/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gHeader #gLoginMenu {
+  color: #999;
+  float: right;
+  margin: 0;
+  padding: 5px 0;
+}
+
+.rtl #gHeader #gLoginMenu {
+  text-align: left;
+}
+
+/* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gSiteAdminMenu {
+  bottom: 0;
+	display: none;
+  font-size: 1.2em;
+  left: 140px;
+  position: absolute;
+}
+
+#gSiteAdminMenu ul {
+  margin-bottom: 0;
+}
+
+/* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.gPager {
+  clear: both;
+  margin: 0;
+  padding: 5px 0 !important;
+  width: 100%;
+}
+
+.gPager li {
+  float: left;
+  margin: 0;
+  width: 30%;
+}
+
+.gPager .gInfo {
+  text-align: center;
+  width: 40%;
+}
+
+/** *******************************************************************
+ * 6) Browser hacks
  *********************************************************************/
 
+#gSiteAdminMenu:after,
 #gHeader:after,
 #gAdminCommentsMenu:after,
 #gGroupAdmin:after,
@@ -307,7 +742,8 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 .gAvailable .gBlock:after,
 #gModuleCreateForm ul li ul:after,
 #gDeveloperTools:after,
-#gPhotoStream:after {
+#gPhotoStream:after,
+#gViewMenu:after {
   clear: both;
   content: ".";
   display: block;
@@ -316,9 +752,49 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 }
 
 /** *******************************************************************
- * 6) jQuery and jQuery UI
+ * 7) jQuery and jQuery UI
  *********************************************************************/
 
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
+.sf-menu li li, .sf-menu li li ul li {
+  background-color: #bdd2ff;
+}
+
+.sf-menu li:hover {
+  background-color: #dfe9ff;
+}
+
+/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
+
+.gLoadingLarge {
+  background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center;
+  font-size: 0;
+}
+
+.gDialogLoadingLarge {
+  background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
+  font-size: 0;
+}
+
+.gLoadingSmall {
+  background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
+  font-size: 0;
+}
+
+.gDraggable {
+  cursor: move;
+}
+
+.gDropTarget {
+  background-color: #cfdeff;
+  border: 1px dotted #999;
+  height: 100px;
+  margin: 1em 0;
+}
+
+/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
+
 #gPanel {
   display: none;
   padding: 1em;
@@ -345,60 +821,232 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   padding: .2em .4em;
 }
 
-/**** Stuff that needs a home! ****/
+.ui-widget-overlay {
+  background: #000;
+  opacity: .7;
+}
+
+#gDialog {
+  text-align: left;
+}
+
+#gDialog li {
+  padding-left: 0;
+}
+
+#gDialog form input[type="text"],
+#gDialog form input[type="password"] {
+  width: 100%;
+}
+
+#gDialog #gLoginForm,
+#gDialog #gAddUserForm,
+#gDialog #gAddGroupForm {
+  margin: 0 auto;
+  width: 270px;
+}
+
+#gDialog fieldset {
+  border: none;
+}
+
+#gDialog legend {
+  display: none;
+}
+
+/* jQuery UI ThemeRoller buttons */
+
+.gButtonLink {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+  outline: 0;
+}
+
+.gButtonSet {
+  padding-left: 1px;
+}
+
+.gButtonSet li {
+  float: left;
+}
+
+.gButtonSet .gButtonLink {
+  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 ****************/
+
+#gMove ul {
+  padding-left: 1em;
+}
+
+#gMove .selected {
+  background: #999;
+}
+
+.gProgressBar {
+  height: 1em;
+  width: 100%;
+  margin-top: .5em;
+  display: inline-block;
+}
+
+#gAddPhotos p {
+  margin: 0;
+  padding: 0;
+}
+
+#gAddPhotosCanvas {
+  height: 325px;
+  width: 450px;
+  overflow: auto;
+}
+
+#gAddPhotosQueue .progressbar {
+  height: 4px;
+}
+
+#gAddPhotosQueue .title {
+  font-size: 1.25em;
+}
+
+#gAddPhotosQueue .status {
+  font-size: .75em;
+}
+
+#gAddPhotosQueue .box {
+  margin-bottom: 8px;
+  padding: 4px;
+}
+
+#gAddPhotosQueue .pending {
+  background-color: #e8e8e8;
+  border: 1px solid #d7d7d7;
+}
+
+#gAddPhotosQueue .error {
+  background-color: #fcc;
+  border: 1px solid #ebb;
+}
+
+#gAddPhotosQueue .uploading {
+  background-color: #ff9;
+  border: 1px solid #ee8;
+}
+
+#gAddPhotosQueue .complete {
+  background-color: #cfc;
+  border: 1px solid #beb;
+}
+
+#gAdminG2ImportNotes {
+  padding-bottom: 20px;
+}
+
+#gAdminG2ImportDetails {
+  padding-top: 20px;
+}
+
+#gAdminG2ImportDetails .gWarning {
+  margin-top: 4px;
+}
+
+#gAdminG2ImportDetails .gInfo {
+  padding: 2px;
+  border: 1px solid #999;
+  margin-bottom: 10px;
+}
+
+#gAdminG2ImportNotes p,
+#gAdminG2ImportDetails .gInfo p {
+  padding: 0;
+  margin: 0;
+}
+
+#gAdminG2ImportNotes ul li,
+#gAdminG2Import .gInfo ul li {
+  padding-left: 0;
+  margin-left: 20px;
+  list-style-type: disc;
+}
+
 #gTagAdmin {
   table-layout: fixed;
 }
+
 #gTagAdmin td {
   border: 0;
 }
+
 #gTagAdmin ul {
   padding-bottom: .3em;
 }
+
 #gTagAdmin li {
   padding: .1em 0 .2em .3em;
 }
+
 #gTagAdmin .gColumn {
   float: left;
   width: 200px;
 }
+
 .rtl #gTagAdmin .gColumn {
   float: right;
 }
+
 .gEditable {
   padding: .1em .3em .2em .3em;
 }
+
 .gEditable:hover {
   background-color: #ffc;
   cursor: text;
 }
+
 #gRenameTagForm input {
   padding: 0 .2em 0 .2em;
   clear: none;
   float: left;
   margin: 0 .2em 0 0;
 }
+
 .rtl #gRenameTagForm input {
   float: right;
 }
+
 #gRenameTagForm input[type="submit"] {
   height: 25px;
 }
+
 #gRenameTagForm a, #gRenameTagForm span {
   display: block;
   float: left;
   padding: .2em .2em 0 .1em;
 }
+
 .rtl #gRenameTagForm a, #gRenameTagForm span {
   float: right;
 }
-#gProgress button {
-  float: right;
-  margin-top: 1em;
-}
-.rtl #gProgress button {
-  float: left;
-}
 
 #gTaskLogDialog h1 {
   font-size: 1.1em;
@@ -413,10 +1061,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   padding: .5em
 }
 
-
-/** *******************************************************************
- * 7) Server Add
- *********************************************************************/
 #gServerAddAdmin {
   margin:auto;
   text-align: left;
@@ -451,8 +1095,71 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   cursor: pointer;
 }
 
-#gLanguageSettingsForm .checklist li {
-  width: 150px;
-  overflow: hidden;
+#gLanguagesForm table {
+	width: 400px;
+	float: left;
+	margin: 0 3em 1em 0;
+}
+
+#gLanguagesForm .installed {
+  background-color: #EEEEEE;
 }
 
+#gLanguagesForm .default {
+	background-color: #C5DBEC;
+	font-weight: bold;
+}
+
+#gLanguagesForm input {
+	clear: both;
+}
+
+#gTranslations {
+	padding: 2em 0 0 0;
+	clear: both;
+}
+
+#gTranslations .gButtonLink {
+	padding: .5em;
+}
+
+.gDocLink {
+  float: right;
+}
+
+/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl {
+  direction: rtl;
+}
+
+.rtl caption,
+.rtl th,
+.rtl #gDialog {
+  text-align: right;
+}
+
+.rtl .txtright {
+  text-align: left;
+}
+
+.rtl #gHeader #gQuickSearchForm,
+.rtl #gForgotPasswordLink,
+.rtl #gHeader #gLoginMenu,
+.rtl .ui-icon-right .ui-icon {
+  clear: left;
+  float: left;
+}
+
+.rtl #gDialog .gCancel,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl .gShortForm li,
+.rtl #gContent #gAlbumGrid .gItem,
+.rtl #gSiteAdminMenu,
+.rtl .gPager li,
+.rtl .gButtonSet li,
+.rtl .ui-icon-left .ui-icon {
+  float: right;
+}
diff --git a/themes/admin_default/images/ico-album.png b/themes/admin_default/images/ico-album.png
new file mode 100644
index 00000000..affa1b84
--- /dev/null
+++ b/themes/admin_default/images/ico-album.png
diff --git a/themes/admin_default/images/ico-error.png b/themes/admin_default/images/ico-error.png
new file mode 100644
index 00000000..c37bd062
--- /dev/null
+++ b/themes/admin_default/images/ico-error.png
diff --git a/themes/admin_default/images/ico-info.png b/themes/admin_default/images/ico-info.png
new file mode 100644
index 00000000..12cd1aef
--- /dev/null
+++ b/themes/admin_default/images/ico-info.png
diff --git a/themes/admin_default/images/ico-print.png b/themes/admin_default/images/ico-print.png
new file mode 100644
index 00000000..b82a8e1e
--- /dev/null
+++ b/themes/admin_default/images/ico-print.png
diff --git a/themes/admin_default/images/ico-separator.gif b/themes/admin_default/images/ico-separator.gif
new file mode 100644
index 00000000..3de2d0d3
--- /dev/null
+++ b/themes/admin_default/images/ico-separator.gif
diff --git a/themes/admin_default/images/ico-success.png b/themes/admin_default/images/ico-success.png
new file mode 100644
index 00000000..a9925a06
--- /dev/null
+++ b/themes/admin_default/images/ico-success.png
diff --git a/themes/admin_default/images/ico-view-comments.png b/themes/admin_default/images/ico-view-comments.png
new file mode 100644
index 00000000..e5d3630f
--- /dev/null
+++ b/themes/admin_default/images/ico-view-comments.png
diff --git a/themes/admin_default/images/ico-view-fullsize.png b/themes/admin_default/images/ico-view-fullsize.png
new file mode 100644
index 00000000..0be23e9b
--- /dev/null
+++ b/themes/admin_default/images/ico-view-fullsize.png
diff --git a/themes/admin_default/images/ico-view-hybrid.png b/themes/admin_default/images/ico-view-hybrid.png
new file mode 100644
index 00000000..ee902e55
--- /dev/null
+++ b/themes/admin_default/images/ico-view-hybrid.png
diff --git a/themes/admin_default/images/ico-view-slideshow.png b/themes/admin_default/images/ico-view-slideshow.png
new file mode 100644
index 00000000..82f61f63
--- /dev/null
+++ b/themes/admin_default/images/ico-view-slideshow.png
diff --git a/themes/admin_default/images/ico-warning.png b/themes/admin_default/images/ico-warning.png
new file mode 100644
index 00000000..628cf2da
--- /dev/null
+++ b/themes/admin_default/images/ico-warning.png
diff --git a/themes/admin_default/js/jquery.dropshadow.js b/themes/admin_default/js/jquery.dropshadow.js
deleted file mode 100644
index af7c4b00..00000000
--- a/themes/admin_default/js/jquery.dropshadow.js
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-	VERSION: Drop Shadow jQuery Plugin 1.6  12-13-2007
-
-	REQUIRES: jquery.js (1.2.6 or later)
-
-	SYNTAX: $(selector).dropShadow(options);  // Creates new drop shadows
-					$(selector).redrawShadow();       // Redraws shadows on elements
-					$(selector).removeShadow();       // Removes shadows from elements
-					$(selector).shadowId();           // Returns an existing shadow's ID
-
-	OPTIONS:
-
-		left    : integer (default = 4)
-		top     : integer (default = 4)
-		blur    : integer (default = 2)
-		opacity : decimal (default = 0.5)
-		color   : string (default = "black")
-		swap    : boolean (default = false)
-
-	The left and top parameters specify the distance and direction, in	pixels, to
-	offset the shadow. Zero values position the shadow directly behind the element.
-	Positive values shift the shadow to the right and down, while negative values
-	shift the shadow to the left and up.
-
-	The blur parameter specifies the spread, or dispersion, of the shadow. Zero
-	produces a sharp shadow, one or two produces a normal shadow, and	three or four
-	produces a softer shadow. Higher values increase the processing load.
-
-	The opacity parameter	should be a decimal value, usually less than one. You can
-	use a value	higher than one in special situations, e.g. with extreme blurring.
-
-	Color is specified in the usual manner, with a color name or hex value. The
-	color parameter	does not apply with transparent images.
-
-	The swap parameter reverses the stacking order of the original and the shadow.
-	This can be used for special effects, like an embossed or engraved look.
-
-	EXPLANATION:
-
-	This jQuery plug-in adds soft drop shadows behind page elements. It is only
-	intended for adding a few drop shadows to mostly stationary objects, like a
-	page heading, a photo, or content containers.
-
-	The shadows it creates are not bound to the original elements, so they won't
-	move or change size automatically if the original elements change. A window
-	resize event listener is assigned, which should re-align the shadows in many
-	cases, but if the elements otherwise move or resize you will have to handle
-	those events manually. Shadows can be redrawn with the redrawShadow() method
-	or removed with the removeShadow() method. The redrawShadow() method uses the
-	same options used to create the original shadow. If you want to change the
-	options, you should remove the shadow first and then create a new shadow.
-
-	The dropShadow method returns a jQuery collection of the new shadow(s). If
-	further manipulation is required, you can store it in a variable like this:
-
-		var myShadow = $("#myElement").dropShadow();
-
-	You can also read the ID of the shadow from the original element at a later
-	time. To get a shadow's ID, either read the shadowId attribute of the
-	original element or call the shadowId() method. For example:
-
-		var myShadowId = $("#myElement").attr("shadowId");  or
-		var myShadowId = $("#myElement").shadowId();
-
-	If the original element does not already have an ID assigned, a random ID will
-	be generated for the shadow. However, if the original does have an ID, the
-	shadow's ID will be the original ID and "_dropShadow". For example, if the
-	element's ID is "myElement", the shadow's ID would be "myElement_dropShadow".
-
-	If you have a long piece of text and the user resizes the	window so that the
-	text wraps or unwraps, the shape of the text changes and the words are no
-	longer in the same positions. In that case, you can either preset the height
-	and width, so that it becomes a fixed box, or you can shadow each word
-	separately, like this:
-
-		<h1><span>Your</span> <span>Page</span> <span>Title</span></h1>
-
-		$("h1 span").dropShadow();
-
-	The dropShadow method attempts to determine whether the selected elements have
-	transparent backgrounds. If you want to shadow the content inside an element,
-	like text or a transparent image, it must not have a background-color or
-	background-image style. If the element has a solid background it will create a
-	rectangular	shadow around the outside box.
-
-	The shadow elements are positioned absolutely one layer below the original
-	element, which is positioned relatively (unless it's already absolute).
-
-	*** All shadows have the "dropShadow" class, for selecting with CSS or jQuery.
-
-	ISSUES:
-
-		1)	Limited styling of shadowed elements by ID. Because IDs must be unique,
-				and the shadows have their own ID, styles applied by ID won't transfer
-				to the shadows. Instead, style elements by class or use inline styles.
-		2)	Sometimes shadows don't align properly. Elements may need to be wrapped
-				in container elements, margins or floats changed, etc. or you may just
-				have to tweak the left and top offsets to get them to align. For example,
-				with draggable objects, you have to wrap them inside two divs. Make the
-				outer div draggable and set the inner div's position to relative. Then
-				you can create a shadow on the element inside the inner div.
-		3)	If the user changes font sizes it will throw the shadows off. Browsers
-				do not expose an event for font size changes. The only known way to
-				detect a user font size change is to embed an invisible text element and
-				then continuously poll for changes in size.
-		4)	Safari support is shaky, and may require even more tweaks/wrappers, etc.
-
-		The bottom line is that this is a gimick effect, not PFM, and if you push it
-		too hard or expect it to work in every possible situation on every browser,
-		you will be disappointed. Use it sparingly, and don't use it for anything
-		critical. Otherwise, have fun with it!
-
-	AUTHOR: Larry Stevens (McLars@eyebulb.com) This work is in the public domain,
-					and it is not supported in any way. Use it at your own risk.
-*/
-
-
-(function($){
-
-	var dropShadowZindex = 1;  //z-index counter
-
-	$.fn.dropShadow = function(options)
-	{
-		// Default options
-		var opt = $.extend({
-			left: 4,
-			top: 4,
-			blur: 2,
-			opacity: .5,
-			color: "black",
-			swap: false
-			}, options);
-		var jShadows = $([]);  //empty jQuery collection
-
-		// Loop through original elements
-		this.not(".dropShadow").each(function()
-		{
-			var jthis = $(this);
-			var shadows = [];
-			var blur = (opt.blur <= 0) ? 0 : opt.blur;
-			var opacity = (blur == 0) ? opt.opacity : opt.opacity / (blur * 8);
-			var zOriginal = (opt.swap) ? dropShadowZindex : dropShadowZindex + 1;
-			var zShadow = (opt.swap) ? dropShadowZindex + 1 : dropShadowZindex;
-
-			// Create ID for shadow
-			var shadowId;
-			if (this.id) {
-				shadowId = this.id + "_dropShadow";
-			}
-			else {
-				shadowId = "ds" + (1 + Math.floor(9999 * Math.random()));
-			}
-
-			// Modify original element
-			$.data(this, "shadowId", shadowId); //store id in expando
-			$.data(this, "shadowOptions", options); //store options in expando
-			jthis
-				.attr("shadowId", shadowId)
-				.css("zIndex", zOriginal);
-			if (jthis.css("position") != "absolute") {
-				jthis.css({
-					position: "relative",
-					zoom: 1 //for IE layout
-				});
-			}
-
-			// Create first shadow layer
-			bgColor = jthis.css("backgroundColor");
-			if (bgColor == "rgba(0, 0, 0, 0)") bgColor = "transparent";  //Safari
-			if (bgColor != "transparent" || jthis.css("backgroundImage") != "none"
-					|| this.nodeName == "SELECT"
-					|| this.nodeName == "INPUT"
-					|| this.nodeName == "TEXTAREA") {
-				shadows[0] = $("<div></div>")
-					.css("background", opt.color);
-			}
-			else {
-				shadows[0] = jthis
-					.clone()
-					.removeAttr("id")
-					.removeAttr("name")
-					.removeAttr("shadowId")
-					.css("color", opt.color);
-			}
-			shadows[0]
-				.addClass("dropShadow")
-				.css({
-					height: jthis.outerHeight(),
-					left: blur,
-					opacity: opacity,
-					position: "absolute",
-					top: blur,
-					width: jthis.outerWidth(),
-					zIndex: zShadow
-				});
-
-			// Create other shadow layers
-			var layers = (8 * blur) + 1;
-			for (i = 1; i < layers; i++) {
-				shadows[i] = shadows[0].clone();
-			}
-
-			// Position layers
-			var i = 1;
-			var j = blur;
-			while (j > 0) {
-				shadows[i].css({left: j * 2, top: 0});           //top
-				shadows[i + 1].css({left: j * 4, top: j * 2});   //right
-				shadows[i + 2].css({left: j * 2, top: j * 4});   //bottom
-				shadows[i + 3].css({left: 0, top: j * 2});       //left
-				shadows[i + 4].css({left: j * 3, top: j});       //top-right
-				shadows[i + 5].css({left: j * 3, top: j * 3});   //bottom-right
-				shadows[i + 6].css({left: j, top: j * 3});       //bottom-left
-				shadows[i + 7].css({left: j, top: j});           //top-left
-				i += 8;
-				j--;
-			}
-
-			// Create container
-			var divShadow = $("<div></div>")
-				.attr("id", shadowId)
-				.addClass("dropShadow")
-				.css({
-					left: jthis.position().left + opt.left - blur,
-					marginTop: jthis.css("marginTop"),
-					marginRight: jthis.css("marginRight"),
-					marginBottom: jthis.css("marginBottom"),
-					marginLeft: jthis.css("marginLeft"),
-					position: "absolute",
-					top: jthis.position().top + opt.top - blur,
-					zIndex: zShadow
-				});
-
-			// Add layers to container
-			for (i = 0; i < layers; i++) {
-				divShadow.append(shadows[i]);
-			}
-
-			// Add container to DOM
-			jthis.after(divShadow);
-
-			// Add shadow to return set
-			jShadows = jShadows.add(divShadow);
-
-			// Re-align shadow on window resize
-			$(window).resize(function()
-			{
-				try {
-					divShadow.css({
-						left: jthis.position().left + opt.left - blur,
-						top: jthis.position().top + opt.top - blur
-					});
-				}
-				catch(e){}
-			});
-
-			// Increment z-index counter
-			dropShadowZindex += 2;
-
-		});  //end each
-
-		return this.pushStack(jShadows);
-	};
-
-
-	$.fn.redrawShadow = function()
-	{
-		// Remove existing shadows
-		this.removeShadow();
-
-		// Draw new shadows
-		return this.each(function()
-		{
-			var shadowOptions = $.data(this, "shadowOptions");
-			$(this).dropShadow(shadowOptions);
-		});
-	};
-
-
-	$.fn.removeShadow = function()
-	{
-		return this.each(function()
-		{
-			var shadowId = $(this).shadowId();
-			$("div#" + shadowId).remove();
-		});
-	};
-
-
-	$.fn.shadowId = function()
-	{
-		return $.data(this[0], "shadowId");
-	};
-
-
-	$(function()
-	{
-		// Suppress printing of shadows
-		var noPrint = "<style type='text/css' media='print'>";
-		noPrint += ".dropShadow{visibility:hidden;}</style>";
-		$("head").append(noPrint);
-	});
-
-})(jQuery);
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 3f062a27..1e09fd9f 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -1,5 +1,4 @@
 $(document).ready(function(){
-  
   // Initialize Superfish menus
   $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu");
   $("ul.gMenu").addClass("sf-menu");
@@ -15,23 +14,20 @@ $(document).ready(function(){
   $("#gSiteAdminMenu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").showMessage();
+  $("#gMessage li").gallery_show_message();
 
   // Initialize modal dialogs
-  var dialogLinks = $(".gDialogLink");
-  for (var i=0; i < dialogLinks.length; i++) {
-    $(dialogLinks[i]).bind("click", handleDialogEvent);
-  }
+  $(".gDialogLink").gallery_dialog();
+
+  // Initialize ajax links
+  $(".gDialogLink").gallery_ajax();
 
   // Initialize panels
-  var panelLinks = $(".gPanelLink");
-  for (i=0; i<panelLinks.length; i++) {
-    $(panelLinks[i]).bind("click", handlePanelEvent);
-  }
+  $(".gPanelLink").gallery_panel();
 
   if ($("#gPhotoStream").length) {
     // Vertically align thumbs in photostream
-    $(".gItem").vAlign();
+    $(".gItem").gallery_valign();
   }
 
   // Apply jQuery UI button css to submit inputs
@@ -51,9 +47,6 @@ $(document).ready(function(){
   $(".gAvailable .gBlock").addClass("ui-corner-all");
   $(".gUnavailable").addClass("ui-corner-all");
 
-  // Add drop shadows
-  $(".gSelected").dropShadow();
-
   // Add hover state for buttons
   $(".ui-state-default").hover(
     function() {
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 575f8a96..f77881bb 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -5,30 +5,29 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <title><?= t("Admin Dashboard") ?></title>
-    <link rel="shortcut icon" href="<?= url::file("themes/default/images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
 
-    <?= $theme->css("lib/yui/reset-fonts-grids.css") ?>
-    <?= $theme->css("lib/themeroller/ui.base.css") ?>
-    <?= $theme->css("lib/superfish/css/superfish.css") ?>
-    <?= $theme->css("themes/default/css/screen.css") ?>
-    <?= $theme->theme_css("css/screen.css") ?>
+    <?= $theme->css("yui/reset-fonts-grids.css") ?>
+    <?= $theme->css("themeroller/ui.base.css") ?>
+    <?= $theme->css("superfish/css/superfish.css") ?>
+    <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->theme_url("css/fix-ie.css") ?>"
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
 
-   <?= $theme->script("lib/jquery.js") ?>
-   <?= $theme->script("lib/jquery.form.js") ?>
-   <?= $theme->script("lib/jquery-ui.js") ?>
-   <?= $theme->script("lib/gallery.common.js") ?>
+   <?= $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') ?>";
+   var MSG_CANCEL = <?= t('Cancel')->for_js() ?>;
    </script>
-   <?= $theme->script("lib/gallery.dialog.js") ?>
-   <?= $theme->script("lib/superfish/js/superfish.js") ?>
-   <?= $theme->theme_script("js/jquery.dropshadow.js") ?>
-   <?= $theme->theme_script("js/ui.init.js") ?>
+   <?= $theme->script("gallery.ajax.js") ?>
+   <?= $theme->script("gallery.dialog.js") ?>
+   <?= $theme->script("superfish/js/superfish.js") ?>
+   <?= $theme->script("ui.init.js") ?>
 
    <?= $theme->admin_head() ?>
   </head>
@@ -44,10 +43,10 @@
       <div id="gHeader">
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor("albums/1", "&larr; ".t("Back to the Gallery")) ?></li>
-          <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1&csrf=$csrf") ?>"><?= t("Logout") ?></a></li>
+          <li class="first"><?= html::anchor(item::root()->url(), "&larr; ".t("Back to the Gallery")) ?></li>
+          <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery") ?>">
+        <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
         <div id="gSiteAdminMenu" style="display: none;">