1 files changed, 66 insertions, 202 deletions

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index e58cd5a5..85168810 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,81 +1,79 @@
-/* @todo move to theme css */
+
 /*******************************************************************
  * Dialog wide stylings
  */
-#gMessage {
-  margin-bottom: .4em;
+#gOrganizeDialog {
+  text-align: left;
 }
 
-#gMessage .gInfo {
-  background-color: transparent;
-  background-image: none;
-  padding-left: .4em;
+#gOrganize {
+  overflow: hidden;
 }
 
-#gOrganizeProgressDialog {
-  text-align: left;
+#gOrganize #bd {
+  height: 100%;
+}
+
+#gOrganize .yui-u {
+  width: 75%;
+}
+
+#gOrganize .yui-gf .first {
+  width: 25%;
 }
 
-#gDialog .yui-gf div.first {
-  width: 20%;
+#gOrganize .yui-gf #gMessage {
+  margin-bottom: .4em;
+  width: 75%;
+  white-space: nowrap;
 }
 
-#gDialog .yui-gf .yui-u {
-  width: 80%;
+#gOrganizeDetail {
+  height: 100%;
+}
+
+#gMessage .gInfo {
+  font-weight: bold;
+  padding-left: 2em;
 }
 
 /*******************************************************************
  * Album Tree styling
  */
 #gOrganizeTreeContainer {
-  overflow-y: auto;
+  height: 100%;
+  overflow: auto;
   margin: 0 !important;
   padding: 0 !important;
 }
 
-#gOrganizeAlbumDescription {
-  height: 2em;
-  overflow-y: auto;
+#gOrganizeTreeContainer ul ul li {
+  padding-left: 1.2em;
+}
+
+.gAlbumText:hover {
+  border: 1px dashed #999;
+  padding: 1px;
 }
 
-.gBranchSelected {
+#gOrganizeAlbumTree .selected {
   background-color: #cfdeff !important;
   border-bottom: 1px solid #999 !important;
   display: block;
   padding: .3em 0;
 }
 
-.gBranchDroppable {
-  border: 1px dotted;
+.gOrganizeAlbum span {
+  cursor: pointer;
 }
 
-.gBranchText {
+.gAlbumText {
   cursor: pointer;
   width: auto;
 }
-
-.gBranchCollapsed {
-  display: none;
-}
-
-.gBranchEmpty {
-  visibility: hidden;
-}
-
-#gOrganizeTreeContainer ul ul li {
-  padding-left: 1.2em;
-}
-
 /*******************************************************************
  * Album Panel Styles
  */
-
-#gMicroThumbUnselectAll,
-#gMicroThumbSelectAll {
-  font-size: 1em;
-  font-weight: bold;
-}
-
 #gMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
@@ -83,200 +81,66 @@
   border: 1px solid #999 !important;
   border-top: none !important;
   border-left: none !important;
-  margin-left: -1em !important;
   overflow-x: hidden;
   overflow-y: auto;
 }
 
 #gMicroThumbGrid {
-  padding: .5em;
+  padding: 1em;
 }
 
-.gMicroThumbContainer {
-  display: block;
+.gMicroThumbGridCell {
   float: left;
-  font-size: .7em;
-  height: 9em;
-  margin-bottom: 1em;
-  margin-left: 1em;
-  opacity: .4;
-  padding: 0 .5em;
+  font-size: 0.8em;
+  padding: .5em !important;
+  opacity: .5;
+  border-left: 1px hidden #13A;
+  border-right: 1px hidden #13A;
 }
 
 .gMicroThumb {
-  height: 9em;
-  width: 9em;
-  background-color: #fff;
   display: block;
-  float: left;
+  height: 9em;
   text-align: center;
+  width: 9em;
 }
 
-#gMicroThumbPanel #gMicroThumbGrid .gAlbum {
-  background-color: #e8e8e8;
-}
-
-#gMicroThumbPanel #gMicroThumbGrid :hover {
+.gMicroThumbGridCell.ui-state-selected {
   opacity: 1;
 }
 
