![\"{0}\"](\"Images/CreateFolder.png\" "\\"{1}\\"")
",
- Localization.GetString("cmdCreate.Text", this.ResXFile, this.LanguageCode),
+ "![\"{0}\"](\"Images/DownloadButton.png\" "\\"{1}\\"")
",
- Localization.GetString("cmdDownload.Text", this.ResXFile, this.LanguageCode),
+ "![\"{0}\"](\"Images/UploadButton.png\" "\\"{1}\\"")
",
- Localization.GetString("cmdUpload.Text", this.ResXFile, this.LanguageCode),
+ "![\"{0}\"](\"Images/DeleteFile.png\" "\\"{1}\\"")
",
- Localization.GetString("cmdDelete.Text", this.ResXFile, this.LanguageCode),
+ "![\"{0}\"](\"Images/ResizeImage.png\" "\\"{1}\\"")
",
- Localization.GetString("cmdResizer.Text", this.ResXFile, this.LanguageCode),
+ "![<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>](<%# this.ResolveUrl(string.Format("~/Providers/HtmlEditorProviders/CKEditor/icons/{0}", DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("/") ? "PageBreak.png" : DataBinder.Eval(Container.DataItem, "Icon"))) %>){kind=icon}
+ ![<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>](<%# this.ResolveUrl(string.Format("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/icons/{0}", DataBinder.Eval(Container.DataItem, "Button").ToString().Equals("/") ? "PageBreak.png" : DataBinder.Eval(Container.DataItem, "Icon"))) %>){kind=icon}
<%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>
-
CKEditor Editor Provider LICENSE
+CKEditor Provider LICENSE
@@ -24,7 +24,7 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{1}",
- Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/"),
+ Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/"),
postedValue);
}
@@ -844,7 +824,7 @@ public bool LoadPostData(string postDataKey, NameValueCollection postCollection)
}
}
- this.Value = postedValue;
+ Value = postedValue;
return true;
}
@@ -885,9 +865,9 @@ protected override void OnPreRender(EventArgs e)
return;
}
- this.RegisterCKEditorLibrary();
+ RegisterCKEditorLibrary();
- this.GenerateEditorLoadScript();
+ GenerateEditorLoadScript();
}
///
@@ -908,19 +888,19 @@ protected override void Render(HtmlTextWriter outWriter)
outWriter.Write(
"",
- this._portalSettings.PortalId);
+ _portalSettings.PortalId);
outWriter.Write(outWriter.NewLine);
- var styleWidth = !string.IsNullOrEmpty(this.currentSettings.Config.Width)
- ? string.Format(" style=\"width:{0};\"", this.currentSettings.Config.Width)
+ var styleWidth = !string.IsNullOrEmpty(currentSettings.Config.Width)
+ ? string.Format(" style=\"width:{0};\"", currentSettings.Config.Width)
: string.Empty;
outWriter.Write("", styleWidth);
// Write text area
- outWriter.AddAttribute("id", this.ClientID.Replace("-", string.Empty).Replace(".", string.Empty));
- outWriter.AddAttribute("name", this.UniqueID);
+ outWriter.AddAttribute("id", ClientID.Replace("-", string.Empty).Replace(".", string.Empty));
+ outWriter.AddAttribute("name", UniqueID);
outWriter.AddAttribute("cols", "80");
outWriter.AddAttribute("rows", "10");
@@ -931,47 +911,47 @@ protected override void Render(HtmlTextWriter outWriter)
outWriter.RenderBeginTag("textarea");
- if (string.IsNullOrEmpty(this.Value))
+ if (string.IsNullOrEmpty(Value))
{
- if (!string.IsNullOrEmpty(this.currentSettings.BlankText))
+ if (!string.IsNullOrEmpty(currentSettings.BlankText))
{
- outWriter.Write(this.Context.Server.HtmlEncode(this.currentSettings.BlankText));
+ outWriter.Write(Context.Server.HtmlEncode(currentSettings.BlankText));
}
}
else
{
- outWriter.Write(this.Context.Server.HtmlEncode(this.Value));
+ outWriter.Write(Context.Server.HtmlEncode(Value));
}
outWriter.RenderEndTag();
outWriter.Write("");
- this.IsRendered = true;
+ IsRendered = true;
/////////////////
- if (!this.HasRenderedTextArea(this.Page))
+ if (!HasRenderedTextArea(Page))
{
return;
}
outWriter.Write("");
- if (PortalSecurity.IsInRoles(this._portalSettings.AdministratorRoleName))
+ if (PortalSecurity.IsInRoles(_portalSettings.AdministratorRoleName))
{
var editorUrl = Globals.NavigateURL(
"CKEditorOptions",
- "ModuleId=" + this.parentModulId,
- "minc=" + this.ID,
- "PortalID=" + this._portalSettings.PortalId,
+ "ModuleId=" + parentModulId,
+ "minc=" + ID,
+ "PortalID=" + _portalSettings.PortalId,
"langCode=" + CultureInfo.CurrentCulture.Name,
"popUp=true");
outWriter.Write(
"{2}",
HttpUtility.HtmlAttributeEncode(HttpUtility.JavaScriptStringEncode(editorUrl, true)),
- string.Format("{0}_ckoptions", this.ClientID.Replace("-", string.Empty).Replace(".", string.Empty)),
+ string.Format("{0}_ckoptions", ClientID.Replace("-", string.Empty).Replace(".", string.Empty)),
Localization.GetString("Options.Text", SResXFile));
}
@@ -985,50 +965,50 @@ protected override void Render(HtmlTextWriter outWriter)
/// The
@@ -1047,13 +1027,13 @@ private void CheckFileBrowser()
switch (objProvider.Attributes["ck_browser"])
{
case "ckfinder":
- this.currentSettings.BrowserMode = Browser.CKFinder;
+ currentSettings.BrowserMode = BrowserType.CKFinder;
break;
case "standard":
- this.currentSettings.BrowserMode = Browser.StandardBrowser;
+ currentSettings.BrowserMode = BrowserType.StandardBrowser;
break;
case "none":
- this.currentSettings.BrowserMode = Browser.None;
+ currentSettings.BrowserMode = BrowserType.None;
break;
}
}
@@ -1063,57 +1043,57 @@ private void CheckFileBrowser()
///
private void LoadAllSettings()
{
- var settingsDictionary = Utility.GetEditorHostSettings();
- var portalRoles = new RoleController().GetPortalRoles(this._portalSettings.PortalId);
+ var settingsDictionary = EditorController.GetEditorHostSettings();
+ var portalRoles = new RoleController().GetPortalRoles(_portalSettings.PortalId);
// Load Default Settings
- this.currentSettings = SettingsUtil.GetDefaultSettings(
- this._portalSettings,
- this._portalSettings.HomeDirectoryMapPath,
- this._settings["configFolder"],
+ currentSettings = SettingsUtil.GetDefaultSettings(
+ _portalSettings,
+ _portalSettings.HomeDirectoryMapPath,
+ _settings["configFolder"],
portalRoles);
// Set Current Mode to Default
- this.currentSettings.SettingMode = SettingsMode.Default;
+ currentSettings.SettingMode = SettingsMode.Default;
- var portalKey = string.Format("DNNCKP#{0}#", this._portalSettings.PortalId);
- var pageKey = string.Format("DNNCKT#{0}#", this._portalSettings.ActiveTab.TabID);
- var moduleKey = string.Format("DNNCKMI#{0}#INS#{1}#", this.parentModulId, this.ID);
+ var portalKey = string.Format("DNNCKP#{0}#", _portalSettings.PortalId);
+ var pageKey = string.Format("DNNCKT#{0}#", _portalSettings.ActiveTab.TabID);
+ var moduleKey = string.Format("DNNCKMI#{0}#INS#{1}#", parentModulId, ID);
// Load Portal Settings ?!
if (SettingsUtil.CheckExistsPortalOrPageSettings(settingsDictionary, portalKey))
{
- /* throw new ApplicationException(settingsDictionary.FirstOrDefault(
- setting => setting.Name.Equals(string.Format("{0}{1}", portalKey, "StartupMode"))).Value);*/
+ /* throw new ApplicationException(settingsDictionary.FirstOrDefault(
+ setting => setting.Name.Equals(string.Format("{0}{1}", portalKey, "StartupMode"))).Value);*/
- this.currentSettings = SettingsUtil.LoadPortalOrPageSettings(
- this._portalSettings, this.currentSettings, settingsDictionary, portalKey, portalRoles);
+ currentSettings = SettingsUtil.LoadPortalOrPageSettings(
+ _portalSettings, currentSettings, settingsDictionary, portalKey, portalRoles);
// Set Current Mode to Portal
- this.currentSettings.SettingMode = SettingsMode.Portal;
+ currentSettings.SettingMode = SettingsMode.Portal;
}
// Load Page Settings ?!
if (SettingsUtil.CheckExistsPortalOrPageSettings(settingsDictionary, pageKey))
{
- this.currentSettings = SettingsUtil.LoadPortalOrPageSettings(
- this._portalSettings, this.currentSettings, settingsDictionary, pageKey, portalRoles);
+ currentSettings = SettingsUtil.LoadPortalOrPageSettings(
+ _portalSettings, currentSettings, settingsDictionary, pageKey, portalRoles);
// Set Current Mode to Page
- this.currentSettings.SettingMode = SettingsMode.Page;
+ currentSettings.SettingMode = SettingsMode.Page;
}
// Load Module Settings ?!
- if (!SettingsUtil.CheckExistsModuleInstanceSettings(moduleKey, this.parentModulId))
+ if (!SettingsUtil.CheckExistsModuleInstanceSettings(moduleKey, parentModulId))
{
return;
}
- this.currentSettings = SettingsUtil.LoadModuleSettings(
- this._portalSettings, this.currentSettings, moduleKey, this.parentModulId, portalRoles);
+ currentSettings = SettingsUtil.LoadModuleSettings(
+ _portalSettings, currentSettings, moduleKey, parentModulId, portalRoles);
// Set Current Mode to Module Instance
- this.currentSettings.SettingMode = SettingsMode.ModuleInstance;
+ currentSettings.SettingMode = SettingsMode.ModuleInstance;
}
///
@@ -1142,11 +1122,11 @@ private string FormatUrl(string sInputUrl)
{
int iFileId = int.Parse(sInputUrl.Substring(7));
- // FileController objFileController = new FileController();
- var objFileInfo = FileManager.Instance.GetFile(iFileId);
+ // FileController objFileController = new FileController();
+ var objFileInfo = FileManager.Instance.GetFile(iFileId);
// FileInfo objFileInfo = objFileController.GetFileById(iFileId, this._portalSettings.PortalId);
- sImageUrl = this._portalSettings.HomeDirectory + objFileInfo.Folder + objFileInfo.FileName;
+ sImageUrl = _portalSettings.HomeDirectory + objFileInfo.Folder + objFileInfo.FileName;
}
return sImageUrl;
@@ -1157,7 +1137,7 @@ private string FormatUrl(string sInputUrl)
///
private void LoadConfigSettings()
{
- this._settings = new NameValueCollection();
+ _settings = new NameValueCollection();
var providerConfiguration = ProviderConfiguration.GetProviderConfiguration(ProviderType);
var objProvider = (Provider)providerConfiguration.Providers[providerConfiguration.DefaultProvider];
@@ -1178,7 +1158,7 @@ private void LoadConfigSettings()
if (sAdjustedKey != string.Empty)
{
- this._settings[sAdjustedKey] = objProvider.Attributes[key];
+ _settings[sAdjustedKey] = objProvider.Attributes[key];
}
}
}
@@ -1199,12 +1179,12 @@ private void RegisterStartupScript(string key, string script, bool addScriptTags
{
if (HasMsAjax)
{
- ScriptManager.RegisterStartupScript(this, this.GetType(), key, script, addScriptTags);
+ ScriptManager.RegisterStartupScript(this, GetType(), key, script, addScriptTags);
}
else
{
- this.Page.ClientScript.RegisterStartupScript(this.GetType(), key, script, true);
- }
+ Page.ClientScript.RegisterStartupScript(GetType(), key, script, true);
+ }
}
///
@@ -1239,18 +1219,18 @@ private string SetUserToolbar(string alternateConfigSubFolder)
string toolbarName = HttpContext.Current.Request.IsAuthenticated ? "Full" : "Basic";
var listToolbarSets = ToolbarUtil.GetToolbars(
- this._portalSettings.HomeDirectoryMapPath, alternateConfigSubFolder);
+ _portalSettings.HomeDirectoryMapPath, alternateConfigSubFolder);
var listUserToolbarSets = new List();
var roleController = new RoleController();
- if (this.currentSettings.ToolBarRoles.Count <= 0)
+ if (currentSettings.ToolBarRoles.Count <= 0)
{
return toolbarName;
}
- foreach (var roleToolbar in this.currentSettings.ToolBarRoles)
+ foreach (var roleToolbar in currentSettings.ToolBarRoles)
{
if (roleToolbar.RoleId.Equals(-1) && !HttpContext.Current.Request.IsAuthenticated)
{
@@ -1263,7 +1243,7 @@ private string SetUserToolbar(string alternateConfigSubFolder)
}
// Role
- var role = roleController.GetRole(roleToolbar.RoleId, this._portalSettings.PortalId);
+ var role = roleController.GetRole(roleToolbar.RoleId, _portalSettings.PortalId);
if (role == null)
{
@@ -1311,12 +1291,12 @@ private string SetUserToolbar(string alternateConfigSubFolder)
private void RegisterCKEditorLibrary()
{
ClientResourceManager.RegisterStyleSheet(
- this.Page,
- Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/editor.css"));
+ Page,
+ Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/editor.css"));
- ClientScriptManager cs = this.Page.ClientScript;
+ ClientScriptManager cs = Page.ClientScript;
- Type csType = this.GetType();
+ Type csType = GetType();
const string CsName = "CKEdScript";
const string CsAdaptName = "CKAdaptScript";
@@ -1332,44 +1312,44 @@ private void RegisterCKEditorLibrary()
this, csType, "jquery_registered", "//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js");
}
- if (File.Exists(this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/CKEditor/ckeditor.js"))
+ if (File.Exists(Context.Server.MapPath("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/ckeditor.js"))
&& !cs.IsClientScriptIncludeRegistered(csType, CsName))
{
cs.RegisterClientScriptInclude(
- csType, CsName, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/ckeditor.js"));
+ csType, CsName, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/ckeditor.js"));
}
if (
File.Exists(
- this.Context.Server.MapPath(
- "~/Providers/HtmlEditorProviders/CKEditor/js/jquery.ckeditor.adapter.js"))
+ Context.Server.MapPath(
+ "~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.ckeditor.adapter.js"))
&& !cs.IsClientScriptIncludeRegistered(csType, CsAdaptName))
{
cs.RegisterClientScriptInclude(
csType,
CsAdaptName,
- Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/js/jquery.ckeditor.adapter.js"));
+ Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.ckeditor.adapter.js"));
}
if (
File.Exists(
- this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.js")) &&
- !cs.IsClientScriptIncludeRegistered(csType, CsFindName) && this.currentSettings.BrowserMode.Equals(Browser.CKFinder))
+ Context.Server.MapPath("~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.js")) &&
+ !cs.IsClientScriptIncludeRegistered(csType, CsFindName) && currentSettings.BrowserMode.Equals(BrowserType.CKFinder))
{
cs.RegisterClientScriptInclude(
csType,
CsFindName,
- Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.js"));
+ Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.js"));
}
// Load Custom JS File
- if (!string.IsNullOrEmpty(this.currentSettings.CustomJsFile)
+ if (!string.IsNullOrEmpty(currentSettings.CustomJsFile)
&& !cs.IsClientScriptIncludeRegistered(csType, "CKCustomJSFile"))
{
cs.RegisterClientScriptInclude(
csType,
"CKCustomJSFile",
- this.FormatUrl(this.currentSettings.CustomJsFile));
+ FormatUrl(currentSettings.CustomJsFile));
}
}
@@ -1380,10 +1360,10 @@ private void GenerateEditorLoadScript()
{
var editorVar = string.Format(
"editor{0}",
- this.ClientID.Substring(this.ClientID.LastIndexOf("_", StringComparison.Ordinal) + 1).Replace(
+ ClientID.Substring(ClientID.LastIndexOf("_", StringComparison.Ordinal) + 1).Replace(
"-", string.Empty));
- var editorFixedId = this.ClientID.Replace("-", string.Empty).Replace(".", string.Empty);
+ var editorFixedId = ClientID.Replace("-", string.Empty).Replace(".", string.Empty);
if (HasMsAjax)
{
@@ -1392,8 +1372,8 @@ private void GenerateEditorLoadScript()
@"if (CKEDITOR && CKEDITOR.instances && CKEDITOR.instances.{0}) {{ CKEDITOR.instances.{0}.updateElement(); CKEDITOR.instances.{0}.destroy(); }}",
editorFixedId);
- this.RegisterOnSubmitStatement(
- this.GetType(), string.Format("CKEditor_OnAjaxSubmit_{0}", editorFixedId), postBackScript);
+ RegisterOnSubmitStatement(
+ GetType(), string.Format("CKEditor_OnAjaxSubmit_{0}", editorFixedId), postBackScript);
}
var editorScript = new StringBuilder();
@@ -1415,13 +1395,13 @@ private void GenerateEditorLoadScript()
var test = new StringBuilder();
test.AppendFormat("var editorConfig{0} = {{", editorVar);
- var keysCount = this.Settings.Keys.Count;
+ var keysCount = Settings.Keys.Count;
var currentCount = 0;
// Write options
- foreach (string key in this.Settings.Keys)
+ foreach (string key in Settings.Keys)
{
- var value = this.Settings[key];
+ var value = Settings[key];
currentCount++;
@@ -1437,7 +1417,7 @@ private void GenerateEditorLoadScript()
else if (value.Equals("False"))
{
value = "false";
- }
+ }
test.AppendFormat("{0}:{1}", key, value);
@@ -1460,7 +1440,7 @@ private void GenerateEditorLoadScript()
editorScript.AppendFormat(
"if (CKEDITOR.instances.{0}){{return;}}",
editorFixedId);
-
+
// Check if we can use jQuery or $, and if both fail use ckeditor without the adapter
editorScript.Append("if (jQuery().ckeditor) {");
@@ -1489,7 +1469,7 @@ private void GenerateEditorLoadScript()
// End of LoadScript
editorScript.Append("}");
- this.RegisterStartupScript(string.Format(@"{0}_CKE_Startup", editorFixedId), editorScript.ToString(), true);
+ RegisterStartupScript(string.Format(@"{0}_CKE_Startup", editorFixedId), editorScript.ToString(), true);
}
#endregion
diff --git a/css/Options.css b/css/Options.css
index f8ab67c..2fdb4de 100644
--- a/css/Options.css
+++ b/css/Options.css
@@ -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(../Images/loading.gif) no-repeat 102px 5px;height:20px}
+.LoadingContent h3 {background: url(../CKEditor/Images/loading.gif) no-repeat 102px 5px;height:20px}
.LoadingMessage {text-align:center}
/* Manager Module */