GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Somewhat better layout for approving/rejecting subrequests

This commit is contained in:
Mikael Nordfeldth 2016-01-03 20:42:21 +01:00
parent c19964094b
commit 3bddf01350
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/approvesubform.php
View File

@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
* Form for leaving a group
* Form for approving or reject a pending subscription request
*
* PHP version 5
*
@ -28,14 +28,10 @@
* @link http://status.net/
*/
if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
require_once INSTALLDIR.'/lib/form.php';
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Form for leaving a group
* Form for approving or reject a pending subscription request
*
* @category Form
* @package StatusNet
@ -107,8 +103,8 @@ class ApproveSubForm extends Form
function formActions()
{
// TRANS: Submit button text to accept a subscription request on approve sub form.
$this->out->submit('approve', _m('BUTTON','Accept'));
$this->out->submit($this->id().'-approve', _m('BUTTON','Accept'), 'submit approve', 'approve');
// TRANS: Submit button text to reject a subscription request on approve sub form.
$this->out->submit('cancel', _m('BUTTON','Reject'));
$this->out->submit($this->id().'-cancel', _m('BUTTON','Reject'), 'submit cancel', 'cancel');
}
}

7
theme/base/css/display.css
View File

@ -1711,7 +1711,7 @@ display:block;
padding: 4px 4px 4px 26px;
}
.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input, .entity_actions input.submit {
.entity_actions a, .entity_actions p, .entity_actions .entity_approval input, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input, .entity_actions input.submit {
background-color: #ccc !important;
border: none;
}
@ -1720,7 +1720,7 @@ display:block;
padding: 2px 4px 4px 28px;
}
.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover, .entity_actions input.submit:hover {
.entity_actions a:hover, .entity_actions p:hover, .entity_actions, .entity_subscribe input:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover, .entity_actions input.submit:hover {
background-color: #f2f2f2 !important;
}
@ -2256,6 +2256,7 @@ button.minimize,
.entity_clear input.submit,
.entity_flag input.submit,
.entity_flag p,
.entity_approval input.submit,
.entity_subscribe input.submit,
#realtime_play,
#realtime_pause,
@ -2377,9 +2378,11 @@ background-position: 5px -2039px;
.entity_flag p {
background-position: 5px -2105px;
}
.entity_approval input.approve,
.entity_subscribe input.accept {
background-position: 5px -2171px;
}
.entity_approval input.cancel,
.entity_subscribe input.reject {
background-position: 5px -2237px;
}