Merge pull request #570 from adrexia/7528-insert-link

BUGFIX: Insert link styling inconsistent with Insert media (fixes #7528)
silverstripe · Jun 25, 2012 · 6dc108a · 6dc108a
2 parents 3a54d4a + e51bf76
commit 6dc108a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
@@ -1550,7 +1550,7 @@ body.cms-dialog {
 			padding:0;
 		}
 	}
-	.ss-insert-media, .Actions{
+	.ss-insert-media, .Actions, .ss-insert-link{
 		padding:$grid-y $grid-x*2 ;
 	}
 	.details{

diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
@@ -299,9 +299,11 @@ function LinkForm() {
 			$this->controller,
 			"{$this->name}/LinkForm", 
 			new FieldList(
-				new LiteralField(
-					'Heading', 
-					sprintf('<h3>%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
+				$headerWrap = new CompositeField(
+					new LiteralField(
+						'Heading', 
+						sprintf('<h3 class="htmleditorfield-mediaform-heading insert">%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
+					)
 				),
 				$contentComposite = new CompositeField(
 					new OptionsetField(
@@ -340,8 +342,9 @@ function LinkForm() {
 					->setUseButtonTag(true)
 			)
 		);
-
-		$contentComposite->addExtraClass('content');
+
+		$headerWrap->addExtraClass('CompositeField composite cms-content-header nolabel ');		
+		$contentComposite->addExtraClass('ss-insert-link content');
 
 		$form->unsetValidator();
 		$form->loadDataFrom($this);