tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
BUGFIX: Insert link styling inconsistent with Insert media (fixes #7528)
This commit is contained in:
Ingo Schommer 2012-06-25 06:24:30 -07:00
commit 6dc108ac3e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/css/screen.css
View File

@ -565,7 +565,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active { background: #f0f3f4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top; } .htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active { background: #f0f3f4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top; }
.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; } .htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; }
.htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; } .htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; }
.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions { padding: 8px 16px; } .htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions, .htmleditorfield-dialog .ss-insert-link { padding: 8px 16px; }
.htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; } .htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
.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); } .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); }
.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); } .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); }

2
admin/scss/_style.scss
View File

@ -1550,7 +1550,7 @@ body.cms-dialog {
padding:0; padding:0;
} }
} }
.ss-insert-media, .Actions{ .ss-insert-media, .Actions, .ss-insert-link{
padding:$grid-y $grid-x*2 ; padding:$grid-y $grid-x*2 ;
} }
.details{ .details{

11
forms/HtmlEditorField.php
View File

@ -299,9 +299,11 @@ class HtmlEditorField_Toolbar extends RequestHandler {
$this->controller, $this->controller,
"{$this->name}/LinkForm", "{$this->name}/LinkForm",
new FieldList( new FieldList(
new LiteralField( $headerWrap = new CompositeField(
'Heading', new LiteralField(
sprintf('<h3>%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link')) 'Heading',
sprintf('<h3 class="htmleditorfield-mediaform-heading insert">%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
)
), ),
$contentComposite = new CompositeField( $contentComposite = new CompositeField(
new OptionsetField( new OptionsetField(
@ -341,7 +343,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
) )
); );
$contentComposite->addExtraClass('content'); $headerWrap->addExtraClass('CompositeField composite cms-content-header nolabel ');
$contentComposite->addExtraClass('ss-insert-link content');
$form->unsetValidator(); $form->unsetValidator();
$form->loadDataFrom($this); $form->loadDataFrom($this);