General markup and style cleanup

2 files changed, 14 insertions, 14 deletions

diff --git a/actions/showgroup.php b/actions/showgroup.php
index c2cd3d295..bd9d4f175 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -195,13 +195,13 @@ class ShowgroupAction extends Action
 
     function showGroupProfile()
     {
-        $this->elementStart('div', array('id' => 'group_profile',
+        $this->elementStart('div', array('id' => 'user_profile',
                                          'class' => 'vcard author'));
 
         $this->element('h2', null, _('Group profile'));
 
-        $this->elementStart('dl', 'group_depiction');
-        $this->element('dt', null, _('Photo'));
+        $this->elementStart('dl', 'user_depiction');
+        $this->element('dt', null, _('Avatar'));
         $this->elementStart('dd');
 
         $logo = ($this->group->homepage_logo) ?
@@ -215,7 +215,7 @@ class ShowgroupAction extends Action
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'group_nickname');
+        $this->elementStart('dl', 'user_nickname');
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
         $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid';
@@ -226,7 +226,7 @@ class ShowgroupAction extends Action
         $this->elementEnd('dl');
 
         if ($this->group->fullname) {
-            $this->elementStart('dl', 'group_fn');
+            $this->elementStart('dl', 'user_fn');
             $this->element('dt', null, _('Full name'));
             $this->elementStart('dd');
             $this->element('span', 'fn', $this->group->fullname);
@@ -235,14 +235,14 @@ class ShowgroupAction extends Action
         }
 
         if ($this->group->location) {
-            $this->elementStart('dl', 'group_location');
+            $this->elementStart('dl', 'user_location');
             $this->element('dt', null, _('Location'));
             $this->element('dd', 'location', $this->group->location);
             $this->elementEnd('dl');
         }
 
         if ($this->group->homepage) {
-            $this->elementStart('dl', 'group_url');
+            $this->elementStart('dl', 'user_url');
             $this->element('dt', null, _('URL'));
             $this->elementStart('dd');
             $this->element('a', array('href' => $this->group->homepage,
@@ -253,7 +253,7 @@ class ShowgroupAction extends Action
         }
 
         if ($this->group->description) {
-            $this->elementStart('dl', 'group_note');
+            $this->elementStart('dl', 'user_note');
             $this->element('dt', null, _('Note'));
             $this->element('dd', 'note', $this->group->description);
             $this->elementEnd('dl');
@@ -261,10 +261,10 @@ class ShowgroupAction extends Action
 
         $this->elementEnd('div');
 
-        $this->elementStart('div', array('id' => 'group_actions'));
+        $this->elementStart('div', array('id' => 'user_actions'));
         $this->element('h2', null, _('Group actions'));
         $this->elementStart('ul');
-        $this->elementStart('li', array('id' => 'group_subscribe'));
+        $this->elementStart('li', array('id' => 'user_subscribe'));
         $cur = common_current_user();
         if ($cur) {
             if ($cur->isMember($this->group)) {
@@ -361,4 +361,4 @@ class ShowgroupAction extends Action
                            _('All members'));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/actions/showstream.php b/actions/showstream.php
index 9734c2907..b2b8b344c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -410,7 +410,7 @@ class ShowstreamAction extends Action
             $this->elementStart('p');
             $this->element('a', array('href' => common_local_url('subscriptions',
                                                                  array('nickname' => $this->profile->nickname)),
-                                      'class' => 'mores'),
+                                      'class' => 'more'),
                            _('All subscriptions'));
             $this->elementEnd('p');
         }
@@ -439,7 +439,7 @@ class ShowstreamAction extends Action
             $this->elementStart('p');
             $this->element('a', array('href' => common_local_url('subscribers',
                                                                  array('nickname' => $this->profile->nickname)),
-                                      'class' => 'mores'),
+                                      'class' => 'more'),
                            _('All subscribers'));
             $this->elementEnd('p');
         }
@@ -521,7 +521,7 @@ class ShowstreamAction extends Action
             $this->elementStart('p');
             $this->element('a', array('href' => common_local_url('usergroups',
                                                                  array('nickname' => $this->profile->nickname)),
-                                      'class' => 'mores'),
+                                      'class' => 'more'),
                            _('All groups'));
             $this->elementEnd('p');
         }