6 files changed, 19 insertions, 109 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 2679386b..24c63756 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -67,7 +67,7 @@ h3 {
 
 a,
 .gMenu a,
-#gDialog a,
+#g-dialog a,
 .g-button,
 .g-button:hover,
 .g-button:active,
@@ -80,7 +80,7 @@ button.ui-state-hover {
 }
 
 a:hover,
-#gDialog a:hover {
+#g-dialog a:hover {
   text-decoration: underline;
 }
 
@@ -88,21 +88,6 @@ 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 {
@@ -782,7 +767,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   font-size: 0;
 }
 
-.gDialogLoadingLarge {
+.g-dialogLoadingLarge {
   background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
   font-size: 0;
 }
@@ -836,34 +821,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   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 */
 
 .gButtonSet {
@@ -1056,7 +1013,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: right;
 }
 
-#gTaskLogDialog h1 {
+#gTaskLog-dialog h1 {
   font-size: 1.1em;
 }
 
@@ -1143,7 +1100,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 .rtl caption,
 .rtl th,
-.rtl #gDialog {
+.rtl #g-dialog {
   text-align: right;
 }
 
@@ -1159,7 +1116,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: left;
 }
 
-.rtl #gDialog .gCancel,
+.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index d9b011bd..a603f87f 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
   $("#gMessage li").gallery_show_message();
 
   // Initialize modal dialogs
-  $(".gDialogLink").gallery_dialog();
+  $(".g-dialogLink").gallery_dialog();
 
   // Initialize ajax links
   $(".gAjaxLink").gallery_ajax();
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 4c13764f..8899ec59 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -23,7 +23,7 @@ input.submit {
   width: 110px;
 }
 
-#gDialog a.gCancel {
+#g-dialog a.g-cancel {
   display: inline-block !important;
   float: none !important;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 8f17e310..ec75d310 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -67,7 +67,7 @@ h3 {
 
 a,
 .gMenu a,
-#gDialog a,
+#g-dialog a,
 .g-button,
 .g-button:hover,
 .g-button:active,
@@ -81,7 +81,7 @@ button.ui-state-hover {
 }
 
 a:hover,
-#gDialog a:hover {
+#g-dialog a:hover {
   text-decoration: underline;
 }
 
@@ -89,22 +89,7 @@ a:hover,
   text-decoration: none;
 }
 
-#gDialog .gCancel {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
-}
-
-#gForgotPasswordLink {
-  float: right;
-  font-size: .9em;
-}
-
-#gDialog .gCancel {
-  float: left;
-}
-
-#gDialog #gMessage li {
+#g-dialog #gMessage li {
   width: 400px;
   white-space: normal;
   padding-left: 32px;
@@ -685,13 +670,13 @@ form .gError,
   font-weight: bold;
 }
 
-#gDialog ul.gBreadcrumbs {
+#g-dialog ul.gBreadcrumbs {
   clear: both;
   margin-left: 0;
   padding-left: 0;
 }
 
-#gDialog .gBreadcrumbs li {
+#g-dialog .gBreadcrumbs li {
   font-size: .9em;
 }
 
@@ -822,7 +807,7 @@ form .gError,
   font-size: 0;
 }
 
-.gDialogLoadingLarge {
+.g-dialogLoadingLarge {
   background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
   font-size: 0;
 }
@@ -850,38 +835,6 @@ form .gError,
   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;
-}
-
-#gDialog p {
-	margin: 0;
-}
-
 /* jQuery UI ThemeRoller buttons */
 
 .gButtonSet {
@@ -1097,7 +1050,7 @@ form .gError,
 
 .rtl caption,
 .rtl th,
-.rtl #gDialog {
+.rtl #g-dialog {
   text-align: right;
 }
 
@@ -1109,7 +1062,7 @@ form .gError,
   float: left;
 }
 
-.rtl #gDialog .gCancel,
+.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 4a1962c0..4b3b4306 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -26,8 +26,8 @@ $(document).ready(function() {
   $("#gMessage li").gallery_show_message();
 
   // Initialize dialogs
-  $("#gLoginLink").addClass("gDialogLink");
-  $(".gDialogLink").gallery_dialog();
+  $("#gLoginLink").addClass("g-dialogLink");
+  $(".g-dialogLink").gallery_dialog();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 01f7be50..fd647f81 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -30,7 +30,7 @@
   <? if ($user->admin || access::can("add", $item)): ?>
   <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
-            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li>
+            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialogLink\""))) ?></li>
   <? else: ?>
   <li><?= t("There aren't any photos here yet!") ?></li>
   <? endif; ?>