Skip to content
This repository
Browse code

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
Ingo Schommer authored March 27, 2012
3  admin/css/screen.css
@@ -419,8 +419,7 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .
419 419
 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; }
420 420
 
421 421
 .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; }
422  
-.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%; }
423  
-.cms .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
  422
+.cms .cms-content-fields { overflow-y: auto; overflow-x: auto; background: none; width: 100%; }
424 423
 .cms .cms-content-fields #Root_Main .confirmedpassword { border-bottom: none; box-shadow: none; }
425 424
 .cms .cms-content-fields #Root_Main .customFormat { max-width: 80px; }
426 425
 .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; }
2  admin/javascript/LeftAndMain.js
@@ -23,6 +23,8 @@ jQuery.noConflict();
23 23
 		var applyChosen = function(el){
24 24
 			if(el.outerWidth()){
25 25
 				el.chosen().addClass("has-chzn");
  26
+				// Copy over title attribute if required
  27
+				if(el.attr('title')) el.siblings('.chzn-container').attr('title', el.attr('title'));
26 28
 			} else {
27 29
 				setTimeout(function() {applyChosen(el);},500);
28 30
 			}
9  admin/scss/_style.scss
@@ -952,17 +952,12 @@ form.member-profile-form {
952 952
 	}
953 953
 	
954 954
 	.cms-content-fields {
955  
-		/* always show a y scroll bar as popups like TreeDropdowns 
956  
-		 can trigger longer pages and the extra scroll bar doesn't 
957  
-		 fire our sizing bar */
  955
+		// always show a y scroll bar as popups like TreeDropdowns 
  956
+		// can trigger longer pages and the extra scroll bar doesn't fire our sizing bar
958 957
 		overflow-y: auto;
959 958
 		overflow-x: auto;
960 959
 		background: none;
961 960
 		width:100%;
962  
-		.aligned-right-label {
963  
-			margin-left:$grid-x*23;
964  
-			padding:$grid-x 0;
965  
-		}
966 961
 		#Root_Main {
967 962
 			.confirmedpassword {
968 963
 				border-bottom:none;
5  security/Group.php
@@ -85,7 +85,10 @@ public function getCMSFields() {
85 85
 			)
86 86
 		);
87 87
 		
88  
-		$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>');
  88
+		$parentidfield->setAttribute(
  89
+			'title', 
  90
+			_t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles')
  91
+		);
89 92
 
90 93
 		// Filter permissions
91 94
 		// TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm

0 notes on commit efc30fd

Please sign in to comment.
Something went wrong with that request. Please try again.