Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/4101 update ck editor version #4383

Merged
Prev Previous commit
Next Next commit
Moved DNN icons and images out of CKE folder
  • Loading branch information
skamphuis authored and bdukes committed Dec 22, 2020
commit af46ae940c3676fe707ebd98c3c4687738fe55c2
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ img {border:0}

.ModalFooter {float:right}

.LoadingContent h3 {background: url(../js/ckeditor/4.15.1/images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingContent h3 {background: url(../images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingMessage {text-align:center}

#cmdCreate img,
Expand Down Expand Up @@ -491,7 +491,7 @@ img {border:0}
display: block;
width: 32px;
height: 32px;
background: url("../js/ckeditor/4.15.1/images/loading.gif") center no-repeat;
background: url("../images/loading.gif") center no-repeat;
background-size: contain;
}
.files audio,
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ img {border:0}

.ModalFooter {float:right}

.LoadingContent h3 {background: url(../js/ckeditor/4.15.1/images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingContent h3 {background: url(../images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingMessage {text-align:center}

#cmdCreate img,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
display: block;
width: 32px;
height: 32px;
background: url("../js/ckeditor/4.15.1/images/loading.gif") center no-repeat;
background: url("../images/loading.gif") center no-repeat;
background-size: contain;
}
.files audio,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
</HeaderTemplate>
<ItemTemplate>
<li class='ui-state-default ui-corner-all<%# DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("-") ? " separator" : string.Empty%>'>
<img alt='<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>' class="itemIcon" src='<%# this.ResolveUrl(string.Format("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/icons/{0}", DataBinder.Eval(Container.DataItem, "Icon")))%>'/>&nbsp;
<img alt='<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>' class="itemIcon" src='<%# this.ResolveUrl(string.Format("~/Providers/HtmlEditorProviders/DNNConnect.CKE/icons/{0}", DataBinder.Eval(Container.DataItem, "Icon")))%>'/>&nbsp;
<span class="item"><%# DataBinder.Eval(Container.DataItem, "Button").ToString()%></span>
</li>
</ItemTemplate>
Expand Down Expand Up @@ -264,7 +264,7 @@
<ItemTemplate>
<li class='groupButton ui-state-default ui-corner-all<%# DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("-") ? " separator" : string.Empty%><%# DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("/") ? " rowBreak" : string.Empty%>'>
<span class="ui-icon ui-icon-cancel" title='<%= DotNetNuke.Services.Localization.Localization.GetString("DeleteToolbarButton.Text", this.ResXFile, this.LangCode) %>'></span>
<img alt='<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>' class="itemIcon" src='<%# this.ResolveUrl(string.Format("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/icons/{0}", DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("/") ? "PageBreak.png" : DataBinder.Eval(Container.DataItem, "Icon"))) %>'/>&nbsp;
<img alt='<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>' class="itemIcon" src='<%# this.ResolveUrl(string.Format("~/Providers/HtmlEditorProviders/DNNConnect.CKE/icons/{0}", DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("/") ? "PageBreak.png" : DataBinder.Eval(Container.DataItem, "Icon"))) %>'/>&nbsp;
<span class="item"><%# DataBinder.Eval(Container.DataItem, "Button").ToString()%></span>
</li>
</ItemTemplate>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3077,7 +3077,7 @@ private void ShowNotification(string message, string type)
this.Page,
this.GetType(),
$"notification_{Guid.NewGuid()}",
$"ShowNotificationBar('{message}','{type}','{this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/")}');",
$"ShowNotificationBar('{message}','{type}','{this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/")}');",
true);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,35 @@
<div class="iconLegend">
<ul>
<li>
<asp:Image ID="HostHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/HostHasSetting.png" />&nbsp;
<asp:Image ID="HostHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/HostHasSetting.png" />&nbsp;
<asp:Label runat="server" ID="HostHasSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="HostNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/HostNoSetting.png"/>&nbsp;
<asp:Image ID="HostNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/HostNoSetting.png"/>&nbsp;
<asp:Label runat="server" ID="HostNoSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="PortalHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/PortalHasSetting.png" />&nbsp;
<asp:Image ID="PortalHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/PortalHasSetting.png" />&nbsp;
<asp:Label runat="server" ID="PortalHasSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="PortalNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/PortalNoSetting.png"/>&nbsp;
<asp:Image ID="PortalNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/PortalNoSetting.png"/>&nbsp;
<asp:Label runat="server" ID="PortalNoSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="PageHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/PageHasSetting.png"/>&nbsp;
<asp:Image ID="PageHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/PageHasSetting.png"/>&nbsp;
<asp:Label runat="server" ID="PageHasSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="PageNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/PageNoSetting.png" />&nbsp;
<asp:Image ID="PageNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/PageNoSetting.png" />&nbsp;
<asp:Label runat="server" ID="PageNoSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="ModuleHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/ModuleHasSetting.png" />&nbsp;
<asp:Image ID="ModuleHasSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/ModuleHasSetting.png" />&nbsp;
<asp:Label runat="server" ID="ModuleHasSettingLabel"></asp:Label>
</li>
<li>
<asp:Image ID="ModuleNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/ckeditor/4.15.1/images/ModuleNoSetting.png"/>&nbsp;
<asp:Image ID="ModuleNoSettingImage" runat="server" ImageUrl="~/Providers/HtmlEditorProviders/DNNConnect.CKE/images/ModuleNoSetting.png"/>&nbsp;
<asp:Label runat="server" ID="ModuleNoSettingLabel"></asp:Label>
</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ private static Dictionary<int, HashSet<TreeNode>> GetModuleNodes(int portalId, M
Text = m.ModuleTitle,
ImageUrl =
SettingsUtil.CheckSettingsExistByKey(editorHostSettings, $"DNNCKMI#{m.ModuleID}#INS#")
? "../js/ckeditor/4.15.1/images/ModuleHasSetting.png"
: "../js/ckeditor/4.15.1/images/ModuleNoSetting.png",
? "../images/ModuleHasSetting.png"
: "../images/ModuleNoSetting.png",
};

if (modulesNodes.ContainsKey(m.TabID))
Expand Down Expand Up @@ -150,8 +150,8 @@ private static void LoadNodesByTreeViewHelper(
Func<int, bool> getParentIdCheck = x => x != -1;
Func<TabInfo, string> getNodeImageURL =
x => SettingsUtil.CheckSettingsExistByKey(editorHostSettings, $"DNNCKT#{x.TabID}#")
? "../js/ckeditor/4.15.1/images/PageHasSetting.png"
: "../js/ckeditor/4.15.1/images/PageNoSetting.png";
? "../images/PageHasSetting.png"
: "../images/PageNoSetting.png";

TreeViewHelper<int> tvh = new TreeViewHelper<int>();
tvh.LoadNodes(tabs, portalNode.ChildNodes, getNodeId, getParentId, getNodeText, getNodeValue, getNodeImageURL, getParentIdCheck, modulesNodes);
Expand Down Expand Up @@ -361,8 +361,8 @@ private void RenderHostNode(IEnumerable<PortalInfo> portals, ModuleController mo
Value = "h",
ImageUrl =
hostSettingsExist
? "../js/ckeditor/4.15.1/images/HostHasSetting.png"
: "../js/ckeditor/4.15.1/images/HostNoSetting.png",
? "../images/HostHasSetting.png"
: "../images/HostNoSetting.png",
Expanded = true,
};

Expand Down Expand Up @@ -394,8 +394,8 @@ private void RenderPortalNode(PortalInfo portal, ModuleController moduleControll
Value = $"p{portal.PortalID}",
ImageUrl =
portalSettingsExists
? "../js/ckeditor/4.15.1/images/PortalHasSetting.png"
: "../js/ckeditor/4.15.1/images/PortalNoSetting.png",
? "../images/PortalHasSetting.png"
: "../images/PortalNoSetting.png",
Expanded = this.PortalOnly.Checked,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ h1 {font-weight: bold;margin: 0;font-size:medium;font-family:Arial, Helvetica, s
opacity: 0.2
}

.LoadingContent h3 {background: url(../js/ckeditor/4.15.1/images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingContent h3 {background: url(../images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingMessage {text-align:center}

/* Manager Module */
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.