summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/comment/views/admin_comments.html.php91
-rw-r--r--themes/admin_default/css/screen.css33
-rw-r--r--themes/admin_default/js/ui.init.js3
-rw-r--r--themes/default/css/screen.css11
4 files changed, 76 insertions, 62 deletions
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index ea405197..c5689e08 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -102,63 +102,76 @@
alt="<?= $comment->author_name() ?>"
width="40"
height="40" />
- </a><br/>
- <a href="mailto:<?= $comment->author_email() ?>"
- title="<?= $comment->author_email() ?>"> <?= $comment->author_name() ?> </a>
+ </a>
+ <p><a href="mailto:<?= $comment->author_email() ?>"
+ title="<?= $comment->author_email() ?>"> <?= $comment->author_name() ?> </a></p>
</td>
<td>
<div class="right">
<? $item = $comment->item(); ?>
- <a href="<?= $item->url() ?>">
- <img src="<?= $item->thumb_url() ?>"
+ <div class="gItem gPhoto">
+ <a href="<?= $item->url() ?>">
+ <img src="<?= $item->thumb_url() ?>"
alt="<?= $item->title ?>"
<?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
/>
- </a><br/>
- <a href="<?= $item->url() ?>"> <?= $item->title ?> </a>
+ </a>
+ </div>
</div>
<p><?= date("Y-M-d", $comment->created); ?></p>
<?= $comment->text ?>
</td>
<td>
- <div class="gButtonSetVertical">
+ <ul class="gButtonSetVertical">
<? if ($comment->state != "unpublished"): ?>
- <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
- class="gButtonLink ui-state-default ui-icon-left">
- <span class="ui-icon ui-icon-check"></span>
- <?= t("Unapprove") ?>
- </a>
+ <li>
+ <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
+ class="gButtonLink ui-state-default ui-icon-left">
+ <span class="ui-icon ui-icon-check"></span>
+ <?= t("Unapprove") ?>
+ </a>
+ </li>
<? endif ?>
<? if ($comment->state != "published"): ?>
- <a href="javascript:set_state('published',<?=$comment->id?>)"
- class="gButtonLink ui-state-default ui-icon-left">
- <span class="ui-icon ui-icon-check"></span>
- <?= t("Approve") ?>
- </a>
+ <li>
+ <a href="javascript:set_state('published',<?=$comment->id?>)"
+ class="gButtonLink ui-state-default ui-icon-left">
+ <span class="ui-icon ui-icon-check"></span>
+ <?= t("Approve") ?>
+ </a>
+ </li>
<? endif ?>
<? if ($comment->state != "spam"): ?>
- <a href="javascript:set_state('spam',<?=$comment->id?>)"
- class="gButtonLink ui-state-default ui-icon-left">
- <span class="ui-icon ui-icon-cancel"></span>
- <?= t("Spam") ?>
- </a>
+ <li>
+ <a href="javascript:set_state('spam',<?=$comment->id?>)"
+ class="gButtonLink ui-state-default ui-icon-left">
+ <span class="ui-icon ui-icon-cancel"></span>
+ <?= t("Spam") ?>
+ </a>
+ </li>
<? endif ?>
- <a href="javascript:reply(<?=$comment->id?>)"
- class="gButtonLink ui-state-default ui-icon-left">
- <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
- <?= t("Reply") ?>
- </a>
- <a href="javascript:Edit(<?=$comment->id?>)"
- class="gButtonLink ui-state-default ui-icon-left">
- <span class="ui-icon ui-icon-pencil"></span>
- <?= t("Edit") ?>
- </a>
- <a href="javascript:set_state('deleted',<?=$comment->id?>)"
- class="gButtonLink ui-state-default ui-icon-left">
- <span class="ui-icon ui-icon-trash"></span>
- <?= t("Delete") ?>
- </a>
- </div>
+ <li>
+ <a href="javascript:reply(<?=$comment->id?>)"
+ class="gButtonLink 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="gButtonLink 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="gButtonLink ui-state-default ui-icon-left">
+ <span class="ui-icon ui-icon-trash"></span>
+ <?= t("Delete") ?>
+ </a>
+ </li>
+ </ul>
</td>
</tr>
<? endforeach ?>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 85c76c2a..2647ba48 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -118,16 +118,14 @@
background-color: #e8e8e8;
}
-#gPhotoStream .gBlockContent {
-
-}
-
#gPhotoStream .gBlockContent ul {
border-right: 1px solid #e8e8e8;
height: 92px;
- overflow: hidden;
- white-space: nowrap;
- width: 100%;
+ overflow: auto;
+ overflow: -moz-scrollbars-horizontal; /* for FF */
+ overflow-x: scroll; /* scroll horizontal */
+ overflow-y: hidden; /* Hide vertical*/
+ position: absolute;
}
#gContent #gPhotoStream .gItem {
@@ -136,7 +134,6 @@
border-right-color: #ccc;
border-bottom-color: #ccc;
float: left;
- font-size: .7em;
height: 90px;
overflow: hidden;
text-align: center;
@@ -147,12 +144,19 @@
margin-bottom: 0;
}
-#gAdminCommentsMenu {
- margin: 1em 0;
+#gContent .gItem {
+ background-color: #fff;
+ border: 1px solid #e8e8e8;
+ border-right-color: #ccc;
+ border-bottom-color: #ccc;
+ height: 90px;
+ padding: 14px 8px;
+ text-align: center;
+ width: 90px;
}
-#gAdminCommentsMenu li {
- float: left;
+#gAdminCommentsMenu {
+ margin: 1em 0;
}
#gAdminCommentsMenu a {
@@ -205,7 +209,8 @@ li.gGroup {
#gAdminCommentsMenu:after,
#gGroupAdmin:after,
.gSelected:after,
-.gAvailable .gBlock:after {
+.gAvailable .gBlock:after,
+#gPhotoStream .gItem:after {
clear: both;
content: ".";
display: block;
@@ -236,5 +241,5 @@ li.gGroup {
}
.gButtonSetVertical a {
- width: 8em;
+ width: 8em !important;
}
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 677b985a..4f672c2a 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -29,8 +29,7 @@ $(document).ready(function(){
// Round view menu buttons
if ($("#gAdminCommentsMenu").length) {
$("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
- $("#gAdminCommentsMenu").addClass("gToolBar");
- $("#gAdminCommentsMenu ul").addClass("gButtonSet");
+ $("#gAdminCommentsMenu").addClass("gButtonSet");
$("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default");
$("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
$("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 2e0936e4..2715cd95 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -793,20 +793,17 @@ form p.gError {
zoom: 1;
}
-.gToolbar {
-}
-
-.gToolbar .gButtonSet {
+.gButtonSet {
padding-left: 1px;
}
-.gToolbar .gButtonSet li {
+.gButtonSet li {
float: left;
}
-.gToolbar .gButtonLink {
+.gButtonSet .gButtonLink {
margin: 0;
- }
+}
.ui-icon-left .ui-icon {
float: left;