-.gMicroThumbContainer.ui-selected {
-  opacity: 1;
+.ui-selectable-lasso {
+  z-index: 2000 !important;
+  border: 1px dashed #13A;
 }
 
-#gDragHelper .gMicroThumbGrid {
-  background-color: transparent;
-  padding: 0;
-  overflow: visible;
+.gThumbnail {
+  padding: .5em;
 }
 
-#gDragHelper .gMicroThumbContainer {
-  display: block;
-  margin: 0;
-  padding: 0;
+#gMicroThumbPanel #gMicroThumbGrid .gAlbum {
+  background-color: #e8e8e8;
 }
 
-#gDragHelper .gMicroThumb {
-  background-color: transparent;
-  height: auto;
-  width: auto;
+#gMicroThumbPanel #gMicroThumbGrid :hover {
+  opacity: 1;
 }
 
-
 /****************************************************************
- * Organize Edit Drawer styling
+ * Organize Controls styling
  */
-#gOrganizeEditDrawer {
+#gOrganizeControls {
+  padding-left: 8px;
   background-color: #13A;
-  width: 90%;
-}
-
-#gOrganizeEditDrawerPanel {
-  background-color: #fff;
-  border: 1px solid #13A;
-  display: none;
-  height: 195px;
-}
-
-#gOrganizeEditDrawerHandle {
-  height: 30px;
-}
-
-#gOrganizeEditHandleLeft {
-  background-color: #FFF;
-  float: left;
-  height: 30px;
-  width: 15px;
-}
-
-#gOrganizeEditHandleButtonsMiddle,
-#gOrganizeEditHandleButtonsLeft {
-  float: left;
-  height: 20px;
-  padding: 2px 10px;
-}
-
-#gOrganizeEditHandleButtonsMiddle {
-  margin-left: 20px;
-}
-
-#gOrganizeEditHandleButtonsMiddle a,
-#gOrganizeEditHandleButtonsLeft a {
-  float: left;
-  margin: 0 2.5px;
-}
-
-#gOrganizeEditHandleButtonsRight {
-  float: right;
-  height: 20px;
-  padding: 2px 10px;
-}
-
-#gOrganizeEditHandleButtonsRight a {
-  float: left;
-  margin: 0 2.5px;
-}
-
-#gOrganizeEditHandleRight {
-  background-color: #FFF;
-  background-position: -15px 0;
-  float: right;
-  height: 30px;
-  width: 15px;
+  color: #ccc;
+  width: 100% !important;
 }
 
-#gOrganizeFormButtons {
-  bottom: 0.5em;
-}
-
-#gOrganizeFormButtons .submit {
+#gOrganizeControls select {
   display: inline;
-  float: none;
-  left: 0.5em;
-  position: relative;
 }
 
-/* yui-u gives 80% width, but then we wrap so do it ourselves */
-#gOrganizeEditForm {
+#gOrganizeClose {
   float: right;
-  width: 79%;
-  //  height: 100px;
-}
-
-#gOrganizeFormThumbs {
-  overflow: hidden;
-}
-
-#gOrganizeFormThumbs div {
-  margin: 0;
-  text-align: center;
-  background: transparent none repeat scroll 0 0;
-}
-
-#gOrganizeFormThumbs .gMicroThumbContainer {
-  display: block;
-  float: left;
-  opacity: 1;
-  position: absolute;
-}
-
-/****************************************************************
- * Organize Edit From tabs styling
- */
-#gOrganizeEditForm.ui-tabs .ui-tabs-hide {
-  display: block !important;
-  left: -10000px;
-  position: absolute;
-}
-
-#gOrganizeEditForm.ui-widget {
-  font-size: .75em;
-}
-
-.gOrganizeEditPane {
-  height: 135px;
-  overflow-y: auto;
-}
-
-.textbox,
-.textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-  width: 100%;
-}
-
-.textarea {
-  height: 6em;
-}
-
-.textbox  {
-  height: 1.3em;
-  width: 50%
-}
-
-.gTagGroup {
-  float:left;
-  margin: .5em;
+  margin-right: 12px;
 }