From ef32310ef8023d70a32a2c075bc11a9f351dbccc Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 16 Oct 2012 18:26:48 +1300 Subject: [PATCH 1/2] FIX: Allow 1024 chars for keywords, not a mere 255 --- code/model/SiteTree.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index 635aeacb..39a78bec 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -78,7 +78,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid "Content" => "HTMLText", "MetaTitle" => "Varchar(255)", "MetaDescription" => "Text", - "MetaKeywords" => "Varchar(255)", + "MetaKeywords" => "Varchar(1024)", "ExtraMeta" => "HTMLText", "ShowInMenus" => "Boolean", "ShowInSearch" => "Boolean", From abba77af517ca892d1ac7d3025b5b19409a81889 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 6 Nov 2012 15:01:34 +0100 Subject: [PATCH 2/2] Fixes required for jQuery UI 1.9 --- css/screen.css | 2 +- scss/_AssetAdmin.scss | 3 +-- templates/Includes/CMSMain_Content.ss | 6 +++--- templates/Includes/CMSPagesController_Content.ss | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/css/screen.css b/css/screen.css index 677cb1a0..8f690c35 100644 --- a/css/screen.css +++ b/css/screen.css @@ -33,7 +33,7 @@ .cms .AssetAdmin .cms-content-fields .cms-edit-form.AssetAdmin { overflow-y: auto; } .cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content { overflow: hidden; } .cms .AssetAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { height: 100%; } -.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; } +.cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; padding: 0 20px 0; text-indent: -9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-treeview a { background-position: 2px 0px; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-galleryview a { background-position: -160px 0px; } .cms .AssetAdmin .cms-content-header-tabs .ui-tabs-nav li.content-listview a { background-position: -39px 0px; } diff --git a/scss/_AssetAdmin.scss b/scss/_AssetAdmin.scss index f1f8eee6..b4b25bae 100644 --- a/scss/_AssetAdmin.scss +++ b/scss/_AssetAdmin.scss @@ -16,8 +16,7 @@ li { a { font-weight: bold; - line-height: 16px; - padding: 12px 20px 12px; + padding: 0 20px 0; text-indent:-9999em; background: url(../images/content-header-tabs-sprite.png) no-repeat; } diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss index cb1f22a1..c13fed7b 100644 --- a/templates/Includes/CMSMain_Content.ss +++ b/templates/Includes/CMSMain_Content.ss @@ -9,17 +9,17 @@