From df9b73725a370b30c21eb6dcc838d212bc892f4d Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Fri, 21 Oct 2016 11:58:18 +1300 Subject: [PATCH] Make minor buttons smaller, change conflicting class (used elsewhere) --- client/src/legacy/SiteTreeURLSegmentField.js | 10 +++++----- client/src/styles/legacy/_CMSMain.scss | 2 +- .../SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/legacy/SiteTreeURLSegmentField.js b/client/src/legacy/SiteTreeURLSegmentField.js index d03c338d..ace87c35 100644 --- a/client/src/legacy/SiteTreeURLSegmentField.js +++ b/client/src/legacy/SiteTreeURLSegmentField.js @@ -19,7 +19,7 @@ $.entwine('ss', function($) { // This ensures we don't get bogus previews on readonly fields. if(this.find(':text').length) this.toggleEdit(false); this.redraw(); - + this._super(); }, @@ -34,7 +34,7 @@ $.entwine('ss', function($) { } // Transfer current value to holder - this.find('.preview').attr('href', encodeURI(url + field.data('suffix'))).text(previewUrl); + this.find('.URL-link').attr('href', encodeURI(url + field.data('suffix'))).text(previewUrl); }, /** @@ -51,7 +51,7 @@ $.entwine('ss', function($) { field.focus(); } }, - + /** * Commits the change of the URLSegment to the field * Optional: pass in (String) to update the URLSegment @@ -62,7 +62,7 @@ $.entwine('ss', function($) { currentVal = field.data('origval'), title = arguments[0], updateVal = (title && title !== "") ? title : field.val(); - + if (currentVal != updateVal) { this.addClass('loading'); this.suggest(updateVal, function(data) { @@ -76,7 +76,7 @@ $.entwine('ss', function($) { this.redraw(); } }, - + /** * Cancels any changes to the field */ diff --git a/client/src/styles/legacy/_CMSMain.scss b/client/src/styles/legacy/_CMSMain.scss index 7a94fdac..54b39380 100644 --- a/client/src/styles/legacy/_CMSMain.scss +++ b/client/src/styles/legacy/_CMSMain.scss @@ -99,7 +99,7 @@ background: url(../../images/loading.gif) no-repeat 162px 8px; } - .preview { + .URL-link { padding-top: 8px; display: inline-block; } diff --git a/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss b/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss index 26eba8b1..ebbed248 100644 --- a/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss +++ b/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss @@ -1,19 +1,19 @@
- + $URL <% if not $IsReadonly %> - <% end_if %>
- - <% if $HelpText %>

$HelpText

<% end_if %>