From a415bb466cdbcaac2e0d8779e8feb323b0ab488e Mon Sep 17 00:00:00 2001 From: samantha copeland Date: Wed, 24 Apr 2024 17:38:33 -0500 Subject: [PATCH] tiny setting in widget projects about page tweak --- CMSAdmin/c3-admin/Includes/tinymce-config.js | 27 ++++++++++---------- CMSAdmin/c3-admin/about.aspx.cs | 5 ++-- CMSCore/SiteContent/SiteDataStatic.cs | 18 ++++++++++--- CarrotCMSData/CarrotCMS.cs | 6 +++-- PluginCalendarModule/Site1.Master | 11 +++++--- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/CMSAdmin/c3-admin/Includes/tinymce-config.js b/CMSAdmin/c3-admin/Includes/tinymce-config.js index 2400c87b..23189773 100644 --- a/CMSAdmin/c3-admin/Includes/tinymce-config.js +++ b/CMSAdmin/c3-admin/Includes/tinymce-config.js @@ -28,24 +28,25 @@ function cmsTinyMceInit(winWidth, winHeight, allowResize) { file_picker_types: 'file image media', file_picker_callback: cmsTinyFileBrowserCallback, promotion: false, + convert_unsafe_embeds: true, plugins: 'image link lists media charmap searchreplace visualblocks table preview code codesample help', toolbar1: 'bold italic underline strikethrough sub sup | blocks forecolor backcolor | blockquote alignleft aligncenter alignright alignjustify outdent indent | help | ', toolbar2: 'undo redo searchreplace | bullist numlist | removeformat pastetext | link unlink anchor image media customfilebrowser | charmap codesample code preview visualblocks', removed_menuitems: 'newdocument help', codesample_languages: [ - { text: 'HTML', value: 'markup' }, - { text: 'XML', value: 'xml' }, - { text: 'Bash', value: 'bash' }, - { text: 'JavaScript', value: 'javascript' }, - { text: 'CSS', value: 'css' }, - { text: 'SQL', value: 'sql' }, - { text: 'PHP', value: 'php' }, - { text: 'Ruby', value: 'ruby' }, - { text: 'Python', value: 'python' }, - { text: 'Java', value: 'java' }, - { text: 'C', value: 'c' }, - { text: 'C#', value: 'csharp' }, - { text: 'C++', value: 'cpp' } + { text: 'HTML', value: 'markup' }, + { text: 'XML', value: 'xml' }, + { text: 'Bash', value: 'bash' }, + { text: 'JavaScript', value: 'javascript' }, + { text: 'CSS', value: 'css' }, + { text: 'SQL', value: 'sql' }, + { text: 'PHP', value: 'php' }, + { text: 'Ruby', value: 'ruby' }, + { text: 'Python', value: 'python' }, + { text: 'Java', value: 'java' }, + { text: 'C', value: 'c' }, + { text: 'C#', value: 'csharp' }, + { text: 'C++', value: 'cpp' } ], resize: tinyBrowseResize, width: tinyBrowseWidth, diff --git a/CMSAdmin/c3-admin/about.aspx.cs b/CMSAdmin/c3-admin/about.aspx.cs index e60c4e83..4d649432 100644 --- a/CMSAdmin/c3-admin/about.aspx.cs +++ b/CMSAdmin/c3-admin/about.aspx.cs @@ -1,4 +1,5 @@ -using System; +using Carrotware.CMS.Core; +using System; /* * CarrotCake CMS @@ -15,7 +16,7 @@ namespace Carrotware.CMS.UI.Admin.c3_admin { public partial class about : AdminBasePage { protected void Page_Load(object sender, EventArgs e) { - litVersion.Text = CurrentDLLVersion; + litVersion.Text = SiteData.CarrotCakeCMSVersionShort; } } } \ No newline at end of file diff --git a/CMSCore/SiteContent/SiteDataStatic.cs b/CMSCore/SiteContent/SiteDataStatic.cs index ddace4cb..b9df1f62 100644 --- a/CMSCore/SiteContent/SiteDataStatic.cs +++ b/CMSCore/SiteContent/SiteDataStatic.cs @@ -849,7 +849,7 @@ public static bool IsPageReal { } } - static private List _specialFiles = null; + private static List _specialFiles = null; public static List SpecialFiles { get { @@ -904,12 +904,23 @@ public static string CurrentDLLMajorMinorVersion { } } + public static string CarrotCakeCMSVersionShort { + get { +#if DEBUG + return string.Format("Web Forms {0} (debug)", CurrentDLLVersion); +#else + return string.Format("Web Forms {0}", CurrentDLLVersion); +#endif + } + } + public static string CarrotCakeCMSVersion { get { #if DEBUG return string.Format("CarrotCake CMS {0} DEBUG MODE", CurrentDLLVersion); -#endif +#else return string.Format("CarrotCake CMS {0}", CurrentDLLVersion); +#endif } } @@ -917,8 +928,9 @@ public static string CarrotCakeCMSVersionMM { get { #if DEBUG return string.Format("CarrotCake CMS {0} (debug)", CurrentDLLMajorMinorVersion); -#endif +#else return string.Format("CarrotCake CMS {0}", CurrentDLLMajorMinorVersion); +#endif } } diff --git a/CarrotCMSData/CarrotCMS.cs b/CarrotCMSData/CarrotCMS.cs index fbc61c7e..cc13aac0 100644 --- a/CarrotCMSData/CarrotCMS.cs +++ b/CarrotCMSData/CarrotCMS.cs @@ -35,8 +35,9 @@ public static CarrotCMSDataContext GetDataContext(string connection) { iDBConnCounter = 0; } return _db; -#endif +#else return new CarrotCMSDataContext(connection); +#endif } public static CarrotCMSDataContext GetDataContext(IDbConnection connection) { @@ -48,8 +49,9 @@ public static CarrotCMSDataContext GetDataContext(IDbConnection connection) { iDBConnCounter = 0; } return _db; -#endif +#else return new CarrotCMSDataContext(connection); +#endif } //public CarrotCMSDataContext() : diff --git a/PluginCalendarModule/Site1.Master b/PluginCalendarModule/Site1.Master index c608c958..e9e0266b 100644 --- a/PluginCalendarModule/Site1.Master +++ b/PluginCalendarModule/Site1.Master @@ -95,20 +95,23 @@ }); - + @* https://cdnjs.com/libraries/tinymce/6.8.3 *@ +