Permalink
Browse files

MINOR Removed setRightTitle() special case (and too specific styling)…

… 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 efc30fd39e93b3470b109bf393c7b9c737d78801
Showing with 9 additions and 10 deletions.
  1. +1 −2 admin/css/screen.css
  2. +2 −0 admin/javascript/LeftAndMain.js
  3. +2 −7 admin/scss/_style.scss
  4. +4 −1 security/Group.php
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -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);
}
View
@@ -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;
View
@@ -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

0 comments on commit efc30fd

Please sign in to comment.