Skip to content

Commit

Permalink
MINOR Removed setRightTitle() special case (and too specific styling)…
Browse files Browse the repository at this point in the history
… from Group->getCMSFields(), implemented title attribute for chosen.js drop downs instead (to be styled with more friendly title popovers)
  • Loading branch information
chillu committed Mar 27, 2012
1 parent 9a301e3 commit efc30fd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
3 changes: 1 addition & 2 deletions admin/css/screen.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions admin/javascript/LeftAndMain.js
Expand Up @@ -23,6 +23,8 @@ jQuery.noConflict();
var applyChosen = function(el){
if(el.outerWidth()){
el.chosen().addClass("has-chzn");
// Copy over title attribute if required
if(el.attr('title')) el.siblings('.chzn-container').attr('title', el.attr('title'));
} else {
setTimeout(function() {applyChosen(el);},500);
}
Expand Down
9 changes: 2 additions & 7 deletions admin/scss/_style.scss
Expand Up @@ -952,17 +952,12 @@ form.member-profile-form {
}

.cms-content-fields {
/* always show a y scroll bar as popups like TreeDropdowns
can trigger longer pages and the extra scroll bar doesn't
fire our sizing bar */
// always show a y scroll bar as popups like TreeDropdowns
// can trigger longer pages and the extra scroll bar doesn't fire our sizing bar
overflow-y: auto;
overflow-x: auto;
background: none;
width:100%;
.aligned-right-label {
margin-left:$grid-x*23;
padding:$grid-x 0;
}
#Root_Main {
.confirmedpassword {
border-bottom:none;
Expand Down
5 changes: 4 additions & 1 deletion security/Group.php
Expand Up @@ -85,7 +85,10 @@ public function getCMSFields() {
)
);

$parentidfield->setRightTitle('<span class="aligned-right-label">' . _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') . '</span>');
$parentidfield->setAttribute(
'title',
_t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles')
);

// Filter permissions
// TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm
Expand Down

0 comments on commit efc30fd

Please sign in to comment.