Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's.

1 files changed, 72 insertions, 67 deletions

diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index f7e77a01..dda18265 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -7,83 +7,88 @@
   }
 </script>
 
-<h1> <?= t("Theme Choice") ?> </h1>
-<p>
-  <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface.  Click a theme to preview and activate it.") ?>
-</p>
+<div class="g-block ui-helper-clearfix">
+  <h1> <?= t("Theme Choice") ?> </h1>
+  <p>
+    <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface.  Click a theme to preview and activate it.") ?>
+  </p>
 
-<div id="g-site-theme">
-  <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="g-block g-selected ui-helper-clearfix">
-    <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
-         alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
-    <h3> <?= $themes[$site]->name ?> </h3>
-    <p>
-      <?= $themes[$site]->description ?>
-    </p>
-  </div>
+  <div class="g-block-content">
+    <div id="g-site-theme">
+      <h2> <?= t("Gallery theme") ?> </h2>
+      <div class="g-block g-selected ui-helper-clearfix">
+        <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
+             alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
+        <h3> <?= $themes[$site]->name ?> </h3>
+        <p>
+          <?= $themes[$site]->description ?>
+        </p>
+      </div>
 
-  <h2> <?= t("Available Gallery themes") ?> </h2>
-  <div class="g-available">
-    <? $count = 0 ?>
-    <? foreach ($themes as $id => $info): ?>
-    <? if (!$info->site) continue ?>
-    <? if ($id == $site) continue ?>
-    <div class="g-block ui-helper-clearfix">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
-        <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= html::clean_attribute($info->name) ?>" />
-        <h3> <?= $info->name ?> </h3>
+      <h2> <?= t("Available Gallery themes") ?> </h2>
+      <div class="g-available">
+        <? $count = 0 ?>
+        <? foreach ($themes as $id => $info): ?>
+        <? if (!$info->site) continue ?>
+        <? if ($id == $site) continue ?>
+        <div class="g-block ui-helper-clearfix">
+          <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+            <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
+                 alt="<?= html::clean_attribute($info->name) ?>" />
+            <h3> <?= $info->name ?> </h3>
+            <p>
+              <?= $info->description ?>
+            </p>
+          </a>
+        </div>
+        <? $count++ ?>
+        <? endforeach ?>
+
+        <? if (!$count): ?>
         <p>
-          <?= $info->description ?>
+          <?= t("There are no other site themes available.") ?>
         </p>
-      </a>
+        <? endif ?>
+      </div>
     </div>
-    <? $count++ ?>
-    <? endforeach ?>
 
-    <? if (!$count): ?>
-    <p>
-      <?= t("There are no other site themes available.") ?>
-    </p>
-    <? endif ?>
-  </div>
-</div>
+    <div id="g-admin-theme">
+      <h2> <?= t("Admin theme") ?> </h2>
+      <div class="g-block g-selected ui-helper-clearfix">
+        <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
+             alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
+        <h3> <?= $themes[$admin]->name ?> </h3>
+        <p>
+          <?= $themes[$admin]->description ?>
+        </p>
+      </div>
 
-<div id="g-admin-theme">
-  <h2> <?= t("Admin theme") ?> </h2>
-  <div class="g-block g-selected ui-helper-clearfix">
-    <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
-         alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
-    <h3> <?= $themes[$admin]->name ?> </h3>
-    <p>
-      <?= $themes[$admin]->description ?>
-    </p>
-  </div>
+      <h2> <?= t("Available admin themes") ?> </h2>
+      <div class="g-available">
+        <? $count = 0 ?>
+        <? foreach ($themes as $id => $info): ?>
+        <? if (!$info->admin) continue ?>
+        <? if ($id == $admin) continue ?>
+        <div class="g-block ui-helper-clearfix">
+          <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+            <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
+                 alt="<?= html::clean_attribute($info->name) ?>" />
+            <h3> <?= $info->name ?> </h3>
+            <p>
+              <?= $info->description ?>
+            </p>
+          </a>
+        </div>
+        <? $count++ ?>
+        <? endforeach ?>
 
-  <h2> <?= t("Available admin themes") ?> </h2>
-  <div class="g-available">
-    <? $count = 0 ?>
-    <? foreach ($themes as $id => $info): ?>
-    <? if (!$info->admin) continue ?>
-    <? if ($id == $admin) continue ?>
-    <div class="g-block ui-helper-clearfix">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
-        <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= html::clean_attribute($info->name) ?>" />
-        <h3> <?= $info->name ?> </h3>
+        <? if (!$count): ?>
         <p>
-          <?= $info->description ?>
+          <?= t("There are no other admin themes available.") ?>
         </p>
-      </a>
+        <? endif ?>
+      </div>
     </div>
-    <? $count++ ?>
-    <? endforeach ?>
-
-    <? if (!$count): ?>
-    <p>
-      <?= t("There are no other admin themes available.") ?>
-    </p>
-    <? endif ?>
+    
   </div>
 </div>
\ No newline at end of file