profilelist markup and styles

3 files changed, 65 insertions, 14 deletions

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 973df7bb6..b2a9925c1 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -106,32 +106,48 @@ class ProfileList extends Widget
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        $this->out->elementStart('span', 'nickname');
+        $hasFN = ($this->profile->fullname) ? 'nickname' : 'fn nickname';
+        $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
         $this->out->elementEnd('span');
         $this->out->elementEnd('a');
         
         if ($this->profile->fullname) {
+            $this->out->elementStart('dl', 'user_fn');
+            $this->out->element('dt', null, 'Full name');
+            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->location) {
-            $this->out->elementStart('span', 'location');
+            $this->out->elementStart('dl', 'user_location');
+            $this->out->element('dt', null, _('Location'));
+            $this->out->elementStart('dd', 'location');
             $this->out->raw($this->highlight($this->profile->location));
-            $this->out->elementEnd('span');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->homepage) {
-            $this->out->elementStart('p', 'website');
-            $this->out->elementStart('a', array('href' => $this->profile->homepage));
+            $this->out->elementStart('dl', 'user_url');
+            $this->out->element('dt', null, _('URL'));
+            $this->out->elementStart('dd');
+            $this->out->elementStart('a', array('href' => $this->profile->homepage,
+                                                'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('p');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->bio) {
-            $this->out->elementStart('p', 'bio');
+            $this->out->elementStart('dl', 'user_note');
+            $this->out->element('dt', null, _('Note'));
+            $this->out->elementStart('dd', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
-            $this->out->elementEnd('p');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 61ce2d043..f0bf6bfc1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -62,7 +62,9 @@ font-weight:bold;
 textarea {
 overflow:auto;
 }
-select, option {
+select {
+}
+option {
 padding-bottom:0;
 }
 fieldset {
@@ -526,14 +528,13 @@ clear:none;
 }
 #user_profile .user_fn {
 margin-left:11px;
-margin-left:4px;
 margin-right:4px;
 }
 #user_profile .user_fn .fn {
 font-weight:bold;
 font-style:normal;
 }
-#user_profile .user_nickname .nickname {
+#user_profile .nickname {
 font-style:italic;
 font-weight:bold;
 }
@@ -553,8 +554,13 @@ display:none;
 #user_profile h2 {
 display:none;
 }
+
 /* user_profile */
 
+
+
+
+
 /*user_actions*/
 #user_actions {
 clear:left;
@@ -677,12 +683,40 @@ clear:both;
 
 
 
+.profile #user_profile {
+margin-bottom:0;
+min-height:60px;
+}
 
+.profile .form_user_unsubscribe {
+float:right;
+}
+.profiles {
+list-style-type:none;
+}
+.profile #user_profile .user_location {
+width:auto;
+clear:none;
+margin-left:11px;
+}
+.profile #user_profile dl,
+.profile #user_profile dd {
+display:inline;
+float:none;
+}
+.profile #user_profile .user_note,
+.profile #user_profile .user_url {
+margin-left:55px;
+clear:none;
+display:block;
+width:auto;
+}
 
 
 
 /* NOTICE */
-.notice {
+.notice,
+.profile {
 position:relative;
 padding-top:18px;
 padding-bottom:18px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index eb5f78b9e..e3b5310f7 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -39,7 +39,9 @@ color:#fff;
 }
 
 a,
-div.notice-options input {
+div.notice-options input,
+.form_user_block input.submit,
+.form_user_unblock input.submit {
 color:#002E6E;
 }
 
@@ -155,7 +157,6 @@ background-image:url(../images/icons/twotone/green/mail.gif);
 .form_user_block input.submit,
 .form_user_unblock input.submit {
 background-image:url(../images/icons/twotone/green/shield.gif);
-color:#000;
 }