summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/apioauthauthorize.php46
-rw-r--r--theme/base/css/display.css10
2 files changed, 20 insertions, 36 deletions
diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 0966ba1d7..72d142651 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -274,27 +274,6 @@ class ApiOauthAuthorizeAction extends ApiOauthAction
}
/**
- * Show page notice
- *
- * Display a notice for how to use the page, or the
- * error if it exists.
- *
- * @return void
- */
-
- function showPageNotice()
- {
- if ($this->error) {
- $this->element('p', 'error', $this->error);
- } else {
- $instr = $this->getInstructions();
- $output = common_markup_to_html($instr);
-
- $this->raw($output);
- }
- }
-
- /**
* Shows the authorization form.
*
* @return void
@@ -303,40 +282,38 @@ class ApiOauthAuthorizeAction extends ApiOauthAction
function showContent()
{
$this->elementStart('form', array('method' => 'post',
- 'id' => 'form_login',
+ 'id' => 'form_apioauthauthorize',
'class' => 'form_settings',
'action' => common_local_url('apioauthauthorize')));
+ $this->elementStart('fieldset');
+ $this->element('legend', array('id' => 'apioauthauthorize_allowdeny'),
+ _('Allow or deny access'));
$this->hidden('token', common_session_token());
$this->hidden('oauth_token', $this->oauth_token);
$this->hidden('oauth_callback', $this->callback);
- $this->elementStart('fieldset');
-
- $this->elementStart('ul');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
+ $this->elementStart('p');
if (!empty($this->app->icon)) {
$this->element('img', array('src' => $this->app->icon));
}
- $this->elementEnd('li');
- $this->elementStart('li');
$access = ($this->app->access_type & Oauth_application::$writeAccess) ?
'access and update' : 'access';
- $msg = _("The application <b>%s</b> by <b>%s</b> would like " .
- "the ability to <b>%s</b> your account data.");
+ $msg = _("The application <strong>%s</strong> by <strong>%s</strong> would like " .
+ "the ability to <strong>%s</strong> your account data.");
$this->raw(sprintf($msg,
$this->app->name,
$this->app->organization,
$access));
-
+ $this->elementEnd('p');
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->elementEnd('fieldset');
-
if (!common_logged_in()) {
$this->elementStart('fieldset');
@@ -355,17 +332,18 @@ class ApiOauthAuthorizeAction extends ApiOauthAction
}
$this->element('input', array('id' => 'deny_submit',
- 'class' => 'submit',
+ 'class' => 'submit submit form_action-primary',
'name' => 'deny',
'type' => 'submit',
'value' => _('Deny')));
$this->element('input', array('id' => 'allow_submit',
- 'class' => 'submit',
+ 'class' => 'submit submit form_action-secondary',
'name' => 'allow',
'type' => 'submit',
'value' => _('Allow')));
+ $this->elementEnd('fieldset');
$this->elementEnd('form');
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 507733979..681d07724 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -177,7 +177,8 @@ font-weight:bold;
#form_password_recover legend,
#form_password_change legend,
.form_entity_block legend,
-#form_filter_bytag legend {
+#form_filter_bytag legend,
+#apioauthauthorize_allowdeny {
display:none;
}
@@ -905,10 +906,15 @@ list-style-type:none;
}
.application img,
#showapplication .entity_profile img,
-#editapplication .form_data #application_icon img {
+#editapplication .form_data #application_icon,
+#apioauthauthorize .form_data img {
max-width:96px;
max-height:96px;
}
+#apioauthauthorize .form_data img {
+margin-right:18px;
+float:left;
+}
#showapplication .entity_profile {
width:68%;
}