Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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...
commit efc30fd39e93b3470b109bf393c7b9c737d78801 1 parent 9a301e3
@chillu chillu authored
View
3  admin/css/screen.css
@@ -419,8 +419,7 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .
form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .ui-tabs-nav .ui-corner-top, form.member-profile-form .ui-tabs-nav .ui-corner-left, form.member-profile-form .ui-tabs-nav .ui-corner-tl { border-radius: 0; }
.cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; }
-.cms .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 */ overflow-y: auto; overflow-x: auto; background: none; width: 100%; }
-.cms .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
+.cms .cms-content-fields { overflow-y: auto; overflow-x: auto; background: none; width: 100%; }
.cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; }
.cms .cms-content-fields #Root_Main .customFormat { max-width: 80px; }
.cms .cms-content-fields #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; }
View
2  admin/javascript/LeftAndMain.js
@@ -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
9 admin/scss/_style.scss
@@ -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
5 security/Group.php
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.