Change admin/themes to show both styles of themes side by side. This

eliminates the menu, which is kind of clunky.

While I'm at it, let's call the "regular" themes a "site theme" so we
have "site" and "admin" themes.

3 files changed, 55 insertions, 16 deletions

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 06ebc582..ce5f471e 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -107,26 +107,18 @@
   margin-right: 1em;
 }
 
-#gAdminThemes #gSelectedTheme img {
-  float: left;
-  margin-right: 1em;
-}
-
-#gAdminThemes #gSelectedTheme div.gBlock,
 #gAdminGraphics #gSelectedToolkit div.gBlock {
   width: 700px;
   height: 140px;
   background: #cfc;
 }
 
-#gAdminGraphics .gBlock,
-#gAdminThemes .gBlock {
+#gAdminGraphics .gBlock {
   background: #fff;
   padding: 1em;
 }
 
-#gAdminGraphics #gAvailableToolkits .gBlock,
-#gAdminThemes #gAvailableThemes .gBlock {
+#gAdminGraphics #gAvailableToolkits .gBlock {
   clear: none;
   cursor: pointer;
   float: left;
@@ -145,16 +137,63 @@
   cursor: default !important;
 }
 
-#gAdminGraphics #gAvailableToolkits .gBlock:hover,
-#gAdminThemes #gAvailableThemes .gBlock:hover {
+#gAdminGraphics #gAvailableToolkits .gBlock:hover {
   background: #eee;
 }
 
-#gAdminGraphics a,
-#gAdminThemes a {
+#gAdminGraphics a {
   color: #333;
 }
 
 #gAdminGraphics #gAvailableToolkits .gBlock {
   cursor: pointer;
 }
+
+
+#gAdminThemes #gAdminTheme,
+#gAdminThemes #gSiteTheme {
+  width: 400px;
+  float: left;
+}
+
+#gAdminThemes #gAdminTheme {
+  padding-left: 40px;
+}
+
+
+#gAdminThemes #gSelectedTheme img {
+  float: left;
+  margin-right: 1em;
+}
+
+#gAdminThemes .selected {
+  background: #cfc !important;
+}
+
+#gAdminThemes .gBlock {
+  width: 328px;
+  height: 140px;
+  background: #fff;
+  padding: 1em;
+  text-align: center;
+}
+
+#gAdminThemes .gBlock {
+  clear: none;
+  cursor: pointer;
+  float: left;
+  text-align: center;
+  width: 328px;
+  height: 200px;
+}
+
+#gAvailableSiteThemes .gBlock:hover,
+#gAvailableAdminThemes .gBlock:hover {
+  background: #eee;
+}
+
+#gAdminThemes a {
+  color: #333;
+  text-decoration: none;
+}
+
diff --git a/themes/admin_default/theme.info b/themes/admin_default/theme.info
index 59fe88f4..d21b0ff5 100644
--- a/themes/admin_default/theme.info
+++ b/themes/admin_default/theme.info
@@ -3,4 +3,4 @@ description = A crisp Site Administration theme with soft colors and drop down m
 version = 1
 author = Gallery Team
 admin = 1
-regular = 0
+site = 0
diff --git a/themes/default/theme.info b/themes/default/theme.info
index 30817e28..71e8a740 100644
--- a/themes/default/theme.info
+++ b/themes/default/theme.info
@@ -2,5 +2,5 @@ name = Gallery Default
 description = A crisp and distinctive theme that uses large fonts and icons for easy navigation and an enjoyable browsing experience.
 version = 1
 author = Gallery Team
-regular = 1
+site = 1
 admin = 0