Using nickname only for uid

2 files changed, 19 insertions, 15 deletions

diff --git a/actions/showstream.php b/actions/showstream.php
index b877f5df3..1d79ea30d 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -239,6 +239,15 @@ class ShowstreamAction extends Action
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
+        $this->elementStart('dl', 'user_nickname');
+        $this->element('dt', null, _('Nickname'));
+        $this->elementStart('dd');
+            $this->element('a', array('href' => $this->profile->profileurl,
+                                      'rel' => 'me', 'class' => 'nickname url uid'),
+                           $this->profile->nickname);
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
+
         if ($this->profile->fullname) {
             $this->elementStart('dl', 'user_fn');
             $this->element('dt', null, _('Full name'));
@@ -247,14 +256,6 @@ class ShowstreamAction extends Action
             $this->elementEnd('dd');
             $this->elementEnd('dl');
         }
-        $this->elementStart('dl', 'user_nickname');
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
-            $this->element('a', array('href' => $this->profile->profileurl,
-                                      'rel' => 'me', 'class' => 'fn nickname url uid'),
-                           $this->profile->nickname);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if ($this->profile->location) {
             $this->elementStart('dl', 'user_location');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 59429cf72..406ba3f9a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -489,7 +489,7 @@ margin-bottom:0;
 /* user_profile */
 #user_profile {
 position:relative;
-width:633px;
+width:475px;
 min-height:123px;
 float:left;
 margin-bottom:17px;
@@ -514,7 +514,7 @@ width:96px;
 #user_profile .user_tags {
 float:left;
 clear:left;
-margin-left:125px;
+margin-left:113px;
 width:322px;
 margin-bottom:4px;
 }
@@ -524,21 +524,24 @@ margin-bottom:4px;
 width:auto;
 clear:none;
 }
-#user_profile .user_nickname {
+#user_profile .user_fn {
 margin-left:11px;
+margin-left:4px;
+margin-right:4px;
+font-weight:bold;
 }
 #user_profile .user_nickname .nickname {
 font-style:italic;
 font-weight:bold;
-margin-left:4px;
-margin-right:4px;
 }
 
-#user_profile .user_nickname dd:before {
+#user_profile .user_fn dd:before {
 content: "(";
+font-weight:normal;
 }
-#user_profile .user_nickname dd:after {
+#user_profile .user_fn dd:after {
 content: ")";
+font-weight:normal;
 }
 
 #user_profile dt {