From 2078873fbb5610e30a12336eaeda3479f090b669 Mon Sep 17 00:00:00 2001 From: "Matt@MBP-PC.Home" Date: Tue, 3 Jul 2012 18:04:56 -0100 Subject: [PATCH] Undone previous "Show Label" fix and applied at the database layer (Un-tested) --- src/SQLCE4Umbraco/Sql/Total.sql | 4 ++-- src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql | 4 ++-- src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql | 4 ++-- src/umbraco.editorControls/tinyMCE3/TinyMCE.cs | 2 -- .../tinymce/tinyMCEPreValueConfigurator.cs | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/SQLCE4Umbraco/Sql/Total.sql b/src/SQLCE4Umbraco/Sql/Total.sql index 4057691bb8..26167c24d8 100644 --- a/src/SQLCE4Umbraco/Sql/Total.sql +++ b/src/SQLCE4Umbraco/Sql/Total.sql @@ -10,7 +10,7 @@ IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT - Database version: 4.1.0.0 + Database version: 4.8.0.1 Please increment this version number if ANY change is made to this script, so compatibility with scripts for other database systems can be verified easily. @@ -860,7 +860,7 @@ add [description] nvarchar(1500) NULL ALTER TABLE umbracoLog ALTER COLUMN logComment NVARCHAR(4000) NULL ; !!!SET IDENTITY_INSERT [cmsDataTypePreValues] ON -|insert into cmsDataTypePreValues (id, dataTypeNodeId, [value], sortorder, alias) values (3,-87,',code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,mcecharmap,' + nchar(124) + '1' + nchar(124) + '1,2,3,' + nchar(124) + '0' + nchar(124) + '500,400' + nchar(124) + '1049,' + nchar(124) + '', 0, '') +|insert into cmsDataTypePreValues (id, dataTypeNodeId, [value], sortorder, alias) values (3,-87,',code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,mcecharmap,' + nchar(124) + '1' + nchar(124) + '1,2,3,' + nchar(124) + '0' + nchar(124) + '500,400' + nchar(124) + '1049,' + nchar(124) + 'true' + nchar(124) + '', 0, '') |insert into cmsDataTypePreValues (id, dataTypeNodeId, [value], sortorder, alias) values (4,1041,'default', 0, 'group') |SET IDENTITY_INSERT [cmsDataTypePreValues] OFF ; diff --git a/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql b/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql index 8dc420ba26..818a20babb 100644 --- a/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql +++ b/src/umbraco.datalayer/SqlHelpers/MySql/Sql/Total.sql @@ -10,7 +10,7 @@ IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT - Database version: 4.1.0.3 + Database version: 4.8.0.4 Please increment this version number if ANY change is made to this script, so compatibility with scripts for other database systems can be verified easily. @@ -727,7 +727,7 @@ alter TABLE cmsContentType add description nvarchar(1500) NULL alter TABLE cmsContentType add masterContentType int NULL ; insert into cmsDataTypePreValues (id, dataTypeNodeId, value, sortorder, alias) values -(3,-87,',code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,mcecharmap,|1|1,2,3,|0|500,400|1049,|', 0, ''), +(3,-87,',code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,mcecharmap,|1|1,2,3,|0|500,400|1049,|true|', 0, ''), (4,1041,'default', 0, 'group') ; diff --git a/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql b/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql index fac99aa098..4275ff7d3d 100644 --- a/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql +++ b/src/umbraco.datalayer/SqlHelpers/SqlServer/Sql/Total.sql @@ -10,7 +10,7 @@ IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT - Database version: 4.1.0.0 + Database version: 4.8.0.1 Please increment this version number if ANY change is made to this script, so compatibility with scripts for other database systems can be verified easily. @@ -879,7 +879,7 @@ ALTER TABLE umbracoLog ALTER COLUMN logComment NVARCHAR(4000) NULL ; SET IDENTITY_INSERT [cmsDataTypePreValues] ON insert into cmsDataTypePreValues (id, dataTypeNodeId, [value], sortorder, alias) -values (3,-87,',code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,mcecharmap,' + char(124) + '1' + char(124) + '1,2,3,' + char(124) + '0' + char(124) + '500,400' + char(124) + '1049,' + char(124) + '', 0, '') +values (3,-87,',code,undo,redo,cut,copy,mcepasteword,stylepicker,bold,italic,bullist,numlist,outdent,indent,mcelink,unlink,mceinsertanchor,mceimage,umbracomacro,mceinserttable,mcecharmap,' + char(124) + '1' + char(124) + '1,2,3,' + char(124) + '0' + char(124) + '500,400' + char(124) + '1049,' + char(124) + 'true' + char(124) + '', 0, '') insert into cmsDataTypePreValues (id, dataTypeNodeId, [value], sortorder, alias) values (4,1041,'default', 0, 'group') diff --git a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs index 8669c6f844..97e8c0994d 100644 --- a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs +++ b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs @@ -83,8 +83,6 @@ namespace umbraco.editorControls.tinyMCE3 if (configSettings.Length > 6 && configSettings[6] != "") _showLabel = bool.Parse(configSettings[6]); - else - _showLabel = true; if (configSettings.Length > 7 && configSettings[7] != "") m_maxImageWidth = int.Parse(configSettings[7]); diff --git a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs index a17e03fdee..de2afaa555 100644 --- a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs +++ b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs @@ -154,8 +154,7 @@ namespace umbraco.editorControls.tinymce _stylesheets = config[5]; if (config.Length > 6 && config[6] != "") _showLabel.Checked = bool.Parse(config[6]); - else - _showLabel.Checked = true; + if (config.Length > 7 && config[7] != "") _maxImageWidth.Text = config[7]; else