Add special CSS classes to OAuth authorization and pin pages when

in desktop mode

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 75b4540fb9a7c3676cbebc09d13df45308329648..2b8ea84c7d9ca3ebc0d463bd52a0a6a6b2110543 100644 (file)
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -323,18 +323,46 @@ class ApiOauthAuthorizeAction extends Action
     }
 
     /**
-     * Override to add some special (more compact) styling when the page is
-     * being displayed in desktop mode.
+     * Show body - override to add a special CSS class for the authorize
+     * page's "desktop mode" (minimal display)
+     *
+     * Calls template methods
      *
      * @return nothing
      */
-    function showStylesheets()
+    function showBody()
     {
-        parent::showStyleSheets();
+        $bodyClasses = array();
 
         if ($this->desktopMode()) {
-            $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;}');
+            $bodyClasses[] = 'oauth-desktop-mode';
+        }
+
+        if (common_current_user()) {
+            $bodyClasses[] = 'user_in';
         }
+
+        $attrs = array('id' => strtolower($this->trimmed('action')));
+
+        if (!empty($bodyClasses)) {
+            $attrs['class'] = implode(' ', $bodyClasses);
+        }
+
+        $this->elementStart('body', $attrs);
+
+        $this->elementStart('div', array('id' => 'wrap'));
+        if (Event::handle('StartShowHeader', array($this))) {
+            $this->showHeader();
+            Event::handle('EndShowHeader', array($this));
+        }
+        $this->showCore();
+        if (Event::handle('StartShowFooter', array($this))) {
+            $this->showFooter();
+            Event::handle('EndShowFooter', array($this));
+        }
+        $this->elementEnd('div');
+        $this->showScripts();
+        $this->elementEnd('body');
     }
 
     function showForm($error=null)
@@ -599,7 +627,12 @@ class ApiOauthAuthorizeAction extends Action
         );
 
         if ($this->reqToken->verified_callback == 'oob') {
-            $pin = new ApiOauthPinAction($title, $msg, $this->reqToken->verifier);
+            $pin = new ApiOauthPinAction(
+                $title,
+                $msg,
+                $this->reqToken->verifier,
+                $this->desktopMode()
+            );
             $pin->showPage();
         } else {
 

diff --git a/actions/apioauthpin.php b/actions/apioauthpin.php
index 206df432172d737cda2acafcf858876bfa63fe25..64baf260d1479139e18632dca4ce716ce8040b4f 100644 (file)
--- a/actions/apioauthpin.php
+++ b/actions/apioauthpin.php
@@ -45,13 +45,57 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class ApiOauthPinAction extends InfoAction
 {
-    function __construct($title, $message, $verifier)
+    function __construct($title, $message, $verifier, $desktopMode = false)
     {
-        $this->verifier = $verifier;
-        $this->title    = $title;
+        $this->verifier    = $verifier;
+        $this->title       = $title;
+        $this->desktopMode = $desktopMode;
         parent::__construct($title, $message);
     }
 
+    /**
+     * Show body - override to add a special CSS class for the pin pages's
+     * "desktop mode" (minimal display)
+     *
+     * Calls template methods
+     *
+     * @return nothing
+     */
+    function showBody()
+    {
+        $bodyClasses = array();
+
+        if ($this->desktopMode) {
+            $bodyClasses[] = 'oauth-desktop-mode';
+        }
+
+        if (common_current_user()) {
+            $bodyClasses[] = 'user_in';
+        }
+
+        $attrs = array('id' => strtolower($this->trimmed('action')));
+
+        if (!empty($bodyClasses)) {
+            $attrs['class'] = implode(' ', $bodyClasses);
+        }
+
+        $this->elementStart('body', $attrs);
+
+        $this->elementStart('div', array('id' => 'wrap'));
+        if (Event::handle('StartShowHeader', array($this))) {
+            $this->showHeader();
+            Event::handle('EndShowHeader', array($this));
+        }
+        $this->showCore();
+        if (Event::handle('StartShowFooter', array($this))) {
+            $this->showFooter();
+            Event::handle('EndShowFooter', array($this));
+        }
+        $this->elementEnd('div');
+        $this->showScripts();
+        $this->elementEnd('body');
+    }
+
     /**
      * Display content.
      *