7 files changed, 46 insertions, 32 deletions
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index b436fd98..3ca34a0f 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -2,9 +2,14 @@
 <ul>
   <? foreach ($comments as $comment): ?>
   <li id="gComment-<?= $comment->id; ?>">
-    <p>
-      <a href="#" class="gAuthor"><?= $comment->author ?></a>
-      <?= date("Y-M-d H:i:s", $comment->created) ?>
+    <? $avatar = $theme->url("images/avatar.jpg") ?>
+    <? //if ($user->avatar($comment->author)): ?>
+      <? //$avatar = $theme->url("images/avatar.jpg") ?>
+    <? //endif ?>
+    <p class="gAuthor">
+      <a href="#"><img src="<?= $avatar ?>" class="gAvatar" alt="<?= $comment->author ?>" /></a>
+      <?= _("on ") . date("Y-M-d H:i:s", $comment->created) ?>
+      <a href="#"><?= $comment->author ?></a> <?= _("said") ?>
     </p>
     <div>
       <?= $comment->text ?>
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 951341c9..b73bea07 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -1,11 +1,11 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul id="gLoginMenu">
   <? if ($user->guest): ?>
-  <li><a href="<?= url::site("login") ?>"
+  <li class="first"><a href="<?= url::site("login") ?>"
          title="<?= _("Login to Gallery") ?>"
          id="gLoginLink"><?= _("Login") ?></a></li>
   <? else: ?>
-  <li><a href="<?= url::site("form/edit/users/{$user->id}") ?>"
+  <li class="first"><a href="<?= url::site("form/edit/users/{$user->id}") ?>"
       title="<?= _("Edit Your Profile") ?>"
       id="gUserProfileLink" class="gDialogLink"><?= _("Modify Profile") ?></a></li>
   <li><a href="<?= url::site("logout?continue=" . url::current(true)) ?>"
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index a4f6bb00..7c01955a 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -60,12 +60,7 @@
 }
 
 #gHeader #gLoginMenu {
-	float: right;
-  margin: 1em 0 0 1em;	
-}
-
-#gHeader #gLoginMenu li {
-  margin: 0 0 0 1em;
+  margin-right: 0;
 }
 
 #gContent .gBlock h2 {
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index f05f24eb..a8650068 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -35,7 +35,7 @@
             <?= $theme->admin_menu() ?>
           </div>
           <ul id="gLoginMenu">
-            <li><?= html::anchor("albums/1", "Browse the Gallery") ?></li>
+            <li class="first"><?= html::anchor("albums/1", "Browse the Gallery") ?></li>
             <li id="gLogoutLink"><a href="<?= url::site("logout?continue=albums/1") ?>">Logout</a></li>
           </ul>
           <?= $theme->admin_header_bottom() ?>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 5eb5f700..060f1c9e 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -14,7 +14,6 @@
  * 8)  jQuery and jQuery UI
  *
  * @todo Default user icon (user w/ camera) 
- * @todo Group Credits and gLoginMenu seperator styles
  * @todo Apply :hover bg image to #gViewMenu (will clear fix correct this?)
  * @todo Refactor form layout styles to reserve room for validation messages in default state. This
  *       will eliminate layout shifts when validation messages are displayed.
@@ -257,15 +256,12 @@ li.gError select {
 }
 
 .gBlock h2 {
-  background: #e8e8e8;
-  padding: .3em 1.4em;
-  background-image: url('../images/ico-move-handle.png');
-  background-repeat: no-repeat;
-  cursor: move;
+  background-color: #e8e8e8;
+  padding: .3em .8em;
 }
 
 .gBlockContent {
-  padding: .5em 1em;
+  margin-top: 1em;
 }
 
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -393,6 +389,15 @@ li.gError select {
   margin-right: 20px;
 }
 
+#gContent .gBlock h2 {
+  background-color: transparent;
+  padding-left: 0;
+}
+
+#gSidebar .gBlockContent {
+	padding-left: 1em;
+}
+
 /* Album/Photo information ~~~~~~~~~~~~~~~ */
 
 #gContent #gInfo {
@@ -442,27 +447,34 @@ li.gError select {
   margin: 1em 0;
 }
 
-#gContent #gComments ul li p {
+#gContent #gComments .gAuthor {
   background-color: #e8e8e8;
-  margin-bottom: 2px;
-  padding: 4px;
+  height: 32px;
+  line-height: 32px;
 }
 
 #gContent #gComments ul li div {
-  padding: 8px;
+  padding: 0 8px 8px 32px;
+}
+
+#gContent #gComments .gAvatar {
+	margin-right: .4em;
 }
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#gHeader #gLoginMenu li,
 #gFooter #gCredits li {
   display: inline;
 }
 
+#gHeader #gLoginMenu li:before,
 #gFooter #gCredits li:before {
-  padding: 0 2px;
+  padding: 0 .6em 0 .4em;
   content: "|";
 }
 
+#gHeader #gLoginMenu li.first:before,
 #gFooter #gCredits li.first:before {
   content: "";
 }
@@ -479,14 +491,9 @@ li.gError select {
 
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gLoginMenu {
+#gHeader #gLoginMenu {
   float: right;
-  margin-top: 7px;
-}
-
-#gLoginMenu li {
-  display: inline;
-  margin-right: 20px;
+  margin: 9px 20px 0 0;
 }
 
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -747,6 +754,13 @@ li.gError select {
   font-size: 0;
 }
 
+.gDraggable {
+  background-image: url('../images/ico-move-handle.png');
+  background-repeat: no-repeat;
+  cursor: move;
+  padding: .3em 1.4em;
+}
+
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gDialog {
diff --git a/themes/default/images/avatar.jpg b/themes/default/images/avatar.jpg
new file mode 100644
index 00000000..2e76b12b
--- /dev/null
+++ b/themes/default/images/avatar.jpg
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index 582186bf..c94527e9 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->site_status() ?>
 <?= $theme->header_top() ?>
-<img id="gLogo" width="107" height="48" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+<img id="gLogo" alt="<?= _("Logo") ?>" src="<?= $theme->url("images/logo.png") ?>" />
 
 <div id="gSiteMenu">
 <?= $theme->site_menu() ?>