Skip to content
This repository
Browse code

MINOR Using new setDescription() styling in HtmlEditorField

  • Loading branch information...
commit db076c0f0273ab255f6289428abdd0c51694cd42 1 parent 9e4b526
Ingo Schommer authored June 13, 2012
3  admin/css/screen.css
@@ -558,9 +558,6 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
558 558
 .htmleditorfield-dialog .details .cms-file-info .field { border: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
559 559
 .htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
560 560
 .htmleditorfield-dialog .details .field.last { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); margin-bottom: 0; }
561  
-.htmleditorfield-dialog .details .img-detail-group { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px 0; }
562  
-.htmleditorfield-dialog .details .img-detail-group .extraLabel { display: block; position: relative; top: -8px; margin-left: 184px; color: #ccc; color: rgba(0, 0, 0, 0.5); font-style: italic; padding: 0; text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.7); }
563  
-.htmleditorfield-dialog .details .img-detail-group .field { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
564 561
 
565 562
 .htmleditorfield-linkform .step2 { margin-bottom: 16px; }
566 563
 
20  admin/scss/_style.scss
@@ -1530,26 +1530,6 @@ body.cms-dialog {
1530 1530
 				margin-bottom:0;
1531 1531
 			}	
1532 1532
 		}
1533  
-		.img-detail-group{
1534  
-			border-bottom: 1px solid $color-shadow-light;
1535  
-    		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
1536  
-    		margin: 0 0 8px 0;
1537  
-    		.extraLabel{
1538  
-				display:block;
1539  
-				position:relative;
1540  
-				top: 0 - $grid-y;
1541  
-				margin-left:176px + $grid-y; //width of main label
1542  
-				color: #ccc;
1543  
-				color: rgba(#000, 0.5);
1544  
-				font-style:italic;
1545  
-				padding:0;
1546  
-				@include text-shadow(1px 1px 0 rgba($color-text-shadow, 0.7));
1547  
-			}					
1548  
-			.field{
1549  
-				border-bottom:none;
1550  
-				@include box-shadow(0 0 0 rgba(0, 0, 0, 0));
1551  
-			}
1552  
-		}
1553 1533
 	}
1554 1534
 }
1555 1535
 
26  forms/HtmlEditorField.php
@@ -691,22 +691,16 @@ protected function getFieldsForImage($url, $file) {
691 691
 					)
692 692
 				)->setName("FilePreviewData")->addExtraClass('cms-file-info-data')
693 693
 			)->setName("FilePreview")->addExtraClass('cms-file-info'),			
694  
-			CompositeField::create(
695  
-				new TextField(
696  
-					'AltText', 
697  
-					_t('HtmlEditorField.IMAGEALT', 'Alternative text (alt)'),  
698  
-					$file->Title, 
699  
-					80
700  
-				),
701  
-				new LiteralField('extraAlt', '<div class="middleColumn extraLabel">' . _t('HtmlEditorField.IMAGEALTTEXTDESC', 'Shown to screen readers or if image can not be displayed') . '</div>')
702  
-			) -> addExtraClass('img-detail-group first'),
703  
-			CompositeField::create(
704  
-				new TextField(
705  
-					'Title', 
706  
-					_t('HtmlEditorField.IMAGETITLETEXT', 'Title text (tooltip)')
707  
-				),
708  
-				new LiteralField('extraTitle', '<div class="middleColumn extraLabel">' . _t('HtmlEditorField.IMAGETITLETEXTDESC', 'For additional information about the image') . '</div>')
709  
-			)-> addExtraClass('img-detail-group'),
  694
+			TextField::create(
  695
+				'AltText', 
  696
+				_t('HtmlEditorField.IMAGEALT', 'Alternative text (alt)'),  
  697
+				$file->Title, 
  698
+				80
  699
+			)->setDescription(_t('HtmlEditorField.IMAGEALTTEXTDESC', 'Shown to screen readers or if image can not be displayed')),
  700
+			TextField::create(
  701
+				'Title', 
  702
+				_t('HtmlEditorField.IMAGETITLETEXT', 'Title text (tooltip)')
  703
+			)->setDescription(_t('HtmlEditorField.IMAGETITLETEXTDESC', 'For additional information about the image')),
710 704
 			new TextField('CaptionText', _t('HtmlEditorField.CAPTIONTEXT', 'Caption text')),
711 705
 			$alignment = new DropdownField(
712 706
 				'CSSClass',

0 notes on commit db076c0

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