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, 154 insertions, 151 deletions

diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 8f719f05..82e071a8 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -34,165 +34,168 @@
   }
 </script>
 
-<div id="g-admin-comments">
+<div id="g-admin-comments" class="g-block">
   <h1> <?= t("Manage Comments") ?> </h1>
 
-  <!-- @todo: Highlight active menu option -->
-  <div id="g-admin-comments-menu" class="ui-helper-clearfix">
-    <?= $menu ?>
-  </div>
+  <div class="g-block-content">
+    <!-- @todo: Highlight active menu option -->
+    <div id="g-admin-comments-menu" class="ui-helper-clearfix">
+      <?= $menu ?>
+    </div>
 
-  <!-- @todo: Remove after setting active option? -->
-  <h2>
-    <? if ($state == "published"): ?>
-    <?= t("Approved Comments") ?>
-    <? elseif ($state == "unpublished"): ?>
-    <?= t("Comments Awaiting Moderation") ?>
-    <? elseif ($state == "spam"): ?>
-    <?= t("Spam Comments") ?>
-    <? elseif ($state == "deleted"): ?>
-    <?= t("Recently Deleted Comments") ?>
-    <? endif ?>
-  </h2>
+    <!-- @todo: Remove after setting active option? -->
+    <h2>
+      <? if ($state == "published"): ?>
+      <?= t("Approved Comments") ?>
+      <? elseif ($state == "unpublished"): ?>
+      <?= t("Comments Awaiting Moderation") ?>
+      <? elseif ($state == "spam"): ?>
+      <?= t("Spam Comments") ?>
+      <? elseif ($state == "deleted"): ?>
+      <?= t("Recently Deleted Comments") ?>
+      <? endif ?>
+    </h2>
 
-  <? if ($state == "spam"): ?>
-  <div>
-    <? $spam_caught = module::get_var("comment", "spam_caught") ?>
-    <? if ($spam_caught > 0): ?>
-    <p>
-      <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
-             "Gallery has caught %count spam for you since you installed spam filtering.",
-             $spam_caught) ?>
-    </p>
-    <? endif ?>
-    <p>
-      <? if ($counts->spam): ?>
-      <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
-             "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
-             $counts->spam) ?>
-    </p>
-    <p>
-      <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
-        <?= t("Delete all spam") ?>
-      </a>
-      <? else: ?>
-      <?= t("Your spam queue is empty!") ?>
+    <? if ($state == "spam"): ?>
+    <div>
+      <? $spam_caught = module::get_var("comment", "spam_caught") ?>
+      <? if ($spam_caught > 0): ?>
+      <p>
+        <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
+               "Gallery has caught %count spam for you since you installed spam filtering.",
+               $spam_caught) ?>
+      </p>
       <? endif ?>
-    </p>
-  </div>
-  <? endif ?>
+      <p>
+        <? if ($counts->spam): ?>
+        <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
+               "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
+               $counts->spam) ?>
+      </p>
+      <p>
+        <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
+          <?= t("Delete all spam") ?>
+        </a>
+        <? else: ?>
+        <?= t("Your spam queue is empty!") ?>
+        <? endif ?>
+      </p>
+    </div>
+    <? endif ?>
 
-  <? if ($state == "deleted"): ?>
-  <div>
-    <p>
-      <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
-    </p>
-  </div>
-  <? endif ?>
+    <? if ($state == "deleted"): ?>
+    <div>
+      <p>
+        <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
+      </p>
+    </div>
+    <? endif ?>
 
