Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 9929c36c0d9131e9b089b2d9521b64027ab8f551..b83582702ecf43bfd06771144d46025f375c96aa 100644 (file)
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -333,7 +333,7 @@ class ApiOauthAuthorizeAction extends Action
         parent::showStyleSheets();
 
         if ($this->desktopMode()) {
-            $this->style('#wrap {min-width: 500px; } #content {width: 480px; padding: 10px;} fieldset {margin-bottom: 10px !important;}</style>');
+            $this->style('#wrap {min-width: 500px;} #content {width: 480px; padding: 6px; margin: 4px 0px 0px 4px; border-top-left-radius: 7px; -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px;} fieldset {margin-bottom: 10px !important;}');
         }
     }
 

diff --git a/lib/action.php b/lib/action.php
index 4aa6ace778b8c3c0ed7aaa26428a1b230bee4c7c..01bb0f7e92bebe78bc50ae7eb7afad4f43bbc412 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -364,7 +364,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('body', (common_current_user()) ? array('id' => strtolower($this->trimmed('action')),
                                                                     'class' => 'user_in')
-                            : array('id' => $this->trimmed('action')));
+                            : array('id' => strtolower($this->trimmed('action'))));
         $this->elementStart('div', array('id' => 'wrap'));
         if (Event::handle('StartShowHeader', array($this))) {
             $this->showHeader();