Skip to content
This repository has been archived by the owner on Feb 10, 2021. It is now read-only.

Commit

Permalink
Merge pull request #66 from zyhfish/bug/65
Browse files Browse the repository at this point in the history 
issue-65: remove ck finder and news article plugin.
  • Loading branch information
Kan Ma committed Apr 11, 2016
2 parents bac7f8b + 1b12b2d commit faa7428
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 530 deletions.
239 changes: 0 additions & 239 deletions CKFinder/config.ascx
View file

This file was deleted.

3 changes: 0 additions & 3 deletions DNNConnect.CKEditorProvider.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@
<Content Include="js\jquery.notification.js" />
<Content Include="js\jquery.ui.controls.js" />
<Content Include="js\Options.js" />
<Content Include="CKFinder\config.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="Install\Dnn.CKToolbarButtons.xml" />
<Content Include="Install\Dnn.CKToolbarSets.xml" />
<Content Include="Install\license.txt" />
Expand Down
2 changes: 1 addition & 1 deletion Install/Dnn.CKEditorDefaultSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Browser>standard</Browser>
<BrowserRoles>0;Administrators;</BrowserRoles>
<SettingMode>Portal</SettingMode>
<Config allowedContent="true" autoGrow_bottomSpace="0" autoGrow_maxHeight="0" autoGrow_minHeight="200" autoGrow_onStartup="false" autoParagraph="true" autosave_delay="25" autoUpdateElement="true" baseFloatZIndex="10000" basicEntities="true" blockedKeystrokes="[ CKEDITOR.CTRL + 66, CKEDITOR.CTRL + 73, CKEDITOR.CTRL + 85 ]" browserContextMenuOnCtrl="true" clipboard_defaultContentType="html" colorButton_colors="00923E,F8C100,28166F" colorButton_enableMore="true" contentsLangDirection="Inherit" dataIndentationChars=" " defaultLanguage="en" defaultLinkType="url" dialog_backgroundCoverColor="white" dialog_backgroundCoverOpacity="0.5" dialog_buttonsOrder="OS" dialog_magnetDistance="20" dialog_startupFocusTab="false" disableNativeSpellChecker="true" disableNativeTableHandles="true" disableObjectResizing="false" disableReadonlyStyling="false" div_wrapTable="false" docType="&lt;!DOCTYPE html&gt;" enableTabKeyTools="true" enterMode="P" entities="true" entities_additional="#39" entities_greek="false" entities_latin="false" entities_processNumerical="false" extraPlugins="newsarticleslinks,dnnpages" filebrowserWindowFeatures="location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes" filebrowserWindowHeight="70%" filebrowserWindowWidth="80%" fillEmptyBlocks="true" flashAddEmbedTag="false" flashConvertOnEdit="false" flashEmbedTagOnly="false" floatSpaceDockedOffsetX="0" floatSpaceDockedOffsetY="0" floatSpacePinnedOffsetX="0" floatSpacePinnedOffsetY="0" fontSize_sizes="12px;2.3em;130%;larger;x-small" font_names="Arial;Times New Roman;Verdana" forceEnterMode="false" forcePasteAsPlainText="false" forceSimpleAmpersand="false" format_tags="p;h1;h2;h3;h4;h5;h6;pre;address;div" fullPage="false" height="200" htmlEncodeOutput="false" ignoreEmptyParagraph="true" image_previewText="Lorem ipsum dolor..." image_removeLinkByEmptyURL="true" indentOffset="40" indentUnit="px" linkShowAdvancedTab="true" linkShowTargetTab="true" magicline_color="#FF0000" magicline_holdDistance="0.5" magicline_keystrokeNext="0" magicline_keystrokePrevious="0" magicline_putEverywhere="false" magicline_triggerOffset="30" menu_groups="clipboard,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div" menu_subMenuDelay="400" oembed_maxWidth="0" oembed_maxHeight="0" pasteFromWordCleanupFile="" pasteFromWordNumberedHeadingToList="false" pasteFromWordPromptCleanup="false" pasteFromWordRemoveFontStyles="true" pasteFromWordRemoveStyles="true" protectedSource="( /&lt;i class[\s\S]*?&gt;[\s\S]*?&lt;/i&gt;/gi ),( /&lt;span class[\s\S]*?&gt;[\s\S]*?&lt;/span&gt;/gi ),( /&lt;em class[\s\S]*?&gt;[\s\S]*?&lt;/em&gt;/gi ),( /&lt;button class[\s\S]*?&gt;[\s\S]*?&lt;/button&gt;/gi )]" readOnly="false" removeFormatAttributes="class,style,lang,width,height,align,hspace,valign" removeFormatTags="b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var" resize_dir="both" resize_enabled="true" resize_maxHeight="600" resize_maxWidth="3000" resize_minHeight="250" resize_minWidth="750" scayt_autoStartup="false" scayt_maxSuggestions="0" shiftEnterMode="BR" skin="moono" smiley_columns="8" sourceAreaTabSize="20" startupFocus="false" startupMode="wysiwyg" startupOutlineBlocks="false" startupShowBorders="true" tabIndex="0" tabSpaces="0" templates="default" templates_replaceContent="true" toolbarCanCollapse="false" toolbarGroupCycling="true" toolbarLocation="Top" toolbarStartupExpanded="true" undoStackSize="20" useComputedState="true" width="99%">
<Config allowedContent="true" autoGrow_bottomSpace="0" autoGrow_maxHeight="0" autoGrow_minHeight="200" autoGrow_onStartup="false" autoParagraph="true" autosave_delay="25" autoUpdateElement="true" baseFloatZIndex="10000" basicEntities="true" blockedKeystrokes="[ CKEDITOR.CTRL + 66, CKEDITOR.CTRL + 73, CKEDITOR.CTRL + 85 ]" browserContextMenuOnCtrl="true" clipboard_defaultContentType="html" colorButton_colors="00923E,F8C100,28166F" colorButton_enableMore="true" contentsLangDirection="Inherit" dataIndentationChars=" " defaultLanguage="en" defaultLinkType="url" dialog_backgroundCoverColor="white" dialog_backgroundCoverOpacity="0.5" dialog_buttonsOrder="OS" dialog_magnetDistance="20" dialog_startupFocusTab="false" disableNativeSpellChecker="true" disableNativeTableHandles="true" disableObjectResizing="false" disableReadonlyStyling="false" div_wrapTable="false" docType="&lt;!DOCTYPE html&gt;" enableTabKeyTools="true" enterMode="P" entities="true" entities_additional="#39" entities_greek="false" entities_latin="false" entities_processNumerical="false" extraPlugins="dnnpages" filebrowserWindowFeatures="location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes" filebrowserWindowHeight="70%" filebrowserWindowWidth="80%" fillEmptyBlocks="true" flashAddEmbedTag="false" flashConvertOnEdit="false" flashEmbedTagOnly="false" floatSpaceDockedOffsetX="0" floatSpaceDockedOffsetY="0" floatSpacePinnedOffsetX="0" floatSpacePinnedOffsetY="0" fontSize_sizes="12px;2.3em;130%;larger;x-small" font_names="Arial;Times New Roman;Verdana" forceEnterMode="false" forcePasteAsPlainText="false" forceSimpleAmpersand="false" format_tags="p;h1;h2;h3;h4;h5;h6;pre;address;div" fullPage="false" height="200" htmlEncodeOutput="false" ignoreEmptyParagraph="true" image_previewText="Lorem ipsum dolor..." image_removeLinkByEmptyURL="true" indentOffset="40" indentUnit="px" linkShowAdvancedTab="true" linkShowTargetTab="true" magicline_color="#FF0000" magicline_holdDistance="0.5" magicline_keystrokeNext="0" magicline_keystrokePrevious="0" magicline_putEverywhere="false" magicline_triggerOffset="30" menu_groups="clipboard,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div" menu_subMenuDelay="400" oembed_maxWidth="0" oembed_maxHeight="0" pasteFromWordCleanupFile="" pasteFromWordNumberedHeadingToList="false" pasteFromWordPromptCleanup="false" pasteFromWordRemoveFontStyles="true" pasteFromWordRemoveStyles="true" protectedSource="( /&lt;i class[\s\S]*?&gt;[\s\S]*?&lt;/i&gt;/gi ),( /&lt;span class[\s\S]*?&gt;[\s\S]*?&lt;/span&gt;/gi ),( /&lt;em class[\s\S]*?&gt;[\s\S]*?&lt;/em&gt;/gi ),( /&lt;button class[\s\S]*?&gt;[\s\S]*?&lt;/button&gt;/gi )]" readOnly="false" removeFormatAttributes="class,style,lang,width,height,align,hspace,valign" removeFormatTags="b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var" resize_dir="both" resize_enabled="true" resize_maxHeight="600" resize_maxWidth="3000" resize_minHeight="250" resize_minWidth="750" scayt_autoStartup="false" scayt_maxSuggestions="0" shiftEnterMode="BR" skin="moono" smiley_columns="8" sourceAreaTabSize="20" startupFocus="false" startupMode="wysiwyg" startupOutlineBlocks="false" startupShowBorders="true" tabIndex="0" tabSpaces="0" templates="default" templates_replaceContent="true" toolbarCanCollapse="false" toolbarGroupCycling="true" toolbarLocation="Top" toolbarStartupExpanded="true" undoStackSize="20" useComputedState="true" width="99%">
<CodeMirror theme="default" lineNumbers="true" lineWrapping="true" matchBrackets="true" autoCloseTags="false" enableSearchTools="true" enableCodeFolding="true" enableCodeFormatting="true" autoFormatOnStart="false" codemirror="true" highlightMatches="true" showTabs="false" showFormatButton="true" showCommentButton="true" showUncommentButton="true">
<HighlightActiveLine>true</HighlightActiveLine>
</CodeMirror>
Expand Down
4 changes: 0 additions & 4 deletions Install/Dnn.CKToolbarButtons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,6 @@
<ToolbarName>qrcodes</ToolbarName>
<ToolbarIcon>qrcodes.jpg</ToolbarIcon>
</ToolbarButton>
<ToolbarButton>
<ToolbarName>newsarticleslinks</ToolbarName>
<ToolbarIcon>newsarticleslinks.gif</ToolbarIcon>
</ToolbarButton>
<ToolbarButton>
<ToolbarName>-</ToolbarName>
<ToolbarIcon>separator.png</ToolbarIcon>
Expand Down
2 changes: 1 addition & 1 deletion Objects/EditorConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public EditorConfig()
this.Entities_Greek = false;
this.Entities_Latin = false;
this.Entities_ProcessNumerical = false;
this.ExtraPlugins = "newsarticleslinks,dnnpages";
this.ExtraPlugins = "dnnpages";
this.FileBrowserWindowFeatures = "location=no,menubar=no,toolbar=no,dependent=yes,minimizable=no,modal=yes,alwaysRaised=yes,resizable=yes,scrollbars=yes";
this.FileBrowserWindowHeight = "70%";
this.FileBrowserWindowWidth = "80%";
Expand Down
7 changes: 0 additions & 7 deletions Utilities/ToolbarUtil.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,13 +559,6 @@ public static void CreateDefaultToolbarButtonXml(string savePath)
ToolbarIcon =
"qrcodes.jpg"
},
new ToolbarButton
{
ToolbarName =
"newsarticleslinks",
ToolbarIcon =
"newsarticleslinks.gif"
},
new ToolbarButton
{
ToolbarName = "-",
Expand Down
Loading

0 comments on commit faa7428

Please sign in to comment.