-  <table id="g-admin-comments-list">
-    <tr>
-      <th>
-        <?= t("Author") ?>
-      </th>
-      <th>
-        <?= t("Comment") ?>
-      </th>
-      <th>
-        <?= t("Actions") ?>
-      </th>
-    </tr>
-    <? foreach ($comments as $i => $comment): ?>
-    <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
-      <td>
-        <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-               class="g-avatar"
-               alt="<?= html::clean_attribute($comment->author_name()) ?>"
-               width="40"
-               height="40" />
-        </a>
-        <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
-              title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
-      </td>
-      <td>
-        <div class="g-right">
-          <? $item = $comment->item() ?>
-          <div class="g-item g-photo">
-            <a href="<?= $item->url() ?>">
-              <? if ($item->has_thumb()): ?>
-              <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= html::purify($item->title)->for_html_attr() ?>"
-                 <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
-              />
-              <? else: ?>
-              <?= t("No thumbnail") ?>
-              <? endif ?>
-            </a>
+    <table id="g-admin-comments-list">
+      <tr>
+        <th>
+          <?= t("Author") ?>
+        </th>
+        <th>
+          <?= t("Comment") ?>
+        </th>
+        <th>
+          <?= t("Actions") ?>
+        </th>
+      </tr>
+      <? foreach ($comments as $i => $comment): ?>
+      <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+        <td>
+          <a href="#">
+            <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+                 class="g-avatar"
+                 alt="<?= html::clean_attribute($comment->author_name()) ?>"
+                 width="40"
+                 height="40" />
+          </a>
+          <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
+                title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
+        </td>
+        <td>
+          <div class="g-right">
+            <? $item = $comment->item() ?>
+            <div class="g-item g-photo">
+              <a href="<?= $item->url() ?>">
+                <? if ($item->has_thumb()): ?>
+                <img src="<?= $item->thumb_url() ?>"
+                   alt="<?= html::purify($item->title)->for_html_attr() ?>"
+                   <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
+                />
+                <? else: ?>
+                <?= t("No thumbnail") ?>
+                <? endif ?>
+              </a>
+            </div>
           </div>
-        </div>
-        <p><?= gallery::date($comment->created) ?></p>
-           <?= nl2br(html::purify($comment->text)) ?>
-      </td>
-      <td>
-        <ul class="g-buttonset-vertical">
-        <? if ($comment->state != "unpublished"): ?>
-          <li>
-            <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-check"></span>
-              <?= t("Unapprove") ?>
-            </a>
-          </li>
-        <? endif ?>
-        <? if ($comment->state != "published"): ?>
-          <li>
-            <a href="javascript:set_state('published',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-check"></span>
-              <?= t("Approve") ?>
-            </a>
-          </li>
-        <? endif ?>
-        <? if ($comment->state != "spam"): ?>
-          <li>
-            <a href="javascript:set_state('spam',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-cancel"></span>
-              <?= t("Spam") ?>
-            </a>
-          </li>
-        <? endif ?>
-          <!--
-          <li>
-            <a href="javascript:reply(<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
-              <?= t("Reply") ?>
-            </a>
-          </li>
-          <li>
-            <a href="javascript:Edit(<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-pencil"></span>
-              <?= t("Edit") ?>
-            </a>
-          </li>
-          -->
-          <li>
-            <a href="javascript:set_state('deleted',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-trash"></span>
-              <?= t("Delete") ?>
-            </a>
-          </li>
-        </ul>
-      </td>
-    </tr>
-    <? endforeach ?>
-  </table>
+          <p><?= gallery::date($comment->created) ?></p>
+             <?= nl2br(html::purify($comment->text)) ?>
+        </td>
+        <td>
+          <ul class="g-buttonset-vertical">
+          <? if ($comment->state != "unpublished"): ?>
+            <li>
+              <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Unapprove") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "published"): ?>
+            <li>
+              <a href="javascript:set_state('published',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Approve") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "spam"): ?>
+            <li>
+              <a href="javascript:set_state('spam',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-cancel"></span>
+                <?= t("Spam") ?>
+              </a>
+            </li>
+          <? endif ?>
+            <!--
+            <li>
+              <a href="javascript:reply(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
+                <?= t("Reply") ?>
+              </a>
+            </li>
+            <li>
+              <a href="javascript:Edit(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-pencil"></span>
+                <?= t("Edit") ?>
+              </a>
+            </li>
+            -->
+            <li>
+              <a href="javascript:set_state('deleted',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-trash"></span>
+                <?= t("Delete") ?>
+              </a>
+            </li>
+          </ul>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
 
-  <div class="g-pager">
-    <?= $pager ?>
+    <div class="g-pager">
+      <?= $pager ?>
+    </div>
+    
   </div>
 </div>