Merge branch '0.7.x' into 0.8.x

Conflicts:

	EVENTS.txt

EVENTS.txt

@@ -100,6 +100,12 @@ StartPublicGroupNav: Showing the public group nav menu
 EndPublicGroupNav: At the end of the public group nav menu
 - $action: the current action
 
+StartSubGroupNav: Showing the subscriptions group nav menu
+- $action: the current action
+
+EndSubGroupNav: At the end of the subscriptions group nav menu
+- $action: the current action
+
 RouterInitialized: After the router instance has been initialized
 - $m: the Net_URL_Mapper that has just been set up
 
@@ -109,3 +115,5 @@ StartLogout: Before logging out
 EndLogout: After logging out
 - $action: the logout action
 
+ArgsInitialized: After the argument array has been initialized
+- $args: associative array of arguments, can be modified

index.php

@@ -105,6 +105,8 @@ function main()
 
     $args = array_merge($args, $_REQUEST);
 
+    Event::handle('ArgsInitialize', array(&$args));
+
     $action = $args['action'];
 
     if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {

lib/action.php

@@ -597,7 +597,10 @@ class Action extends HTMLOutputter // lawsuit
                                         'class' => 'system_notice'));
         $this->element('dt', null, _('Page notice'));
         $this->elementStart('dd');
+        if (Event::handle('StartShowPageNotice', array($this))) {
             $this->showPageNotice();
+            Event::handle('EndShowPageNotice', array($this));
+        }
         $this->elementEnd('dd');
         $this->elementEnd('dl');
     }

lib/subgroupnav.php

@@ -74,6 +74,8 @@ class SubGroupNav extends Widget
 
         $this->out->elementStart('ul', array('class' => 'nav'));
 
+        if (Event::handle('StartSubGroupNav', array($this))) {
+
             $this->out->menuItem(common_local_url('subscriptions',
                                                   array('nickname' =>
                                                         $this->user->nickname)),
@@ -106,6 +108,10 @@ class SubGroupNav extends Widget
                                      $action == 'invite',
                                      'nav_invite');
             }
+
+            Event::handle('EndSubGroupNav', array($this));
+        }
+
         $this->out->elementEnd('ul');
     }
 }

theme/base/css/display.css

@@ -495,7 +495,7 @@ line-height:1.618;
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:67.702%;
+width:74.702%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -531,12 +531,15 @@ margin-bottom:4px;
 .entity_profile .entity_nickname {
 margin-left:11px;
 display:inline;
-font-weight:bold;
 }
 .entity_profile .entity_nickname {
 margin-left:0;
 }
-
+.entity_profile .fn,
+.entity_profile .nickname {
+font-size:1.1em;
+font-weight:bold;
+}
 .entity_profile .entity_fn dd:before {
 content: "(";
 font-weight:normal;
@@ -558,7 +561,7 @@ display:none;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:4.35%;
+margin-left:2.35%;
 max-width:25%;
 }
 .entity_actions h2 {