diff --git a/.gitignore b/.gitignore index e0667fe7ce0..fc16245290c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *.suo *.user *.sln.docstates +*.local.sln # Build results [Rr]elease diff --git a/DNN Platform/DotNetNuke.Web/InternalServices/ItemListServiceController.cs b/DNN Platform/DotNetNuke.Web/InternalServices/ItemListServiceController.cs index e2d815b2c2b..b45051161dc 100644 --- a/DNN Platform/DotNetNuke.Web/InternalServices/ItemListServiceController.cs +++ b/DNN Platform/DotNetNuke.Web/InternalServices/ItemListServiceController.cs @@ -78,66 +78,68 @@ public class ItemIdDto #region Web Method [HttpGet] - public HttpResponseMessage GetPageDescendants(string parentId = null, int sortOrder = 0, string searchText = "", int portalId = -1) + public HttpResponseMessage GetPageDescendants(string parentId = null, int sortOrder = 0, string searchText = "", int portalId = -1, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Items = GetPageDescendantsInternal(portalId, parentId, sortOrder, searchText) + Items = GetPageDescendantsInternal(portalId, parentId, sortOrder, searchText, includeDisabled, includeAllTypes) }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage GetTreePathForPage(string itemId, int sortOrder = 0, int portalId = -1) + public HttpResponseMessage GetTreePathForPage(string itemId, int sortOrder = 0, int portalId = -1, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = GetTreePathForPageInternal(portalId, itemId, sortOrder), + Tree = GetTreePathForPageInternal(portalId, itemId, sortOrder, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage SortPages(string treeAsJson, int sortOrder = 0, string searchText = "", int portalId = -1) + public HttpResponseMessage SortPages(string treeAsJson, int sortOrder = 0, string searchText = "", int portalId = -1, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = string.IsNullOrEmpty(searchText) ? SortPagesInternal(portalId, treeAsJson, sortOrder) : SearchPagesInternal(portalId, searchText, sortOrder), + Tree = string.IsNullOrEmpty(searchText) ? SortPagesInternal(portalId, treeAsJson, sortOrder, includeDisabled, includeAllTypes) + : SearchPagesInternal(portalId, searchText, sortOrder, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage SortPagesInPortalGroup(string treeAsJson, int sortOrder = 0, string searchText = "") + public HttpResponseMessage SortPagesInPortalGroup(string treeAsJson, int sortOrder = 0, string searchText = "", bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = string.IsNullOrEmpty(searchText) ? SortPagesInPortalGroupInternal(treeAsJson, sortOrder) : SearchPagesInPortalGroupInternal(treeAsJson, searchText, sortOrder), + Tree = string.IsNullOrEmpty(searchText) ? SortPagesInPortalGroupInternal(treeAsJson, sortOrder, includeDisabled, includeAllTypes) + : SearchPagesInPortalGroupInternal(treeAsJson, searchText, sortOrder, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage GetPages(int sortOrder = 0, int portalId = -1) + public HttpResponseMessage GetPages(int sortOrder = 0, int portalId = -1, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = GetPagesInternal(portalId, sortOrder), + Tree = GetPagesInternal(portalId, sortOrder, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage GetPagesInPortalGroup(int sortOrder = 0) + public HttpResponseMessage GetPagesInPortalGroup(int sortOrder = 0) { var response = new { @@ -149,12 +151,13 @@ public HttpResponseMessage GetPagesInPortalGroup(int sortOrder = 0) } [HttpGet] - public HttpResponseMessage SearchPages(string searchText, int sortOrder = 0, int portalId = -1) + public HttpResponseMessage SearchPages(string searchText, int sortOrder = 0, int portalId = -1, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = string.IsNullOrEmpty(searchText) ? GetPagesInternal(portalId, sortOrder) : SearchPagesInternal(portalId, searchText, sortOrder), + Tree = string.IsNullOrEmpty(searchText) ? GetPagesInternal(portalId, sortOrder, includeDisabled, includeAllTypes) + : SearchPagesInternal(portalId, searchText, sortOrder, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); @@ -220,35 +223,36 @@ public HttpResponseMessage SearchFolders(string searchText, int sortOrder = 0, s } [HttpGet] - public HttpResponseMessage GetPageDescendantsInPortalGroup(string parentId = null, int sortOrder = 0, string searchText = "") + public HttpResponseMessage GetPageDescendantsInPortalGroup(string parentId = null, int sortOrder = 0, string searchText = "", bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Items = GetPageDescendantsInPortalGroupInternal(parentId, sortOrder, searchText) + Items = GetPageDescendantsInPortalGroupInternal(parentId, sortOrder, searchText, includeDisabled , includeAllTypes) }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage GetTreePathForPageInPortalGroup(string itemId, int sortOrder = 0) + public HttpResponseMessage GetTreePathForPageInPortalGroup(string itemId, int sortOrder = 0, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = GetTreePathForPageInternal(itemId, sortOrder, true), + Tree = GetTreePathForPageInternal(itemId, sortOrder, true, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); } [HttpGet] - public HttpResponseMessage SearchPagesInPortalGroup(string searchText, int sortOrder = 0) + public HttpResponseMessage SearchPagesInPortalGroup(string searchText, int sortOrder = 0, bool includeDisabled = false, bool includeAllTypes = false) { var response = new { Success = true, - Tree = string.IsNullOrEmpty(searchText) ? GetPagesInPortalGroupInternal(sortOrder) : SearchPagesInPortalGroupInternal(searchText, sortOrder), + Tree = string.IsNullOrEmpty(searchText) ? GetPagesInPortalGroupInternal(sortOrder) + : SearchPagesInPortalGroupInternal(searchText, sortOrder, includeDisabled, includeAllTypes), IgnoreRoot = true }; return Request.CreateResponse(HttpStatusCode.OK, response); @@ -258,9 +262,9 @@ public HttpResponseMessage SearchPagesInPortalGroup(string searchText, int sortO #region Pages List - private NTree GetPagesInternal(int portalId, int sortOrder) + private NTree GetPagesInternal(int portalId, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { - var tabs = GetPortalPages(portalId); + var tabs = GetPortalPages(portalId, includeDisabled, includeAllTypes); var sortedTree = new NTree { Data = new ItemDto { Key = RootKey } }; if (tabs == null) { @@ -279,7 +283,7 @@ private static NTree GetPagesInPortalGroupInternal(int sortOrder) return treeNode; } - private IEnumerable GetPageDescendantsInPortalGroupInternal(string parentId, int sortOrder, string searchText) + private IEnumerable GetPageDescendantsInPortalGroupInternal(string parentId, int sortOrder, string searchText, bool includeDisabled = false, bool includeAllTypes = false) { if (string.IsNullOrEmpty(parentId)) { @@ -296,7 +300,7 @@ private IEnumerable GetPageDescendantsInPortalGroupInternal(string pare } if (!String.IsNullOrEmpty(searchText)) { - return SearchPagesInternal(portalId, searchText, sortOrder).Children.Select(node => node.Data); + return SearchPagesInternal(portalId, searchText, sortOrder, includeDisabled, includeAllTypes).Children.Select(node => node.Data); } } else @@ -307,17 +311,17 @@ private IEnumerable GetPageDescendantsInPortalGroupInternal(string pare parentIdAsInt = -1; } } - return GetPageDescendantsInternal(portalId, parentIdAsInt, sortOrder, searchText); + return GetPageDescendantsInternal(portalId, parentIdAsInt, sortOrder, searchText, includeDisabled, includeAllTypes); } - private IEnumerable GetPageDescendantsInternal(int portalId, string parentId, int sortOrder, string searchText) + private IEnumerable GetPageDescendantsInternal(int portalId, string parentId, int sortOrder, string searchText, bool includeDisabled = false, bool includeAllTypes = false) { int id; id = int.TryParse(parentId, out id) ? id : Null.NullInteger; - return GetPageDescendantsInternal(portalId, id, sortOrder, searchText); + return GetPageDescendantsInternal(portalId, id, sortOrder, searchText, includeDisabled , includeAllTypes); } - private IEnumerable GetPageDescendantsInternal(int portalId, int parentId, int sortOrder, string searchText) + private IEnumerable GetPageDescendantsInternal(int portalId, int parentId, int sortOrder, string searchText, bool includeDisabled = false, bool includeAllTypes = false) { List tabs; @@ -345,7 +349,7 @@ private IEnumerable GetPageDescendantsInternal(int portalId, int parent var includeHiddenTabs = PortalSettings.UserInfo.IsSuperUser || PortalSettings.UserInfo.IsInRole("Administrators"); tabs = TabController.GetPortalTabs(portalId, Null.NullInteger, false, null, includeHiddenTabs, false, false, true, false) - .Where(tab => searchFunc(tab) && tab.ParentId == parentId && !tab.DisableLink) + .Where(tab => searchFunc(tab) && tab.ParentId == parentId && (includeDisabled || !tab.DisableLink) && (includeAllTypes || tab.TabType == TabType.Normal)) .OrderBy(tab => tab.TabOrder) .ToList(); } @@ -376,7 +380,7 @@ private IEnumerable GetPageDescendantsInternal(int portalId, int parent return ApplySort(pages, sortOrder); } - private NTree SearchPagesInternal(int portalId, string searchText, int sortOrder) + private NTree SearchPagesInternal(int portalId, string searchText, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { var tree = new NTree { Data = new ItemDto { Key = RootKey } }; @@ -411,7 +415,7 @@ private NTree SearchPagesInternal(int portalId, string searchText, int var includeHiddenTabs = PortalSettings.UserInfo.IsSuperUser || PortalSettings.UserInfo.IsInRole("Administrators"); if (!includeHiddenTabs) allTabs = allTabs.Where(t => t.IsVisible).ToList(); - tabs = allTabs.Where(tab => tab.PortalID == portalId && !tab.DisableLink && searchFunc(tab)) + tabs = allTabs.Where(tab => tab.PortalID == portalId && (includeDisabled || !tab.DisableLink) && (includeAllTypes || tab.TabType == TabType.Normal) && searchFunc(tab)) .OrderBy(tab => tab.TabOrder) .ToList(); } @@ -441,7 +445,7 @@ private NTree SearchPagesInternal(int portalId, string searchText, int return tree; } - private List GetPortalPages(int portalId) + private List GetPortalPages(int portalId, bool includeDisabled = false, bool includeAllTypes = false) { List tabs = null; if (portalId == -1) @@ -459,8 +463,8 @@ private List GetPortalPages(int portalId) if (portalId > -1) { var includeHiddenTabs = PortalSettings.UserInfo.IsSuperUser || PortalSettings.UserInfo.IsInRole("Administrators"); - tabs = TabController.GetPortalTabs(portalId, Null.NullInteger, false, null, includeHiddenTabs, false, false, true, false) - .Where(t => !t.DisableLink) + tabs = TabController.GetPortalTabs(portalId, Null.NullInteger, false, null, includeHiddenTabs, false, includeAllTypes, true, false) + .Where(t => !t.DisableLink || includeDisabled) .ToList(); } else @@ -492,15 +496,15 @@ private static IEnumerable GetChildrenOf(IEnumerable tabs, str return GetChildrenOf(tabs, id); } - private NTree SortPagesInternal(int portalId, string treeAsJson, int sortOrder) + private NTree SortPagesInternal(int portalId, string treeAsJson, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { var tree = Json.Deserialize>(treeAsJson); - return SortPagesInternal(portalId, tree, sortOrder); + return SortPagesInternal(portalId, tree, sortOrder, includeDisabled, includeAllTypes); } - private NTree SortPagesInternal(int portalId, NTree openedNodesTree, int sortOrder) + private NTree SortPagesInternal(int portalId, NTree openedNodesTree, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { - var pages = GetPortalPages(portalId); + var pages = GetPortalPages(portalId, includeDisabled, includeAllTypes); var sortedTree = new NTree { Data = new ItemDto { Key = RootKey } }; if (pages == null) { @@ -510,7 +514,7 @@ private NTree SortPagesInternal(int portalId, NTree openedNo return sortedTree; } - private NTree SearchPagesInPortalGroupInternal(string searchText, int sortOrder) + private NTree SearchPagesInPortalGroupInternal(string searchText, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { var treeNode = new NTree { Data = new ItemDto { Key = RootKey } }; var portals = GetPortalGroup(sortOrder); @@ -520,14 +524,14 @@ private NTree SearchPagesInPortalGroupInternal(string searchText, int s int portalId; if (int.TryParse(child.Data.Key.Replace(PortalPrefix, string.Empty), out portalId)) { - var pageTree = SearchPagesInternal(portalId, searchText, sortOrder); + var pageTree = SearchPagesInternal(portalId, searchText, sortOrder, includeDisabled, includeAllTypes); child.Children = pageTree.Children; } } return treeNode; } - private NTree SearchPagesInPortalGroupInternal(string treeAsJson, string searchText, int sortOrder) + private NTree SearchPagesInPortalGroupInternal(string treeAsJson, string searchText, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { var treeNode = new NTree { Data = new ItemDto { Key = RootKey } }; var openedNode = Json.Deserialize>(treeAsJson); @@ -554,20 +558,20 @@ private NTree SearchPagesInPortalGroupInternal(string treeAsJson, strin int portalId; if (int.TryParse(treeNodeChild.Data.Key.Replace(PortalPrefix, string.Empty), out portalId)) { - var pageTree = SearchPagesInternal(portalId, searchText, sortOrder); + var pageTree = SearchPagesInternal(portalId, searchText, sortOrder, includeDisabled, includeAllTypes); treeNodeChild.Children = pageTree.Children; } } return treeNode; } - private NTree SortPagesInPortalGroupInternal(string treeAsJson, int sortOrder) + private NTree SortPagesInPortalGroupInternal(string treeAsJson, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { var tree = Json.Deserialize>(treeAsJson); - return SortPagesInPortalGroupInternal(tree, sortOrder); + return SortPagesInPortalGroupInternal(tree, sortOrder, includeDisabled, includeAllTypes); } - private NTree SortPagesInPortalGroupInternal(NTree openedNode, int sortOrder) + private NTree SortPagesInPortalGroupInternal(NTree openedNode, int sortOrder, bool includeDisabled = false, bool includeAllTypes = false) { var treeNode = new NTree { Data = new ItemDto { Key = RootKey } }; if (openedNode == null) @@ -591,14 +595,14 @@ private NTree SortPagesInPortalGroupInternal(NTree openedNod { portalId = -1; } - var treeOfPages = SortPagesInternal(portalId, openedNodeChild, sortOrder); + var treeOfPages = SortPagesInternal(portalId, openedNodeChild, sortOrder, includeDisabled, includeAllTypes); treeNodeChild.Children = treeOfPages.Children; } } return treeNode; } - private static void SortPagesRecursevely(IList tabs, NTree treeNode, NTree openedNode, int sortOrder) + private static void SortPagesRecursevely(IList tabs, NTree treeNode, NTree openedNode, int sortOrder) { if (openedNode == null) { @@ -620,17 +624,17 @@ private static void SortPagesRecursevely(IList tabs, NTree tre } } - private NTree GetTreePathForPageInternal(int portalId, string itemId, int sortOrder, bool includePortalTree = false) + private NTree GetTreePathForPageInternal(int portalId, string itemId, int sortOrder, bool includePortalTree = false, bool includeDisabled = false, bool includeAllTypes = false) { int itemIdAsInt; if (string.IsNullOrEmpty(itemId) || !int.TryParse(itemId, out itemIdAsInt)) { itemIdAsInt = Null.NullInteger; } - return GetTreePathForPageInternal(portalId, itemIdAsInt, sortOrder, includePortalTree); + return GetTreePathForPageInternal(portalId, itemIdAsInt, sortOrder, includePortalTree, includeDisabled, includeAllTypes); } - private NTree GetTreePathForPageInternal(string itemId, int sortOrder, bool includePortalTree = false) + private NTree GetTreePathForPageInternal(string itemId, int sortOrder, bool includePortalTree = false, bool includeDisabled = false, bool includeAllTypes = false) { var tree = new NTree { Data = new ItemDto { Key = RootKey } }; int itemIdAsInt; @@ -648,10 +652,10 @@ private NTree GetTreePathForPageInternal(string itemId, int sortOrder, { return tree; } - return GetTreePathForPageInternal(portalId, itemIdAsInt, sortOrder, includePortalTree); + return GetTreePathForPageInternal(portalId, itemIdAsInt, sortOrder, includePortalTree, includeDisabled, includeAllTypes); } - private NTree GetTreePathForPageInternal(int portalId, int selectedItemId, int sortOrder, bool includePortalTree = false) + private NTree GetTreePathForPageInternal(int portalId, int selectedItemId, int sortOrder, bool includePortalTree = false, bool includeDisabled = false, bool includeAllTypes = false) { var tree = new NTree { Data = new ItemDto { Key = RootKey } }; @@ -660,7 +664,7 @@ private NTree GetTreePathForPageInternal(int portalId, int selectedItem return tree; } - var pages = GetPortalPages(portalId); + var pages = GetPortalPages(portalId, includeDisabled, includeAllTypes); if (pages == null) { diff --git a/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs b/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs index c9f30ac50d1..91e2f3a9780 100644 --- a/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs +++ b/DNN Platform/DotNetNuke.Web/InternalServices/SearchServiceController.cs @@ -198,21 +198,22 @@ private static ArrayList GetModulesByDefinition(int portalID, string friendlyNam private ModuleInfo GetSearchModule() { var arrModules = GetModulesByDefinition(PortalSettings.PortalId, "Search Results"); + ModuleInfo findModule = null; if (arrModules.Count > 1) { - return arrModules.Cast().FirstOrDefault(searchModule => searchModule.CultureCode == PortalSettings.CultureCode); + findModule = arrModules.Cast().FirstOrDefault(searchModule => searchModule.CultureCode == PortalSettings.CultureCode); } - if (arrModules.Count == 1) - { - return ((ModuleInfo)arrModules[0]); - } - - return null; + return findModule ?? (ModuleInfo) arrModules[0]; } private Hashtable GetSearchModuleSettings() { + if (ActiveModule != null && ActiveModule.ModuleDefinition.FriendlyName == "Search Results") + { + return ActiveModule.ModuleSettings; + } + var searchModule = GetSearchModule(); return searchModule != null ? searchModule.ModuleSettings : null; } @@ -554,6 +555,7 @@ public HttpResponseMessage Search(string search, string culture, int pageIndex, SearchTypeIds = searchTypeIds, ModuleDefIds = moduleDefids, BeginModifiedTimeUtc = beginModifiedTimeUtc, + EndModifiedTimeUtc = beginModifiedTimeUtc > DateTime.MinValue ? DateTime.MaxValue : DateTime.MinValue, PageIndex = pageIndex, PageSize = pageSize, SortField = (SortFields) sortOption, diff --git a/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnPageDropDownList.cs b/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnPageDropDownList.cs index 16e648ea2a0..5234be4fb00 100644 --- a/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnPageDropDownList.cs +++ b/DNN Platform/DotNetNuke.Web/UI/WebControls/DnnPageDropDownList.cs @@ -37,10 +37,24 @@ protected override void OnPreRender(EventArgs e) if (InternalPortalId.HasValue) { Services.Parameters.Add("PortalId", InternalPortalId.Value.ToString(CultureInfo.InvariantCulture)); - } + } + + Services.Parameters.Add("includeDisabled", IncludeDisabledTabs.ToString().ToLowerInvariant()); + Services.Parameters.Add("includeAllTypes", IncludeAllTabTypes.ToString().ToLowerInvariant()); + base.OnPreRender(e); } + /// + /// Whether include pages which are disabled. + /// + public bool IncludeDisabledTabs { get; set; } + + /// + /// Whether include pages which tab type is not normal. + /// + public bool IncludeAllTabTypes { get; set; } + public int PortalId { get diff --git a/DNN Platform/Library/Common/Globals.cs b/DNN Platform/Library/Common/Globals.cs index e0e0a99c7ef..fa3ddfde028 100644 --- a/DNN Platform/Library/Common/Globals.cs +++ b/DNN Platform/Library/Common/Globals.cs @@ -2769,31 +2769,19 @@ public static TabType GetURLType(string URL) { return TabType.Normal; } - else + if (URL.ToLower().StartsWith("mailto:") == false && URL.IndexOf("://") == -1 && URL.StartsWith("~") == false && URL.StartsWith("\\\\") == false && URL.StartsWith("/") == false) { - if (URL.ToLower().StartsWith("mailto:") == false && URL.IndexOf("://") == -1 && URL.StartsWith("~") == false && URL.StartsWith("\\\\") == false && URL.StartsWith("/") == false) + if (Regex.IsMatch(URL, @"^\d+$")) { - if (Regex.IsMatch(URL, @"^\d+$")) - { - return TabType.Tab; - } - else - { - if (URL.ToLower().StartsWith("userid=")) - { - return TabType.Member; - } - else - { - return TabType.File; - } - } + return TabType.Tab; } - else + if (URL.ToLower().StartsWith("userid=")) { - return TabType.Url; + return TabType.Member; } + return TabType.File; } + return TabType.Url; } /// diff --git a/DNN Platform/Library/Common/Utilities/HtmlUtils.cs b/DNN Platform/Library/Common/Utilities/HtmlUtils.cs index b9b00ff2b23..2a20c1130a6 100644 --- a/DNN Platform/Library/Common/Utilities/HtmlUtils.cs +++ b/DNN Platform/Library/Common/Utilities/HtmlUtils.cs @@ -761,7 +761,7 @@ public static string AbsoluteToRelativeUrls(string html, IEnumerable ali searchAlias = string.Format("{0}/", portalAlias); } string protocol = PortalSettings.Current.SSLEnabled ? "https://" : "http://"; - Regex exp = new Regex(string.Format("(href="){0}{1}(.*?")", protocol, searchAlias)); + Regex exp = new Regex(string.Format("(href="){0}{1}(.*?")", protocol, searchAlias), RegexOptions.IgnoreCase); if(portalAlias.Contains("/")) { diff --git a/DNN Platform/Library/Common/Utilities/UrlController.cs b/DNN Platform/Library/Common/Utilities/UrlController.cs index bf51a9572f0..760d5b0fa0e 100644 --- a/DNN Platform/Library/Common/Utilities/UrlController.cs +++ b/DNN Platform/Library/Common/Utilities/UrlController.cs @@ -65,7 +65,7 @@ public void UpdateUrl(int PortalID, string Url, string UrlType, int Clicks, Date { if (GetUrl(PortalID, Url) == null) { - DataProvider.Instance().AddUrl(PortalID, Url); + DataProvider.Instance().AddUrl(PortalID, Url.Replace(@"\", @"/")); } } UrlTrackingInfo objURLTracking = GetUrlTracking(PortalID, Url, ModuleID); diff --git a/DNN Platform/Library/Entities/Portals/PortalSettings.cs b/DNN Platform/Library/Entities/Portals/PortalSettings.cs index 5a828a10ea7..a998162cadc 100644 --- a/DNN Platform/Library/Entities/Portals/PortalSettings.cs +++ b/DNN Platform/Library/Entities/Portals/PortalSettings.cs @@ -351,9 +351,9 @@ public string DefaultPortalAlias foreach (var alias in TestablePortalAliasController.Instance.GetPortalAliasesByPortalId(PortalId).Where(alias => alias.IsPrimary)) { return alias.HTTPAlias; - } + } return String.Empty; - } + } } public string DefaultPortalContainer diff --git a/DNN Platform/Library/Entities/Tabs/TabController.cs b/DNN Platform/Library/Entities/Tabs/TabController.cs index 603ac6af87a..81ad641a8ca 100644 --- a/DNN Platform/Library/Entities/Tabs/TabController.cs +++ b/DNN Platform/Library/Entities/Tabs/TabController.cs @@ -168,7 +168,7 @@ private void CreateTabRedirect(TabInfo tab) var settings = PortalController.GetCurrentPortalSettings(); - if (settings != null && tab.TabUrls.Count(u => u.HttpStatus == "200") == 0) + if (settings != null && tab.TabID != settings.HomeTabId && tab.TabUrls.Count(u => u.HttpStatus == "200") == 0) { var domainRoot = Globals.AddHTTP(settings.PortalAlias.HTTPAlias); diff --git a/DNN Platform/Library/Entities/Urls/FriendlyUrlController.cs b/DNN Platform/Library/Entities/Urls/FriendlyUrlController.cs index 4a86eddb901..45cd61c322a 100644 --- a/DNN Platform/Library/Entities/Urls/FriendlyUrlController.cs +++ b/DNN Platform/Library/Entities/Urls/FriendlyUrlController.cs @@ -1137,6 +1137,12 @@ public static string CleanNameForUrl(string urlName, FriendlyUrlOptions options, replacedUnwantedChars = true; } ch = replaceWith; //in list of replacment chars + + //If we still have a space ensure its encoded + if (ch == " ") + { + ch = options.SpaceEncoding; + } } } } diff --git a/DNN Platform/Library/Services/FileSystem/FileServerHandler.cs b/DNN Platform/Library/Services/FileSystem/FileServerHandler.cs index 1b9f1590842..61710d35724 100644 --- a/DNN Platform/Library/Services/FileSystem/FileServerHandler.cs +++ b/DNN Platform/Library/Services/FileSystem/FileServerHandler.cs @@ -121,6 +121,8 @@ public void ProcessRequest(HttpContext context) } if (!String.IsNullOrEmpty(URL)) { + URL = URL.Replace(@"\", @"/"); + //update clicks, this must be done first, because the url tracker works with unmodified urls, like tabid, fileid etc var objUrls = new UrlController(); objUrls.UpdateUrlTracking(_portalSettings.PortalId, URL, ModuleId, -1); diff --git a/DNN Platform/Library/Services/Search/Internals/InternalSearchControllerImpl.cs b/DNN Platform/Library/Services/Search/Internals/InternalSearchControllerImpl.cs index bc0b2bf0772..da7c14d7a3f 100644 --- a/DNN Platform/Library/Services/Search/Internals/InternalSearchControllerImpl.cs +++ b/DNN Platform/Library/Services/Search/Internals/InternalSearchControllerImpl.cs @@ -203,7 +203,6 @@ private void AddSearchDocumentInternal(SearchDocument searchDocument, bool autoC { Requires.NotNull("SearchDocument", searchDocument); Requires.NotNullOrEmpty("UniqueKey", searchDocument.UniqueKey); - Requires.NotNullOrEmpty("Title", searchDocument.Title); Requires.NotNegative("SearchTypeId", searchDocument.SearchTypeId); Requires.PropertyNotEqualTo("searchDocument", "SearchTypeId", searchDocument.SearchTypeId, 0); Requires.PropertyNotEqualTo("searchDocument", "ModifiedTimeUtc", searchDocument.ModifiedTimeUtc.ToString(CultureInfo.InvariantCulture), DateTime.MinValue.ToString(CultureInfo.InvariantCulture)); diff --git a/DNN Platform/Library/Services/Sitemap/CoreSitemapProvider.cs b/DNN Platform/Library/Services/Sitemap/CoreSitemapProvider.cs index 8d0f30f6b23..aebc26b05e6 100644 --- a/DNN Platform/Library/Services/Sitemap/CoreSitemapProvider.cs +++ b/DNN Platform/Library/Services/Sitemap/CoreSitemapProvider.cs @@ -96,7 +96,11 @@ private SitemapUrl GetPageUrl(TabInfo objTab, string language) var pageUrl = new SitemapUrl(); pageUrl.Url = Globals.NavigateURL(objTab.TabID, objTab.IsSuperTab, ps, "", language); - if (pageUrl.Url.ToLower().IndexOf(ps.PortalAlias.HTTPAlias.ToLower()) == -1) + string portalAlias = !String.IsNullOrEmpty(ps.DefaultPortalAlias) + ? ps.DefaultPortalAlias + : ps.PortalAlias.HTTPAlias; + + if (pageUrl.Url.ToLower().IndexOf(portalAlias.ToLower(), StringComparison.Ordinal) == -1) { // code to fix a bug in dnn5.1.2 for navigateurl if ((HttpContext.Current != null)) @@ -106,9 +110,10 @@ private SitemapUrl GetPageUrl(TabInfo objTab, string language) else { // try to use the portalalias - pageUrl.Url = Globals.AddHTTP(ps.PortalAlias.HTTPAlias.ToLower()) + pageUrl.Url; + pageUrl.Url = Globals.AddHTTP(portalAlias.ToLower()) + pageUrl.Url; } } + pageUrl.Priority = GetPriority(objTab); pageUrl.LastModified = objTab.LastModifiedOnDate; var modCtrl = new ModuleController(); diff --git a/DNN Platform/Modules/Groups/GroupListControl.cs b/DNN Platform/Modules/Groups/GroupListControl.cs index 0366a10a16d..69d75f66529 100644 --- a/DNN Platform/Modules/Groups/GroupListControl.cs +++ b/DNN Platform/Modules/Groups/GroupListControl.cs @@ -125,7 +125,7 @@ protected override void Render(HtmlTextWriter output) if (DisplayCurrentUserGroups) whereCls.Add(grp => currentUser.IsInRole(grp.RoleName)); else - whereCls.Add(grp => grp.IsPublic || currentUser.IsInRole(grp.RoleName)); + whereCls.Add(grp => grp.IsPublic || currentUser.IsInRole(grp.RoleName) || currentUser.IsInRole(PortalSettings.AdministratorRoleName)); if (!string.IsNullOrEmpty(SearchFilter)) { diff --git a/DNN Platform/Modules/MemberDirectory/Scripts/MemberDirectory.js b/DNN Platform/Modules/MemberDirectory/Scripts/MemberDirectory.js index a5da4595043..52f98da584b 100644 --- a/DNN Platform/Modules/MemberDirectory/Scripts/MemberDirectory.js +++ b/DNN Platform/Modules/MemberDirectory/Scripts/MemberDirectory.js @@ -99,7 +99,7 @@ var url = ""; var userId = self.UserId(); if (userId != undefined) { - url = profileUrl.replace(profileUrlUserToken, self.UserId().toString()); + url = profileUrl.replace(new RegExp(profileUrlUserToken, "gi"), self.UserId().toString()); } return url; }, this); diff --git a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Components/EditorProvider.cs b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Components/EditorProvider.cs index 38b77faea2a..9f9921dbb7d 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Components/EditorProvider.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Components/EditorProvider.cs @@ -1026,6 +1026,7 @@ protected void Panel_PreRender(object sender, EventArgs e) ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "editorModuleId", moduleid.ToString(), true); ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "editorTabId", tabId.ToString(), true); ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "editorPortalId", portalId.ToString(), true); + ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "sslEnabled", PortalSettings.SSLEnabled.ToString().ToLowerInvariant(), true); ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "editorHomeDirectory", PortalSettings.HomeDirectory, true); ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "editorPortalGuid", PortalSettings.GUID.ToString(), true); ClientAPI.RegisterClientVariable(HtmlEditorControl.Page, "editorEnableUrlLanguage", PortalSettings.EnableUrlLanguage.ToString(), true); diff --git a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Dialogs/LinkManager.ascx b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Dialogs/LinkManager.ascx index d2d0bffc486..3df2d119b5f 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Dialogs/LinkManager.ascx +++ b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/Dialogs/LinkManager.ascx @@ -1,7 +1,5 @@ <%@ Control Language="C#" %> <%@ Register Assembly="Telerik.Web.UI" Namespace="Telerik.Web.UI.Editor" TagPrefix="tools" %> -<%@ Register Assembly="Telerik.Web.UI" Namespace="Telerik.Web.UI.Widgets" TagPrefix="widgets" %> -<%@ Register Assembly="Telerik.Web.UI" Namespace="Telerik.Web.UI.Dialogs" TagPrefix="dialogs" %> <%@ Register Assembly="Telerik.Web.UI" Namespace="Telerik.Web.UI" TagPrefix="telerik" %> <%@ Register Assembly="DotNetNuke.RadEditorProvider" Namespace="DotNetNuke.Providers.RadEditorProvider" TagPrefix="provider" %> @@ -36,8 +34,7 @@ return regexp.test(s); } - - function _PageOnSite_Change(obj) { + function _PageOnSite_Change(obj) { if (obj) { var linkTextTextBox = $get("LinkText"); var linkUrlTextBox = $get("LinkURL"); @@ -56,15 +53,13 @@ } } - - function GetLinkClickURL(linkUrl) { // Data is provided in the DialogParams format var linkClickURL = linkUrl; - var trackClicksCheckbox = $get("TrackLink") - var trackUserCheckbox = $get("TrackUser") + var trackClicksCheckbox = $get("TrackLink"); + var trackUserCheckbox = $get("TrackUser"); - if (linkClickURL != "http:///" && linkClickURL != "http://") { + if (linkClickURL != "http:///" && linkClickURL != "https://") { $.ajax({ type: 'POST', @@ -193,7 +188,7 @@ return; } - var href = "http://"; //"link" + var href = (_sslEnabled == "true") ? "https://" : "http://"; //"link" if (currentLink.href) { href = GetLinkClickURL(currentHref); @@ -610,6 +605,7 @@ var _homeDirectory = parent.dnn.getVar('editorHomeDirectory'); var _portalGuid = parent.dnn.getVar('editorPortalGuid'); var _enableUrlLanguage = parent.dnn.getVar('editorEnableUrlLanguage'); + var _sslEnabled = parent.dnn.getVar('sslEnabled'); @@ -923,7 +919,7 @@ - diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Advanced Module Settings.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Advanced Module Settings.html index df9d6a3037d..f46ae90ba57 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Advanced Module Settings.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Advanced Module Settings.html @@ -1,5 +1,5 @@  - + @@ -8,37 +8,37 @@

Configuring Advanced Module Settings

This section allows you to display a module on multiple pages including the Admin pages, or to only on newly added pages. Module content is shared therefore changes made on one instance of the module are reflected on all instances of the module. If you choose to only display the module on new pages, this doesn't affect the pages where it is already located. Once a module is set to display on all/new pages, if you make changes to any module settings located on the Module Settings tab, then these changes will be reflected on all copies of the module. However, changes to module settings located on the Page Settings tab are unique to the module that you have changed.

  1. - +
  2. Select the Module Settings tab.
  3. Expand the Advanced Settings section.
  4. At Display Module On All Pages?, select from these options: -
    • to add this module to all pages. Note: Once this setting is updated you can delete a single instance of a module from any page and all other instances on other pages will remain and be unaffected. Enabling this setting, reveals two additional fields that allow you to customize this setting. -
      1. At Only Display Search Results Once, to display a single search results for all instances of this module - OR - to display the search results for each instance of this module. For example, if there are five instances of the module on the site and this field is unchecked, whenever a search is made, there will be five search results for the same content with each result going to a different module.
      2. At Add To New Pages Only?, to add this module to each new pages that is added to the site - OR - to add the module to both existing and new pages. This is the default setting.
    • to display this module on this page only. This will remove all other instances of this module apart from the one you are currently working on. It doesn't matter which module you choose to enable or disable this feature using.
    5. +
    • Mark  the check box to add this module to all pages. Note: Once this setting is updated you can delete a single instance of a module from any page and all other instances on other pages will remain and be unaffected. Enabling this setting, reveals two additional fields that allow you to customize this setting. +
      1. At Only Display Search Results Once, to display a single search results for all instances of this module - OR - to display the search results for each instance of this module. For example, if there are five instances of the module on the site and this field is unchecked, whenever a search is made, there will be five search results for the same content with each result going to a different module.
      2. At Add To New Pages Only?, to add this module to each new pages that is added to the site - OR - to add the module to both existing and new pages. This is the default setting.
    • Unmark  the check box to display this module on this page only. This will remove all other instances of this module apart from the one you are currently working on. It doesn't matter which module you choose to enable or disable this feature using.

    -
  1. At Is Shareable? select from these options to configure this settings:
    • to allow this module to be shared. This allows the module to be displayed in the "Add Existing Module" list on the Control Panel. For Evoq Content and Evoq Content Enterprise, this also allows modules that support module sharing to be shared with other sites that belong to the same Site Group. Module Sharing between sites is available for modules that have been developed to support this feature. SuperUsers should set a module as supporting module share via the Host > Extension page to remove the warning message that is displayed in the default configuration. See "Editing Module Extension Settings"
      1. At View Only?, if this module can only be edited via this site - OR - if this module can be edited from other sites that it is shared with.
    • if this module to disable module sharing for this module..
    2. +
  2. At Is Shareable? select from these options to configure this settings:
    • Mark  the check box to allow this module to be shared. This allows the module to be displayed in the "Add Existing Module" list on the Control Panel. For Evoq Content and Evoq Content Enterprise, this also allows modules that support module sharing to be shared with other sites that belong to the same Site Group. Module Sharing between sites is available for modules that have been developed to support this feature. SuperUsers should set a module as supporting module share via the Host > Extension page to remove the warning message that is displayed in the default configuration. See "Editing Module Extension Settings"
      1. At View Only?, if this module can only be edited via this site - OR - if this module can be edited from other sites that it is shared with.
    • Unmark  the check box if this module to disable module sharing for this module..

  1.  At Hide Admin Border, select from these options to set the visibility of the "Visible By Administrators Only" message. The message is displayed to Administrators and SuperUsers on modules which are only visible to Administrators. This message appears on the page where the module is located as well as on the Module Settings page for that module. This message is also displayed by default for any modules which are added to the Admin pages. -
    • to hide the message. This will hide the message even if the module is only visible by administrators.
    • to display the message. This displays the message even if the module is only visible to members in the Administrator role (which by default includes all hosts).
    2. +
    • Mark  the check box to hide the message. This will hide the message even if the module is only visible by administrators.
    • Unmark  the check box to display the message. This displays the message even if the module is only visible to members in the Administrator role (which by default includes all hosts).
  2. In the Header text box, add, edit or delete the header that is displayed above the module content. Plain text and basic HTML such as headings, italic and bold can be used.
  3. In the Footer text box, add, edit or delete the footer that is displayed below the module content.
    4. -
  4. At Start Date, click the Calendar button and select the first day that the module will be visible on the site. This displays the date you selected along with the default time of 12:00:00 AM. To modify this default time, click the Time button and select a different time. Modules with a start date are only visible to Page Editors and Administrators prior to that date, enabling them to create content in advance. A "Module Effective - [start date]" message is displayed to these users prior to the start date.
    5. -
  5. At End Date, click the Calendar button and then select the last day that the module will be visible on the site. This displays the date you selected along with the default time of 12:00:00 AM. To modify this default time, click the Time button and select a different time. When the end date and time is reached, the module is only visible to Page Editors and Administrators, enabling them to retain, edit and republish the content as desired. A "Module Expired [end date]" message is displayed to these users once the module has expired.
    6. +
  6. At Start Date, click the Calendar button and select the first day that the module will be visible on the site. This displays the date you selected along with the default time of 12:00:00 AM. To modify this default time, click the Time button and select a different time. Modules with a start date are only visible to Page Editors and Administrators prior to that date, enabling them to create content in advance. A "Module Effective - [start date]" message is displayed to these users prior to the start date.
    7. +
  7. At End Date, click the Calendar button and then select the last day that the module will be visible on the site. This displays the date you selected along with the default time of 12:00:00 AM. To modify this default time, click the Time button and select a different time. When the end date and time is reached, the module is only visible to Page Editors and Administrators, enabling them to retain, edit and republish the content as desired. A "Module Expired [end date]" message is displayed to these users once the module has expired.

  1. - + Click the OK button to confirm.

Below are some examples of modules with some of these Advanced Module Settings applied.

diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Basic Module Settings.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Basic Module Settings.html index 1c41eb979c3..10e64d01602 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Basic Module Settings.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Configuring Basic Module Settings.html @@ -1,7 +1,6 @@  - + -

Configuring Basic Module Settings

@@ -9,21 +8,21 @@

Configuring Basic Module Settings

Important. In order to view the Module Title, the "Display Container?" field must be checked and the container applied to the module must include the [TITLE] skin token.

  1. - +
  2. Select the Module Settings tab.
  3. Expand the Basic Settings section.
  4. At Module Culture, the culture associated with this module is displayed.
  5. At Module, view the name of the module. This field cannot be edited. E.g. Announcements, HTML, etc.
  6. In the Module Title text box, edit the module title.
    7. -
  7. At Tags, click on the drop down list and then beside each tag you want to associate with this module. Click off the drop down list to save your selections. Tagging is a way of categorizing content for more meaningful search results. Tags can be created by users (See "Tagging Page Content") or editors (See "Creating a Vocabulary").
    8. +
  8. At Tags, click on the drop down list and then beside each tag you want to associate with this module. Click off the drop down list to save your selections. Tagging is a way of categorizing content for more meaningful search results. Tags can be created by users (See "Tagging Page Content") or editors (See "Creating a Vocabulary").

  1. - + Click the OK button to confirm.
diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Viewing Added To Pages Module Settings.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Viewing Added To Pages Module Settings.html index 9161c9988c4..2412b5581f5 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Viewing Added To Pages Module Settings.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Module Settings/Viewing Added To Pages Module Settings.html @@ -1,14 +1,13 @@  - + -

Viewing Added To Pages Module Settings

How to view a list of the pages where a module is located. This setting includes a link to view the module on any of the listed pages.

  1. - +
  2. Select the Module Settings tab.
  3. Expand the Added To Pages section. This displays a hierarchical list of all pages (apart from the current page) where this module is located.
    4. @@ -19,7 +18,7 @@

    Viewing Added To Pages Module Settings


    The Added To Pages List

    - + Related Topics:

    • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Advanced Page Settings for a Module.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Advanced Page Settings for a Module.html index d8bc458e0e8..454ae232df4 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Advanced Page Settings for a Module.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Advanced Page Settings for a Module.html @@ -1,19 +1,18 @@  - + -

      Configuring Advanced Page Settings for a Module

      How to set the Advanced Page Settings on this module as the default settings for all new modules. You can optionally set these settings for all existing modules.

      1. - +
      2. Select the Page Settings tab.
      3. Expand the Advanced Settings section.
        4. -
      4. At Set As Default Settings?, to use these page settings for all new modules.
        5. -
      5. Optional. At Apply To All Modules?, to apply these page settings to all existing modules.
        6. +
      6. At Set As Default Settings?, to use these page settings for all new modules.
        7. +
      7. Optional. At Apply To All Modules?, to apply these page settings to all existing modules.
      8. At Move To Page, select the page name where the module will be moved to from the drop down list.

      @@ -21,11 +20,11 @@

      Configuring Advanced Page Settings for a Module

      1. - + Click the OK button to confirm.

      - + Related Topics:

      • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Basic Page Settings for Modules.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Basic Page Settings for Modules.html index b7038b01c48..58fff5f6ebe 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Basic Page Settings for Modules.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Basic Page Settings for Modules.html @@ -1,5 +1,5 @@  - + @@ -11,11 +11,11 @@

        Configuring Basic Page Settings for Modules

        1. - +
        2. Select the Page Settings tab.
        3. Expand the Basic Settings section.
          4. -
        4. At Display Container?, to display the module container - OR - to hide the module container.
          5. +
        5. At Display Container?, to display the module container - OR - to hide the module container.
        6. At Icon, choose whether to display an icon in the module container. The icon can be any common image type such as a JPEG, or GIF. The icon is typically displayed to the left of the module title.
          1. At Link Type, select from the following:
            • None: Select for no icon.
            • File ( A File On Your Site): Select to choose an image from the Digital Asset Management module (located on the Admin > File Management page) or upload a file. See "Uploading and Linking to a File"
              1. At File Location, select the folder where the file is located.
              2. At File Name, select the file from the drop down list. See "Setting a File Link". Note: You can remove the icon later by selecting <None Specified>.
            • System Image: Select to choose from the system icon library. @@ -28,11 +28,11 @@

              Configuring Basic Page Settings for Modules

            • At Collapse/Expand, select from the following options to set the visibility of module content.
              • Maximized: Select to display the module content on the page. The Minimize button is displayed enabling users to minimize the content.
              • Minimized: Select to hide the module content. The module title, header and footer are still visible. The Maximize button is displayed enabling users to maximize the content.
              • None: Select to display module content and remove the Maximize / Minimize button.
              • -
            • At Display Container?, to display the module container - OR - to hide the module container including the icon, module title, Minimize/Maximize button, Print button or Syndicate button.
              • +
            • At Display Container?, to display the module container - OR - to hide the module container including the icon, module title, Minimize/Maximize button, Print button or Syndicate button.
            • At Allow Print?, select from the following options to set the visibility of the Print button which enables users to print the module content. The Print icon displays in the menu and on the module container. -
              • to display the Print button and allow printing.
              • to disable.
              • +
              • Mark  the check box to display the Print button and allow printing.
              • Unmark  the check box to disable.
            • At Allow Syndicate?, select from the following options to enable or disable the Syndicate RSS button. Syndication enables users to create an XML syndication of module content. -
              • to allow syndication and display the Syndicate RSS button.
              • to disable syndication.
              • +
              • Mark  the check box to allow syndication and display the Syndicate RSS button.
              • Unmark  the check box to disable syndication.

          @@ -40,8 +40,7 @@

          Configuring Basic Page Settings for Modules

          1. At Is a WebSlice?, optionally set this module as a Webslice.
              2. -
            • - to enable WebSlice and set any of these optional settings:
              1. Optional. In the Web Slice Title text box, enter a title for the Web Slice - OR - Leave blank to use the module title. +
              2. Mark  the check box to enable WebSlice and set any of these optional settings:
                1. Optional. In the Web Slice Title text box, enter a title for the Web Slice - OR - Leave blank to use the module title.
                2. Optional. At Web Slice Expires: Enter a date when the Web Slice will expire - OR - Leave blank to use the End date . See "Working with the Calendar"
                3. Optional. In the Web Slice TTL text box, enter the Time to Live (TTL) for this web slice in minutes - OR - Leave blank to use the default to the cache time (converted as minutes).
            @@ -51,13 +50,12 @@

            Configuring Basic Page Settings for Modules

                -
              • - to disable WebSlice.
                • +
              • Unmark  the check box to disable WebSlice.
            1. At Module Container, select the name of the module container you want to use on this module from the drop down list. -
              1. Optional. Click the Preview link to view the module with this container applied in a new browser window.
              2. +
              1. Optional. Click the Preview button to view the module with this container applied in a new browser window.
            2. - + Click the OK button to confirm.

            Tip: System icons associated with the Icon field are stored in the Images folder of your DNN Installation.

            diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Cache Settings for a Module.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Cache Settings for a Module.html index 6500e00f2a0..a9691ef3282 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Cache Settings for a Module.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Page Settings/Configuring Cache Settings for a Module.html @@ -1,14 +1,13 @@  - + -

            Configuring Cache Settings for a Module

            How to set the provider used for cached files and set the period before the cache in DNN refreshes.

            1. - +
            2. Select the Page Settings tab.
            3. Go to the Cache Settings section.
              4. @@ -20,7 +19,7 @@

              Configuring Cache Settings for a Module

                -
                2. +
              2. Click the OK button to confirm.
              \ No newline at end of file diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Permissions/Setting Module Permissions.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Permissions/Setting Module Permissions.html index a319cd02edb..46b09fb0f6f 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Permissions/Setting Module Permissions.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Settings/Permissions/Setting Module Permissions.html @@ -1,5 +1,5 @@  - + @@ -7,9 +7,7 @@

              Setting Module Permissions

              How to set permissions to view and edit a module. Permission can be granted or denied for a role or for an individual user. Additional permission options are available on some modules such as the Events and Feedback modules.

              1. -

                - -

                +
              2. Select the Permissions tab.
              3. Optional. In the Username text box, enter the username of the user that you want to grant or deny module permissions to and then click the Add link. Repeat this step to add additional usernames.
                4. @@ -17,7 +15,7 @@

                Setting Module Permissions

              4. [Role Name]: Select the name of a Role Group to view the roles within that group.
    • Optional. At Inherit View permissions from Page, select from these options: -
      • if the users who are authorized to view the page this module is located on are always authorized to view this module. This displays the Security RolesSecurity Locked image in the View Module column indicating that the view security is 'locked'. Skip to step 7.
      • to set different permissions for viewing this module than set for the page it is located on. If you choose to uncheck this option, the check boxes at View Module will become available.
      • +
      • Mark  the check box if the users who are authorized to view the page this module is located on are always authorized to view this module. This displays the Security RolesSecurity Locked image in the View Module column indicating that the view security is 'locked'. Skip to step 7.
      • Unmark  the check box  to set different permissions for viewing this module than set for the page it is located on. If you choose to uncheck this option, the check boxes at View Module will become available.
    • In the View Module column, click on the check box beside a role/username repeatedly until the correct permission is displayed. The following options are available:
      • Not Specified: Permissions are not specified. Users cannot view the module unless they belong to another role/username that has been granted permission.
      • Permission Granted: Users can view the module.
      • Permission Denied Permission Denied: Users cannot view the module.
      • @@ -32,13 +30,13 @@

      Setting Module Permissions

      Permission Denied Permission Denied: Users cannot edit content. If these users have been granted permission to edit the content under another role/username, this setting will override those permissions and prevent them editing this module.
  4. - + Click the OK button to confirm.

Tip: When setting Permissions, you can change the selection at Filter By Group and set permissions for any of the related roles before updating.

For Example: In the below screen capture, permissions to view the module are inherited from the page, permission to edit the module has been granted to the Marketing and Translator roles, however the user Bree Brueton (username Brueton) is denied access to edit the module.

- + Related Topics:

  • diff --git a/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page.html b/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page.html index db60a88e8c1..1987a0a2eb2 100644 --- a/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page.html +++ b/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page.html @@ -22,7 +22,7 @@

    Adding a New Page

  • Click the Add Page button.

    • - + Related Topics:

    • diff --git a/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page2.htm b/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page2.htm index d5dae91251f..b29a7856a12 100644 --- a/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page2.htm +++ b/Documentation/Building Your Site/Adding and Managing Pages/Adding a New Page2.htm @@ -1,5 +1,5 @@  - + @@ -14,7 +14,7 @@

      Quick Add a New Page (RibbonBar)

    • Optional. At Template, select a page template. Page templates add one or more modules with optional content to the page - OR - Select No template. The Default template included with DNN adds an HTML module without any content into the Content Pane.
    • Optional. At Insert, select from these options:
      • Skip this step to add the page after (to the right of) the page you are currently on.
      • Select to add the page either Before (to the left of) or After (to the right of) the page name selected in the second drop down list.
      • Select to add the page as a Child Of the page name selected in the second drop down list.
      • -
    • Optional. At Include In Menu, to include this page in the menu - OR - to hide the page in the menu. Note: You can provide users another way to navigate to the page by adding a link to that page using the HTML or Links module. Administrators can navigate to the page using the Pages module.
      • +
    • Optional. At Include In Menu, to include this page in the menu - OR - to hide the page in the menu. Note: You can provide users another way to navigate to the page by adding a link to that page using the HTML or Links module. Administrators can navigate to the page using the Pages module.
    • Click the Add Page button.

      • @@ -22,7 +22,7 @@

      Quick Add a New Page (RibbonBar)


      Adding a New Page using the RibbonBar

      - +

        diff --git a/Documentation/Building Your Site/Adding and Managing Pages/Deleting a Page.html b/Documentation/Building Your Site/Adding and Managing Pages/Deleting a Page.html index f9a5765b6c5..a99d0371150 100644 --- a/Documentation/Building Your Site/Adding and Managing Pages/Deleting a Page.html +++ b/Documentation/Building Your Site/Adding and Managing Pages/Deleting a Page.html @@ -18,7 +18,7 @@

        Deleting a Page

        Tip: You can also delete a page via Page Settings.

        - + Related Topics:

        • diff --git a/Documentation/Building Your Site/Adding and Managing Pages/Moving Page Location.html b/Documentation/Building Your Site/Adding and Managing Pages/Moving Page Location.html index bbf8044a026..8d4dda37527 100644 --- a/Documentation/Building Your Site/Adding and Managing Pages/Moving Page Location.html +++ b/Documentation/Building Your Site/Adding and Managing Pages/Moving Page Location.html @@ -11,7 +11,7 @@

          Moving Page Location (Iconbar)

        • Go to the Basic Settings - Page Details section.
        • At Parent Page, select a new parent page, or select < None Specified > to change this page to a parent page.
        • - + Click the OK button to confirm.
          • diff --git a/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for Existing Pages.html b/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for Existing Pages.html index 70ec7763b4c..a612ce4a591 100644 --- a/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for Existing Pages.html +++ b/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for Existing Pages.html @@ -1,7 +1,6 @@  - + -

          Localization Settings for Existing Pages

          diff --git a/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for New Pages.html b/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for New Pages.html index facba5cf111..66d417ee364 100644 --- a/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for New Pages.html +++ b/Documentation/Building Your Site/Adding and Managing Pages/Page Settings/Localization Settings for New Pages.html @@ -1,7 +1,6 @@  - + -

          Localization Settings for New Pages

          diff --git a/Documentation/Building Your Site/Installed Modules/Account Login/About the Account Login Module.html b/Documentation/Building Your Site/Installed Modules/Account Login/About the Account Login Module.html index 6e7108ab368..835f5c9c6d0 100644 --- a/Documentation/Building Your Site/Installed Modules/Account Login/About the Account Login Module.html +++ b/Documentation/Building Your Site/Installed Modules/Account Login/About the Account Login Module.html @@ -1,19 +1,19 @@  - + -

          About the Account Login Module

          -

          The Account Login module enables registered users to log in to a site using their login credentials. If registration is enabled on the site a Register link enables visitors to join as registered user of the site. The module can be enabled to help with forgotten passwords. The Account Login module is pre-installed on the site can be deployed to any page and is automatically displayed on the default User Log In page.

          +

          About Account Login

          +

          Account Login enables registered users to log in to a site using their login credentials. If registration is enabled on the site a Register link enables visitors to join as registered user of the site. Account Login can be enabled to help with forgotten passwords. Account Login can be deployed to any page and is automatically displayed on the default User Log In page.

          Important. For information on logging in and logging out using the Account Login module, See "Logging into a Site" and other tutorials in this section.

          -
          The Account Login module enabling login +
          Account Login

          Skin Token: The [LOGIN] skin token displays the Login link that opens the User Log In page. The login link is located in the top right corner of the default DNN skin.

          -
          The Login skin token +
          The Login link displayed on site page

          diff --git a/Documentation/Building Your Site/Installed Modules/Add New User/About the Add New User Module.html b/Documentation/Building Your Site/Installed Modules/Add New User/About the Add New User Module.html index 4c9c4b9f57c..19cd54e7583 100644 --- a/Documentation/Building Your Site/Installed Modules/Add New User/About the Add New User Module.html +++ b/Documentation/Building Your Site/Installed Modules/Add New User/About the Add New User Module.html @@ -1,14 +1,14 @@  - + -

          About the Add New User Module

          -

          The Add New User module enables authorized users to create new user accounts. Once the user account is created, it can be managed using the User Accounts module. See "About the User Accounts Module"

          -

          Note: The Add New User module forms part of the Users & Roles module package. This means that you must select the module titled "Users & Roles" to add this module to a page.

          +

          About Add New User

          +

          Add New User enables authorized users to create new user accounts. Once the user account is created, it can be managed using the User Accounts module. See "About User Accounts"

          +

          Note: Add New User forms part of the Users & Roles module package. This means that you must select the module titled "Users & Roles" to add this module to a page.

          Add New User module -
          The Add New User Module +
          Add New User

          \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Banners/About the Banners Module.html b/Documentation/Building Your Site/Installed Modules/Banners/About the Banners Module.html index 6a9978a6120..c0e9fd5a7b2 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/About the Banners Module.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/About the Banners Module.html @@ -1,11 +1,10 @@  - + -

          About the Banners Module

          -

          The Banners module displays vendor banner advertising. Banners can be plain text, HTML, a static image, an animated image or they can execute a script such as JavaScript. You can set the number of banners to be displayed and modify the layout. If there are more banners available than is set to display in the module one time, then different banners are displayed each time the page is visited or refreshed.

          -

          Installation Note: This module is installed during a typical DNN installation.

          +

          About Banners

          +

          Banners displays vendor banner advertising. Banners can be plain text, HTML, a static image, an animated image or they can execute a script such as JavaScript. The number and layout of banners can be modified and if there are more banners available than the number you have chosen to display, then different banners will be displayed each time the page is visited or refreshed.

          @@ -14,7 +13,7 @@

          About the Banners Module

          • - See "About the Admin Vendors Module" + See "About Admin Vendors"
          • See "About the Host Vendors Module" diff --git a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Horizontally.html b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Horizontally.html index 02f7b559656..877d46a0dc8 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Horizontally.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Horizontally.html @@ -10,7 +10,7 @@

            Displaying Banners Horizontally

          • At Orientation, select Horizontal.
          • Optional. In the Column Width text box, enter a number to set the width of each column cell. If this setting is left empty the banners may not align evenly across the module. E.g. Width is set at 300 pixels in the below image.
          • - + Click the OK button to confirm.

            • diff --git a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Vertically.html b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Vertically.html index 9eddeab8de3..39addad21b6 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Vertically.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying Banners Vertically.html @@ -9,7 +9,7 @@

            Displaying Banners Vertically

            1. Select Add Banner Options from the module actions menu.
            2. At Orientation, select Vertical.
              3. -
              4. +
            4. Click the OK button to confirm.

            diff --git a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying a Banner.html b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying a Banner.html index 4c78d376bca..edb7f0cf289 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying a Banner.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Displaying a Banner.html @@ -21,7 +21,7 @@

            Displaying a Banner

              -
              2. +
            2. Click the OK button to confirm.
            \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Editing Banner Options.html b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Editing Banner Options.html index 3a4b12e7c04..b0d58cbbca0 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Editing Banner Options.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Editing Banner Options.html @@ -9,7 +9,7 @@

            Editing Banner Options

            1. Select Add Banner Options from the module actions menu.
            2. Edit the options as required.
              3. -
              4. +
            4. Click the OK button to confirm.
            \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting Banner Spacing.html b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting Banner Spacing.html index 12fba97506c..05a40325c6a 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting Banner Spacing.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting Banner Spacing.html @@ -17,7 +17,7 @@

            Setting Banner Spacing

            1. - + Click the OK button to confirm.

            diff --git a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting the Banner Border.html b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting the Banner Border.html index 6efeeeed863..ffc2b82450a 100644 --- a/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting the Banner Border.html +++ b/Documentation/Building Your Site/Installed Modules/Banners/Module Editors/Setting the Banner Border.html @@ -15,7 +15,7 @@

            Setting the Banner Border

            1. - + Click the OK button to confirm.

            Tip: You may like to for the Display Container? field on the Module Settings for this module to hide the module container.

            diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Administrators/Deleting a Content Version.html b/Documentation/Building Your Site/Installed Modules/HTML/Administrators/Deleting a Content Version.html index caf495caa1c..20b9c324218 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Administrators/Deleting a Content Version.html +++ b/Documentation/Building Your Site/Installed Modules/HTML/Administrators/Deleting a Content Version.html @@ -17,7 +17,7 @@

            Deleting a Content Version

            1. - + Click the OK button to confirm.
            diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Content - HTML Module.html b/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Content - HTML Module.html index baa39d75720..813f85a1f5a 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Content - HTML Module.html +++ b/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Content - HTML Module.html @@ -1,23 +1,23 @@  - +

            Adding Content

            How to add basic text, add rich text or paste HTML into the HTML Editor of the Text/HTML module.

              -
            1. Select Edit Content from the module actions menu.
              2. +
            2. Select Edit Content from the module actions menu.
            3. Enter your content using one of these methods: See "Adding Basic Text and HTML using Editor", See "Adding Rich Text Using The Editor" or See "Pasting HTML Content".
              4. -
            4. Optional. Click the Preview link located below the Editor. This expands the Preview section below and displays the content currently displayed in the Editor. If Direct Publish (rather than Content Staging) is used for this module, then skip to Step 7.
              5. +
            5. Optional. Click the  Preview link located below the Editor. This expands the Preview section below and displays the content currently displayed in the Editor. If Direct Publish (rather than Content Staging) is used for this module, then skip to Step 7.
            6. At On Save? / Publish Changes?, select from the below options (Note: This field only displays when Content Staging is enabled. See "Setting a Workflow"): -
              • to publish these changes and set them as ready for approval. This automatically locks the content until it is either published or the lock is manually removed by an Administrator.
              • if the content is not yet ready for publishing/approval. This enables you to save this draft and return to edit it at a later stage before submitting the content for approval.
              7. +
              • Mark  the check box to publish these changes and set them as ready for approval. This automatically locks the content until it is either published or the lock is manually removed by an Administrator.
              • Unmark  the check box if the content is not yet ready for publishing/approval. This enables you to save this draft and return to edit it at a later stage before submitting the content for approval.
            7. Click the Save button. If Direct Publishing is set for this module, the content changes are now displayed in the HTML Pro module. If Content Approval is enabled, continue to Step 7.
            8. Optional. In the Enter Submission Comment text box, enter a comment relating to this submission.
            9. Click the Submit link. This enters these changes into the next stage of content approval and sends out notification messages as set in the workflow. You will be notified when your changes are approved or rejected.

            Note: If content approval is enabled and this content is ready to publish, See "Publishing a Draft"

            - +

            • diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Replacement Tokens.html b/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Replacement Tokens.html index d5df53201e6..fef1ed30b0b 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Replacement Tokens.html +++ b/Documentation/Building Your Site/Installed Modules/HTML/Module Editors/Adding Replacement Tokens.html @@ -21,7 +21,7 @@

              Adding Replacement Tokens


              Replacement Tokens Displaying the User's Name

              - + Related Topics:

              • diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Settings/Applying a Workflow.htm b/Documentation/Building Your Site/Installed Modules/HTML/Settings/Applying a Workflow.htm index bb9faea60e4..3b0ddae419c 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Settings/Applying a Workflow.htm +++ b/Documentation/Building Your Site/Installed Modules/HTML/Settings/Applying a Workflow.htm @@ -1,18 +1,18 @@  - +

                Applying a Workflow

                1. - +
                2. Select the HTML Module Settings tab.
                3. At Apply Workflow To, select from these options:
                  • Module: Select to apply the workflow set on this module to this module only.
                  • Page: Select to apply the workflow set on this module to all modules on this page.
                  • Site: Select to apply the workflow set on this module across all modules on the site.
                  4. -
                4. At Replace Existing Settings?, to replace the existing settings for this Module, Modules on this Page, or the whole site - depending on which of these three options you selected at Step 3.
                  5. +
                5. At Replace Existing Settings?, to replace the existing settings for this Module, Modules on this Page, or the whole site - depending on which of these three options you selected at Step 3.
                6. - +

                diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Settings/Enabling-Disabling Token Replacement.html b/Documentation/Building Your Site/Installed Modules/HTML/Settings/Enabling-Disabling Token Replacement.html index 9d71c67270c..eb71f800ad5 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Settings/Enabling-Disabling Token Replacement.html +++ b/Documentation/Building Your Site/Installed Modules/HTML/Settings/Enabling-Disabling Token Replacement.html @@ -1,27 +1,27 @@  - +

                Enabling/Disabling Token Replacement

                How to enable or disable token replacement on the HTML module. Token replacement enables tokens such as [FirstName] to be replaced with the first name of the authenticated user. Tokens include information such as user details, site name, key words, date, time, etc.

                Important. Inline editing and module caching are disabled if token replacement is enabled.

                1. - +
                2. Select the HTML Module Settings tab.
                3. At Replace Tokens, select from these options: -
                  • to enable full token replacement.
                  • to disable token replacement. If tokens have already been entered into the Editor, they will be displayed as text once this setting is updated.
                  4. +
                  • Mark  the check box to enable full token replacement.
                  • Unmark  the check box to disable token replacement. If tokens have already been entered into the Editor, they will be displayed as text once this setting is updated.

                1. - +

                - + Related Topics:

                • diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Settings/Setting a Workflow.html b/Documentation/Building Your Site/Installed Modules/HTML/Settings/Setting a Workflow.html index 2baa9af91f8..c3ccac04d0c 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Settings/Setting a Workflow.html +++ b/Documentation/Building Your Site/Installed Modules/HTML/Settings/Setting a Workflow.html @@ -1,22 +1,21 @@  - +

                  Setting a Workflow

                  How to set the workflow for an individual HTML module.

                  1. - +
                  2. Select the HTML Module Settings tab.
                    3. -
                  3. At Workflow, select the workflow you wish to use from these options:
                    • Content Staging: Content staging allows content to be saved as a draft before it is published. Draft content will only be visible when edit mode is selected by users who can edit the module/page. In view mode the most recent published version of content will be displayed instead of the draft. This is the same for users with view permissions only. See "Publishing a Draft"
                    • Direct Publish: With the direct publish workflow any content that is saved on the Edit Content page or through the inline editor will be immediately visible to all users with permissions to view the module. Editing users will be able to see the content for both view and edit mode.
                    4. +
                  4. At Workflow, select the workflow you wish to use from these options:
                    • Content Staging: Content staging allows content to be saved as a draft before it is published. Draft content will only be visible when edit mode is selected by users who can edit the module/page. In view mode the most recent published version of content will be displayed instead of the draft. This is the same for users with view permissions only. See "Publishing a Draft"
                    • Direct Publish: With the direct publish workflow any content that is saved on the Edit Content page or through the inline editor will be immediately visible to all users with permissions to view the module. Editing users will be able to see the content for both view and edit mode.

                  1. - + Click the OK button to confirm.
                  diff --git a/Documentation/Building Your Site/Installed Modules/HTML/Settings/UseFormDecoration.htm b/Documentation/Building Your Site/Installed Modules/HTML/Settings/UseFormDecoration.htm index 71fe127de5b..65866598fe3 100644 --- a/Documentation/Building Your Site/Installed Modules/HTML/Settings/UseFormDecoration.htm +++ b/Documentation/Building Your Site/Installed Modules/HTML/Settings/UseFormDecoration.htm @@ -1,5 +1,5 @@  - + @@ -7,20 +7,20 @@

                  Enabling or Disabling Form Decoration

                  How to enable or disable decoration on form elements such as check boxes and radio buttons that have been added to this HTML module.

                  1. - +
                  2. Select the HTML Module Settings tab.
                    3. -
                  3. At Use Form Decoration, to enable. This is the default setting - OR - to disable.
                    4. +
                  4. At Use Form Decoration, to enable. This is the default setting - OR - to disable.

                  1. - + Click the OK button to confirm.

                  -
                  Form decoration is enabled in the left image and disabled in the right image. Note the difference in the appearance of the check boxes

                  +
                  Form decoration is enabled in the left image and disabled in the right image. Note the difference in the appearance of the check boxes

                  \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Journal/Settings/Configuring Journal Settings.html b/Documentation/Building Your Site/Installed Modules/Journal/Settings/Configuring Journal Settings.html index 6a20aadf4d2..99b99a0b71f 100644 --- a/Documentation/Building Your Site/Installed Modules/Journal/Settings/Configuring Journal Settings.html +++ b/Documentation/Building Your Site/Installed Modules/Journal/Settings/Configuring Journal Settings.html @@ -1,14 +1,14 @@  - +

                  Configuring Journal Settings

                  How to configure the settings applied to an instance of the Journal module. -
                  2. Select the Journal Settings tab.
                  3. At Enable Journal Editor, select from these options:
                    • to enable users to post entries using this module. This enables the following two fields.
                      1. At Enable File Attachments, select from these options: -
                        • to allow users to attach files to journal posts. This displays the Attachment button below the message entry box. This is the default setting.
                        • to disable file attachments.
                      2. At Enable Photo Attachments, select from these options: -
                        • to allow users to attach photographs to journal posts. This displays the Photo button below the message entry box. This is the default setting.
                        • to disable photograph attachments.
                    • to disable the journal editor for this module.
                  4. At Default Page Size, select the number of journal items that are displayed per page. The default setting is 20. +
                    2. Select the Journal Settings tab.
                    3. At Enable Journal Editor, select from these options:
                      • Mark  the check box to enable users to post entries using this module. This enables the following two fields.
                        1. At Enable File Attachments, select from these options: +
                          • Mark  the check box to allow users to attach files to journal posts. This displays the Attachment button below the message entry box. This is the default setting.
                          • Unmark  the check box to disable file attachments.
                        2. At Enable Photo Attachments, select from these options: +
                          • Mark  the check box to allow users to attach photographs to journal posts. This displays the Photo button below the message entry box. This is the default setting.
                          • Unmark  the check box to disable photograph attachments.
                      • Unmark  the check box to disable the journal editor for this module.
                    4. At Default Page Size, select the number of journal items that are displayed per page. The default setting is 20.
                    5. At Maximum Characters per message, select the maximum number of characters for a message. The default setting is 250.
                    6. At Journal Types, select the types of journals you want to display. -


                    Journal Setting

                    +


                  Journal Setting

                  \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Configuring Search Settings.html b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Configuring Search Settings.html index 1f839f1fbcc..b6386ef7a22 100644 --- a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Configuring Search Settings.html +++ b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Configuring Search Settings.html @@ -5,5 +5,5 @@

                  Configuring Search Settings

                  How to enable/disable search capabilities on the Member Directory module and configure the advanced search options. -Two search tools can be enabled. The Simple Search tool allows members to search by user name, first name or last name of the message recipient or role name. The Advanced Search tool allows up to four search criteria to be specified for searches. The available options are Display Name, Email, Prefix, First Name, Middle Name, Last Name, Suffix, Unit, Street, City, Region, Country, Postal Code, Telephone, Cell/Mobile, Website, IM, or Fax.
                  2. Select the Member Directory Settings tab.
                  3. Expand the Search Settings section.
                  4. At Display Search, select from these options:
                    • None: Select to remove both the simple and advanced search tools.
                    • Simple Search: Select to only display the simple search box.
                    • Simple and Advanced Search to display both the basic and advanced search boxes.
                  5. At Search Field 1, select the first field displayed on the advanced search box. The default option is Username.
                  6. At Search Field 2, select the second field displayed on the advanced search box. The default option is Email.
                  7. At Search Field 3, select the third field displayed on the advanced search box. The default option is City.
                  8. At Search Field 4, select the fourth field displayed on the advanced search box. The default option is Country.

                  Configuring Members Directory search settings

                  The default search setting for the Members Directory module
                  The default search setting for the Members Directory module

                  • See "Searching for Members"
                  +Two search tools can be enabled. The Simple Search tool allows members to search by user name, first name or last name of the message recipient or role name. The Advanced Search tool allows up to four search criteria to be specified for searches. The available options are Display Name, Email, Prefix, First Name, Middle Name, Last Name, Suffix, Unit, Street, City, Region, Country, Postal Code, Telephone, Cell/Mobile, Website, IM, or Fax.
                  2. Select the Member Directory Settings tab.
                  3. Expand the Search Settings section.
                  4. At Display Search, select from these options:
                    • None: Select to remove both the simple and advanced search tools.
                    • Simple Search: Select to only display the simple search box.
                    • Simple and Advanced Search to display both the basic and advanced search boxes.
                  5. At Search Field 1, select the first field displayed on the advanced search box. The default option is Username.
                  6. At Search Field 2, select the second field displayed on the advanced search box. The default option is Email.
                  7. At Search Field 3, select the third field displayed on the advanced search box. The default option is City.
                  8. At Search Field 4, select the fourth field displayed on the advanced search box. The default option is Country.

                  Configuring Members Directory search settings

                  1. Click the OK button to confirm.

                  The default search setting for the Members Directory module
                  The default search setting for the Members Directory module

                  Related Topics:

                  • See "Searching for Members"
                  \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Managing Templates.html b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Managing Templates.html index 7f40faf4480..f715e535771 100644 --- a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Managing Templates.html +++ b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Managing Templates.html @@ -1,7 +1,6 @@  - + -

                  Managing Templates

                  @@ -11,14 +10,14 @@

                  Managing Templates


                  Here's how to configure the Member Directory templates:

                  1. - +
                  2. Select the Member Directory Settings tab.
                  3. Expand the Templates section.
                  4. In the Item Template text box, edit the template for member listings.
                  5. In the Alternative Item Template text box, edit the template for alternate member listings or leave this field blank to use the same layout for all members.
                  6. At Enable PopUp, select from these options: -
                    • to display member details in a popup window when a user mouses over a member's listing.
                    • to disable popup window.
                    7. +
                    • Mark  the check box to display member details in a popup window when a user mouses over a member's listing.
                    • Unmark  the check box to disable popup window.
                  7. In the PopUp Template text box, edit the template used for the PopUp window.

                  @@ -26,7 +25,7 @@

                  Managing Templates

                  1. - + Click the OK button to confirm.
                  diff --git a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Paging Options.html b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Paging Options.html index db0fffea995..f305c76a2fb 100644 --- a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Paging Options.html +++ b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Paging Options.html @@ -4,5 +4,5 @@

                  Setting Paging Options

                  How to set the number of members records displayed on each page of the Member Directory module and enable or disable the ability to view more results than displayed on the first page. -
                  2. Select the Member Directory Settings tab.
                  3. Expand the Paging Optionssection.
                  4. At Disable Paging, to disable the "Load More" button. This will only display the number of members displayed on the first page.
                  5. At Page Size, select the number of members to be displayed on each page.

                  +
                  2. Select the Member Directory Settings tab.
                  3. Expand the Paging Optionssection.
                  4. At Disable Paging, to disable the "Load More" button. This will only display the number of members displayed on the first page.
                  5. At Page Size, select the number of members to be displayed on each page.

                  1. Click the OK button to confirm.
                  \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Setting Filters and Sorting.html b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Setting Filters and Sorting.html index 63146c649f0..b09e00c86ab 100644 --- a/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Setting Filters and Sorting.html +++ b/Documentation/Building Your Site/Installed Modules/Member Directory/Settings/Setting Filters and Sorting.html @@ -1,10 +1,10 @@  - +

                  Setting Filters and Sorting

                  The Member Directory module uses templates to allow authorized users to define the layout of the module. Different filters can also be applied to the Members Directory module to control which member records are displayed. -
                  2. Select the Member Directory Settings tab.
                  3. Expand the Filters and Sorting section.
                  4. Optional. At Filter By, you can choose to apply a filter to this instance of the Members Directory module. -
                    • No Filter: Select this option to remove the filter and display all members.
                    • User: Select this option to only display the profile of the member who is currently logged into the site.
                    • Group: Select this option and then select a Social Group to only display members who belong to that group.
                    • Relationship: Select this option to only display members that you have a relationship with. E.g. friend or follower.
                    • Profile Property: Select this option and then choose a profile property to only display matching members. E.g. Select Country and then enter United States to only display members who have set United States as their country.
                  5. At Sort Field, choose to sort member cards by User ID, Last Name, Display Name, or Date Created. Display Name is the default setting.
                  6. At Sort Order, choose to sort member cards in ascending or descending order. Ascending is the default setting.


                  Members Directory set to only display the current user


                  Members Directory set to only display friends (Relationship filter)

                  +
                  2. Select the Member Directory Settings tab.
                  3. Expand the Filters and Sorting section.
                  4. Optional. At Filter By, you can choose to apply a filter to this instance of the Members Directory module. +
                    • No Filter: Select this option to remove the filter and display all members.
                    • User: Select this option to only display the profile of the member who is currently logged into the site.
                    • Group: Select this option and then select a Social Group to only display members who belong to that group.
                    • Relationship: Select this option to only display members that you have a relationship with. E.g. friend or follower.
                    • Profile Property: Select this option and then choose a profile property to only display matching members. E.g. Select Country and then enter United States to only display members who have set United States as their country.
                  5. At Sort Field, choose to sort member cards by User ID, Last Name, Display Name, or Date Created. Display Name is the default setting.
                  6. At Sort Order, choose to sort member cards in ascending or descending order. Ascending is the default setting.

                  1. Click the OK button to confirm.


                  Members Directory set to only display the current user


                  Members Directory set to only display friends (Relationship filter)

                  \ No newline at end of file diff --git a/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Configuring Message Center Settings.html b/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Configuring Message Center Settings.html index fb5a6863f8a..68a7d327131 100644 --- a/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Configuring Message Center Settings.html +++ b/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Configuring Message Center Settings.html @@ -18,7 +18,7 @@

                  Configuring Message Center Settings

                  1. - + Click the OK button to confirm.
                  diff --git a/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Setting Messaging Template Settings.html b/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Setting Messaging Template Settings.html index c9c7504d806..2bd98b4bdcd 100644 --- a/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Setting Messaging Template Settings.html +++ b/Documentation/Building Your Site/Installed Modules/Message Centre/Settings/Setting Messaging Template Settings.html @@ -12,11 +12,11 @@

                  Setting Messaging Template Settings

                • Select the Messaging Settings tab.
                • In the Template text box, enter a custom template. Replacement tokens and HTML formatting are allowed.
                • - + Click the OK button to confirm.

                  • - + Related Topics:

                  • diff --git a/Documentation/Building Your Site/Installed Modules/Search Results/Settings/SearchResultsSettings.htm b/Documentation/Building Your Site/Installed Modules/Search Results/Settings/SearchResultsSettings.htm index dd2e727f1d0..106ec58358f 100644 --- a/Documentation/Building Your Site/Installed Modules/Search Results/Settings/SearchResultsSettings.htm +++ b/Documentation/Building Your Site/Installed Modules/Search Results/Settings/SearchResultsSettings.htm @@ -11,7 +11,7 @@

                    Configuring Search Results Settings

                  • Select the Search Results Settings tab.
                  • At Title Link Target, choose where results will be displayed from these options:
                    • On Same Page: When you click on a linked search result the details will be displayed on the current page. This is the default setting.
                    • Open New Page: When you click on a linked search result the details will be displayed in a new site page.
                    • -
                  • At Results Scope for Sites(s), beside each site that can be searched. The current site must belong to a Site Group.
                    • +
                  • At Results Scope for Sites(s), beside each site that can be searched. Prerequisite. The current site must belong to a Site Group.
                  • At Results Scope for Content Type(s), beside a type of content to limit the Search Results. All Items are checked by default.
                  • At Enable wildcard searches by default, select from these options:
                    • enable searches for partial words. E.g. typing "org" will find "organization" or "organize". This ensures more results and increases a users chances of finding information. This is the default setting.
                    • to disable wildcard searching if results are taking too long to retrieve.
                    • @@ -20,11 +20,11 @@

                    Configuring Search Results Settings

                    1. - + Click the OK button to confirm.

                    - + Related Topics:

                    • diff --git a/Documentation/Building Your Site/Installed Modules/Social Groups/Configuring Social Groups Settings.htm b/Documentation/Building Your Site/Installed Modules/Social Groups/Configuring Social Groups Settings.htm index 29645dbba7b..951f1549774 100644 --- a/Documentation/Building Your Site/Installed Modules/Social Groups/Configuring Social Groups Settings.htm +++ b/Documentation/Building Your Site/Installed Modules/Social Groups/Configuring Social Groups Settings.htm @@ -22,7 +22,7 @@

                      Configuring Social Groups Settings

                      1. - + Click the Update button.
                      diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Adding an Announcement.html b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Adding an Announcement.html index 6b08da60cef..10a4e3c2560 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Adding an Announcement.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Adding an Announcement.html @@ -15,7 +15,7 @@

                      Adding an Announcement

                      1. The following optional settings are also available:
                        1. At Image, set the link to display an image on this announcement or select None if no image is required. See "Setting a File Link"
                        2. At Link set the Read more... link for this announcement or select None for no link. See "About the Link Control"
                        3. At Publish Date, set these options:
                          • Click the Calendar link and select the date when the announcement will be published on the module. The publish date is displayed beside the announcement title in the default template.
                          • Optional. Select the Hour, Minute and AM/PM to set a publish time. The default time is 12:00 AM.
                        4. At Expire Date, set these options:
                          • Click the Calendar link and select the date when the announcement will expire from the module. Expired announcements can still be viewed and managed by content editors.
                          • Optional. Select the Hour, Minute and AM/PM to set an expiry time. The default time is 12:00 AM.
                        5. In the View Order text box, enter a number to order this announcement. E.g. 0 = First announcement; 1 = Second announcement, etc. This will override the default order that lists announcements from most recent publish date to oldest publish date.
                      2. - + Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Deleting an Announcement.html b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Deleting an Announcement.html index 37c88e3e464..e2291cad964 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Deleting an Announcement.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Deleting an Announcement.html @@ -10,7 +10,7 @@

                      Deleting an Announcement

                    • Click the Edit button beside the announcement to be deleted.
                    • Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
                    • - + Click the OK button to confirm.
                      • diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Editing an Announcement.html b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Editing an Announcement.html index 388ef217466..9e8166600c9 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Editing an Announcement.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Editing an Announcement.html @@ -16,7 +16,7 @@

                      Editing an Announcement

                      1. Edit any fields as required.
                      2. - + Click the OK button to confirm.
                      diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Modifying the Announcement Publish Date.html b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Modifying the Announcement Publish Date.html index 0c5bca28d43..e5a26b5bc21 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Modifying the Announcement Publish Date.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Module Editors/Modifying the Announcement Publish Date.html @@ -15,7 +15,7 @@

                      Modifying the Announcement Publish Date

                    • Optional. Select the Hour, Minute and AM/PM to set a publish time. The default time is 12:00 AM.
                  • - + Click the OK button to confirm.
                    • diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Modifying the Announcement Templates.html b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Modifying the Announcement Templates.html index 917077ad11e..a7203499675 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Modifying the Announcement Templates.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Modifying the Announcement Templates.html @@ -16,7 +16,7 @@

                    Modifying the Announcement Templates

                  • In the Alternate Item Template text box, edit the template as required. This template controls each alternate announcement item. E.g. Announcement 2, Announcement 4, etc. Leave blank to use the Item Template for all items.
                  • In the Separator Template text box, edit the template as desired.
                  • - + Click the OK button to confirm.

                    • Tip: To hide the publish date, delete- [PUBLISHDATE] from the Template window.

                    diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting Announcement History By Days.html b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting Announcement History By Days.html index 68f5de3a65c..570cfa83947 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting Announcement History By Days.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting Announcement History By Days.html @@ -17,7 +17,7 @@

                    Setting Announcement History By Days

                      -
                      2. +
                    2. Click the OK button to confirm.
                    \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Description Length for Search and RSS.html b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Description Length for Search and RSS.html index 9a50c44270d..a24aaa49013 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Description Length for Search and RSS.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Description Length for Search and RSS.html @@ -17,7 +17,7 @@

                    Setting the Description Length for Search and RSS

                      -
                      2. +
                    2. Click the OK button to confirm.
                    \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Default View for Announcements .html b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Default View for Announcements .html index ebc3995c777..f9fa8789ec0 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Default View for Announcements .html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Default View for Announcements .html @@ -19,7 +19,7 @@

                    Setting the Default View for Announcements

                    1. - + Click the OK button to confirm.
                    diff --git a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Editor Height.html b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Editor Height.html index af97fc764b7..d0831e73991 100644 --- a/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Editor Height.html +++ b/Documentation/Building Your Site/Project Modules/Announcements/Settings/Setting the Editor Height.html @@ -18,7 +18,7 @@

                    Setting the Editor Height

                    1. - + Click the OK button to confirm.
                    diff --git a/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Authenticated Users.html b/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Authenticated Users.html index 60875e3f58b..ae62e68aacb 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Authenticated Users.html +++ b/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Authenticated Users.html @@ -33,7 +33,7 @@

                    Adding a Blog Comment (Authenticated Users)

                  • Optional. If comments require approval the message "Your comment MUST be approved by the blog owner BEFORE it is displayed on the web site. Do you wish to save your comment now?" is displayed.
                  • - If approval isn't required, the comment is now displayed below the entry.
                    • + Click the OK button to confirm. If approval isn't required, the comment is now displayed below the entry.

                    diff --git a/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Unauthenticated Users.html b/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Unauthenticated Users.html index baadb3bea63..e7d767e348c 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Unauthenticated Users.html +++ b/Documentation/Building Your Site/Project Modules/Blog/All Users/Adding a Blog Comment - Unauthenticated Users.html @@ -28,7 +28,7 @@

                    Adding a Blog Comment (Unauthenticated Users)

                    1. Optional. If comments require approval, this displays the message "Your comment MUST be approved by the blog owner BEFORE it is displayed on the web site. Do you wish to save your comment now?"
                    2. - + Click the OK button to confirm.

                    Tip: As an unauthenticated user you are unable to delete or edit your comments.

                    diff --git a/Documentation/Building Your Site/Project Modules/Blog/All Users/Editing Your Comments.html b/Documentation/Building Your Site/Project Modules/Blog/All Users/Editing Your Comments.html index f18fc219edb..ebe80c5ecd6 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/All Users/Editing Your Comments.html +++ b/Documentation/Building Your Site/Project Modules/Blog/All Users/Editing Your Comments.html @@ -20,7 +20,7 @@

                    Editing Your Comments

                  • Click the Update Comment link.
                  • Optional. If comments require approval a dialog box reading "Your comment MUST be approved by the blog owner BEFORE it is displayed on the website. Do you wish to save your comment now?" is displayed.
                  • - If approval isn't required, the edited comment is displayed below the entry.
                    • + Click the OK button to confirm. If approval isn't required, the edited comment is displayed below the entry. \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Configuring Blog Tag Settings.html b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Configuring Blog Tag Settings.html index d7348f2e6b2..864903a7aa1 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Configuring Blog Tag Settings.html +++ b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Configuring Blog Tag Settings.html @@ -14,7 +14,7 @@

                    Configuring Blog Tag Settings

                  • Select the Blog Tag Settings tab.
                  • Select from the following options:
                    • Tag Cloud: Select to display tag names.

                    • Tag List: Select to display tags in a list. The number of entries associated with each tag is listed beside the tag name. This is the default setting.

                    • -
                    • +
                  • Click the OK button to confirm.

                    • diff --git a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Bloggers Blog Management Rights.html b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Bloggers Blog Management Rights.html index 99f4afb88f5..ef8b70804cf 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Bloggers Blog Management Rights.html +++ b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Bloggers Blog Management Rights.html @@ -20,7 +20,7 @@

                    Enabling Bloggers Blog Management Rights


                    Setting Blog permissions in DNN Platform

                    - + Related Topics:

                    • diff --git a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Users to Create Blogs.html b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Users to Create Blogs.html index 33ae0525a41..a4a4e353265 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Users to Create Blogs.html +++ b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Enabling Users to Create Blogs.html @@ -38,14 +38,14 @@

                      Enabling Users to Create Blogs

                      1. - This displays the Create My Blog link on the New_Blog module.
                        2. + Click the OK button to confirm. This displays the Create My Blog link on the New_Blog module.


                      The Create My Blog link is enabled

                      - + Related Topics:

                      • diff --git a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Modifying Recent Comments Template.html b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Modifying Recent Comments Template.html index fc946dd9197..6375e71ae19 100644 --- a/Documentation/Building Your Site/Project Modules/Blog/Configuration/Modifying Recent Comments Template.html +++ b/Documentation/Building Your Site/Project Modules/Blog/Configuration/Modifying Recent Comments Template.html @@ -16,7 +16,7 @@

                        Modifying Recent Comments Template

                          -
                          2. +
                        2. Click the OK button to confirm.

                        Here is the default Display Template for comments:

                        diff --git a/Documentation/Building Your Site/Project Modules/Documents/About the Documents Module.htm b/Documentation/Building Your Site/Project Modules/Documents/About the Documents Module.htm index 04790a63bc3..2d347c01166 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/About the Documents Module.htm +++ b/Documentation/Building Your Site/Project Modules/Documents/About the Documents Module.htm @@ -1,13 +1,10 @@  - +

                        About the Documents Module

                        The Documents module displays a list of documents that can be set as downloadable. All document records Title and a link to view (depending on a user's file associations) or download the document. Link tracking and logging are also available.

                        -

                        - -

                        Module Version: 05.00.00 / Minimum DNN Version: 05.01.00

                        @@ -37,10 +34,12 @@

                        About the Documents Module

                      • Set the visibility and order of each field.
                      • Set the sort order of documents.
                      - +

                      + +

                      \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Adding a Document.html b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Adding a Document.html index 524e064b585..f1b12e7967f 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Adding a Document.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Adding a Document.html @@ -22,7 +22,7 @@

                      Adding a Document

                    • Recommended. At Link, set the link to this document (See "Setting a URL Link" or See "Setting a File Link" ) - OR - Select None for no link. Tip: The default folder for files can be modified. See "Setting the Default Folder for Documents"
                      1. Recommended. At Track Number Of Times This Link Is Clicked? to track clicking. If this field is unchecked, the number of the clicks will not recorded. If the clicks are recorded, you have the option of displaying this information in the optional Clicks column. See "Setting the Visibility of Document Columns"
                    • Optional. In the Sort Index text box, enter a number to set the order of this document. Leave blank to use zero (0) and display documents alphabetically.
                    • - + Click the OK button to confirm.

                      • diff --git a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Changing the Document Owner.html b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Changing the Document Owner.html index db0f95fa6d3..3e80f64cfcc 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Changing the Document Owner.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Changing the Document Owner.html @@ -21,7 +21,7 @@

                      Changing the Document Owner

                        -
                        2. +
                      2. Click the OK button to confirm.
                      \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Editing a Document.html b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Editing a Document.html index bbbf28e6dcc..9df6bbb3bb4 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Editing a Document.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Editing a Document.html @@ -14,7 +14,7 @@

                      Editing a Document

                      1. Edit the document fields as required.
                        2. -
                        3. +
                      3. Click the OK button to confirm.
                      \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Troubleshooting Security Permissions Warning.html b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Troubleshooting Security Permissions Warning.html index 4879f768a94..73139b1ee3e 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Troubleshooting Security Permissions Warning.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Module Editors/Troubleshooting Security Permissions Warning.html @@ -30,7 +30,7 @@

                      Troubleshooting: Security Permissions Warning

                    • Upload the file to the selected folder. See "Uploading and Linking to a File"
                    • The uploaded file should now be displayed. If not, select the file.
                    • - + Click the OK button to confirm.
                      • diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Adding Document Sorting by Column Name.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Adding Document Sorting by Column Name.html index 61171781bea..98cdf78cdb4 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Adding Document Sorting by Column Name.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Adding Document Sorting by Column Name.html @@ -31,7 +31,7 @@

                      Adding Document Sorting by Column Name

                      1. Optional. Repeat Steps 4-6 to add additional columns to this sort order.
                        2. -
                        3. +
                      3. Click the OK button to confirm.

                      Tip: You can click the Delete Sort Order link beside any column name to delete it from sorting order.

                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling Manual Document Sorting.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling Manual Document Sorting.html index 950fe1d5a9b..0b3395f07ec 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling Manual Document Sorting.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling Manual Document Sorting.html @@ -26,7 +26,7 @@

                      Enabling Manual Document Sorting

                      1. If any other sorting orders are displayed, click the Delete Sort Order link beside each one to delete them. This may occur if sorting has been previously set.
                        2. -
                        3. +
                      3. Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling Users to Sort Documents.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling Users to Sort Documents.html index 38e15a18055..5705b79b9a6 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling Users to Sort Documents.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling Users to Sort Documents.html @@ -18,7 +18,7 @@

                      Enabling/Disabling Users to Sort Documents

                      1. - + Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Categories List.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Categories List.html index 6923f8d5c09..368692a093f 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Categories List.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Categories List.html @@ -19,7 +19,7 @@

                      Enabling/Disabling the Categories List

                      1. - + Click the OK button to confirm.
                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Title Link.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Title Link.html index 92497d48f05..3897ebec92e 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Title Link.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Enabling-Disabling the Title Link.html @@ -16,7 +16,7 @@

                      Enabling/Disabling the Title Link

                      • to set the title as a link.
                      • to disable the link.
                    • Recommended. At Display Columns - Download Links, at Visible to display download links.
                    • - + Click the OK button to confirm.

                      • diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Default Folder for Documents.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Default Folder for Documents.html index 2c4fa130c94..759da21361c 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Default Folder for Documents.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Default Folder for Documents.html @@ -19,7 +19,7 @@

                      Setting the Default Folder for Documents

                      1. - + Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Order of Document Columns.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Order of Document Columns.html index fab97da7439..deca1d6e479 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Order of Document Columns.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Order of Document Columns.html @@ -18,7 +18,7 @@

                      Setting the Order of Document Columns

                        -
                        2. +
                      2. Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Visibility of Document Columns.html b/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Visibility of Document Columns.html index dddb6e875b9..bbfa892968c 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Visibility of Document Columns.html +++ b/Documentation/Building Your Site/Project Modules/Documents/Settings/Setting the Visibility of Document Columns.html @@ -20,7 +20,7 @@

                      Setting the Visibility of Document Columns

                      1. - + Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Documents/SuperUsers/Adding Document Categories.html b/Documentation/Building Your Site/Project Modules/Documents/SuperUsers/Adding Document Categories.html index ff421fb6761..351c685aa4e 100644 --- a/Documentation/Building Your Site/Project Modules/Documents/SuperUsers/Adding Document Categories.html +++ b/Documentation/Building Your Site/Project Modules/Documents/SuperUsers/Adding Document Categories.html @@ -7,7 +7,7 @@

                      Adding Document Categories

                      How to create the categories list for the Documents module.

                      1. - +
                      2. Click the List Editor link. This opens the Host > Lists page. Note. You can also navigate directly to the Lists page.
                      3. Add a parent list and one or more list entries. See "Adding a Parent List"
                        4. diff --git a/Documentation/Building Your Site/Project Modules/Events/About the Events Module.htm b/Documentation/Building Your Site/Project Modules/Events/About the Events Module.htm index 6ccb7166507..c5253404100 100644 --- a/Documentation/Building Your Site/Project Modules/Events/About the Events Module.htm +++ b/Documentation/Building Your Site/Project Modules/Events/About the Events Module.htm @@ -1,14 +1,11 @@  - +

                        About the Events Module

                        The Events module displays a list of upcoming events. Events can be displayed in chronological order as list or in a monthly or weekly calendar. Each event includes a title, start and end date/time, a description and an optional image. Events can be set to automatically expire on a particular date, or to recur by any specified number of days, weeks, months or years. Event moderation, event notification and enrolments also be used.

                        The Events module can be configured to require moderation of events and enrollments. Moderation can be required for all event/enrollment changes or only for new items. One or more moderators will be sent email notification when items require moderation.

                        -

                        - -

                        Module Version: 06.00.03 / Minimum DNN Version: 06.01.02

                        Features: ISearchable

                        @@ -26,7 +23,7 @@

                        About the Events Module

                        Project Links

                        \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Events/All Users/Canceling an Event Enrollment.html b/Documentation/Building Your Site/Project Modules/Events/All Users/Canceling an Event Enrollment.html index bb2ff876fe6..9e650a00c1b 100644 --- a/Documentation/Building Your Site/Project Modules/Events/All Users/Canceling an Event Enrollment.html +++ b/Documentation/Building Your Site/Project Modules/Events/All Users/Canceling an Event Enrollment.html @@ -11,7 +11,7 @@

                        Canceling an Event Enrollment

                      4. In the Select column, beside each enrollment you want to cancel.
                      5. Click the Cancel Selected Enrolments link. This displays the message "Are You Sure You Wish To Cancel the SELECTED Enrolments?"
                      6. - The selected enrollments are now removed from the list.
                        7. + Click the OK button to confirm.The selected enrollments are now removed from the list.

                      diff --git a/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Free Event.html b/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Free Event.html index b3fe1584057..afd8ff3555b 100644 --- a/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Free Event.html +++ b/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Free Event.html @@ -15,7 +15,7 @@

                      Enrolling for a Free Event

                      1. Click the  Enroll for this Event? link. This displays the message "Are You Sure You Want To Enroll?"
                      2. - + Click the OK button to confirm.

                      diff --git a/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Paid Event.html b/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Paid Event.html index b66ef891e17..99bcbf79c4a 100644 --- a/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Paid Event.html +++ b/Documentation/Building Your Site/Project Modules/Events/All Users/Enrolling for a Paid Event.html @@ -10,7 +10,7 @@

                      Enrolling for a Paid Event

                    • Go to the event details page of the required event. See "Viewing Event Details (List View)", See "Viewing Event Details (Month View)" or See "Viewing Event Details (Week View)".
                    • Click the  Enroll for the Event? link. This displays the message "Are You Sure You Want To Enroll?"
                    • - + Click the OK button to confirm.

                      • diff --git a/Documentation/Building Your Site/Project Modules/Events/All Users/Requesting Event Reminder.html b/Documentation/Building Your Site/Project Modules/Events/All Users/Requesting Event Reminder.html index a25ecdc6a14..1e1e4e03566 100644 --- a/Documentation/Building Your Site/Project Modules/Events/All Users/Requesting Event Reminder.html +++ b/Documentation/Building Your Site/Project Modules/Events/All Users/Requesting Event Reminder.html @@ -28,7 +28,7 @@

                      Requesting Event Reminder

                      - + Related Topics:

                      • diff --git a/Documentation/Building Your Site/Project Modules/Events/All Users/Subscribing to New Event Notifications.html b/Documentation/Building Your Site/Project Modules/Events/All Users/Subscribing to New Event Notifications.html index bd73ef4bf74..a4248ddc77a 100644 --- a/Documentation/Building Your Site/Project Modules/Events/All Users/Subscribing to New Event Notifications.html +++ b/Documentation/Building Your Site/Project Modules/Events/All Users/Subscribing to New Event Notifications.html @@ -7,7 +7,7 @@

                        Subscribing to New Event Notifications

                        How to subscribe to receive notifications when a new event is added to the Events module. Note: This option may not be available.

                        - The Event Notification schedule must be enabled for event/enrollment notifications to be sent. See "Enabling/Disabling a Task"

                        + Prerequisite. The Event Notification schedule must be enabled for event/enrollment notifications to be sent. See "Enabling/Disabling a Task"

                        1. The Notify Me check box is located in the top right corner of the Events module toolbar.
                          • Check the check box to subscribe to notifications.
                          • Uncheck the check box to unsubscribe from notifications.
                          2. @@ -17,7 +17,7 @@

                          Subscribing to New Event Notifications


                          Notification of new events enabled

                          - + Related Topics:

                          • diff --git a/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Deleting Event Categories.html b/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Deleting Event Categories.html index d7da97e6177..093850f0e54 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Deleting Event Categories.html +++ b/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Deleting Event Categories.html @@ -14,7 +14,7 @@

                            Deleting Event Categories

                            1. - + Click the OK button to confirm.
                            2. Repeat Steps 2-3 to delete additional categories.
                            3. Click the Return link to return to the module.
                              4. diff --git a/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Editing Event Categories.html b/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Editing Event Categories.html index e9da208226c..3bed7aa08cc 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Editing Event Categories.html +++ b/Documentation/Building Your Site/Project Modules/Events/Global Category Editor/Editing Event Categories.html @@ -10,7 +10,7 @@

                              Editing Event Categories

                            4. Select Edit Categories from the Events module actions menu.
                            5. In the Category Name list, click on the linked [Category Name]. This displays the category details in the Category and Color fields.
                            6. Edit fields as required. See "Adding Event Categories"
                              7. -
                              8. +
                            8. Click the OK button to confirm.

                            diff --git a/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Deleting Event Locations.html b/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Deleting Event Locations.html index df2485f8557..38efbd8c907 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Deleting Event Locations.html +++ b/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Deleting Event Locations.html @@ -15,7 +15,7 @@

                            Deleting Event Locations

                            1. - + Click the OK button to confirm.
                            2. Repeat Steps 2-3 to delete additional locations.
                            3. Click the Return link to return to the module.
                              4. diff --git a/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Editing Event Locations.html b/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Editing Event Locations.html index 95e6b7e3f5e..1f1a14c5834 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Editing Event Locations.html +++ b/Documentation/Building Your Site/Project Modules/Events/Global Location Editor/Editing Event Locations.html @@ -10,7 +10,7 @@

                              Editing Event Locations

                            4. Select Edit Locations from the module actions menu.
                            5. In the Location Name list, click on linked [Location Name] to be edited. This displays the location details in the edit fields to the left.
                            6. Edit the Location and/or Map URL fields as required.
                              7. -
                              8. +
                            8. Click the OK button to confirm.
                            9. Repeat Steps 2-4 to add additional locations.
                            10. Click the Return link to return to the module.
                            diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Enrollments.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Enrollments.html index b18bfd0f497..c13a40f70a0 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Enrollments.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Enrollments.html @@ -14,7 +14,7 @@

                            Approving All Moderated Enrollments

                            1. In the Email From text box, edit the email address that will be displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
                            2. Optional. In the Email Subject text box, edit the subject of the email.
                            3. Optional. In the Email Message text box, edit the message of the email.
                          • if you don't want to send email notifications.
                        2. Click the Approve All link. This will display the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
                        3. - + Click the OK button to confirm.

                        diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Events.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Events.html index 146c159256c..3481c41d1f7 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Events.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving All Moderated Events.html @@ -14,7 +14,7 @@

                        Approving All Moderated Events

                        1. In the Email From text box, edit the email address that will be displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
                        2. Optional. In the Email Subject text box, edit the subject of the email
                        3. Optional. In the Email Message text box, edit the message of the email.
                      • if you don't want to send email notifications.
                    • Click the Approve All link. This will display the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
                    • - + Click the OK button to confirm.

                      • diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Enrollments.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Enrollments.html index 8d2f28d84df..386711dca71 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Enrollments.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Enrollments.html @@ -14,9 +14,9 @@

                      Approving Moderated Enrollments

                      1. In the Email From text box, edit the email address that is displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
                      2. Optional. In the Email Subject text box, edit the subject of the email.
                      3. Optional. In the Email Message text box, edit the message of the email.
                    • if you don't want to send email notifications.
                  • In the Action column, select Approve beside each enrollment to be approved.
                  • - This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
                    • + Click the OK button to confirm. This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
                  • - + Click the OK button to confirm.

                    • Tip: Click the Unmark All link to deselect the Approve and Deny action for all enrollments.

                    diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Events.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Events.html index f6d4b42d05e..2a394a43b3d 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Events.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Approving Moderated Events.html @@ -7,7 +7,7 @@

                    Approving Moderated Events

                    How to approve one or more events awaiting moderation in the Events module.

                    - Moderation must be enabled on this module (See "Configuring Moderation Settings") and the user must be granted permissions to the Moderator role. See "Setting Unique Event Permissions"

                    + Prerequisite. Moderation must be enabled on this module (See "Configuring Moderation Settings") and the user must be granted permissions to the Moderator role. See "Setting Unique Event Permissions"

                    1. Select Moderate Events from the Events module actions menu - OR - Click the Moderate Events button. This opens the Moderate Enrollment-Events page.
                    2. At Select View to Moderate, select Moderate Events. This displays a list of any events that are awaiting moderation
                      3. @@ -16,9 +16,9 @@

                      Approving Moderated Events

                      1. In the Email From text box, edit the email address that will be displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
                      2. In the Email Subject text box, edit the subject of the email.
                      3. Optional. In the Email Message text box, edit the message of the email.
                    3. if you don't want to send email notification.
                • In the Action column, select Approve beside each event to be approved.
                • - This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
                  • + Click the OK button to confirm. This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
                • - + Click the OK button to confirm.

                  • Tip: Click the Unmark All link to deselect the Approve and Deny action for all events.

                  diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Enrollments.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Enrollments.html index d915345ae8a..50b9a8e700d 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Enrollments.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Enrollments.html @@ -14,7 +14,7 @@

                  Denying All Moderated Enrollments

                  1. In the Email From text box, edit the email address that will be displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
                  2. Optional. In the Email Subject text box, edit the subject of the email.
                  3. Optional. In the Email Message text box, edit the message of the email.
                • if you don't want to send email notifications.
              • Click the Deny All link. This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
              • - + Click the OK button to confirm.

                • diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Events.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Events.html index 5945cc55d62..38dfa9c73fb 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Events.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying All Moderated Events.html @@ -14,7 +14,7 @@

                Denying All Moderated Events

                1. In the Email From text box, edit the email address that is displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
                2. Optional. In the Email Subject text box, edit the subject of the email.
                3. Optional. In the Email Message text box, edit the message of the email.
              • if you don't want to send email notifications.
            • Click the Deny All link. This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
            • - + Click the OK button to confirm.

              • diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Enrollments.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Enrollments.html index e2fdefca5c0..3ac5022cbd3 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Enrollments.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Enrollments.html @@ -14,9 +14,9 @@

              Denying Moderated Enrollments

              1. In the Email From text box, edit the email address that is displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
              2. Optional. In the Email Subject text box, edit the subject of the email.
              3. Optional. In the Email Message text box, edit the message of the email.
            • if you don't want to send email notification.
          • In the Action column, select Deny for each enrollment to be denied and deleted.
          • - This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
            • + Click the OK button to confirm.This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
          • - + Click the OK button to confirm.

            • diff --git a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Events.html b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Events.html index 853d704245a..38d2ecc4c08 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Events.html +++ b/Documentation/Building Your Site/Project Modules/Events/Moderator/Denying Moderated Events.html @@ -14,9 +14,9 @@

            Denying Moderated Events

            1. In the Email From text box, edit the email address that will be displayed in the From field when the user receives the message. The email address of the logged in moderator will be displayed by default.
            2. Optional. In the Email Subject text box, edit the subject of the email.
            3. Optional. In the Email Message text box, edit the message of the email.
          • if you don't want to send email notification.
        • In the Action column, select Deny for each event to be denied and deleted.
        • - This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
          • + Click the OK button to confirm. This displays the message "Are You Sure You Wish To Update/Delete Item(s) (and send Email) ?"
        • - + Click the OK button to confirm.

          • diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Adding an Event.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Adding an Event.html index 1bf9a14fe2b..f0773d88fb8 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Adding an Event.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Adding an Event.html @@ -31,14 +31,14 @@

          Adding an Event

          1. - If the event requires moderation you will be notified when moderation has occurred and whether the event was accepted or rejected. Once moderated events are accepted they are displayed in the module.
            2. + Click the OK button to confirm. If the event requires moderation you will be notified when moderation has occurred and whether the event was accepted or rejected. Once moderated events are accepted they are displayed in the module.


          The New Event displayed in the Month View

          - + Related Topics:

          • diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Copying an Existing Event as a New Event.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Copying an Existing Event as a New Event.html index fb3e9bb1b72..1ac7ab3566f 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Copying an Existing Event as a New Event.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Copying an Existing Event as a New Event.html @@ -12,7 +12,7 @@

            Copying an Existing Event as a New Event

          • Optional. At Owner, select a new owner for this event.
          • Click the Copy As New Event link. This displays the message "Have you set all the correct details for the new Event?"
          • - If the event requires moderation you will be notified when moderation has occurred and whether the event was accepted. Once moderated events are accepted they are displayed in the module.
            • + Click the OK button to confirm. If the event requires moderation you will be notified when moderation has occurred and whether the event was accepted. Once moderated events are accepted they are displayed in the module.

            diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Deleting an Event or Event Series.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Deleting an Event or Event Series.html index 38d20c11b17..129e069a2af 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Deleting an Event or Event Series.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Deleting an Event or Event Series.html @@ -9,8 +9,8 @@

            Deleting an Event or Event Series

          • Go to the event details page of the required event. See "Viewing Event Details (List View)", See "Viewing Event Details (Month View)" or See "Viewing Event Details (Week View)"
          • Select from these options:
            • Click the Delete link to delete a onetime event or this instance of a recurring event. This displays the message "Are you sure you wish to Delete this entry?" -
            • Click the Delete Series link to delete all instances of this recurring event. This displays the message "Are you sure you wish to Delete ALL recurrences?" -
            • +
            1. Click the OK button to confirm.
          • Click the Delete Series link to delete all instances of this recurring event. This displays the message "Are you sure you wish to Delete ALL recurrences?" +
            • Click the OK button to confirm.

          diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Editing an Event.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Editing an Event.html index ec2296a0d37..ab32329563e 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Editing an Event.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Editing an Event.html @@ -17,7 +17,7 @@

          Editing an Event

          1. Edit the event details as required.
          2. Optional. At Owner, select a new owner for this event.
            3. -
            4. +
          4. Click the OK button to confirm.
          \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Event Enrollment.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Event Enrollment.html index 311195b53ab..fe9af8fab97 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Event Enrollment.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Event Enrollment.html @@ -7,7 +7,7 @@

          Enabling/Disabling and Configuring Event Enrollment

          How to enable or disable users to enroll for a paid event and configure the related settings on the Events module.

          - Enrollment must be enabled by a Page Editor on the Edit Settings page of this module. See "Configuring the Enrollment Settings"

          + Prerequisite. Enrollment must be enabled by a Page Editor on the Edit Settings page of this module. See "Configuring the Enrollment Settings"

          1. Add a new event (See "Adding an Event") - OR - Go to the event details page of the required event. See "Viewing Event Details (List View)", See "Viewing Event Details (Month View)" or See "Viewing Event Details (Week View)" and then click the Edit link to edit either one time events or to edit only this instance of a recurring event, or click the Edit Series link to edit all instances of this recurring event.
          2. At Allow Enrollment, select from these options: @@ -32,7 +32,7 @@

            Enabling/Disabling and Configuring Event Enrollment


            The newly added event with enrollment enabled

            - + Related Topics:

            • diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Recurring Events.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Recurring Events.html index 68660f1f977..94edc8a07f4 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Recurring Events.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring Recurring Events.html @@ -24,7 +24,7 @@

              Enabling/Disabling and Configuring Recurring Events

              to set the event as a one time event. Note: Saved settings are retained for future use.
          3. - + Click the OK button to confirm.

          diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring an Event Reminder.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring an Event Reminder.html index 0a7b3c277b7..5ff6bd19e15 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring an Event Reminder.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enabling-Disabling and Configuring an Event Reminder.html @@ -7,7 +7,7 @@

          Enabling/Disabling and Configuring an Event Reminder

          How to enable or disable a reminder email to be sent for an event on the Events module.

          - Event reminders are disabled by default and must be enabled for each event as required. See "Configuring Event Reminder Settings"

          + Prerequisite. Event reminders are disabled by default and must be enabled for each event as required. See "Configuring Event Reminder Settings"

          1. Commence adding a new event (See "Adding an Event") but don't Update until completing the below steps - OR - Edit an existing event (See "Editing an Event")
          2. Select the Advanced Setting tab.
            3. @@ -16,7 +16,7 @@

            Enabling/Disabling and Configuring an Event Reminder

            • to enable reminders. This displays the associated settings.
              1. In the Time Before Event text box, enter and select the number of Days, Minutes or Hours before the event start time to send the notification.
              2. Optional. In the Email From text box, modify the email address to be displayed in the From field of in message.
              3. In the Email Subject text box, modify the email subject including any of the available replacement tokens. (See the list of allowed tokens below)
              4. Optional. In the Email Message text box, modify the email message including any of the available replacement tokens. Some of the allowed tokens are listed below.
            • to disable reminders. Note: This disables the reminder but any saved reminder settings are retained for future use.
          3. - + Click the OK button to confirm.

          List of Allowed Replacement Tokens for the Email Subject and Email Message fields:

          diff --git a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enrolling User to an Event.html b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enrolling User to an Event.html index caf6be8ff87..243d7337579 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enrolling User to an Event.html +++ b/Documentation/Building Your Site/Project Modules/Events/Module Editors/Enrolling User to an Event.html @@ -6,6 +6,6 @@

          Enrolling User to an Event

          How to enroll one or more users to an event on the Events module. -

          Event enrollment must be enabled for the module (See "Configuring the Enrollment Settings") and the event must allow enrollment (See "Enabling/Disabling and Configuring Event Enrollment").

          1. Go to the event details page of the required event. See "Viewing Event Details (List View)", See "Viewing Event Details (Month View)" or See "Viewing Event Details (Week View)"
          2. Click the Edit link.
          3. Select the Advanced Settings tab.
          4. Go to the Allow Enrollment section.
          5. At Enroll User To Event, the names of all users who are authorized to enroll to this event are displayed.
          6. Optional. Search for user(s) by choosing to search by either their Username or Last Name, entering the first letter of the name into the Starts With text box and then clicking the Refresh List link to view the corresponding users. In the below example, a search has been made for all usernames beginning with G.
          7. Check the check box beside each user to be enrolled.
          8. Click the Enroll Selected Users link.

          1. The user(s) are now added to the Enrolled Users list.
          2. Optional. To email details of the enrollment and event to one or more enrolled users: +

            Prerequisite. Event enrollment must be enabled for the module (See "Configuring the Enrollment Settings") and the event must allow enrollment (See "Enabling/Disabling and Configuring Event Enrollment").

            1. Go to the event details page of the required event. See "Viewing Event Details (List View)", See "Viewing Event Details (Month View)" or See "Viewing Event Details (Week View)"
            2. Click the Edit link.
            3. Select the Advanced Settings tab.
            4. Go to the Allow Enrollment section.
            5. At Enroll User To Event, the names of all users who are authorized to enroll to this event are displayed.
            6. Optional. Search for user(s) by choosing to search by either their Username or Last Name, entering the first letter of the name into the Starts With text box and then clicking the Refresh List link to view the corresponding users. In the below example, a search has been made for all usernames beginning with G.
            7. Check the check box beside each user to be enrolled.
            8. Click the Enroll Selected Users link.

            1. The user(s) are now added to the Enrolled Users list.
            2. Optional. To email details of the enrollment and event to one or more enrolled users:
              1. Check the check box beside each user to be emailed.
              2. Edit the Email Details if required.
              3. Click the Email Selected Enrolled Users link.

              1. The message "Are You Sure You Wish To Send an Email to SELECTED Enrolled Users?" is now displayed. Click the OK button to confirm.
              2. Click the Cancel button to return to the module.

            Tip: If the list of enrolled users is set to display on the event detail page, you can view the full list of enrolled users there. Otherwise you must edit the event to view the enrolled users list.

            \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Events/Settings/Setting Unique Event Permissions.html b/Documentation/Building Your Site/Project Modules/Events/Settings/Setting Unique Event Permissions.html index 2a4b9914f81..2dd2b4e9ea5 100644 --- a/Documentation/Building Your Site/Project Modules/Events/Settings/Setting Unique Event Permissions.html +++ b/Documentation/Building Your Site/Project Modules/Events/Settings/Setting Unique Event Permissions.html @@ -14,7 +14,7 @@

            Setting Event Permissions

          3. At Permissions, set these unique Event module permissions:
            • Event Moderators: Grant this permission to enable roles/users to moderate events.
            • Event Editor: Grant this permission to enable users/roles to edit existing events.
            • Global Category Editors: Grant this permission to enable users/roles to create and manage event categories.
            • Global Location Editors: Grant this permission to enable users/roles to create and manage event categories.
          4. - + Click the OK button to confirm.

          @@ -22,7 +22,7 @@

          Setting Event Permissions


          Assigning roles and users as Events Moderators

          - + Related Topics:

          • diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ .html b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ .html index f0aab098df4..a344d180268 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ .html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ .html @@ -17,7 +17,7 @@

            Adding an FAQ

              -
            1. The newly added FAQ is now displayed in the module.
              2. +
            2. Click the OK button to confirm. The newly added FAQ is now displayed in the module.
            3. Optional. Click the Down arrow beside the tutorial to move it down the list of FAQs.

            diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ Category.html b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ Category.html index 683c5f79646..21d62baca43 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ Category.html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Adding an FAQ Category.html @@ -17,7 +17,7 @@

            Adding an FAQ Category

              -
              2. +
            2. Click the OK button to confirm.
            3. Repeat Steps 2-5 to add additional categories.
            4. Click the Cancel button to return to the module.
            diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Deleting an FAQ .html b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Deleting an FAQ .html index 6adbc529bb3..427884f96f7 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Deleting an FAQ .html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Deleting an FAQ .html @@ -15,7 +15,7 @@

            Deleting an FAQ

            1. Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
            2. - + Click the OK button to confirm.
            diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ Category .html b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ Category .html index 7eb736d83ad..5fde24650e5 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ Category .html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ Category .html @@ -16,7 +16,7 @@

            Editing an FAQ Category

            1. The following editing options are available:
                2. -
              • To edit the Parent Category, Category Name and/or Category Description, modify the details displayed to the right and then
                • +
              • To edit the Parent Category, Category Name and/or Category Description, modify the details displayed to the right and then Click the OK button to confirm.
              • To change the order of categories, simply drag the selected category to new position. For Example, drag a category on top of another to make it a parent category.
              diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ.html b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ.html index 9049a15138d..b7e5c058009 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ.html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Module Editors/Editing an FAQ.html @@ -10,7 +10,7 @@

              Editing FAQ details or category

              1. Click the Edit button associated with the FAQ to be edited.
              2. Edit the one or more fields as required.
                3. -
                4. +
              4. Click the OK button to confirm.

              Reordering FAQs

                diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Settings/Editing the FAQ Templates.html b/Documentation/Building Your Site/Project Modules/FAQs/Settings/Editing the FAQ Templates.html index 13aa4a1cc42..df71723749d 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Settings/Editing the FAQ Templates.html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Settings/Editing the FAQ Templates.html @@ -20,7 +20,7 @@

                Editing the FAQ Templates

                1. - + Click the OK button to confirm.

                Note: In the below image, the Question Template has been modified to include the FAQ Index before the question and the background color of questions has been changed.

                diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Settings/Managing Category Settings.html b/Documentation/Building Your Site/Project Modules/FAQs/Settings/Managing Category Settings.html index 6ac1001ebca..679fd0df510 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Settings/Managing Category Settings.html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Settings/Managing Category Settings.html @@ -20,7 +20,7 @@

                Managing Category Settings

                1. - + Click the OK button to confirm.

                diff --git a/Documentation/Building Your Site/Project Modules/FAQs/Settings/Setting the Default Sorting Order of FAQs.html b/Documentation/Building Your Site/Project Modules/FAQs/Settings/Setting the Default Sorting Order of FAQs.html index 9fae39397b6..35b1b3a87ab 100644 --- a/Documentation/Building Your Site/Project Modules/FAQs/Settings/Setting the Default Sorting Order of FAQs.html +++ b/Documentation/Building Your Site/Project Modules/FAQs/Settings/Setting the Default Sorting Order of FAQs.html @@ -19,7 +19,7 @@

                Setting the Default Sorting Order of FAQ's

                1. - + Click the OK button to confirm.

                diff --git a/Documentation/Building Your Site/Project Modules/Feedback/About the Feedback Module.htm b/Documentation/Building Your Site/Project Modules/Feedback/About the Feedback Module.htm index f014bd3a2b7..b9ee355a7e8 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/About the Feedback Module.htm +++ b/Documentation/Building Your Site/Project Modules/Feedback/About the Feedback Module.htm @@ -1,5 +1,5 @@  - + @@ -23,11 +23,11 @@

                About the Feedback Module


                The Feedback Module

                - +

                \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Categories.html b/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Categories.html index 6a9429f6c81..3ac2158dec9 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Categories.html +++ b/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Categories.html @@ -10,7 +10,7 @@

                Deleting Feedback Categories

              1. At List Type, select Categories.
              2. Click the Delete button beside the category to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
              3. - + Click the OK button to confirm.

              diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Subjects.html b/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Subjects.html index d66bf20189e..d4726217073 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Subjects.html +++ b/Documentation/Building Your Site/Project Modules/Feedback/Manage Feedback Lists/Deleting Feedback Subjects.html @@ -11,7 +11,7 @@

              Deleting Feedback Subjects

            2. At List Type, select Subjects.
            3. Click the Delete button beside the subject to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
            4. - + Click the OK button to confirm.

            diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Cleanup Settings.htm b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Cleanup Settings.htm index 7047210f621..f084a460217 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Cleanup Settings.htm +++ b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Cleanup Settings.htm @@ -16,7 +16,7 @@

            Configuring Cleanup Settings

          • In the Days Before text box, enter the number of days history comments to be stored for before clean up. The default is 365 days
          • In the Max Feedback text box, enter the maximum number comments to be stored for each feedback group (e.g. pending, private published and archived) before clean up. The default is 1000 days.
          • - + Click the OK button to confirm.

            • diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Feedback Category Settings.html b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Feedback Category Settings.html index 690a71801cd..cdacf97dc9f 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Feedback Category Settings.html +++ b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Feedback Category Settings.html @@ -23,7 +23,7 @@

            Configuring Feedback Category Settings

            1. - + Click the OK button to confirm.
            diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Form and Fields Settings.html b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Form and Fields Settings.html index 1e48c0bcd74..dd509192d48 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Form and Fields Settings.html +++ b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Form and Fields Settings.html @@ -38,7 +38,7 @@

            Configuring Form and Fields Settings

            1. - + Click the OK button to confirm.
            diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Moderation and Feedback Management Settings.html b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Moderation and Feedback Management Settings.html index ccb9e856286..5b4a4ce5a1c 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Moderation and Feedback Management Settings.html +++ b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Moderation and Feedback Management Settings.html @@ -13,7 +13,7 @@

            Configuring Moderation and Feedback Management Settings

          • Select the Feedback Settings tab.
          • Expand the Moderation and Feedback Management Settings section.
          • At Scope, select the scope of moderation from these options:
            • Instance (for this Feedback module only): Feedback moderators can only view and manage feedback associated with this instance of the Feedback module.
            • Portal (across all Feedback modules of portal): Feedback moderators can view and manage feedback for all instances of the Feedback module on this site. This option should be used with caution.
            • -
          • At Moderated, select from these options:
            • to enable moderation. This displays Moderation Categories List for this module with all categories pre-selected.
              1. At Send Emails to Admins, to send moderation emails to Administrators - OR - if Administrators don't need to receive moderation emails.
              2. Optional. At Moderation Categories, beside any category that will not be moderated. If no categories are selected, then all categories are moderated.
              3. At Unmoderated Category Status, select the status for unmoderated posts when not all categories are moderated. The available options are: Archived, Pending, Private, Published, or Deleted.
            • to disable moderation.
            • +
          • At Moderated, select from these options:
            • to enable moderation. This displays Moderation Categories List for this module with all categories pre-selected.
              1. At Send Emails to Admins, to send moderation emails to Administrators - OR - if Administrators don't need to receive moderation emails.
              2. Optional. At Moderation Categories, beside any category that will not be moderated. If no categories are selected, then all categories are moderated.
              3. At Unmoderated Category Status, select the status for unmoderated posts when not all categories are moderated. The available options are: Archived, Pending, Private, Published, or Deleted.
            • to disable moderation.
          • In the Print Template text box, view and/or edit the HTML template used for printing a single feedback item from the moderation/management control. You may use the same field value tokens as those available in the guest book settings. For example, the token [Feedback:Subject] will be replaced with the feedback Subject field value. Note: You can reset the default template by clicking the Reset Default button.
          • At Print Action, select to display print results either In-Line (Existing Page) or in a Popup (New Window). This setting relates to the Print button which can be selected when moderating feedback.
            • @@ -22,7 +22,7 @@

            Configuring Moderation and Feedback Management Settings

            1. - + Click the OK button to confirm.
            diff --git a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Submission and Security Settings.html b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Submission and Security Settings.html index 734d5c657f5..ae1de9b1f71 100644 --- a/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Submission and Security Settings.html +++ b/Documentation/Building Your Site/Project Modules/Feedback/Settings/Configuring Submission and Security Settings.html @@ -23,9 +23,7 @@

            Configuring Submission and Security Settings

              -
            1. - -
              2. +
            2. Click the Update button

            diff --git a/Documentation/Building Your Site/Project Modules/Form And List/Configuration/Resetting to the Default Configuration.html b/Documentation/Building Your Site/Project Modules/Form And List/Configuration/Resetting to the Default Configuration.html index 7f0484de775..926200435ad 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/Configuration/Resetting to the Default Configuration.html +++ b/Documentation/Building Your Site/Project Modules/Form And List/Configuration/Resetting to the Default Configuration.html @@ -10,7 +10,7 @@

            Resetting to the Default Configuration

          • Select  Form and List Configuration from the module actions menu. This will open the Form And List Configuration page.
          • Select Reset To Default Configuration from the module actions menu. This displays the message "Are You Sure Wish To Reset All Page Related Settings For This Module?"
          • - + Click the OK button to confirm.
            • diff --git a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record when a Security Code is Required .html b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record when a Security Code is Required .html index 5885dbc6fb3..355c4e56144 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record when a Security Code is Required .html +++ b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record when a Security Code is Required .html @@ -10,7 +10,7 @@

            Adding a List Record when a Security Code is Required

          • Select Add New Record from the module actions menu. This opens the Edit Record page.
          • Enter or select your data. Required fields are denoted by an asterisk ( * ).
          • In the Security Code text box, enter the code displayed above the text box.
            • -
            • +
          • Click the Update button.

            • Tip: If you cannot read the Security Code, strike the F5 key on your keyboard to view a new code. You should be this before entering your data, as all data will be lost if you strike F5.

            diff --git a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record.html b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record.html index c8ba6f11036..064dedefc43 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record.html +++ b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Adding a List Record.html @@ -19,7 +19,7 @@

            Adding a List Record

              -
              2. +
            2. Click the Update button.

            diff --git a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting All List Records.html b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting All List Records.html index c620ded421f..e4db0652f9a 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting All List Records.html +++ b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting All List Records.html @@ -9,7 +9,7 @@

            Deleting All List Records

            1. Select Delete All Records from the Forms and Lists module actions menu either on the default module view or from the Form And List Configuration page. This displays the message "Are You Sure Wish To Delete All Records Stored In This Table?"
            2. - + Click the OK button to confirm.
            3. Optional. Click the Refresh button - OR - F5 key on your keyboard.
            diff --git a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting a List Record.html b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting a List Record.html index 525877f2272..9b31a7cd511 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting a List Record.html +++ b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Deleting a List Record.html @@ -10,7 +10,7 @@

            Deleting a List Record

          • Click the Edit  button beside the record to be deleted.
          • Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
          • - + Click the OK button to confirm.
          • Repeat Steps 1-3 to delete additional records.
            • diff --git a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Editing a List Record.html b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Editing a List Record.html index ceb212c3b2c..c6fe8035d67 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Editing a List Record.html +++ b/Documentation/Building Your Site/Project Modules/Form And List/List Editors/Editing a List Record.html @@ -14,7 +14,7 @@

            Editing a List Record

              -
              2. +
            2. Click the Update button.
            \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Form And List/Settings/Enabling-Disabling CAPTCHA for Anonymous Users.html b/Documentation/Building Your Site/Project Modules/Form And List/Settings/Enabling-Disabling CAPTCHA for Anonymous Users.html index 7fc0a941274..497dd8e74a3 100644 --- a/Documentation/Building Your Site/Project Modules/Form And List/Settings/Enabling-Disabling CAPTCHA for Anonymous Users.html +++ b/Documentation/Building Your Site/Project Modules/Form And List/Settings/Enabling-Disabling CAPTCHA for Anonymous Users.html @@ -17,7 +17,7 @@

            Enabling/Disabling CAPTCHA for Anonymous Users

              -
              2. +
            2. Click the Update button.

            diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Deleting a Forum Post.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Deleting a Forum Post.html index 27ce218c6ad..86fb3fc1c1c 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Deleting a Forum Post.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Deleting a Forum Post.html @@ -17,7 +17,7 @@

            Deleting a Forum Post

          • Optional. Complete this step to send email notification to the poster that this post has been deleted:
            1. At Email Template, select the reason why the post is being deleted.
            2. Optional. In the Emailed Response, edit the message to be emailed to the poster.
            3. At Email User, to email the poster.
          • Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
          • - + Click the OK button to confirm.

            • diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Editing your Forum Posts.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Editing your Forum Posts.html index a2a5fb042be..8be8ffc70bd 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Editing your Forum Posts.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Editing your Forum Posts.html @@ -18,7 +18,7 @@

            Editing your Forum Posts


            Editing Your Post

            - + Related Topics:

            • diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Managing Forum Bookmarks.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Managing Forum Bookmarks.html index b711848c5f2..57e284cb634 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Managing Forum Bookmarks.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Managing Forum Bookmarks.html @@ -15,7 +15,7 @@

              Managing Forum Bookmarks

              - + Related Topics:

              • diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Reporting a Post.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Reporting a Post.html index d2c8c706bfb..2596a7ec777 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Reporting a Post.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Reporting a Post.html @@ -33,7 +33,7 @@

                Reporting a Post

                1. Click the Report Post link. This displays the message "Are you sure you want to report this post?"
                2. - The post now displays the Report Warning  icon. Mouse over the icon to view the number of reports against this post.
                  3. + Click the OK button to confirm. The post now displays the Report Warning  icon. Mouse over the icon to view the number of reports against this post.

                diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Splitting a Thread.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Splitting a Thread.html index e7bd2c21858..0cae49aba3d 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Splitting a Thread.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Members/Splitting a Thread.html @@ -20,7 +20,7 @@

                Splitting a Thread

              • Optional. At Include Post In New Thread, to include other posts in this thread - OR - to only include the post selected for splitting. E.g. The first post listed here.
              • Click the Split Thread link. This displays the message "All Posts which are not approved and are being split into the new thread will be approved during the split!"
              • - + Click the OK button to confirm.

                • diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Deleting a Post awaiting Moderation.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Deleting a Post awaiting Moderation.html index 5384a8162a1..235cd3727f8 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Deleting a Post awaiting Moderation.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Deleting a Post awaiting Moderation.html @@ -20,7 +20,7 @@

                Deleting a Post awaiting Moderation

              • Optional. At Email User, to email the poster - OR - if no email is required.
              • Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
              • - + Click the OK button to confirm.

                • diff --git a/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Viewing Banned Users.html b/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Viewing Banned Users.html index 706a894db91..b13a2e0681c 100644 --- a/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Viewing Banned Users.html +++ b/Documentation/Building Your Site/Project Modules/Forum/Forum Moderators/Viewing Banned Users.html @@ -17,7 +17,7 @@

                Viewing Banned Users

              • In the User column, click on a user name link to view the users profile.

                • - + Related Topics:

                • diff --git a/Documentation/Building Your Site/Project Modules/Gallery/All Users/Setting Gallery View.html b/Documentation/Building Your Site/Project Modules/Gallery/All Users/Setting Gallery View.html index a4e9c23d637..69b1630d081 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/All Users/Setting Gallery View.html +++ b/Documentation/Building Your Site/Project Modules/Gallery/All Users/Setting Gallery View.html @@ -21,7 +21,7 @@

                  Setting Gallery View


                  Gallery displayed in Standard View

                  - + Related Topics:

                  • diff --git a/Documentation/Building Your Site/Project Modules/Gallery/All Users/Sorting Gallery Files.html b/Documentation/Building Your Site/Project Modules/Gallery/All Users/Sorting Gallery Files.html index b6c4754d169..c7c25eb84a6 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/All Users/Sorting Gallery Files.html +++ b/Documentation/Building Your Site/Project Modules/Gallery/All Users/Sorting Gallery Files.html @@ -14,7 +14,7 @@

                    Sorting Gallery Files


                    Sorting Albums

                    - + Related Topics:

                    • diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a File to an Album.html b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a File to an Album.html index b9495113ef3..4019cb4c6be 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a File to an Album.html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a File to an Album.html @@ -6,7 +6,7 @@

                      Adding Files to an Album

                      Module Editors can add one or more files to an album of the Gallery module. In the below example, two files are uploaded to an album titled "Bikes"

                      - The maximum height and width of images is set to 500 pixels by default and the maximum height and width of thumbnails is set to 100 pixels by default. Page Editors can only modify these settings prior to adding albums and images to the Gallery. See "Configuring Display Settings"

                      + Prerequisite. The maximum height and width of images is set to 500 pixels by default and the maximum height and width of thumbnails is set to 100 pixels by default. Page Editors can only modify these settings prior to adding albums and images to the Gallery. See "Configuring Display Settings"

                      1. Navigate to and open the menu of the required album. See "Opening the Album Menu"
                      2. Select Add Files from the menu.
                        3. diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a Parent Album .html b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a Parent Album .html index d8ea7b02688..baa74c026e4 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a Parent Album .html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Adding a Parent Album .html @@ -6,7 +6,7 @@

                        Adding a Parent Album

                        Module Editors can add a parent album to the gallery module. Note: Album names may not include the following characters that are invalid in either a Windows folder name or web URL: \ / : * ? ! " > < | &

                        - The maximum height and width of images is set to 500 pixels by default and the maximum height and width of thumbnails is set to 100 pixels by default. Page Editors can only modify these settings prior to adding albums and images to the Gallery. See "Configuring Display Settings"

                        + Prerequisite. The maximum height and width of images is set to 500 pixels by default and the maximum height and width of thumbnails is set to 100 pixels by default. Page Editors can only modify these settings prior to adding albums and images to the Gallery. See "Configuring Display Settings"

                        1. Go to the Gallery home page.
                        2. Mouse over the Gallery icon and then select Add Album. This opens the Edit Album page.
                          3. diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a File from an Album .html b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a File from an Album .html index b0b5447934f..f67512318ce 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a File from an Album .html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a File from an Album .html @@ -18,7 +18,7 @@

                          Deleting a File from an Album

                          1. - + Click the OK button to confirm.
                          2. Repeat Steps 4-5 to delete additional files from this album.
                          diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a Sub-Album .html b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a Sub-Album .html index c68232d7c77..fee74251ca1 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a Sub-Album .html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Deleting a Sub-Album .html @@ -21,7 +21,7 @@

                          Deleting a Sub-Album

                          1. - + Click the OK button to confirm.
                          2. Repeat Steps 4-5 to delete additional albums.
                          diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Editing Image Properties .html b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Editing Image Properties .html index 4c4d43f695c..65fb7f1d6c5 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Editing Image Properties .html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Module Editors/Editing Image Properties .html @@ -29,7 +29,7 @@

                          Editing Image Properties

                          1. Click the Save button. This displays the message "Are you sure you wish to save the changes to this item?"
                          2. - + Click the OK button to confirm.
                          3. To edit additional images, use the  Previous and Next buttons to move to other images and then repeat Steps 4-6.
                          4. Click the Close button to exit the Gallery Image Viewer/Editor.
                            5. diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Configuring Private Gallery.html b/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Configuring Private Gallery.html index 54afffa6cae..276224c576a 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Configuring Private Gallery.html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Configuring Private Gallery.html @@ -16,7 +16,7 @@

                            Configuring Private Gallery

                          5. Select Edit > Configuration from the Gallery module actions menu to return to the Private Gallery.
                          6. Maximize  the Private Gallery section.
                            7. -
                          7.  At Owner the name of the user who created the Private Gallery is displayed as the owner. You can select a different the gallery owner as follows:
                            1. Click the Search button.
                            2. In the Find text box, enter the username - OR - just the first letter(s) of the username - OR - Leave blank to view all users.
                            3. Click the Go button. This displays the matching users in the Name/Display Name list.
                            4. Select the required user.
                            8. +
                          8.  At Owner the name of the user who created the Private Gallery is displayed as the owner. You can select a different the gallery owner as follows:
                            1. Click the Search button.
                            2. In the Find text box, enter the username - OR - just the first letter(s) of the username - OR - Leave blank to view all users.
                            3. Click the Go button. This displays the matching users in the Name/Display Name list.
                            4. Select the required user.
                            5. Click the OK button to confirm.

                          diff --git a/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Gallery Themes.html b/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Gallery Themes.html index 4e127633a5f..4064370ee4c 100644 --- a/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Gallery Themes.html +++ b/Documentation/Building Your Site/Project Modules/Gallery/Page Editors/Gallery Themes.html @@ -66,7 +66,7 @@

                          Overview of Gallery Themes

                          …
                          DotNetNuke Theme Image Viewer

                          - + Related Topics:

                          • diff --git a/Documentation/Building Your Site/Project Modules/Links/All Users/Viewing Info Link.html b/Documentation/Building Your Site/Project Modules/Links/All Users/Viewing Info Link.html index 0b3063bb93c..3bbf66a2451 100644 --- a/Documentation/Building Your Site/Project Modules/Links/All Users/Viewing Info Link.html +++ b/Documentation/Building Your Site/Project Modules/Links/All Users/Viewing Info Link.html @@ -14,7 +14,7 @@

                            Viewing Info Link

                            - + Related Topics:

                            • diff --git a/Documentation/Building Your Site/Project Modules/Links/Module Editors/Adding a Link.html b/Documentation/Building Your Site/Project Modules/Links/Module Editors/Adding a Link.html index 89c2630da5d..e807b622e23 100644 --- a/Documentation/Building Your Site/Project Modules/Links/Module Editors/Adding a Link.html +++ b/Documentation/Building Your Site/Project Modules/Links/Module Editors/Adding a Link.html @@ -8,7 +8,7 @@

                              Adding a Link

                              How to manually create a link to any internal or external URL or to any site page, file or user profile using the Links module.

                              Note: The Links module does not prevent you from adding a link to a page that has been set as disabled therefore it is recommended that you test your links once you have created them. If you do create a link to a page that is disabled or becomes disabled, the link will function normally for Administrators and SuperUsers, however registered users and visitors will be redirected to the site's Home page. An alternative to the Links module is the DotNetNuke RadEditorProvider that prevents links being created to Disabled pages. See "Setting a Page Link"

                              - The Link module must be set to use the default Link Mode to create and manage individual links. See "Setting the Links Mode"

                              + Prerequisite. The Link module must be set to use the default Link Mode to create and manage individual links. See "Setting the Links Mode"

                              1. Select Edit > Add Link from the module actions menu to opens the Edit Links page.
                              2. In the Title text box, enter a title for the link as it will appear in the module.
                                3. diff --git a/Documentation/Building Your Site/Project Modules/Links/Module Editors/Deleting a Link.html b/Documentation/Building Your Site/Project Modules/Links/Module Editors/Deleting a Link.html index 88b4b3ab9aa..adc0b0f02c5 100644 --- a/Documentation/Building Your Site/Project Modules/Links/Module Editors/Deleting a Link.html +++ b/Documentation/Building Your Site/Project Modules/Links/Module Editors/Deleting a Link.html @@ -17,7 +17,7 @@

                                Deleting a Link

                                1. Click the Delete link located at the base on the Edit Links module. This displays the message "Are You Sure You Wish To Delete This Item?"
                                2. - + Click the OK button to confirm.
                                diff --git a/Documentation/Building Your Site/Project Modules/Links/Module Editors/Editing a Link.html b/Documentation/Building Your Site/Project Modules/Links/Module Editors/Editing a Link.html index 1aeb94b93d8..d0b043ae707 100644 --- a/Documentation/Building Your Site/Project Modules/Links/Module Editors/Editing a Link.html +++ b/Documentation/Building Your Site/Project Modules/Links/Module Editors/Editing a Link.html @@ -7,7 +7,7 @@

                                Editing a Link

                                How to edit a link that was manually created using the Links module.

                                - The Link module must be set to Links mode to create and manage individual links. See "Setting the Links Mode"

                                + Prerequisite. The Link module must be set to Links mode to create and manage individual links. See "Setting the Links Mode"

                                1. If the links are displayed in a drop down list, choose the link to be edited from the drop down list.
                                2. Click the Edit button beside the link to be edited.
                                  3. diff --git a/Documentation/Building Your Site/Project Modules/Links/Settings/Enabling-Disabling the Info Link.html b/Documentation/Building Your Site/Project Modules/Links/Settings/Enabling-Disabling the Info Link.html index bc76895d891..3963d1b89e2 100644 --- a/Documentation/Building Your Site/Project Modules/Links/Settings/Enabling-Disabling the Info Link.html +++ b/Documentation/Building Your Site/Project Modules/Links/Settings/Enabling-Disabling the Info Link.html @@ -38,7 +38,7 @@

                                  Enabling/Disabling the Info Link


                                  The Links module (Friends Mode) with info links

                                  - + Related Topics:

                                  • diff --git a/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying Video and Flash.html b/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying Video and Flash.html index 0f5abd9b05c..b1e19147cca 100644 --- a/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying Video and Flash.html +++ b/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying Video and Flash.html @@ -52,7 +52,7 @@

                                    Displaying Video and Flash


                                    The Journal post displayed in the Journal module

                                    - + Related Topics:

                                    • diff --git a/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying a Sound File .html b/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying a Sound File .html index 5ee23ddb45c..3d7bd670957 100644 --- a/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying a Sound File .html +++ b/Documentation/Building Your Site/Project Modules/Media/Module Editors/Displaying a Sound File .html @@ -50,7 +50,7 @@

                                      Displaying a Sound File


                                      A sound file posted to the Journal module

                                      - + Related Topics:

                                      • diff --git a/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Adding News Feeds from Syndicated Modules.html b/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Adding News Feeds from Syndicated Modules.html index 72e7b8e2c4e..d919fe6c329 100644 --- a/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Adding News Feeds from Syndicated Modules.html +++ b/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Adding News Feeds from Syndicated Modules.html @@ -7,7 +7,7 @@

                                        Adding News Feeds from Syndicated Modules

                                        How to add news feeds from syndicated modules on your website using the News Feeds (RSS) module.

                                        - Syndication must be enabled for the required module. See "Configuring Basic Page Settings for Modules"

                                        + Prerequisite. Syndication must be enabled for the required module. See "Configuring Basic Page Settings for Modules"

                                        1. Go to a syndicated module. In this example an Announcements module is used.
                                        2. Select Manage > Syndicate from the module actions menu.
                                          3. @@ -47,7 +47,7 @@

                                          Adding News Feeds from Syndicated Modules

                                          - + Related Topics:

                                          • diff --git a/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Deleting News Feeds.html b/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Deleting News Feeds.html index 2dc85fcd15f..f12d5d806d4 100644 --- a/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Deleting News Feeds.html +++ b/Documentation/Building Your Site/Project Modules/News Feeds/Module Editors/Deleting News Feeds.html @@ -11,7 +11,7 @@

                                            Deleting News Feeds

                                          • Click the Edit button beside the feed to be deleted.
                                          • Click the Delete button at the base of the page. This displays the message "Do you really want to delete the selected RSS feed?"
                                          • - + Click the OK button to confirm.
                                          • Repeat Steps 2-4 to delete additional feeds.
                                          • Click the Return button to return to the page.
                                            • diff --git a/Documentation/Building Your Site/Project Modules/News Feeds/Settings/Configuring Feed Retrieval Settings.html b/Documentation/Building Your Site/Project Modules/News Feeds/Settings/Configuring Feed Retrieval Settings.html index 83b4bfd1087..2e0a1a66122 100644 --- a/Documentation/Building Your Site/Project Modules/News Feeds/Settings/Configuring Feed Retrieval Settings.html +++ b/Documentation/Building Your Site/Project Modules/News Feeds/Settings/Configuring Feed Retrieval Settings.html @@ -22,7 +22,7 @@

                                            Configuring Feed Retrieval Settings

                                        - + Related Topics:

                                        • diff --git a/Documentation/Building Your Site/Project Modules/Reports/About the Reports Module.htm b/Documentation/Building Your Site/Project Modules/Reports/About the Reports Module.htm index 9f6535c10b1..823865044fe 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/About the Reports Module.htm +++ b/Documentation/Building Your Site/Project Modules/Reports/About the Reports Module.htm @@ -1,25 +1,21 @@  - +

                                          About the Reports Module

                                          The Reports module displays the results of an SQL query to the database of the site. The report is displayed as a series of records. The Reports Module is designed to query a tabular data store (such as a Relational Database like Microsoft SQL Server) and visualize the results. Only the Host is able to create reports. Page Editors are able to configure a range of setting that control the way reports are displayed in the module.

                                          -

                                          - -

                                          Module Version: 05.05.00 / Minimum DNN Version: 05.04.04

                                          -

                                          -

                                          The Reports Module +
                                          Reports

                                          Tip: The Reports module is not designed for viewing data from hierarchical sources such as XML, and we recommend you use the XML module if you wish to process XML data.

                                          - +

                                          \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Installing the Microsoft Report Viewer Visualizer.html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Installing the Microsoft Report Viewer Visualizer.html index 21d9ae8ee54..445f8c36dfa 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Installing the Microsoft Report Viewer Visualizer.html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Installing the Microsoft Report Viewer Visualizer.html @@ -6,7 +6,7 @@

                                          Installing the Microsoft Report Viewer Visualizer

                                          The Microsoft ReportViewer Visualizer uses the ReportViewer control to display rich reports, as well as reports running on a SQL Server Reporting Services instance. This visualizer displays reports produced in Microsoft Report Definition Language. This includes reports that are processed locally on the web server as well as reports processed on a Microsoft SQL Server Reporting Services server. The ReportViewer Visualizer has two modes: Local Report Mode and Server Report Mode. See "Configuring the Microsoft Report Viewer Visualizer Settings" for details on using this visualizer.

                                          - The Report Viewer Visualizer requires that your site is running in a full trust environment. See "Enabling Full Trust for DNN Sites"

                                          + Prerequisite. The Report Viewer Visualizer requires that your site is running in a full trust environment. See "Enabling Full Trust for DNN Sites"

                                          Important: This Visualizer DOES NOT require a license to Microsoft SQL Server or Microsoft SQL Server Reporting Services. All you need is this Module and DNN.

                                          Here's how to install the Microsoft Report Viewer data source on the Reports module.

                                            diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/More Details on the Testing and Showing Source Options .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/More Details on the Testing and Showing Source Options .html index 2b3319ff8c0..7c8c281dbcd 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/More Details on the Testing and Showing Source Options .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/More Details on the Testing and Showing Source Options .html @@ -7,11 +7,11 @@

                                            More Details on the Testing and Showing Source Options

                                            This section provides more details on the Test Data Source, Show Xml Source,  Hide Results and Hide Xml Source links in the Data Source Setting section of the Reports module. These tools are available for all data sources.

                                              -
                                            • Test Data Source: Click this link to test your data source. This will display the following message: "WARNING! This action will run your Data Source. Any SQL or other Query Language code configured for the Data Source will be executed. Do you want to continue?" One of the following options will be displayed:
                                              • Test Successful Message: This OK message includes the number of records returned. 
                                              • Error Message: Details the specific error. In this case, you will need to fix the error and may want to re-test the data source. 

                                              • +
                                            • Test Data Source: Click this link to test your data source. This will display the following message: "WARNING! This action will run your Data Source. Any SQL or other Query Language code configured for the Data Source will be executed. Do you want to continue?" Click the OK button to confirm. One of the following options will be displayed:
                                              • Test Successful Message: This OK message includes the number of records returned. 
                                              • Error Message: Details the specific error. In this case, you will need to fix the error and may want to re-test the data source. 

                                            • Hide Results: Click this link to hide the results of the Test Data Source function.
                                              • -
                                            • Show Xml Source: Click link view the Xml of your data source. This will display the following message: "WARNING! This action will run your Data Source. Any SQL or other Query Language code configured for the Data Source will be executed. Do you want to continue?". One of the following options will be displayed:
                                              • +
                                            • Show Xml Source: Click link view the Xml of your data source. This will display the following message: "WARNING! This action will run your Data Source. Any SQL or other Query Language code configured for the Data Source will be executed. Do you want to continue?". Click the OK button to confirm. One of the following options will be displayed:
                                            • No Error: the Xml Source used in XSLT transformations of the data is displayed in the Xml Source text box . This field is read only.
                                              • diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Charting Users in Roles .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Charting Users in Roles .html index f26e6796f0e..a5d706aa1fe 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Charting Users in Roles .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Charting Users in Roles .html @@ -1,5 +1,5 @@  - + @@ -7,7 +7,7 @@

                                              Sample Report: Charting Users in Roles

                                              How to create a report that lists the number of users in each role of your site using the Reports module. This tutorial builds on the previous one: Counting users in each role. This tutorial assumes you have configured the Reports Module as shown in that tutorial. This tutorial also assumes you have installed the Chart Visualizer. The following steps will change your Grid display into a Bar Chart:

                                              1. - +
                                              2. Select the Report Settings tab.
                                              3. Go to the Display and Caching Settings section.
                                                4. @@ -22,7 +22,7 @@

                                                Sample Report: Charting Users in Roles

                                              4. In the Bar Color Mode text box, enter One Color.
                                              5. In the Bar Bar Color text box, enter a hexadecimal color value. E.g. #0000ff
                                              6. - You should now see a Chart similar to the below screen capture. If you do not, verify that your site is running in a full trust environment (See "Enabling Full Trust for DNN Sites") and that the Chart Visualizer is correctly configured.
                                                7. + You should now see a Chart similar to the below screen capture. If you do not, verify that your site is running in a full trust environment (See "Enabling Full Trust for DNN Sites") and that the Chart Visualizer is correctly configured.

                                              diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Counting Users In Each Role.html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Counting Users In Each Role.html index f8e5195fbd2..a68002ba7f5 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Counting Users In Each Role.html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Sample Report Counting Users In Each Role.html @@ -1,14 +1,13 @@  - + -

                                              Sample Report: Counting Users In Each Role

                                              How to create a report that lists the number of users in each role of your site using the Reports module. This tutorial is based on using a new instance of the Reports module and accepting all default for other fields.

                                              1. - +
                                              2. Select the Report Settings tab.
                                              3. Go to the Data Source Settings section.
                                                4. @@ -17,10 +16,10 @@

                                                Sample Report: Counting Users In Each Role

                                              4. At Active Data Source, select DotNetNuke Data Source.
                                              5. In the Query text box, enter the below query:
                                                SELECT R.RoleName, COUNT(UR.UserID) AS 'UsersInRole'
                                                FROM {oQ}UserRoles AS UR
                                                INNER JOIN {oQ}Roles AS R ON UR.RoleID = R.RoleID
                                                WHERE PortalID = @PortalID
                                                GROUP BY R.RoleName
                                              6. Go to the Display and Caching Settings section.
                                                7. -
                                              7. At Show Info Pane, .
                                                8. -
                                              8. At Auto Run Report, .
                                                9. +
                                              9. At Show Info Pane, mark  the check box.
                                                10. +
                                              10. At Auto Run Report, mark  the check box.
                                              11. - +

                                              diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting Converter Settings .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting Converter Settings .html index ac1f64ad0d1..4a04f323cb7 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting Converter Settings .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting Converter Settings .html @@ -1,26 +1,29 @@ - - + + -

                                              Setting Converter Settings

                                              Converters are designed to allow users to apply special conversions to the data retrieved by a Data Source before that data reaches the Visualizer. Currently, there are two Converters provided. Here's how to set the Converters settings on the Reports module.

                                              -
                                                -
                                              1. Select Settings from the Reports module actions menu - OR - Click the Settings button.
                                                2. -
                                              2. Maximize - the Report Settings section.
                                                3. -
                                              3. Go to the Data Source Settings section and configure these settings as required.
                                                4. -
                                              4. Go to the Converters section.
                                                5. -
                                              5. In the HTML Decode text box, enter a comma-separated list of columns to be Html Decoded. Note: This field decodes HTML Encoded Data, converting text such as <b>"Hello"</b> into "Hello". This is useful for decoding data which was HTML Encoded when it was entered into the database so that the tags will be interpreted by the Web browser when the report is displayed.
                                                6. -
                                              6. In the HTML Encode text box, enter a comma-separated list of columns to be Html Encoded. Note: HTML Encodes Data, converting text such as "Hello" into <b>"Hello"</b>. This is useful for displaying raw HTML tags specified in your data.
                                                7. -
                                              -

                                              - -

                                              -
                                                -
                                                2. -
                                              -

                                              Tip: The appropriate converter will be applied to each column specified in the list.

                                              +
                                                +
                                              1. + +
                                                2. +
                                              2. Maximize + the Report Settings section.
                                                3. +
                                              3. Go to the Data Source Settings section and configure these settings as required.
                                                4. +
                                              4. Go to the Converters section.
                                                5. +
                                              5. In the HTML Decode text box, enter a comma-separated list of columns to be HTML Decoded. Note: This field decodes HTML Encoded Data, converting text such as <b>"Hello"</b> into "Hello". This is useful for decoding data which was HTML Encoded when it was entered into the database so that the tags will be interpreted by the Web browser when the report is displayed.
                                                6. +
                                              6. In the HTML Encode text box, enter a comma-separated list of columns to be HTML Encoded. Note: HTML Encodes Data, converting text such as "Hello" into <b>"Hello"</b>. This is useful for displaying raw HTML tags specified in your data.
                                                7. +
                                              +

                                              + +

                                              +
                                                +
                                              1. + +
                                                2. +
                                              +

                                              Tip: The appropriate converter will be applied to each column specified in the list.

                                              \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the DNN Data Source .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the DNN Data Source .html index 927e623419b..45fbe0310b5 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the DNN Data Source .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the DNN Data Source .html @@ -1,7 +1,6 @@  - + -

                                              Setting the DNN Data Source

                                              @@ -12,7 +11,7 @@

                                              Setting the DNN Data Source

                                              Here's how to set the DNN Data Source:

                                              1. - +
                                              2. Select the Report Settings tab.
                                              3. Go to the Data Source Settings section.
                                                4. @@ -23,12 +22,12 @@

                                                Setting the DNN Data Source

                                              4. Optional. Click the Test Data Source link to test your data source.
                                                • Optional. Click the Hide Results link to hide the test results.
                                              5. Optional. Click the Show Xml Source link view the Xml of your data source.
                                                • Optional. Click the Hide Xml Source link to hide the source.
                                              6. - +

                                              Tip: Both the Title and the Description are displayed on the module when Show Info Pane is checked. The title and description are exported with the report when Export Content is selected from the module actions menu.

                                              Parameters: The DNN Data Source supports the four parameters listed in the "Parameterized Queries" tutorial. For example, to retrieve the record in the Users table corresponding to the current user, use the following query:

                                              -

                                              SELECT * FROM {oQ}Users WHERE UserID = @UserID

                                              +

                                              SELECT * FROM {oQ}Users WHERE UserID = @UserID


                                              diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Generic ADO.Net Data Source .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Generic ADO.Net Data Source .html index fb16921306c..b32253169dc 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Generic ADO.Net Data Source .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Generic ADO.Net Data Source .html @@ -1,7 +1,6 @@  - + -

                                              Setting the Generic ADO.Net Data Source

                                              @@ -9,18 +8,18 @@

                                              Setting the Generic ADO.Net Data Source

                                              Here's how to configure the Generic ADO.Net Data Source:

                                              1. - +
                                              2. Select the Report Settings tab.
                                              3. Go to the Data Source Settings section.
                                              4. In the Title text box, enter a title for the report. 
                                              5. Optional. In the Description text box, enter a description of the report. 
                                              6. At Active Data Source, select Generic ADO.Net Data Source. This displays the following settings:
                                                1. At ADO.Net Data Provider, select a data provider from a list of installed ADO.Net data providers (Odbc Data Provider, OleDb Data Provider, OracleClient Data Provider, SqlClient Data Provider).
                                                2. In the Connection String text box, enter a complete ADO.Net Connection String for connecting to the data source.
                                                3. In the Parameter Prefix text box, enter a parameter prefix - OR - Leave this field blank as required. See the section on Parameters below for more details.
                                                7. -
                                              7. Select one of the following options:
                                                1. At Upload SQL File, select the file on your local machine and it will be uploaded and placed in the Query text box. NOTE: You must still click Update at the bottom of the page to save the query.
                                                2. In the Query text box, enter the SQL Query to execute on the database.
                                                8. +
                                              8. Select one of the following options:
                                                1. At Upload SQL File, select the file on your local machine and it will be uploaded and placed in the Query text box. NOTE: You must still click Update at the bottom of the page to save the query.
                                                2. In the Query text box, enter the SQL Query to execute on the database.
                                              9. Optional. Click the Test Data Source link to test your data source.
                                                1. Optional. Click the Hide Results link to hide the test results.
                                              10. Optional. Click the Show Xml Source link view the Xml of your data source.
                                                1. Optional. Click the Hide Xml Source link to hide the source.
                                              11. - + Click the OK button to confirm.

                                              Tip: Both the Title and the Description are displayed on the module when Show Info Pane is checked. The title and description are exported with the report when Export Content is selected from the module actions menu.

                                              diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Microsoft SQL Server Data Source .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Microsoft SQL Server Data Source .html index 963b5db8130..8c352306d37 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Microsoft SQL Server Data Source .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Setting the Microsoft SQL Server Data Source .html @@ -1,5 +1,5 @@  - + @@ -7,18 +7,18 @@

                                              Setting the Microsoft SQL Server Data Source

                                              How to set the Microsoft SQL Server Data view in Source option on the Active Date Source field on the Reports module. Note: This Data Source does not support the "{oQ}" and "{dO}" tokens since it is assumed you are using it to query databases which are not related to DNN.

                                              1. - +
                                              2. Select the Report Settings tab.
                                              3. Go to the Data Source Settings section.
                                              4. In the Title text box, enter a title for the report.
                                              5. Optional. In the Description text box, enter a description of the report.
                                              6. At Active Data Source, select Microsoft SQL Server Data Source. This displays the following settings:
                                                7. -
                                              7. At Configuration Mode select ONE of the following two options:
                                                • Generate a Connection String: If this option is selected, the module will generate a connection string based on options you enter. The following associated settings are now available to configure:
                                                  1. In the Server Name text box, enter the name of the server to connect to.
                                                  2. In the Database, text box, enter the name of the database to connect to.
                                                  3. At Use Integrated Security, if this box is checked, the user on the web server that is running DNN (usually the NT AUTHORITY\NETWORK SERVICE user account (to determine the exact name of the account that will be used to authenticate with the SQL Server. See "Viewing Configuration Details"
                                                  4. Note: In this mode, the User Name and Password settings are not available.
                                                  5. In the User Name text box, enter the name of the user to use to authenticate with the SQL Server.
                                                  6. In the Password text box, enter the password to use to authenticate with the SQL Server.
                                                  7. At Upload SQL File, select a text file on your local machine and it will be uploaded and placed in the Query text box. NOTE: You must still click Update at the bottom of the page to save the query.
                                                  8. In the Query text box, enter the SQL Query to execute on the database.
                                                • Use the Connection String I Enter: If this option is selected, you are required to manually enter a complete Connection String. The following associated settings are now available to configure:
                                                  1. In the Connection String text box, enter a complete ADO.Net Connection String for connecting to a Microsoft SQL Server instance.
                                                  2. At Upload SQL File, select a text file on your local machine and it will be uploaded and placed in the Query text box. NOTE: You must still click Update at the bottom of the page to save the query.
                                                  3. In the Query text box, enter the SQL Query to execute on the database.
                                                8. +
                                              8. At Configuration Mode select ONE of the following two options:
                                                • Generate a Connection String: If this option is selected, the module will generate a connection string based on options you enter. The following associated settings are now available to configure:
                                                  1. In the Server Name text box, enter the name of the server to connect to.
                                                  2. In the Database, text box, enter the name of the database to connect to.
                                                  3. At Use Integrated Security, if this box is checked, the user on the web server that is running DNN (usually the NT AUTHORITY\NETWORK SERVICE user account (to determine the exact name of the account that will be used to authenticate with the SQL Server. See "Viewing Configuration Details"
                                                  4. Note: In this mode, the User Name and Password settings are not available.
                                                  5. In the User Name text box, enter the name of the user to use to authenticate with the SQL Server.
                                                  6. In the Password text box, enter the password to use to authenticate with the SQL Server.
                                                  7. At Upload SQL File, select a text file on your local machine and it will be uploaded and placed in the Query text box. NOTE: You must still click Update at the bottom of the page to save the query.
                                                  8. In the Query text box, enter the SQL Query to execute on the database.
                                                • Use the Connection String I Enter: If this option is selected, you are required to manually enter a complete Connection String. The following associated settings are now available to configure:
                                                  1. In the Connection String text box, enter a complete ADO.Net Connection String for connecting to a Microsoft SQL Server instance.
                                                  2. At Upload SQL File, select a text file on your local machine and it will be uploaded and placed in the Query text box. Note: You must still click Update at the bottom of the page to save the query.
                                                  3. In the Query text box, enter the SQL Query to execute on the database.
                                              9. Optional. Click the Test Data Source link to test your data source.
                                                • Optional. Click the Hide Results link to hide the test results.
                                              10. Optional. Click the Show Xml Source link view the Xml of your data source.
                                                1. Optional. Click the Hide Xml Source link to hide the source.
                                              11. - +

                                              Tip: Both the Title and the Description are displayed on the module when Show Info Pane is checked. The title and description are exported with the report when Export Content is selected from the module actions menu.

                                              diff --git a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Troubleshooting Upgrading Yellow Warning .html b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Troubleshooting Upgrading Yellow Warning .html index b05a78d8275..66a5d5bcaa9 100644 --- a/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Troubleshooting Upgrading Yellow Warning .html +++ b/Documentation/Building Your Site/Project Modules/Reports/SuperUsers/Troubleshooting Upgrading Yellow Warning .html @@ -1,48 +1,16 @@ - - + + - -

                                              Troubleshooting: Upgrading Yellow Warning

                                              -

                                              If you have upgraded the Reports module you may receive a Yellow Warning message which reads: "It looks like you upgraded from a previous version of the Reports module. Due to a minor limitation, there are a few manual steps that must be performed to properly clean up old files. Please read the DesktopModules/Reports/AppCodeCleanup.text file for instructions. This message will disappear when the clean-up is complete". This warning indicates that a Code Sub-directory could not be found. The below information and steps (as documented in the DesktopModules/Reports/AppCodeCleanup.text file) may correct the issue:

                                              -

                                              In this version of the Reports Module, the module has been converted from an "App_Code-based" module to a pre-compiled module. If you upgraded from a previous version, the App_Code/Reports directory must be removed. The upgrade process should have emptied this folder, but due to some minor limitations, the directory itself cannot simply be removed. Please follow the steps below to remove the directory. Removing this directory is not mandatory, as your site should operate correctly if it is not removed. However, it is recommended you complete these steps to ensure no issues arise.

                                              -
                                                -
                                              1. Open the web.config file.
                                                2. -
                                              2. Remove the entire line:
                                                -
                                                -
                                                '<add directoryName="Reports" />'
                                                -
                                                -
                                                - from the area between -
                                                -
                                                -
                                                '<codeSubDirectories>'
                                                -
                                                -
                                                - and
                                                -
                                                -
                                                '</codeSubDirectories>'
                                                -
                                                -
                                                -
                                                - E.g. If your web.config contains the following:
                                                - -
                                                -
                                                <codeSubDirectories>
                                                -
                                                <add directoryName="HTML" />
                                                -
                                                <add directoryName="Reports" />
                                                -
                                                </codeSubDirectories>
                                                -
                                                -
                                                - After this process, this section should contain the following:
                                                -
                                                -
                                                <codeSubDirectories>
                                                -
                                                <add directoryName="HTML" />
                                                -
                                                </codeSubDirectories>
                                                -
                                                -
                                                3. -
                                              3. Delete the folder App_Code/Reports.
                                                4. -
                                              +

                                              Troubleshooting: Upgrading

                                              +

                                              If you have upgraded the Reports module you may receive the warning message: "It looks like you upgraded from a previous version of the Reports module. Due to a minor limitation, there are a few manual steps that must be performed to properly clean up old files. Please read the DesktopModules/Reports/AppCodeCleanup.text file for instructions. This message will disappear when the clean-up is complete". This warning indicates that a Code Sub-directory could not be found. The below information and steps (as documented in the DesktopModules/Reports/AppCodeCleanup.text file) may correct the issue:

                                              +

                                              In this version of the Reports Module, the module has been converted from an "App_Code-based" module to a pre-compiled module. If you upgraded from a previous version, the App_Code/Reports directory must be removed. The upgrade process should have emptied this folder, but due to some minor limitations, the directory itself cannot simply be removed. Please follow the steps below to remove the directory. Removing this directory is not mandatory, as your site should operate correctly if it is not removed. However, it is recommended you complete these steps to ensure no issues arise.

                                              +
                                                +
                                              1. Open the web.config file.
                                                2. +
                                              2. Remove the entire line:
                                                '<add directoryName="Reports" />'

                                                from the area between +
                                                '<codeSubDirectories>'

                                                and
                                                '</codeSubDirectories>'


                                                E.g. If your web.config contains the following:
                                                <codeSubDirectories>
                                                <add directoryName="HTML" />
                                                <add directoryName="Reports" />
                                                </codeSubDirectories>

                                                After this process, this section should contain the following:
                                                <codeSubDirectories>
                                                <add directoryName="HTML" />
                                                </codeSubDirectories>
                                                3. +
                                              3. Delete the folder App_Code/Reports.
                                                4. +
                                              \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Repository/About the Repository Module.htm b/Documentation/Building Your Site/Project Modules/Repository/About the Repository Module.htm index e7b830ccd9e..b6d47418c57 100644 --- a/Documentation/Building Your Site/Project Modules/Repository/About the Repository Module.htm +++ b/Documentation/Building Your Site/Project Modules/Repository/About the Repository Module.htm @@ -1,14 +1,11 @@  - +

                                              About the Repository Module

                                              The Repository module stores and displays a range of items. The type of items stored is controlled through the skin which is applied to the module. By changing the skin applied to the module, the Repository can be used for numerous purposes such as a simple blog, a media repository, a file repository, an articles repository, a compact file listing, and more. The Repository module offers fine grained permissions which allows you to control which roles can download, upload, rate and comment on items. Features such as moderation and personal are also included.

                                              Important Upgrade Note. If you have modified any of the standard templates that are part of the Repository package, be sure to back them up before installing this new release, then restore them after the release has been installed. Alternatively, you can copy them to the /Portals/n/RepositoryTemplates folder which is the preferred location for storing modified templates.

                                              -

                                              - -

                                              Module Version: 03.05.04 / Minimum DNN Version: 05.03.01

                                              Features: ISearchable

                                              Optional settings (not available on all skin designs):

                                              @@ -22,7 +19,7 @@

                                              About the Repository Module


                                              The Repository Module

                                              - +

                                              • http://dnnrepository.codeplex.com/ diff --git a/Documentation/Building Your Site/Project Modules/Repository/Administrators/Deleting Item Comments.html b/Documentation/Building Your Site/Project Modules/Repository/Administrators/Deleting Item Comments.html index ef30123915a..8d090a255ad 100644 --- a/Documentation/Building Your Site/Project Modules/Repository/Administrators/Deleting Item Comments.html +++ b/Documentation/Building Your Site/Project Modules/Repository/Administrators/Deleting Item Comments.html @@ -12,7 +12,7 @@

                                                Deleting Item Comments

                                              • Click the Edit   button beside the comment to be deleted.
                                              • Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Comment?"
                                              • - + Click the OK button to confirm.

                                          diff --git a/Documentation/Building Your Site/Project Modules/Repository/Contributors/Deleting an Item.html b/Documentation/Building Your Site/Project Modules/Repository/Contributors/Deleting an Item.html index a7fbf39bf8b..d76421a2473 100644 --- a/Documentation/Building Your Site/Project Modules/Repository/Contributors/Deleting an Item.html +++ b/Documentation/Building Your Site/Project Modules/Repository/Contributors/Deleting an Item.html @@ -11,7 +11,7 @@

                                          Deleting an Item

                                        • Click the Edit   button beside the item.
                                        • Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item?"
                                        • - + Click the OK button to confirm.

                                diff --git a/Documentation/Building Your Site/Project Modules/Repository/Contributors/Editing an Item.html b/Documentation/Building Your Site/Project Modules/Repository/Contributors/Editing an Item.html index e759ec30a9f..b1aa28999fe 100644 --- a/Documentation/Building Your Site/Project Modules/Repository/Contributors/Editing an Item.html +++ b/Documentation/Building Your Site/Project Modules/Repository/Contributors/Editing an Item.html @@ -12,7 +12,7 @@

                                Editing an Item

                              3. Edit one or more fields as required.
                              4. Click the Upload button. If you are not a moderator, a message reading "Your upload MUST be approved by an Administrator BEFORE it is displayed on the website. You will receive an email when your upload has been approved" is displayed.
                              5. - + Click the OK button to confirm.

                              diff --git a/Documentation/Building Your Site/Project Modules/Repository/Settings/Setting the Repository Skin.html b/Documentation/Building Your Site/Project Modules/Repository/Settings/Setting the Repository Skin.html index f3749578ab5..f516e9c0af0 100644 --- a/Documentation/Building Your Site/Project Modules/Repository/Settings/Setting the Repository Skin.html +++ b/Documentation/Building Your Site/Project Modules/Repository/Settings/Setting the Repository Skin.html @@ -21,7 +21,7 @@

                              Setting the Repository Skin


                              Setting the Repository Skin

                              - + Related Topics:

                              • diff --git a/Documentation/Building Your Site/Project Modules/Repository/SuperUsers/Setting the Folders to Store Repository Files.html b/Documentation/Building Your Site/Project Modules/Repository/SuperUsers/Setting the Folders to Store Repository Files.html index 6e8c09ca49f..808f91584aa 100644 --- a/Documentation/Building Your Site/Project Modules/Repository/SuperUsers/Setting the Folders to Store Repository Files.html +++ b/Documentation/Building Your Site/Project Modules/Repository/SuperUsers/Setting the Folders to Store Repository Files.html @@ -1,22 +1,21 @@  - + -

                                Setting the Folders to Store Repository Files

                                How to set the options that manage file storage for the Repository module.

                                1. - +
                                  2. -
                                2. Maximize the Repository Settings section.
                                  3. +
                                3. Maximize the Repository Settings section.
                                4. In the Folder for Approved Files text box, enter/edit the full path to the location where the Repository folder will be located for storing approved files.
                                  E.g. C:\Inetpub\WWWRoot\DNN20\Portals\0\Repository
                                  5. -
                                5. At the Do you wish to store each user's files in their own folder?, select from these options:
                                  • at Store uploaded files in User folders to store each user's files within their own separate folder inside the Approved Files folder.
                                  • to store all approved files in the Approved Files folder.
                                  6. +
                                6. At the Do you wish to store each user's files in their own folder?, select from these options:
                                  • Mark  the check box at Store uploaded files in User folders to store each user's files within their own separate folder inside the Approved Files folder.
                                  • Unmark  the check box to store all approved files in the Approved Files folder.
                                7. At Folder for Unapproved Files text box, enter/edit the full path to the location where the Repository folder will be located for storing unapproved files. 
                                  E.g. C:\Inetpub\WWWRoot\DNN5\Portals\0\Repository\Unapproved
                                8. At Folder for Anonymous Files text box, enter/edit the full path to the location where the Repository folder will be located for storing anonymous files. 
                                  E.g. C:\Inetpub\WWWRoot\DNN5\Portals\0\Repository\Anonymous
                                9. - +

                                diff --git a/Documentation/Building Your Site/Project Modules/Store/Administrators/Configuring Atos as the Payment Gateway.html b/Documentation/Building Your Site/Project Modules/Store/Administrators/Configuring Atos as the Payment Gateway.html index cd35c74273f..33a03479c29 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Administrators/Configuring Atos as the Payment Gateway.html +++ b/Documentation/Building Your Site/Project Modules/Store/Administrators/Configuring Atos as the Payment Gateway.html @@ -1,7 +1,6 @@  - + -

                                Configuring Atos as the Payment Gateway

                                diff --git a/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/AddCoupon.htm b/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/AddCoupon.htm index d68a8d10eaa..f395c061c43 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/AddCoupon.htm +++ b/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/AddCoupon.htm @@ -1,16 +1,14 @@  - +

                                Adding a Coupon

                                How to create a coupon that can be redeemed by Store customers during checkout.

                                -

                                - Administrators

                                1. Go to the Store Admin module.
                                  2. -
                                2. Click the Coupons link.
                                  3. -
                                3. Click the Add Coupon link.
                                  4. +
                                4. Click the Coupons link.
                                  5. +
                                5. Click the  Add Coupon link.

                                @@ -28,7 +26,9 @@

                                Adding a Coupon

                                  -
                                  2. +
                                2. + +

                                diff --git a/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/DeleteCoupon.htm b/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/DeleteCoupon.htm index 8e2805f9457..3cbaa0fca79 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/DeleteCoupon.htm +++ b/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/DeleteCoupon.htm @@ -1,12 +1,10 @@  - +

                                Deleting a Coupon

                                How to delete a Store coupon.

                                -

                                - Administrators

                                1. Go to the Store Admin module.
                                2. Click the Coupons link.
                                  3. diff --git a/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/EditCoupon.htm b/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/EditCoupon.htm index 5860ec5567e..9ff2c2ea5e0 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/EditCoupon.htm +++ b/Documentation/Building Your Site/Project Modules/Store/Administrators/Coupons/EditCoupon.htm @@ -1,12 +1,10 @@  - +

                                  Editing a Coupon

                                  How to edit a Store coupon.

                                  -

                                  - Administrators

                                  1. Go to the Store Admin module.
                                  2. Click the Coupons link.
                                    3. @@ -17,7 +15,9 @@

                                    Editing a Coupon

                                    1. Update one or more fields as required. See "Adding a Coupon"
                                      2. -
                                      3. +
                                    3. + +
                                    \ No newline at end of file diff --git a/Documentation/Building Your Site/Project Modules/Store/Administrators/Shipping Settings/Adding Shipping Rates.html b/Documentation/Building Your Site/Project Modules/Store/Administrators/Shipping Settings/Adding Shipping Rates.html index 4ff7184b49a..8f6b3c708ec 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Administrators/Shipping Settings/Adding Shipping Rates.html +++ b/Documentation/Building Your Site/Project Modules/Store/Administrators/Shipping Settings/Adding Shipping Rates.html @@ -1,13 +1,12 @@  - + -

                                    Adding Shipping Rates

                                    How to add one or more shipping rates for the default shipping provider of the Store module. Different rates can be created for different weight ranges. Shipping rates are added to the price of orders at checkout.

                                    - "No Delivery" setting must be disabled to input shipping rates. See "Setting Store Info"

                                    + "No Delivery" setting must be disabled to input shipping rates. See "Setting Store Info"

                                    Tip: When adding weight and cost values for this tutorial, the fields are decimal values.

                                    1. Go to the Store Admin module.
                                      2. diff --git a/Documentation/Building Your Site/Project Modules/Store/Administrators/Tax Settings/Managing Taxation on Orders .html b/Documentation/Building Your Site/Project Modules/Store/Administrators/Tax Settings/Managing Taxation on Orders .html index f3aa734dc6f..bb3295be3f4 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Administrators/Tax Settings/Managing Taxation on Orders .html +++ b/Documentation/Building Your Site/Project Modules/Store/Administrators/Tax Settings/Managing Taxation on Orders .html @@ -1,18 +1,15 @@  - + -

                                      Managing Taxation on Orders

                                      How to enable and set or disable taxation for orders created using the Store module. This tutorial is for the default taxation provider. Taxation is added to an order when the customer proceeds to the checkout.

                                      -

                                      - Administrators

                                      1. Go to the Store Admin module.
                                      2. If the Store Info page isn't displayed, click the Store Info link.
                                      3. Maximize  the   Tax Provider Settings section.
                                        4. -
                                      4. At Enable Tax, select from these options:
                                        • to enable taxation.
                                          1. In the Tax Rate text box, enter the taxation rate as a percentage. E.g. 10

                                        • to disable taxation.

                                        5. +
                                      5. At Enable Tax, select from these options:
                                        • to enable taxation.
                                          1. In the Tax Rate text box, enter the taxation rate as a percentage. E.g. 10

                                        • to disable taxation.

                                      6. Click the Update Tax Settings link.
                                      diff --git a/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/Adding a Product.html b/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/Adding a Product.html index eb12f17315f..4bd5e8002e2 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/Adding a Product.html +++ b/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/Adding a Product.html @@ -1,12 +1,11 @@  - +

                                      Adding a Product

                                      Catalog Managers can add a product to the Store using the Store Admin module.

                                      -

                                      - To add customers who purchase this product to a Security Role, you must create the role before beginning this tutorial.

                                      +

                                      To add customers who purchase this product to a Security Role, you must create the role before beginning this tutorial.

                                      Note 1: The SEO Feature option must be enabled to use the SEO Name and SEO Keywords fields. See "Setting Store Info"

                                      Note 2: Before you begin adding products, consider how you want to manage your product images which will be stored in the site's Digital Asset Management module (Admin > File Management). Typically, images are uploaded to the Portal Root/Store folder. If you have a large number of products, consider creating a child folder for each category (See "Adding a SubFolder"). See "Working with Product Images" for more detailed information.

                                      Tip: If you are adding multiple products at once, it is quickest to upload all of your store images before adding your products. Don't forget to set Folder Security Permissions for your Catalog Managers if you want to enable them to add images.

                                      @@ -66,7 +65,7 @@

                                      Adding a Product

                                      1. - The new product is now displayed in the Store Catalog module and a summary is displayed to Catalog Managers in the Product list.
                                        2. + The new product is now displayed in the Store Catalog module and a summary is displayed to Catalog Managers in the Product list.

                                      diff --git a/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/CopyProduct.html b/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/CopyProduct.html index ce27c949a60..d76f0107d09 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/CopyProduct.html +++ b/Documentation/Building Your Site/Project Modules/Store/Catalog Managers/Products/CopyProduct.html @@ -1,12 +1,12 @@  - +

                                      Copying a Product

                                      Catalog Managers can copy an existing product in the Store and modify one or more fields to create a new product using the Store Admin module.

                                      - If you wish to add customers who purchase this product to a Security Role, you must create the role before beginning this tutorial.

                                      + If you wish to add customers who purchase this product to a Security Role, you must create the role before beginning this tutorial.

                                      1. On the Store Admin module, click the Products link.
                                      2. At Category Filter, select the category of the product you want to copy.
                                        3. @@ -18,7 +18,8 @@

                                        Copying a Product

                                        1. Modify one or more fields as required to create the new product.
                                        2. - The new product is now displayed in the Store Catalog module and a summary is displayed to Catalog Managers in the Product list.
                                          3. + Click the Update button. + The new product is now displayed in the Store Catalog module and a summary is displayed to Catalog Managers in the Product list.

                                        diff --git a/Documentation/Building Your Site/Project Modules/Store/Configuration/Configuring the Store Modules.html b/Documentation/Building Your Site/Project Modules/Store/Configuration/Configuring the Store Modules.html index 9a705c87319..d525aba9856 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Configuration/Configuring the Store Modules.html +++ b/Documentation/Building Your Site/Project Modules/Store/Configuration/Configuring the Store Modules.html @@ -6,7 +6,7 @@

                                        Configuring the Store Module

                                        How to configure the five (5) store modules to enable you to begin adding categories and products to the Store modules. For more comprehensive installation information, download the DNN Store Installation Guide from http://dnnstore.codeplex.com/releases/view/61524.

                                        - + Prerequisite. See "Important Information About Roles" before configuring the Store.

                                        Step 1: Creating the Store

                                          diff --git a/Documentation/Building Your Site/Project Modules/Store/Customers/Canceling an Order.html b/Documentation/Building Your Site/Project Modules/Store/Customers/Canceling an Order.html index 591c1a1100b..2054d014de0 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Customers/Canceling an Order.html +++ b/Documentation/Building Your Site/Project Modules/Store/Customers/Canceling an Order.html @@ -7,7 +7,7 @@

                                          Canceling an Order

                                          How to cancel an order placed in the Store using the Store Account module. This option may not be available on all stores.

                                          - Order cancellation must be authorized. See "Setting Store Info"

                                          + Prerequisite. Order cancellation must be authorized. See "Setting Store Info"

                                          Option One:

                                            diff --git a/Documentation/Building Your Site/Project Modules/Store/Order Managers/Canceling Customer Orders.html b/Documentation/Building Your Site/Project Modules/Store/Order Managers/Canceling Customer Orders.html index c3b3540bc6e..435bf8e8b7d 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Order Managers/Canceling Customer Orders.html +++ b/Documentation/Building Your Site/Project Modules/Store/Order Managers/Canceling Customer Orders.html @@ -7,7 +7,7 @@

                                            Canceling Customer Orders

                                            How to cancel one or more customer orders using the Store Admin module.

                                            - "Authorize Cancel" must be enabled on the Store Admin module. See "Setting Store Info"

                                            + Prerequisite. "Authorize Cancel" must be enabled on the Store Admin module. See "Setting Store Info"

                                            Order Managers

                                            Note: Orders cannot be canceled once they have been dispatched, however they can be canceled following payment, in this case the associated role is removed. The Store module doesn't manage payment refunds. These must be managed using your back office payment system.

                                            diff --git a/Documentation/Building Your Site/Project Modules/Store/Product Managers/Adding a Product - Product Manager.html b/Documentation/Building Your Site/Project Modules/Store/Product Managers/Adding a Product - Product Manager.html index 1566876a465..d4a229350a4 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Product Managers/Adding a Product - Product Manager.html +++ b/Documentation/Building Your Site/Project Modules/Store/Product Managers/Adding a Product - Product Manager.html @@ -9,7 +9,7 @@

                                            Adding a Product (Product Manager)

                                            Product Managers and Catalog Managers.

                                            - If you wish to add customers who purchase this product to a Security Role, you must create this role before beginning this tutorial.

                                            + Prerequisite. If you wish to add customers who purchase this product to a Security Role, you must create this role before beginning this tutorial.

                                            1. On the Store Catalog module, select Edit  >  Add New Product from the module actions menu.
                                            diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/02 Category Product Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/02 Category Product Settings.html index 411f96547f3..82e16f6d1ce 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/02 Category Product Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/02 Category Product Settings.html @@ -7,7 +7,7 @@

                                            Managing Category Product Settings

                                            How to manage the layout of category product listings in the Store Catalog module.

                                            - The "Show Category Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                            + Prerequisite. The "Show Category Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                            1. Go to the Store Catalog module.
                                            2. diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/03 Search Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/03 Search Settings.html index 9ed266347aa..b35e6a9676a 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/03 Search Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/03 Search Settings.html @@ -6,7 +6,7 @@

                                              Managing Search Settings

                                              How to manage search setting for the Store Catalog module.

                                              - The "Show Category Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                              + Prerequisite. The "Show Category Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                              1. Go to the Store Catalog module.
                                              2. diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/04 Sort Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/04 Sort Settings.html index 7be1c848cc8..b533494a2dd 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/04 Sort Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/04 Sort Settings.html @@ -7,7 +7,7 @@

                                                Managing Sort Settings

                                                How to manage the way product sorting is managed in the Store Catalog module.

                                                - The "Show Category Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                + Prerequisite. The "Show Category Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                1. Go to the Store Catalog module.
                                                2. diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/05 Product Details Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/05 Product Details Settings.html index a7dfc9ab73d..54fbe67b5ea 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/05 Product Details Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/05 Product Details Settings.html @@ -7,7 +7,7 @@

                                                  Managing Product Details Settings

                                                  How to manage the layout of product details in the Store Catalog module.

                                                  - The "Show Product Detail" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                  + Prerequisite. The "Show Product Detail" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                  1. diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/06 Also Bought Product Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/06 Also Bought Product Settings.html index d49a5c82dbe..b442bcbd7b1 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/06 Also Bought Product Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/06 Also Bought Product Settings.html @@ -7,7 +7,7 @@

                                                    Managing Also Bought Product Settings

                                                    How to manage the layout of the Customers Who Bought This Product Also Bought section in the Store Catalog module.

                                                    - Both the "Show Product Detail" and "Show Also Bought Products" fields must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                    + Prerequisite. Both the "Show Product Detail" and "Show Also Bought Products" fields must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                    1. Go to the Store Catalog module.
                                                    2. diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/07 New Product Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/07 New Product Settings.html index 9e646684bb7..47c5d944a53 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/07 New Product Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/07 New Product Settings.html @@ -7,7 +7,7 @@

                                                      Managing New Product Settings

                                                      How to set the layout of new product listings in the Store Catalog module.

                                                      - The "Show New Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                      + Prerequisite. The "Show New Products" field must be checked in the General Settings section to configure these settings. See "Managing Store Catalog General Settings"

                                                      1. Go to the Store Catalog module.
                                                      2. diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/08 Featured Product Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/08 Featured Product Settings.html index 0e9d80f4345..f51acda723f 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/08 Featured Product Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/08 Featured Product Settings.html @@ -7,7 +7,7 @@

                                                        Managing Featured Product Settings

                                                        How to set the layout of featured product in the Store Catalog module.

                                                        - + Prerequisite. The "Show Featured Products" field in the General Settings section must be checked to configure these settings. See "Managing Store Catalog General Settings"

                                                          diff --git a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/09 Popular Product Settings.html b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/09 Popular Product Settings.html index 223de3af295..39a3e1c5767 100644 --- a/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/09 Popular Product Settings.html +++ b/Documentation/Building Your Site/Project Modules/Store/Settings/Catalog Settings/09 Popular Product Settings.html @@ -7,7 +7,7 @@

                                                          Managing Popular Product Settings

                                                          How to manage the layout of popular product listings in the Store Catalog module.

                                                          - The "Show Popular Products" field in the General Settings section must be checked to configure these settings.

                                                          + Prerequisite. The "Show Popular Products" field in the General Settings section must be checked to configure these settings.

                                                          1. Go to the Store Catalog module.
                                                          2. diff --git a/Documentation/Building Your Site/Project Modules/Survey/Settings/Setting Survey Closing Date .html b/Documentation/Building Your Site/Project Modules/Survey/Settings/Setting Survey Closing Date .html index c39d9b7b940..56a639255f7 100644 --- a/Documentation/Building Your Site/Project Modules/Survey/Settings/Setting Survey Closing Date .html +++ b/Documentation/Building Your Site/Project Modules/Survey/Settings/Setting Survey Closing Date .html @@ -22,7 +22,7 @@

                                                            Setting Survey Closing Date

                                                          - + Related Topics:

                                                          • diff --git a/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Comments on Individual Wiki Pages.html b/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Comments on Individual Wiki Pages.html index 89241e37e61..54f8672962f 100644 --- a/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Comments on Individual Wiki Pages.html +++ b/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Comments on Individual Wiki Pages.html @@ -7,7 +7,7 @@

                                                            Enabling Comments on Individual Wiki Pages

                                                            How to enable comments on an existing page of the Wiki module.

                                                            - Comments must be enabled on this Wiki module. See "Allowing Wiki Comments for Individual Pages"

                                                            + Prerequisite. Comments must be enabled on this Wiki module. See "Allowing Wiki Comments for Individual Pages"

                                                            1. Navigate to the required page. See "Navigating the Wiki"
                                                            2. Click the Edit Wiki Topic link.
                                                              3. diff --git a/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Ratings for an Existing Wiki Page.html b/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Ratings for an Existing Wiki Page.html index 5ea50ef9930..f419fad0fb8 100644 --- a/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Ratings for an Existing Wiki Page.html +++ b/Documentation/Building Your Site/Project Modules/Wiki/Configuration/Enabling Ratings for an Existing Wiki Page.html @@ -7,7 +7,7 @@

                                                              Enabling Ratings for an Existing Wiki Page

                                                              How to enable ratings on an existing page of the Wiki module.

                                                              - Ratings must be allowed for this Wiki module. See "Allowing Wiki Ratings for Individual Pages"

                                                              + Prerequisite. Ratings must be allowed for this Wiki module. See "Allowing Wiki Ratings for Individual Pages"

                                                              1. Edit an existing Wiki page. See "Editing a Wiki Page"
                                                              2. At Enable Page Ratings, .
                                                                3. diff --git a/Documentation/CoverPages/DNNPlatformSuperUser.htm b/Documentation/CoverPages/DNNPlatformSuperUser.htm index ffc013f27f5..3ab55528268 100644 --- a/Documentation/CoverPages/DNNPlatformSuperUser.htm +++ b/Documentation/CoverPages/DNNPlatformSuperUser.htm @@ -1,9 +1,8 @@  - + -

                                                                 

                                                                \ No newline at end of file diff --git a/Documentation/Installing or Upgrading DNN/Installing DNN.html b/Documentation/Installing or Upgrading DNN/Installing DNN.html index 920fd3787c4..9e1daa333c7 100644 --- a/Documentation/Installing or Upgrading DNN/Installing DNN.html +++ b/Documentation/Installing or Upgrading DNN/Installing DNN.html @@ -6,7 +6,7 @@

                                                                Installing DNN

                                                                Installing DNN is a one step process to create your new website. The installation will detect your current language and if it is either English, French, German, Spanish, Italian or Dutch, the installer will automatically display in your language. The default installation will create either a blank website or a website with helpful information on getting started and some sample content. If you are using Evoq Content or Evoq Content Enterprise, you can also choose a mobile website template. The default installation will install a WYSIWYG rich text editor for managing the content and files on your website. Each of the templates is available in English, French, German, Spanish, Italian and Dutch.

                                                                - An SQL Server or SQL Server Express Database. Note: If you are using a Microsoft Azure database, review the Installation Guide for set-up assistance.

                                                                + Prerequisite. An SQL Server or SQL Server Express Database. Note: If you are using a Microsoft Azure database, review the Installation Guide for set-up assistance.

                                                                Note: If you are installing your DNN database on SQL Azure, the connectivity from DNN application may be slower. This occurs because SQL Azure is a cloud service and the latency between the database and the application is increased. To avoid a timeout error during DNN installation, it is recommended that you manually increase the http timeout (System.Web.HttpException: Request timed out) in the Web.config file by adding an executionTimeout setting under httpRuntime prior to installation. Note: Keyword "executionTimeout" is case-sensitive. In the below configuration setting, a value of 900 indicates 15 minutes which is more than enough for any installation. It is recommended that you remove this setting once installation is complete.

                                                                <httpRuntimeuseFullyQualifiedRedirectUrl="true"maxRequestLength="8192" diff --git a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Facebook.html b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Facebook.html index bdb153c326d..102ecfdb5bf 100644 --- a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Facebook.html +++ b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Facebook.html @@ -19,7 +19,7 @@

                                                                Logging in with Facebook

                                                              3. Click the Go to App button to return to the DNN site and complete your login.

                                                              - + Related Topics:

                                                              • diff --git a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Google.html b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Google.html index 9839fa0fc61..0786b6cad10 100644 --- a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Google.html +++ b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Google.html @@ -6,5 +6,5 @@

                                                                Logging in with Google

                                                                How to login to a DNN site using your existing Facebook account. This allows you to login without needing to create a new user account for this site.
                                                                1. - Click the Login link (typically located in the top right corner of each page) - OR - Navigate to an Account Login module.
                                                                2. Click the Sign with your Google Account button.

                                                                1. On the Google site, enter your email and password.
                                                                2. Click the Sign In button.

                                                                • "Configuring Google Authentication"
                                                                + Click the Login link (typically located in the top right corner of each page) - OR - Navigate to an Account Login module.
                                                              • Click the Sign with your Google Account button.

                                                            1. On the Google site, enter your email and password.
                                                            2. Click the Sign In button.

                                                            Related Topics:

                                                            • "Configuring Google Authentication"
                                                            \ No newline at end of file diff --git a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Live.html b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Live.html index 461dac1cd20..bff3b8cff62 100644 --- a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Live.html +++ b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Live.html @@ -17,7 +17,7 @@

                                                            Logging in with Live

                                                          • Complete login using your Live credentials. If you are already logged into your Live account on this computer you will be automatically logged in.

                                                        - + Related Topics:

                                                        • diff --git a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Twitter.html b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Twitter.html index 2abdb303854..59e9508c355 100644 --- a/Documentation/Managing Your User Account/Logging In and Out/Logging in with Twitter.html +++ b/Documentation/Managing Your User Account/Logging In and Out/Logging in with Twitter.html @@ -16,7 +16,7 @@

                                                          Logging in with Twitter

                                                        • Complete login using your Twitter credentials. If you are already logged into Twitter on this computer you will be automatically logged in.

                                                      - + Related Topics:

                                                      • diff --git a/Documentation/Managing Your User Account/Logging In and Out/Logging in with a Security Code.html b/Documentation/Managing Your User Account/Logging In and Out/Logging in with a Security Code.html index b33b7bd1267..b38f3ea8bae 100644 --- a/Documentation/Managing Your User Account/Logging In and Out/Logging in with a Security Code.html +++ b/Documentation/Managing Your User Account/Logging In and Out/Logging in with a Security Code.html @@ -25,7 +25,7 @@

                                                        Logging in with a Security Code


                                                        Logging in with a Security Code

                                                        - + Related Topics:

                                                        • diff --git a/Documentation/Managing Your User Account/Logging In and Out/Remembering Login Credentials.html b/Documentation/Managing Your User Account/Logging In and Out/Remembering Login Credentials.html index 858c2eaa9ae..44227205622 100644 --- a/Documentation/Managing Your User Account/Logging In and Out/Remembering Login Credentials.html +++ b/Documentation/Managing Your User Account/Logging In and Out/Remembering Login Credentials.html @@ -24,7 +24,7 @@

                                                          Remembering Login Credentials

                                                    Tip: To exit a site, simply close your Web browser. If you click the Logout link you will need to login next time.

                                                    - + Related Topics:

                                                    • diff --git a/Documentation/Managing Your User Account/Managing Notifications.htm b/Documentation/Managing Your User Account/Managing Notifications.htm index 932c37ef7c3..2a85a46060c 100644 --- a/Documentation/Managing Your User Account/Managing Notifications.htm +++ b/Documentation/Managing Your User Account/Managing Notifications.htm @@ -12,9 +12,7 @@

                                                      Managing Notifications

                                                      -

                                                      - -

                                                      +

                                                      Related Topics:

                                                      • See "Connecting with a Member" diff --git a/Documentation/Managing Your User Account/Signing Up for a User Account/Signing up as a Registered User with a Security Code.html b/Documentation/Managing Your User Account/Signing Up for a User Account/Signing up as a Registered User with a Security Code.html index dc5ffdb99a7..57863062265 100644 --- a/Documentation/Managing Your User Account/Signing Up for a User Account/Signing up as a Registered User with a Security Code.html +++ b/Documentation/Managing Your User Account/Signing Up for a User Account/Signing up as a Registered User with a Security Code.html @@ -7,5 +7,5 @@

                                                        Signing up as a Registered User with a Security Code

                                                        How to sign up to become a registered user of a site when the CAPTCHA security code is required. This tutorial includes the fields required to register on the default registration settings and requirements. Other information such names, address details and contact details may be displayed on the registration form if these settings are modified.
                                                        1. Click the Register link (typically located in the top right corner of each page). This opens the User Registration page.

                                                        1. In the User Name text box, enter a user name. Your user name is private and cannot be changed. - Note: This field may not be required on some sites that are set to use your email address as your user name.
                                                        2. In the Password text box, enter your password. Note: Passwords are case sensitive.
                                                        3. In the Confirm Password text box, re-enter your password.
                                                        4. In the Display Name text box, enter the name you want to be displayed to other site members.
                                                        5. In the Email Address text box, enter a valid email address.
                                                        6. In the Security Code text box, enter the code shown above.
                                                        7. Click the Register button.

                                                        Once you have submitted your registration it will be handled in one of the following ways, according to the type of registration used on the site:

                                                        • If Private registration is used, you will need to be authorized by an Administrator before you can login. This is the default option.
                                                        • If Verified registration is enabled, you will be logged in to the site as an unverified user and will need to open your welcome email to obtain additional information to complete your registration and obtain access to any content that is restricted to site members.
                                                        • If Public registration is enabled, you will be automatically logged in to the site as shown in the below image. Once you are logged into the site you can view any Messages or Notifications that have been sent to your user account and update your user profile.

                                                        • See "Configuring the Standard Registration Form"
                                                        • See "Configuring a Custom Registration Form"
                                                        • See "Managing your User Profile"
                                                        • See "Managing your Profile Photo"
                                                        + Note: This field may not be required on some sites that are set to use your email address as your user name.
                                                      • In the Password text box, enter your password. Note: Passwords are case sensitive.
                                                      • In the Confirm Password text box, re-enter your password.
                                                      • In the Display Name text box, enter the name you want to be displayed to other site members.
                                                      • In the Email Address text box, enter a valid email address.
                                                      • In the Security Code text box, enter the code shown above.
                                                      • Click the Register button.

                                                  Once you have submitted your registration it will be handled in one of the following ways, according to the type of registration used on the site:

                                                  • If Private registration is used, you will need to be authorized by an Administrator before you can login. This is the default option.
                                                  • If Verified registration is enabled, you will be logged in to the site as an unverified user and will need to open your welcome email to obtain additional information to complete your registration and obtain access to any content that is restricted to site members.
                                                  • If Public registration is enabled, you will be automatically logged in to the site as shown in the below image. Once you are logged into the site you can view any Messages or Notifications that have been sent to your user account and update your user profile.

                                                  Related Topics:

                                                  • See "Configuring the Standard Registration Form"
                                                  • See "Configuring a Custom Registration Form"
                                                  • See "Managing your User Profile"
                                                  • See "Managing your Profile Photo"
                                                  \ No newline at end of file diff --git a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard.png b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard.png index b4cfa6a5a8b..acff3da86f1 100644 Binary files a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard.png and b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard.png differ diff --git a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard1.png b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard1.png index 98b7a3d4497..acff3da86f1 100644 Binary files a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard1.png and b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard1.png differ diff --git a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard2.png b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard2.png index 0a6bbecd9d9..064f4563772 100644 Binary files a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard2.png and b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard2.png differ diff --git a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard3.png b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard3.png index 9c0bf3c8bd2..75116eda707 100644 Binary files a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard3.png and b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard3.png differ diff --git a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard4.png b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard4.png index f13cb8ae4e7..efbb5cadb56 100644 Binary files a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard4.png and b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard4.png differ diff --git a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard5.png b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard5.png index 838d126f321..4f7676a8d00 100644 Binary files a/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard5.png and b/Documentation/Resources/Images/Admin/SiteWizard/SiteWizard5.png differ diff --git a/Documentation/Using Common Tools/Editor/About the Editor.html b/Documentation/Using Common Tools/Editor/About the Editor.html index 107e85ffee2..0035b627da5 100644 --- a/Documentation/Using Common Tools/Editor/About the Editor.html +++ b/Documentation/Using Common Tools/Editor/About the Editor.html @@ -13,7 +13,7 @@

                                                  About the Editor


                                                  The Default Editor for DNN 6.0+ (DotNetNuke.RadEditorProvider for the RadEditor)

                                                  - + Related Topics:

                                                  • diff --git a/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Images and Media/Working with the Image Editor.html b/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Images and Media/Working with the Image Editor.html index 34d87ff41e3..99707b2a246 100644 --- a/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Images and Media/Working with the Image Editor.html +++ b/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Images and Media/Working with the Image Editor.html @@ -7,7 +7,7 @@

                                                    Working with the Image Editor

                                                    How to use the Image Editor tool in the Image Manager of the DotNetNuke.RadEditorProvider RTE.

                                                    - This topic assumes you are currently inserting a new image. See "Inserting Images"

                                                    + Prerequisite. This topic assumes you are currently inserting a new image. See "Inserting Images"

                                                    1. Click the Insert Media button and select Image Manager from the drop down list. This will open the Image Manager. (The keyboard shortcut is CTRL + G)
                                                    2. Click the Image Media button to open the Image Editor.
                                                      3. diff --git a/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding a Page Link.html b/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding a Page Link.html index cfdaf00880c..472b7d1f4d3 100644 --- a/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding a Page Link.html +++ b/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding a Page Link.html @@ -23,7 +23,7 @@

                                                      Adding a Page Link

                                                    - + Related Topics:

                                                    • diff --git a/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html b/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html index f7d79f7a7ba..1a014b159db 100644 --- a/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html +++ b/Documentation/Using Common Tools/Editor/DotNetNuke RadEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html @@ -23,7 +23,7 @@

                                                      Adding an Anchor Link

                                                - + Related Topics:

                                                • diff --git a/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding a Page Link.html b/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding a Page Link.html index d4f53166d6f..bba17fca753 100644 --- a/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding a Page Link.html +++ b/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding a Page Link.html @@ -23,7 +23,7 @@

                                                  Adding a Page Link

                                              - + Related Topics:

                                              • diff --git a/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html b/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html index 1776dd17da8..0f89d2e1d05 100644 --- a/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html +++ b/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Adding an Anchor Link.html @@ -23,7 +23,7 @@

                                                Adding an Anchor Link

                                            - + Related Topics:

                                            • diff --git a/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Working with the RADCalendar.html b/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Working with the RADCalendar.html index 5eaff6384f0..b6a3b3bdab9 100644 --- a/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Working with the RADCalendar.html +++ b/Documentation/Using Common Tools/Editor/TelerikEditorProvider/Managing Links and Anchors/Working with the RADCalendar.html @@ -31,7 +31,7 @@

                                              Selecting a Date

                                            • Click on a date in the calendar to select it. This closes the pop-up window and displays the selected date in the associated field.

                                          - + Related Topics:

                                          • diff --git a/Documentation/Using Common Tools/Link Control/About the Link Control.html b/Documentation/Using Common Tools/Link Control/About the Link Control.html index 8480c11d86a..0d02c96b31d 100644 --- a/Documentation/Using Common Tools/Link Control/About the Link Control.html +++ b/Documentation/Using Common Tools/Link Control/About the Link Control.html @@ -18,7 +18,7 @@

                                            About the Link Control


                                            The Link Control as displayed on the Edit page of the Links module

                                            - + Related Topics:

                                            • diff --git a/Documentation/Using the Control Panel/About the DNN Control Panels.html b/Documentation/Using the Control Panel/About the DNN Control Panels.html index ede8a05506a..d2ab441dd6a 100644 --- a/Documentation/Using the Control Panel/About the DNN Control Panels.html +++ b/Documentation/Using the Control Panel/About the DNN Control Panels.html @@ -1,7 +1,6 @@  - + -

                                              About the DNN Control Panels

                                              @@ -23,13 +22,13 @@

                                              About the DNN Control Panels

                                              • - See "Overview of the ControlBar Control Panel" + See "Overview of the ControlBar"
                                              • - See "Overview of the RibbonBar Control Panel" + See "Overview of the RibbonBar"
                                              • - See "Overview of the Iconbar Control Panel" + See "Overview of the Iconbar"
                                              • See "Setting the Default Control Panel" diff --git a/Documentation/Using the Control Panel/Admin Console/Advanced Configuration Settings/3 Deploying Language Packs.htm b/Documentation/Using the Control Panel/Admin Console/Advanced Configuration Settings/3 Deploying Language Packs.htm index 2c574327a34..59c38ed8e03 100644 --- a/Documentation/Using the Control Panel/Admin Console/Advanced Configuration Settings/3 Deploying Language Packs.htm +++ b/Documentation/Using the Control Panel/Admin Console/Advanced Configuration Settings/3 Deploying Language Packs.htm @@ -1,5 +1,5 @@  - + @@ -21,7 +21,7 @@

                                                Deploying Language Packs

                                                - +

                                                • diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/About the Log Viewer Module.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/About the Log Viewer Module.html index a85bf56b267..0277c6a533a 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/About the Log Viewer Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/About the Log Viewer Module.html @@ -1,14 +1,14 @@  - + -

                                                  About the Log Viewer Module

                                                  -

                                                  The Event Viewer page displays the Log Viewer module that provides an historical log of database events such as events which are scheduled, exceptions, account logins, module and page changes, user account activities, security role activities, etc. Authorized users can send exceptions to any email address. SuperUsers can add, edit and delete event records for all sites.

                                                  -

                                                  The Log Viewer module is pre-installed on the Admin > Event Viewer page and can be deployed to sites and be added to site pages.

                                                  +

                                                  About the Log Viewer

                                                  +

                                                  The Admin > Event Viewer page displays the Log Viewer that provides an historical log of database events such as events which are scheduled, exceptions, account logins, module and page changes, user account activities, security role activities, etc. Authorized users can send exceptions to any email address. SuperUsers can add, edit and delete event records for all sites.

                                                  +

                                                  The Log Viewer can be deployed to sites and be added to site pages.

                                                  -
                                                  The Log Viewer Module as displayed to SuperUsers +
                                                  The Log Viewer as displayed to SuperUsers

                                                  \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/All Users/Sending Exceptions by Email.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/All Users/Sending Exceptions by Email.html index 1523e002be2..7040e500b9d 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/All Users/Sending Exceptions by Email.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/All Users/Sending Exceptions by Email.html @@ -1,5 +1,9 @@  +<<<<<<< HEAD +======= + +>>>>>>> 5297e8b... Snippet path updates. @@ -11,7 +15,13 @@

                                                  Sending Exceptions by Email

                                                • Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                                • Expand the Viewer section.
                                                • Locate the required exceptions. Filtering records by type such as General Exception can be useful. Note: If color coding is enabled, exceptions are colored red.
                                                  • +<<<<<<< HEAD
                                                • beside each record to be emailed.
                                                  • +======= +
                                                • + + beside each record to be emailed.
                                                  • +>>>>>>> 5297e8b... Snippet path updates.
                                                • Expand the Send Log Entries section.
                                                • In the Email Address text box, enter one or more email addresses separated by a semi-colon ( ; ). E.g. host@domain.com;host@domain.com.au
                                                • Optional. In the Subject text box, enter a subject for the message. Leave blank to use "[Portal Name] Exceptions".
                                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Adding a Event.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Adding a Event.html index 34ba783b7ce..06d7d5ddeb5 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Adding a Event.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Adding a Event.html @@ -1,21 +1,21 @@  - +

                                                  Adding a Database Event

                                                  -

                                                  How to add a database event to the Log Viewer module and configure the settings and notification options. Note: You must be in Edit Page mode.

                                                  +

                                                  How to add a database event to the Log Viewer module and configure the settings and notification options. Note: You must be in Edit Page mode. Restricted to SuperUsers.

                                                  1. Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                                  2. Click the Edit Log Settings button located at the base of the module. This displays the Edit Log Settings page.
                                                    3. -
                                                  3. Click the Add Log Setting link located at the base of this page.
                                                    4. +
                                                  4. Click the Add Log Setting link located at the base of this page.
                                                  5. Go to the Logging Settings section.
                                                    6. -
                                                  6. At Logging Enabled, to enable logging - OR - to disable logging.
                                                    7. +
                                                  7. At Logging Enabled, to enable logging - OR - to disable logging.
                                                  8. At Log Type, select the event type for this Log Setting.
                                                  9. At Portal, select All to create an event for all sites - OR - Select a site name to create an event that is specific to a single site.
                                                  10. At Keep Most Recent, select the number of most recent logged items to be kept.
                                                  11. Optional. Expand the Email Notification Settings section to set any of these optional settings. -
                                                    1. At Email Notification Enabled, to enable email notification - OR - to disable. Notification will occur each time the event occurs. +
                                                      1. At Email Notification Enabled, to enable email notification - OR - to disable. Notification will occur each time the event occurs.
                                                      2. At Occurrence Threshold, complete the following settings:
                                                        1. At the first drop down list select the maximum number of occurrences that can be sent in the time frame selected in the previous setting. The default setting is 1 Occurrence.
                                                        2. At the second and third drop down lists select the number and period to set the time frame. The default setting is 1 Seconds. Note: If the number of occurrences for the threshold time period is reached, emails will be queued until the next time period.
                                                      3. In the Mail From Address text box, enter the email address the notification will be sent from.
                                                      4. In the Mail To Address text box, enter the email address the notification will be sent to.
                                                    @@ -24,7 +24,7 @@

                                                    Adding a Database Event

                                                    1. - The newly created event is now listed on the Edit Log Settings page.
                                                      2. + The newly created event is now listed on the Edit Log Settings page.

                                                    diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Clearing the Event Log.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Clearing the Event Log.html index f9aa7ffc1e6..484050fd9d5 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Clearing the Event Log.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Clearing the Event Log.html @@ -1,10 +1,10 @@  - +

                                                    Clearing the Event Log

                                                    -

                                                    How to clear (delete) all logged event records from the Log Viewer module. This deletes all records from all sites.

                                                    +

                                                    How to clear (delete) all logged event records from the Log Viewer module. This deletes all records from all sites. Restricted to SuperUsers.

                                                    1. Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                                      2. diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting Selected Exceptions.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting Selected Exceptions.html index 2a978fcad9d..f2a2322fe81 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting Selected Exceptions.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting Selected Exceptions.html @@ -1,10 +1,10 @@  - +

                                                      Deleting Selected Exceptions

                                                      -

                                                      How to delete one or more logged event records from the Log Viewer module.

                                                      +

                                                      How to delete one or more logged event records from the Log Viewer module. Restricted to SuperUsers.

                                                      1. Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                                      2. Expand the Viewer section.
                                                        3. @@ -14,7 +14,7 @@

                                                        Deleting Selected Exceptions

                                                      3. Select a site name to view events from that site only.
                                              • - beside each record to be deleted.
                                                • + beside each record to be deleted.
                                              • Click the Delete Selected Exceptions link.

                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting an Event.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting an Event.html index 7a37093abc4..72d1ba690a8 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting an Event.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Deleting an Event.html @@ -1,15 +1,15 @@  - +

                                        Deleting an Event

                                        -

                                        How to delete a logged event from the Log Viewer module.

                                        +

                                        How to delete a logged event from the Log Viewer module. Restricted to SuperUsers.

                                        1. Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                        2. Click the Edit Log Settings button. This displays the Edit Log Settings page.
                                          3. -
                                        3. Click the Edit button beside the item to be deleted.
                                          4. +
                                        4. Click the Edit button beside the item to be deleted.
                                        5. Click the Delete button at the base of the module. This displays the message "Are You Sure You Wish To Delete This Item?"
                                        6. Click the Yes button to confirm.
                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Editing Log Settings.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Editing Log Settings.html index 00a056e982a..68f26bcad52 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Editing Log Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Editing Log Settings.html @@ -17,7 +17,7 @@

                                        Editing Log Settings

                                        1. Edit one or more settings as required.
                                        2. - +
                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Enabling-Disabling an Event.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Enabling-Disabling an Event.html index 4d0f3b4a657..535204e4b1b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Enabling-Disabling an Event.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Enabling-Disabling an Event.html @@ -1,10 +1,10 @@  - +

                                        Enabling/Disabling an Event

                                        -

                                        How to enable or disable any logged event on the Log Viewer module.

                                        +

                                        How to enable or disable any logged event on the Log Viewer module. Restricted to SuperUsers.

                                        1. Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                        2. Click Edit Log Settings button.
                                          3. @@ -13,12 +13,12 @@

                                          Enabling/Disabling an Event

                                        3. At Logging Enabled select from the following options:
                                          • - to enable logging of this event.
                                            • + to enable logging of this event.
                                          • - to disable logging of this event. This disables all fields in the Logging Settings section.
                                            • + to disable logging of this event. This disables all fields in the Logging Settings section.
                                        4. - +

                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Viewing Logged Events for any Site.html b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Viewing Logged Events for any Site.html index b58faa45ae2..24e0c3a0263 100644 --- a/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Viewing Logged Events for any Site.html +++ b/Documentation/Using the Control Panel/Admin Console/Event Viewer/SuperUsers/Viewing Logged Events for any Site.html @@ -1,10 +1,10 @@  - +

                                        Viewing Logged Events for any Site

                                        -

                                        How to view the event logs for a single site or for all the sites within this DNN installation using the Log Viewer module.

                                        +

                                        How to view the event logs for a single site or for all the sites within this DNN installation using the Log Viewer module. Restricted to SuperUsers.

                                        1. Navigate to Admin > Event Viewer - OR - Navigate to a Log Viewer module.
                                        2. Expand the Viewer section.
                                          3. diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/All Users/Viewing Installed Extensions List.html b/Documentation/Using the Control Panel/Admin Console/Extensions/All Users/Viewing Installed Extensions List.html index 6c7d467be34..be97760a1bb 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/All Users/Viewing Installed Extensions List.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/All Users/Viewing Installed Extensions List.html @@ -13,7 +13,7 @@

                                          Viewing Installed Extensions List

                                          - +

                                          • diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Default Authentication.html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Default Authentication.html index b09adbb9ac2..ac5bf70a664 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Default Authentication.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Default Authentication.html @@ -12,9 +12,9 @@

                                            Configuring Default Authentication

                                          • Click the Edit button beside Default Authentication.
                                          • Expand the Authentication Settings section.
                                          • At Enabled?, select from these options: -
                                            • to enable DNN authentication.
                                            • to disable. Skip to Step 7.
                                            • +
                                            • to enable DNN authentication.
                                            • to disable. Skip to Step 7.
                                          • Optional. At Use Captcha?, select from these options: -
                                            • to required users to enter a security code when they login.
                                            • to disable.
                                            • +
                                            • to required users to enter a security code when they login.
                                            • to disable.
                                          diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Facebook Authentication.html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Facebook Authentication.html index 7331c3f2d56..afb038f6232 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Facebook Authentication.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Facebook Authentication.html @@ -1,20 +1,19 @@  - + -

                                          Configuring Facebook Authentication

                                          How to enable or disable the DotNetNuke Facebook authentication system that allows users to login to DNN using their existing Facebook account.

                                          - You will need to sign up for a Facebook Authentication account to complete this tutorial. This authentication system must be enabled by a SuperUser before it can be viewed and configured. See "Managing Authentication System Settings"

                                          + You will need to sign up for a Facebook Authentication account to complete this tutorial. This authentication system must be enabled by a SuperUser before it can be viewed and configured.See "Managing Authentication System Settings"

                                          1. Navigate to Admin > Site Settings Extensions - OR - Go to an Extensions module.
                                          2. Expand the Authentication System section.
                                            3. -
                                          3. Click the Edit button beside DotNetNuke Facebook Authentication Project.
                                            4. +
                                          4. Click the Edit button beside DotNetNuke Facebook Authentication Project.
                                          5. Expand the Authentication Settings section.
                                          6. At Enabled?, select from these options: -
                                            • to enable Facebook authentication.
                                            • to disable Facebook authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                            7. +
                                            • to enable Facebook authentication.
                                            • to disable Facebook authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                          7. In the APP ID text box, enter the information provided to you by Facebook.
                                          8. In the APP Secret text box, enter the secret code provided to you by Facebook.
                                          @@ -26,10 +25,10 @@

                                          Configuring Facebook Authentication

                                        1. Click the Cancel button to return to the Extensions module. The Facebook login button is now displayed on the Login page and any Account Login modules.

                                        - +

                                        - +

                                        • diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Google Authentication .html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Google Authentication .html index 7d5535fa9d2..47299a9e971 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Google Authentication .html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Google Authentication .html @@ -1,28 +1,21 @@  - + -

                                          Configuring Google Authentication

                                          How to enable or disable the DotNetNuke Google authentication system that allows users to login to DNN using their existing Google account to login to DotNetNuke.

                                          - Configure a custom login page, See "Enabling a Custom Login Page"

                                          + Configure a custom login page, See "Enabling a Custom Login Page"

                                          - You will need to sign up for a Google Authentication account to complete this tutorial. This authentication system must be enabled by a SuperUser (See "Managing Authentication System Settings") before it can be viewed and configured. At Google API Console, add your login page to the redirect URL's. If you have multiple languages, you will also need to add those URL's too. E.g.: http://www.yoursite.com/de-de/login.aspx

                                          + You will need to sign up for a Google Authentication account to complete this tutorial. This authentication system must be enabled by a SuperUser (See "Managing Authentication System Settings") before it can be viewed and configured. At Google API Console, add your login page to the redirect URL's. If you have multiple languages, you will also need to add those URL's too. E.g.: http://www.yoursite.com/de-de/login.aspx

                                          1. Navigate to Admin > Advanced Settings > Extensions - OR - Go to an Extensions module.
                                          2. Expand the Authentication Systems section.
                                            3. -
                                          3. Click the Edit button beside DotNetNuke Google Authentication Project.
                                            4. +
                                          4. Click the Edit button beside DotNetNuke Google Authentication Project.
                                          5. Expand the Authentication Settings section.
                                            6. - - -
                                          6. At Enabled?, select from these options: -
                                              - -
                                            • to enable Google authentication.
                                              • - -
                                            • to disable Google authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                            7. +
                                          7. At Enabled?, select from these options: +
                                            • to enable Google authentication.
                                            • to disable Google authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                          8. In the APP ID text box, enter the information provided to you by Google.
                                          9. In the APP Secret text box, enter the secret code provided to you by Google.
                                          @@ -33,10 +26,10 @@

                                          Configuring Google Authentication

                                        • Click the Update Authentication Settings button. The Google login button is now displayed on the Login page and any Account Login modules.

                                      - +

                                      - +

                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Live Authentication.html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Live Authentication.html index a1d5e2da055..b816851839b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Live Authentication.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Live Authentication.html @@ -13,7 +13,7 @@

                                        Configuring Live Authentication

                                      • Click the Edit button beside DotNetNuke Live Authentication Project.
                                      • Expand the Authentication Settings section.
                                      • At Enabled?, select from these options: -
                                        • to enable Live authentication.
                                        • to disable Live authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                        • +
                                        • to enable Live authentication.
                                        • to disable Live authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                      • In the APP ID text box, enter the information provided to you by Live.
                                      • In the APP Secret text box, enter the secret code provided to you by Live.
                                    @@ -25,7 +25,7 @@

                                    Configuring Live Authentication

                                  - +

                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Twitter Authentication.html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Twitter Authentication.html index a1c04741b6c..252b608d684 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Twitter Authentication.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Configuring Twitter Authentication.html @@ -7,14 +7,14 @@

                                    Configuring Twitter Authentication

                                    How to enable or disable the DotNetNuke Twitter authentication system that allows users to login to DNN using their existing Twitter account. Note: The authentication providers included with DNN open the User Log In control within the page. The exception is DNN default authentication which uses a pop-up window for authentication.

                                    - This authentication system must be enabled by a SuperUser (See "Managing Authentication System Settings") before it can be viewed and configured. You will also need to sign up for a Twitter Authentication account to complete this tutorial.

                                    + This authentication system must be enabled by a SuperUser (See "Managing Authentication System Settings") before it can be viewed and configured. You will also need to sign up for a Twitter Authentication account to complete this tutorial.

                                    1. Navigate to Admin > Advanced Settings > Extensions - OR - Go to an Extensions module.
                                    2. Expand the Authentication System section.
                                    3. Click the Edit button beside DotNetNuke Twitter Authentication Project.
                                    4. Expand the Authentication Settings section.
                                    5. At Enabled?, select from these options: -
                                      • to enable Twitter authentication.
                                      • to disable Twitter authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                      6. +
                                      • to enable Twitter authentication.
                                      • to disable Twitter authentication. Note that any ID and Secret information you have added will not be removed from these fields unless you manually remove them. This allows you to re-enable this authentication system at any time without re-entering this information. Skip to Step 8.
                                    6. In the APP ID text box, enter the information provided to you by Twitter.
                                    7. In the APP Secret text box, enter the secret code provided to you by Twitter.
                                    @@ -29,7 +29,7 @@

                                    Configuring Twitter Authentication

                                    - +

                                    • diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Enabling-Disabling LiveID Authentication.html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Enabling-Disabling LiveID Authentication.html index 86cebabed50..7bf20ec2f80 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Enabling-Disabling LiveID Authentication.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Enabling-Disabling LiveID Authentication.html @@ -12,8 +12,8 @@

                                      Enabling/Disabling LiveID Authentication

                                    • Click the Edit button beside DNN_LiveIDAuthentication.
                                    • Go to the Extension Settings section.
                                    • At Enabled?, select from these options: -
                                      • to enable LiveID authentication.
                                      • to disable. Skip to Step 9.
                                      • -
                                    • Optional. At Include Help? to render help text for the LiveID Login box - OR - to hide it.
                                      • +
                                      • to enable LiveID authentication.
                                      • to disable. Skip to Step 9.
                                      +
                                    • Optional. At Include Help? to render help text for the LiveID Login box - OR - to hide it.
                                    • In the Application ID text box, enter your Windows LiveID Application ID.
                                    • In the Secret Key text box, enter your Windows LiveID secret key.
                                    • Click the Update Authentication Settings link.
                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Setting DNN Active Directory Authentication.html b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Setting DNN Active Directory Authentication.html index 0314dc0a65b..8ade01710d6 100644 --- a/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Setting DNN Active Directory Authentication.html +++ b/Documentation/Using the Control Panel/Admin Console/Extensions/Module Editors/Setting DNN Active Directory Authentication.html @@ -12,13 +12,13 @@

                                      Setting DNN Active Directory Authentication

                                    • Click the Edit button beside DNN_ActiveDirectoryAuthentication.
                                    • Go to the Authentication Settings section.
                                    • At Enabled?, select from these options: -
                                      • to enable this authentication.
                                      • to disable. Skip to Step 9.
                                      • +
                                      • to enable this authentication.
                                      • to disable. Skip to Step 9.
                                    • At Hide Login Controls?, select from these options: -
                                      • to hide the Windows Login button on the Login screen.
                                      • to display the Windows Login button on the Login screen.
                                      • +
                                      • to hide the Windows Login button on the Login screen.
                                      • to display the Windows Login button on the Login screen.
                                    • At Synchronize Role?, select from these options: -
                                      • to synchronize the user's role with the Windows Active Directory security group each time user logs on.
                                      • to disable.
                                      • +
                                      • to synchronize the user's role with the Windows Active Directory security group each time user logs on.
                                      • to disable.
                                    • At Do Not Automatically Create Users? select from these options: -
                                      • to prevent Active Directory users from log into the DNN site until an account is created.
                                      • to disable.
                                      • +
                                      • to prevent Active Directory users from log into the DNN site until an account is created.
                                      • to disable.
                                    • At Provider, select the Authentication provider for this site. E.g. ADSIAuthenticationProvider
                                    • At Authentication Type, select the Authentication type for this site. Note: Delegation is recommenced.
                                    • In the Root Domain text box, enter your Root Domain in the format yourdomain.com or DC=yourdomain,DC=com. Leave this value blank if you want to obtain Active Directory objects from root forest. Optionally, you can explicitly define the Organizational Unit (OU) you want to authenticate your users against. Once you define the Organizational Unit, the authentication will verify against all users belonging to the Organizational Unit, as well as the users of Sub-Units belonging to it. The lowest level of Organization Unit you wish to validate against must be listed first. (E.g. "OU=Admin Users,OU=All Users,DC=yourdomain,DC=com" – which will only validate Admin Users as authenticated.)
                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Administrators/Synchronizing Folders.html b/Documentation/Using the Control Panel/Admin Console/File Management/Administrators/Synchronizing Folders.html index de2e382f761..3ccb5bc8a1b 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Administrators/Synchronizing Folders.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Administrators/Synchronizing Folders.html @@ -1,15 +1,15 @@  - +

                                      Synchronizing Folders

                                      -

                                      How to synchronize one or more folders of the Digital Asset Management Pro module to ensure the folders listed match the folder structure within the database. This may be required when folders are uploaded using FTP directly to the database.

                                      +

                                      How to synchronize one or more folders of the Digital Asset Management Pro module to ensure the folders listed match the folder structure within the database. This may be required when folders are uploaded using FTP directly to the database. Restricted to Administrators.

                                      1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                        2. -
                                      2. Click the Sync button on the toolbar and then select one of these options from the drop down list:
                                        • Refresh: Select to refresh the files within a selected folder of the Digital Asset Management module so the file information in the database matches the files on the server. This may be required if files have been uploaded via FTP
                                        • Sync this folder: Select to synchronize the folder structure and files of the selected folder only.
                                        • Sync this folder & subfolders: Select to synchronize the folder structure and files of the selected folder and all subfolders.
                                        3. +
                                      3. Click the Sync button on the toolbar and then select one of these options from the drop down list:
                                        • Refresh: Select to refresh the files within a selected folder of the Digital Asset Management module so the file information in the database matches the files on the server. This may be required if files have been uploaded via FTP
                                        • Sync this folder: Select to synchronize the folder structure and files of the selected folder only.
                                        • Sync this folder & subfolders: Select to synchronize the folder structure and files of the selected folder and all subfolders.
                                      -

                                      Tip: Click on the Sync button again to close the drop down menu.

                                      +

                                      Tip: Click on the Sync button again to close the drop down menu.

                                      diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Downloading a File.html b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Downloading a File.html index 865a3ca1858..f1029f4ddae 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Downloading a File.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Downloading a File.html @@ -8,7 +8,7 @@

                                      Downloading one or more Files

                                      1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                      2. Navigate to and select the folder containing the file to be downloaded. See "Navigating to and Selecting Folders"
                                        3. -
                                      3. Select and download files using one or these methods:
                                        • To download a single file, either click the linked file name - OR - Right click on the file row and click the Download button from the drop down menu - OR - beside the file and then click the Download button in the Files Window Tool Bar.

                                        • To download multiple files,beside each file and then either click the Download button in the Files Window Tool Bar or right click on one of the selected file rows and then click the Download button from the drop down menu.
                                        4. +
                                      4. Select and download files using one or these methods:
                                        • To download a single file, either click the linked file name - OR - Right click on the file row and click the Download button from the drop down menu - OR - beside the file and then click the Download button in the Files Window Tool Bar.

                                        • To download multiple files,beside each file and then either click the Download button in the Files Window Tool Bar or right click on one of the selected file rows and then click the Download button from the drop down menu.

                                      diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Navigating to Files.html b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Navigating to Files.html index 6ab30681184..92b5ba9f120 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Navigating to Files.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Navigating to Files.html @@ -1,10 +1,10 @@  - +

                                      Navigating to Files

                                      -

                                      The Digital Asset Management Pro module displays the first ten (10) files within the selected folder inside the Files Window. When there are more than ten (10) files, the following options are displayed on the Files Navigation Bar located at the base of the module, allowing you to navigate to the additional files as well as change the default number of files displayed.

                                      +

                                      The Digital Asset Management Pro module displays the first ten (10) files within the selected folder inside the Files Window. When there are more than ten (10) files, the following options are displayed on the Files Navigation Bar located at the base of the module, allowing you to navigate to the additional files as well as change the default number of files displayed. All users can perform this task.

                                      • Items per Page: Select the number of files (10, 25, 50, 100 or All) to be displayed in the Files Window. This setting will be retained when a new folder is selected, however it will default back to ten (10) files whenever the Digital Asset Management module is refreshed.
                                      • Page Links: When there is more than one page of files within the selected folder, a list of linked page numbers enables uses to navigate to other pages. E.g.
                                        • diff --git "a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Refreshing All Files within a\302\240Folder.htm" "b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Refreshing All Files within a\302\240Folder.htm" index 2aeaaf8cc62..b85940b1471 100644 --- "a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Refreshing All Files within a\302\240Folder.htm" +++ "b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Refreshing All Files within a\302\240Folder.htm" @@ -1,14 +1,14 @@  - +

                                        Refreshing All Files within a Folder

                                        -

                                        How to refresh the files within a selected folder of the Digital Asset Management Pro module so the file information in the database matches the files on the server. This may be required if files have been uploaded via FTP.

                                        +

                                        How to refresh the files within a selected folder of the Digital Asset Management Pro module so the file information in the database matches the files on the server. This may be required if files have been uploaded via FTP. All users can perform this task.

                                        1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                        2. Navigate to and select the required folder. See "Navigating to and Selecting Folders"
                                          3. -
                                        3. Right click on the folder name and select Refresh Folder - OR - Click the Refresh button in the toolbar and then select Refresh from the drop down list.
                                          4. +
                                        4. Right click on the folder name and select Refresh Folder - OR - Click the Refresh button in the toolbar and then select Refresh from the drop down list.

                                        diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Searching for Files.html b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Searching for Files.html index 58a70d13a26..ae67bdebb10 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Searching for Files.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Searching for Files.html @@ -1,10 +1,10 @@  - +

                                        Searching for Files

                                        -

                                        How to search for files within the Digital Asset Management Pro module by either all or part of the file name or by entering a wild card search for a file extension, e.g. *.docx. Search results will include all files that match the entered criteria and are within the currently selected folder and any of its subfolders.

                                        +

                                        How to search for files within the Digital Asset Management Pro module by either all or part of the file name or by entering a wild card search for a file extension, e.g. *.docx. Search results will include all files that match the entered criteria and are within the currently selected folder and any of its subfolders. All users can perform this task.

                                        1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                        2. Navigate to and select a folder to search for files within both the selected folder and any subfolders. See "Navigating to and Selecting Folders"
                                          3. diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Setting Sort Order Files.html b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Setting Sort Order Files.html index 476bdb7c4c9..ff57448c4e3 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Setting Sort Order Files.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/All Users/Setting Sort Order Files.html @@ -1,10 +1,10 @@  - +

                                          Setting Sort Order of Files

                                          -

                                          The files displayed in the Files Window of the Digital Asset Management Pro module can be sorted alpha-numerically in either ascending or descending order by either the Name, Date Modified or Size column. The default sort order is in ascending order by file name (Name column) by default.

                                          +

                                          The files displayed in the Files Window of the Digital Asset Management Pro module can be sorted alpha-numerically in either ascending or descending order by either the Name, Date Modified or Size column. The default sort order is in ascending order by file name (Name column) by default. All users can perform this task.

                                          1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                          2. In the Title Bar of the Files Window, click on either the Name, Date Modified, or Size column name to sort files by that column. This will sort the files in the selected column in ascending order and display the Sorted Asc icon beside the selected column.
                                            3. diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/01 Adding a New Folder.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/01 Adding a New Folder.html index 2de9b52e349..8978f6689a1 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/01 Adding a New Folder.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/01 Adding a New Folder.html @@ -11,7 +11,7 @@

                                            Adding a SubFolder

                                            to Folder permission to a folder can add subfolders.

                                            Any Evoq Content user, including anonymous users, who have been granted Add permission to a folder can add subfolders.

                                            - Amazon, Azure and UNC folder types must be created before these folder types can be selected. See "Adding an Amazon S3 Folder Type", See "Adding a UNC Folder Type", or See "Adding a Windows Azure Folder Type"

                                            + Amazon, Azure and UNC folder types must be created before these folder types can be selected. See "Adding an Amazon S3 Folder Type", See "Adding a UNC Folder Type", or See "Adding a Windows Azure Folder Type"

                                            1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                            2. Navigate to the folder that you want to add a subfolder beneath. See "Navigating to and Selecting Folders"
                                              3. diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/About Folder Security Settings.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/About Folder Security Settings.html index 2d583fd83fd..51ec22c1262 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/About Folder Security Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/About Folder Security Settings.html @@ -13,7 +13,7 @@

                                              About Folder Security Settings

                                            3. Write to Folder: Enables authorized users to perform all file management tasks for files within this folder.

                                      - +

                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Copying Files.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Copying Files.html index fd9938cff4d..65ececc5b51 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Copying Files.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Copying Files.html @@ -8,7 +8,7 @@

                                        Copying Files

                                        1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                        2. Navigate to and select the folder where the files to be copied are located. See "Navigating to and Selecting Folders"
                                          3. -
                                        3. In the File Window, beside each file to be copied - OR - in the File Window Title Bar to select all items that are currently displayed and then deselect any folders than have been selected. This is required because folders cannot be copied and the Copy option will not display until the folders are deselected. Tip: See "Navigating to Files" learn how to select different or additional files than those on the current page.
                                          4. +
                                        4. In the File Window, beside each file to be copied - OR - in the File Window Title Bar to select all items that are currently displayed and then deselect any folders than have been selected. This is required because folders cannot be copied and the Copy option will not display until the folders are deselected. Tip: See "Navigating to Files" learn how to select different or additional files than those on the current page.
                                        5. Right click on a selected item and select Copy from the drop down menu - OR - Click the Copy button in the Files Window Tool Bar.

                                        diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Deleting Files and Folders.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Deleting Files and Folders.html index 592f13a2842..64df1aa8b54 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Deleting Files and Folders.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Deleting Files and Folders.html @@ -11,7 +11,7 @@

                                        Deleting one or more Files and/or Folders

                                      • Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                                      • Navigate to and select the folder containing the folders or files to be deleted. See "Navigating to and Selecting Folders"
                                      • Optional. At Page Size increase the number of files displayed to view and delete more folders and/or files at one time.
                                        • -
                                      • In the Files Window, beside each item to be deleted - OR - in the File Window title bar to select all items on the current page for deletion.
                                        • +
                                      • In the Files Window, beside each item to be deleted - OR - in the File Window title bar to select all items on the current page for deletion.
                                      • Right click on a selected item and select Delete from the drop down menu - OR - Click the Delete button in the Files Window Tool Bar.

                                diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Properties.htm b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Properties.htm index e5a66eb9b7f..ed8c0208185 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Properties.htm +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Properties.htm @@ -9,7 +9,7 @@

                                Managing File Properties

                              • Navigate to Admin >  File Management - OR - Go to a Digital Asset Management module.
                              • Navigate to the required folder. See "Navigating to and Selecting Folders"
                              • Select the folder and click the View Folder Properties button in the toolbar - OR - Right click on the folder and select View Folder Properties.
                                • -
                              • The following properties can be edited:
                                1. In the Name text box, enter a new file name. Warning. Renaming a file does not update any references to this file across your site. E.g. If the file is an image that is displayed in the HTML module, renaming the file will break the path to the image and you will need to manually update the image path by editing the content of that module. Because of this, it is recommended that you only rename a file when it is first uploaded to the site and has not yet to be used on the site.
                                2. In the Tags text box, enter one or more tags separated by a comma.
                                3. At Attributes, modify any of the following file attributes:
                                  • At Archive, to allow the file to be archived by the operating system. This option is enabled by default.
                                  • At Hidden, to hide this file on the site. Hidden files don't display on your site in modules such as the HTML module, they are also not displayed on vendor banners, nor are they displayed for selection from the Rich Text Editor image or file galleries. This option is disabled by default.
                                  • At Read-only, to set the file as read only. This option is disabled by default.
                                  • At System: to disable hidden option in file properties (Windows). For fast searching, allow Indexing Service to index this file. This option is disabled by default.
                                • +
                              • The following properties can be edited:
                                1. In the Name text box, enter a new file name. Warning. Renaming a file does not update any references to this file across your site. E.g. If the file is an image that is displayed in the HTML module, renaming the file will break the path to the image and you will need to manually update the image path by editing the content of that module. Because of this, it is recommended that you only rename a file when it is first uploaded to the site and has not yet to be used on the site.
                                2. In the Tags text box, enter one or more tags separated by a comma.
                                3. At Attributes, modify any of the following file attributes:
                                  • At Archive, to allow the file to be archived by the operating system. This option is enabled by default.
                                  • At Hidden, to hide this file on the site. Hidden files don't display on your site in modules such as the HTML module, they are also not displayed on vendor banners, nor are they displayed for selection from the Rich Text Editor image or file galleries. This option is disabled by default.
                                  • At Read-only, to set the file as read only. This option is disabled by default.
                                  • At System: to disable hidden option in file properties (Windows). For fast searching, allow Indexing Service to index this file. This option is disabled by default.
                              • Click the Save button to save any modifications.
                        diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Tags.htm b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Tags.htm index f780c4fd275..502b74ca395 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Tags.htm +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing File Tags.htm @@ -21,7 +21,7 @@

                        Adding Tags

                        1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                        2. Navigate to the required folder. See "Navigating to and Selecting Folders"
                          3. -
                        3. Right click on the file row and select  View Properties - OR - beside a file and click the View Properties  button in the Files Window Tool Bar.
                          4. +
                        4. Right click on the file row and select  View Properties - OR - beside a file and click the View Properties  button in the Files Window Tool Bar.
                        5. In the Tags text box, enter one or more tags separated by a comma.
                        6. Click the Save button.
                        diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing Folder Properties.htm b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing Folder Properties.htm index 6a1350398f7..c10f9038909 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing Folder Properties.htm +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Managing Folder Properties.htm @@ -10,7 +10,7 @@

                        Managing Folder Properties

                      3. Navigate to the required folder. See "Navigating to and Selecting Folders"
                      4. Select the folder and click the View Folder Properties  button in the toolbar - OR - Right click on the folder and select View Folder Properties.
                      5. The following information is displayed:
                        • Preview: Displays a thumbnail image of the folder.
                        • Size: Total size of all the files within this folder.
                        • Total Files: Total number of the files within this folder.
                        • Created: Date and time when this folder was created. This field will be blank for folders that were generated when the site was built.
                        • Created By: First and last name of the user who created this folder. This field will be blank for folders that were generated when the site was built.
                        • Modified: Date and time when this folder was last modified.
                        • Modified By: First and last name of the last user to modify the properties of this folder.
                        • Folder Type: Indicates the type of folder. I.e. Standard, secure, database, Amazon Folder Provider, Azure Folder Provider or UNC Folder Provider.
                        6. -
                      6. The following properties can be edited:
                        1. In the Folder Name text box, enter a new folder name. Warning. Renaming a folder does not update any references to the files within the folder across your site. E.g. If a file within this folder is an image that is displayed in the HTML / HTML Pro module, then renaming the file will break the path to the image and you will need to manually update the image by editing the content of that module. Because of this, it is recommended that you only rename folders before the file within them are used on the site.


                        General Properties of a Digital Asset Management folder

                        1. At Versioning, select from these options:
                          1. at Enable to enable versioning for the files within this folder. This enables the Versioning tab on the File Properties of each file within the folder. - OR - to disable versioning for this folder. This removes the Versioning tab from the File Properties page for each file within this folder.
                          2. at Apply settings to all subfolders to apply versioning is applied to all subfolders of this folder. This enables the Versioning tab on the File Properties of each file within subfolder. This option can be selected regardless of whether versioning is enabled on the current folder, allowing you to enable versioning on subfolders but not on the parent folder. Note: This field is be displayed regardless of whether there are any subfolders or not. - OR - to disable versioning for subfolders. This removes the Versioning tab from the File Properties page for each file within the subfolders.
                        2. At Workflow, select from these options:
                          1. at Enable to enable workflow for this folder. This enables the Workflow tab on the File Properties page for each file within this folder. - to disable workflow for this folder. This removes the Workflow tab from the File Properties page for each file within this folder.
                          2. at Apply settings to all subfolders to enable workflow on all subfolders of this folder. This removes the Workflow tab from the File Properties page for each file within this folder. This option can be selected regardless of whether workflow is enabled on the current folder, allowing you to enable workflow on subfolders but not on the parent folder. Note: This field is displayed regardless of whether there are any subfolders or not. - OR - to disable workflow for files within this folder. This removes the Workflow tab from the File Properties page for each file within the subfolders. Note: If there are pending items in workflow you will be advised how many pending items are in the workflow process and asked to either Publish Allor Discard All of the pending files. In this scenario, the user does not need to have Ready To Review permissions granted to publish all files.
                        7. +
                      7. The following properties can be edited:
                        1. In the Folder Name text box, enter a new folder name. Warning. Renaming a folder does not update any references to the files within the folder across your site. E.g. If a file within this folder is an image that is displayed in the HTML / HTML Pro module, then renaming the file will break the path to the image and you will need to manually update the image by editing the content of that module. Because of this, it is recommended that you only rename folders before the file within them are used on the site.


                        General Properties of a Digital Asset Management folder

                        1. At Versioning, select from these options:
                          1. at Enable to enable versioning for the files within this folder. This enables the Versioning tab on the File Properties of each file within the folder. - OR - to disable versioning for this folder. This removes the Versioning tab from the File Properties page for each file within this folder.
                          2. at Apply settings to all subfolders to apply versioning is applied to all subfolders of this folder. This enables the Versioning tab on the File Properties of each file within subfolder. This option can be selected regardless of whether versioning is enabled on the current folder, allowing you to enable versioning on subfolders but not on the parent folder. Note: This field is be displayed regardless of whether there are any subfolders or not. - OR - to disable versioning for subfolders. This removes the Versioning tab from the File Properties page for each file within the subfolders.
                        2. At Workflow, select from these options:
                          1. at Enable to enable workflow for this folder. This enables the Workflow tab on the File Properties page for each file within this folder. - to disable workflow for this folder. This removes the Workflow tab from the File Properties page for each file within this folder.
                          2. at Apply settings to all subfolders to enable workflow on all subfolders of this folder. This removes the Workflow tab from the File Properties page for each file within this folder. This option can be selected regardless of whether workflow is enabled on the current folder, allowing you to enable workflow on subfolders but not on the parent folder. Note: This field is displayed regardless of whether there are any subfolders or not. - OR - to disable workflow for files within this folder. This removes the Workflow tab from the File Properties page for each file within the subfolders. Note: If there are pending items in workflow you will be advised how many pending items are in the workflow process and asked to either Publish Allor Discard All of the pending files. In this scenario, the user does not need to have Ready To Review permissions granted to publish all files.

                      @@ -22,7 +22,7 @@

                      Managing Folder Properties

                    • Click the Yes button to continue.

                      • - +

                      • diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Modifying Folder Permissions.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Modifying Folder Permissions.html index 90b68cbfc12..28bb6c1da65 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Modifying Folder Permissions.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Modifying Folder Permissions.html @@ -16,7 +16,7 @@

                        Modifying Folder Permissions

                      • Select the Permissions tab. The current permission settings are displayed.
                      • Optional. At Filter By Group, select < All Roles > from the drop down list to view a list of all available roles or select a specific role to set permissions for that role only.
                      • Optional. In the Username text box, enter the username of the user to have permissions assigned and then click the Add link. This adds the user's name.
                        • -
                      • Perform the following to modify one or more permissions:
                        • in one or more columns to grant a permission to that role or user.
                        • in one or more columns to remove a permission.
                        • Click the check box until Permission Denied Permission Denied is displayed to deny this permission to a user or role.
                        • +
                      • Perform the following to modify one or more permissions:
                        • in one or more columns to grant a permission to that role or user.
                        • in one or more columns to remove a permission.
                        • Click the check box until Permission Denied Permission Denied is displayed to deny this permission to a user or role.
                      • Optional. At Filter By Group, select another role, role group or Global Roles to set permissions for additional roles.

                        • diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Moving Files.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Moving Files.html index d620fc978bf..23a4719a11b 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Moving Files.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Moving Files.html @@ -8,7 +8,7 @@

                        Moving Files and/or Folders

                        1. Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                        2. Navigate to and select the folder where the files to be moved are located. See "Navigating to and Selecting Folders"
                          3. -
                        3. In the Files Window, beside each item to be moved - OR - in the File Window Title Bar to select all items on the current page. Tip: See "Navigating to Files" learn how to select different or additional files and folders than those on the current page.
                          4. +
                        4. In the Files Window, beside each item to be moved - OR - in the File Window Title Bar to select all items on the current page. Tip: See "Navigating to Files" learn how to select different or additional files and folders than those on the current page.
                        5. Right click on the row of a selected item and select Move from the drop down menu - OR - Click the Move button in the Files Window Tool Bar. 

                        diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Renaming File.html b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Renaming File.html index b19c815e102..373449c5069 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Renaming File.html +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Folder Editor/Renaming File.html @@ -10,7 +10,7 @@

                        Renaming a File

                      • Navigate to Admin >  File Management - OR - Go to a Digital Asset Management Pro module.
                      • Navigate to and select the folder where the file is located. See "Navigating to and Selecting Folders"
                      • In the Files Window, right click on the name of the file.
                        • -
                      • Right click on the file row and select Rename from the drop down menu - OR - beside the file and then click the Rename button in the Files Window Tool Bar.
                        • +
                      • Right click on the file row and select Rename from the drop down menu - OR - beside the file and then click the Rename button in the Files Window Tool Bar.

                        • diff --git a/Documentation/Using the Control Panel/Admin Console/File Management/Settings/DAMSettings.htm b/Documentation/Using the Control Panel/Admin Console/File Management/Settings/DAMSettings.htm index 65c1327bfac..33ede110990 100644 --- a/Documentation/Using the Control Panel/Admin Console/File Management/Settings/DAMSettings.htm +++ b/Documentation/Using the Control Panel/Admin Console/File Management/Settings/DAMSettings.htm @@ -7,16 +7,16 @@

                        Configuring Digital Asset Management Settings

                        How to set the default folder type that will be used when adding a new folder to Digital Asset Management.

                        1. - +
                        2. Select the Digital Asset Management tab.
                        3. At Default Folder Type, select either Standard, Secure, or Database.
                        4. - +

                        - +

                        • diff --git a/Documentation/Using the Control Panel/Admin Console/Google Analytics/Module Editors/Configuring Google Analytics.html b/Documentation/Using the Control Panel/Admin Console/Google Analytics/Module Editors/Configuring Google Analytics.html index 6010421e3a0..afb25a97448 100644 --- a/Documentation/Using the Control Panel/Admin Console/Google Analytics/Module Editors/Configuring Google Analytics.html +++ b/Documentation/Using the Control Panel/Admin Console/Google Analytics/Module Editors/Configuring Google Analytics.html @@ -1,47 +1,22 @@  - + - -

                          Configuring Google Analytics/Google Analytics Pro

                          -

                          How to configure either the Google Analytics or the Google Analytics Pro module.

                          +

                          Configuring Google Analytics

                          +

                          How to configure either the Google Analytics module.

                          - You must have an existing Google Analytics account. Visit the Google Analytics website at http://www.google.com/analytics and click the Create an Account button.

                          -

                          Configuring Google Analytics

                          + You must have an existing Google Analytics account. Visit the Google Analytics website at http://www.google.com/analytics and click the Create an Account button.

                            -
                          1. Navigate to Admin > Advanced Settings > Google Analytics Pro - OR - Go to a Google Analytics Pro module.
                            2. +
                          2. Navigate to Admin > Advanced Settings > Google Analytics - OR - Go to a Google Analytics module.
                          3. In the Tracking ID text box, enter the website tracking ID that you obtained from the welcome message sent by Google when you signed up for an account.
                          4. Optional. In the URL Parameter text box, enter the JavaScript code fragment that will be passed as a parameter to the page tracker. This is used to customize the value tracked in Google Analytics instead of the default location.
                          5. - +

                          -

                          Configuring Google Analytics Pro

                          -
                            -
                          1. Login to your Google Analytics account.
                            2. -
                          2. Go to https://www.google.com/analytics/web/provision?et=&hl=en&authuser=#provision/SignUp/ after logon.
                            3. -
                          3. Click the Advanced Segments button.
                            4. -
                          4. Go to you DNN site.
                            5. -
                          5. Navigate to Admin > Google Analytics Pro - OR - Go to a Google Analytics Pro module.
                            6. -
                          6. In the Tracking ID text box, enter the website tracking ID that you obtained from the welcome message sent by Google when you signed up for an account.
                            7. -
                          7. At Enable, check the check box to enable Google Analytics Pro - OR - Uncheck the check box to disable Google Analytic Pro. -
                            8. -
                          8. Expand the Advanced Parameters section.
                            9. -
                          9. Optional. In the URL Parameter text box, enter the JavaScript code fragment that will be passed as a parameter to the page tracker. This is used to customize the value tracked in Google Analytics instead of the default location. - A list of the available parameters is included below this tutorial. -
                            10. -
                          10. Optional. In the Domain Name text box, enter the domain name of this site to aggregate visits to multiple subdomains in a single profile as if they were a single site. Example: entering ".sample-domain.com" (notice the leading ".") allows you to track dogs.sample-domain.com and cats.sample-domain.com as a single entity. -
                            11. -
                          11. Click the Update link to enable Google Analytics Pro and start collecting statistics.
                            12. -
                          -

                          - -

                          -

                          Here is the list of variables that can be added to the Advanced Parameters section in the URL Parameter field
                          _setCustomVar(index, name, value, opt_scope)

                          index (required): The slot for the custom variable, it can range from 1-5 for standard accounts or 1-50 for Premium accounts.

                          -

                          name (required): The name for the custom variable, a string that identifies the custom variable and appears in the top-level Custom Variables report of the Analytics reports. For example, if you are using a slot to track gender, the name would be 'Gender'.

                          value (required): The value for the custom variable, it appears in the table list of the UI for a selected variable name. Typically, you will have two or more values for a given name. Using the 'Gender' example above, the values would be either 'Male' or 'Female'.

                          opt_scope (optional): The scope for the custom variable. As described above, the scope defines the level of user engagement with the site. It is a number whose possible values are 1 (visitor-level), 2 (session-level), or 3 (page-level). When left undefined, the custom variable scope defaults to page-level interaction.

                          \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/About the Languages Management Module.html b/Documentation/Using the Control Panel/Admin Console/Languages/About the Languages Management Module.html index 1dbbf4cc9be..be1afd02957 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/About the Languages Management Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/About the Languages Management Module.html @@ -1,5 +1,5 @@  - + diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Adding-Editing the Login Message.html b/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Adding-Editing the Login Message.html index b39e6b17c56..69d1bcd9b10 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Adding-Editing the Login Message.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Adding-Editing the Login Message.html @@ -16,7 +16,7 @@

                          Adding/Editing the Login Message

                          1. Find (Crtl + F) Resource Name: MESSAGE_LOGIN_INSTRUCTIONS.Text. Note: If Paging is enabled then it may be located on a subsequent page.
                            2. -
                          2. To edit the message, perform one of the following options: 
                            • Edit the message body using HTML tags in the Localized Value text box below.


                            - OR -

                            • Click the Edit Add button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                              1. Click the OK button.
                              2. Enter your new message into the RTE ensuring you include the replacement tokens displayed at Default Value.
                              3. This will return you to the Language Editor.
                            3. +
                          3. To edit the message, perform one of the following options: 
                            • Edit the message body using HTML tags in the Localized Value text box below.


                            - OR -

                            • Click the Edit Add button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                              1. Click the OK button.
                              2. Enter your new message into the RTE ensuring you include the replacement tokens displayed at Default Value.
                              3. This will return you to the Language Editor.
                          4. Optional. To edit the subject associated with email message language files, edit the associated Subject resource file which will be listed above the Body resource file.
                          5. Click the Save Resource File button.
                          6. Optional. Repeat all of the above steps to update this message for another language.
                            7. diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing Privacy and Terms of Use Statements.html b/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing Privacy and Terms of Use Statements.html index 13b6a497f78..184d155b180 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing Privacy and Terms of Use Statements.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing Privacy and Terms of Use Statements.html @@ -17,10 +17,10 @@

                            Editing Privacy and Terms of Use Statements

                          7. Find Resource Name: MESSAGE_PORTAL_PRIVACY.Text or MESSAGE_PORTAL_TERMS.Text as desired. Note: If Paging is enabled then it may be located on a subsequent page. See "Configuring Setting for the Language Editor"
                          8. To edit the message, perform one of the following options:
                            • Edit the message body using HTML tags in the Localized Value text box below
                              - OR -
                            • Click the Edit button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?" -
                              2. Enter your new message into the RTE ensuring you include the replacement tokens displayed at Default Value.
                              3. This will return you to the Language Editor.
                            9. +
                            2. Enter your new message into the RTE ensuring you include the replacement tokens displayed at Default Value.
                            3. This will return you to the Language Editor.
                      • Optional. To edit the subject associated with email message language files, edit the associated Subject resource file which will be listed above the Body resource file.
                      • - +
                      • Optional. Repeat all of the above steps to update this message for another language.
                        • diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing the Password Reminder Email.html b/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing the Password Reminder Email.html index 8bdd002efb3..c3b671a4a77 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing the Password Reminder Email.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Language Files/Editing the Password Reminder Email.html @@ -12,11 +12,11 @@

                        Editing the Password Reminder Email

                      • Find Resource Name: EMAIL_PASSWORD_REMINDER_BODY.Text. A quick way to do this is to use the Find (Ctrl + F) feature of your Web browser.
                      • To view the current details click the Maximize  button at Default Value.
                      • To edit the message, perform one of the following options:
                        • -
                      • Edit the message body using HTML tags in the Localized Value text box below
                        - OR -
                        1. Click the Edit  button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                        3. Copy, Paste and Edit the default value into the RTE, or enter your new message into the RTE ensuring you include the replacement tokens displayed at Default Value.
                        4. This will return you to the Language Editor.
                        • +
                      • Edit the message body using HTML tags in the Localized Value text box below
                        - OR -
                        1. Click the Edit  button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                        3. Copy, Paste and Edit the default value into the RTE, or enter your new message into the RTE ensuring you include the replacement tokens displayed at Default Value.
                        4. This will return you to the Language Editor.
                      • To edit the email subject go to Resource Name: EMAIL_PASSWORD_REMINDER_SUBJECT.Text which is the next field down the list.
                      • Edit the subject in the Localized Value text box.
                      • - +
                      • Repeat all of the above steps to update this message for another language.
                        • diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/01 Enabling Localized Content.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/01 Enabling Localized Content.html index b28c87e6e78..33f55d9e45a 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/01 Enabling Localized Content.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/01 Enabling Localized Content.html @@ -6,7 +6,7 @@

                        Enabling Localized Content

                        How to create a localized copy of the current site content for each of the enabled languages using the Languages module. This creates a translator role ( titled Translator and then appended with the country code. E.g. Translator (EN-AU) ) for each enabled language. This also enables the Localization tab under Page Settings for all site pages. See "Localization Settings for New Pages". DNN Platform users (including anonymous users) must be granted Edit Module permissions. Evoq Content users (including anonymous users) must be granted Edit Content permissions.

                        - Localized content must be enabled by a SuperUser. Localized content cannot be disabled once it has been enabled. See "Allowing/Disallowing Content Localization"

                        + Localized content must be enabled by a SuperUser. Localized content cannot be disabled once it has been enabled. See "Allowing/Disallowing Content Localization"

                        1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                        2. Select the Languages tab.
                          3. @@ -17,7 +17,7 @@

                          Enabling Localized Content

                          1. The Enable Localized Content message box is now displayed listing the Current Site Default language and informing you that this language cannot be changed once localized content is enabled. If you wish to change the default site culture, you must select Cancel now and change the default language.
                            2. -
                          2. At Make all pages Translatable, select from these options:
                            1. if all pages that are in the default language will be made translatable. This creates a copy of all translatable pages for each of the enabled languages.
                            2. if you only want to translate some of the pages that are in the default language into other languages. This allows you to maintain some or most of the site in the default language and only manage selected pages, such as the contact page or pages that don't frequently change content, into other languages. This is the default setting.
                            3. +
                          3. At Make all pages Translatable, select from these options:
                            1. if all pages that are in the default language will be made translatable. This creates a copy of all translatable pages for each of the enabled languages.
                            2. if you only want to translate some of the pages that are in the default language into other languages. This allows you to maintain some or most of the site in the default language and only manage selected pages, such as the contact page or pages that don't frequently change content, into other languages. This is the default setting.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/AllowUsersto chooseInterfaceLanguage.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/AllowUsersto chooseInterfaceLanguage.html index a6340c5239d..10d6cf4f072 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/AllowUsersto chooseInterfaceLanguage.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/AllowUsersto chooseInterfaceLanguage.html @@ -6,14 +6,14 @@

                          Enabling/Disabling Users to Choose the Interface Language

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                          2. Select the Settings tab.
                            3. -
                          3. At Allow Users to Choose Interface Language?, to enable. - OR - to disable. This is the default setting.
                            4. +
                          4. At Allow Users to Choose Interface Language?, to enable. - OR - to disable. This is the default setting.

                          Setting the Default Site Language

                          1. - +
                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Deleting a Resource File.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Deleting a Resource File.html index db1b1536a34..9e19abd15ad 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Deleting a Resource File.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Deleting a Resource File.html @@ -23,7 +23,7 @@

                          Deleting a Resource File

                          1. This displays the message "Are You Sure You Wish To Delete This Item?"
                          2. - +
                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Editing Site Language Files.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Editing Site Language Files.html index 47e2e9ea474..cd0fcf7023c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Editing Site Language Files.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Editing Site Language Files.html @@ -16,7 +16,7 @@

                          Editing Site Language Files

                          • Local Resources: Files which are related to specific Admin controls, modules (desktop modules), controls, installation and Host skins.
                          • Global Resources: Files which are used across the site. This is divided into GlobalResources and SharedResources. This is where you can edit the messages that are sent to users, error messages, site messages, etc.
                        3. Locate the required resource file. Note: If Paging is enabled, the file may be located on another page.
                        4. To edit a resource file, perform one of the following options: -
                          1. In the Localized Value text box, edit the text.
                            - OR -
                          2. Click the Edit button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                            2. In the Editor, enter the new text ensuring you include the desired replacement tokens displayed at Default Value.
                          5. +
                          1. In the Localized Value text box, edit the text.
                            - OR -
                          2. Click the Edit button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                            2. In the Editor, enter the new text ensuring you include the desired replacement tokens displayed at Default Value.
                        5. Optional. To edit the subject associated with email messages, edit the associated Subject resource file which will be listed above the Body resource file.
                        6. Repeat steps 5-7 to edit additional files.
                        7. Click the Save Resource File button to save your changes.
                          8. diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling Language Parameter.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling Language Parameter.html index cc54021ea57..3abfb2af291 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling Language Parameter.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling Language Parameter.html @@ -6,14 +6,14 @@

                          Enabling/Disabling Language Parameter in URL

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                          2. Select the Settings tab.
                            3. -
                          3. At Enable Language Parameter in URLs?, to enable browser language detection. This is the default setting. - OR - to disable.
                            4. +
                          4. At Enable Language Parameter in URLs?, to enable browser language detection. This is the default setting. - OR - to disable.

                          Setting the Default Site Language

                          1. - +
                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling Browser Language Detection.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling Browser Language Detection.html index 01eef7a3fa3..748c412c94a 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling Browser Language Detection.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling Browser Language Detection.html @@ -6,14 +6,14 @@

                          Enabling/Disabling Browser Language Detection

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                          2. Select the Settings tab.
                            3. -
                          3. At Enable Browser Language Detection?, to enable browser language detection. This is the default setting. - OR - to disable.
                            4. +
                          4. At Enable Browser Language Detection?, to enable browser language detection. This is the default setting. - OR - to disable.

                          Setting the Default Site Language

                          1. - +
                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling a Language.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling a Language.html index c7093b6dcfd..9e8c002f837 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling a Language.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Enabling-Disabling a Language.html @@ -6,11 +6,11 @@

                          Enabling/Disabling a Language

                          How to enable or disable a language on your site using the Languages module. A site can be enabled or disabled before or after content localization is enabled. DNN Platform users (including anonymous users) must be granted Edit Module permissions. Evoq Content users (including anonymous users) must be granted Edit Content permissions.

                          - More than one language must be added as at least one language must always be enabled.

                          + More than one language must be added as at least one language must always be enabled.

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                          2. Select the Languages tab.
                            3. -
                          3. In the Enabled column, beside the language to be enabled - OR - to disable a language. Note: The default language cannot be disabled.
                            4. +
                          4. In the Enabled column, beside the language to be enabled - OR - to disable a language. Note: The default language cannot be disabled.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting Language Files as Pending Translation.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting Language Files as Pending Translation.html index c7d3d787fa6..d71cab818da 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting Language Files as Pending Translation.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting Language Files as Pending Translation.html @@ -12,21 +12,21 @@

                          Setting Language Files as Pending Translation

                          Setting the Default Site Language

                            -
                          1. At Highlight Pending Translations, to set all values as pending translation. This highlights the Localized Value text boxes in red making it easy to identify that they are pending translation.
                            2. +
                          2. At Highlight Pending Translations, to set all values as pending translation. This highlights the Localized Value text boxes in red making it easy to identify that they are pending translation.

                          Setting the Default Site Language

                          1. To edit a resource file, perform one of the following options: -
                            1. In the Localized Value text box, edit the text.
                            2. Click the Save Resource File button to save your changes. This will remove highlight from the translated files.
                              - OR -
                            3. Click the Edit button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                              2. In the Editor, enter the new text ensuring you include the desired replacement tokens displayed at Default Value.
                              3. Note: The red highlight is removed from the box each time you update a value using the Editor.
                            2. +
                            1. In the Localized Value text box, edit the text.
                            2. Click the Save Resource File button to save your changes. This will remove highlight from the translated files.
                              - OR -
                            3. Click the Edit button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                              2. In the Editor, enter the new text ensuring you include the desired replacement tokens displayed at Default Value.
                              3. Note: The red highlight is removed from the box each time you update a value using the Editor.
                          2. Repeat Step 5 to edit additional files.

                          Setting the Default Site Language

                            -
                          1. At Highlight Pending Translations, once translations are completed - OR - to maintain the highlighted of files for future translation.
                            2. +
                          2. At Highlight Pending Translations, once translations are completed - OR - to maintain the highlighted of files for future translation.
                          3. Click the Return button.

                          Tip: Whenever you select "Highlight Pending Translations" each of the fields that haven't been translated are once again hightlighted.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting the Default Site Language.html b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting the Default Site Language.html index b56ceba7944..99a844aa34f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting the Default Site Language.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Module Editors/Setting the Default Site Language.html @@ -4,7 +4,7 @@

                          Setting the Default Site Language

                          Any language that has been deployed/installed on the site can be set as the default language for this site. The default site language is allocated to site members upon registration, or when the regional language that they select is unavailable. SuperUsers can add additional languages that can then be enabled or disabled by Administrators. More language packs are freely available from the www.dnnsoftware.com website and the DotNetNuke Store (http://store.dnnsoftware.com/). DNN Platform users (including anonymous users) must be granted Edit Module permissions. Evoq Content users (including anonymous users) must be granted Edit Content permissions.

                          - A language must be enabled before it can be set as the default site language. If it is not already enabled, it will be automatically enabled when you set it as the default.

                          + A language must be enabled before it can be set as the default site language. If it is not already enabled, it will be automatically enabled when you set it as the default.

                          Note: Changing the default language doesn't update the language allocated to existing users. Only English (United States) is installed by default.

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. @@ -16,7 +16,7 @@

                            Setting the Default Site Language

                            1. - The default site language is now updated on the Languages tab and cannot be disabled.
                              2. + The default site language is now updated on the Languages tab and cannot be disabled.

                            diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Configuring Language Settings for a Site.html b/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Configuring Language Settings for a Site.html index 93c2cf8b7aa..7c94a54edcf 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Configuring Language Settings for a Site.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Configuring Language Settings for a Site.html @@ -8,19 +8,19 @@

                            Configuring Setting for the Language Editor

                            1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. - +
                            3. Select the Language Management Settings tab.
                            4. At Use Paging in Editor?, select from these options: -
                              • to enable paging on the Language Editor. Use paging to reduce the size of the page. -
                                1. At Editor Page Size enter the number of items to be displayed on each page of the editor. The default setting is 10. A drop down box will also be available in the editor allowing you to modify the page size to either 10, 20 or 50.
                              • to disable paging. This is the default setting.
                              5. +
                              • to enable paging on the Language Editor. Use paging to reduce the size of the page. +
                                1. At Editor Page Size enter the number of items to be displayed on each page of the editor. The default setting is 10. A drop down box will also be available in the editor allowing you to modify the page size to either 10, 20 or 50.
                              • to disable paging. This is the default setting.

                            1. - +

                            diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Setting NonAdmin Permissions.htm b/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Setting NonAdmin Permissions.htm index d726da7db45..a4b8f617da5 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Setting NonAdmin Permissions.htm +++ b/Documentation/Using the Control Panel/Admin Console/Languages/Settings/Setting NonAdmin Permissions.htm @@ -8,19 +8,19 @@

                            Setting Language Permissions for Non Administrators

                            1. Go to a Languages module that has been added to a site page. See "Providing Access to the Languages module"
                            2. - +
                            3. Select the Language Management Settings tab.
                              4. -
                            4. Optional. At Show languages for non-administrators?, to display the Languages tab to non-administrators that may have access to this module. This allow these users to perform additional tasks including enabling and activating languages as well as publishing translations and disabling localized content. Administrators and SuperUsers will always see the Languages tab.
                              5. -
                            5. Optional. At Show settings for non-administrators, to display the Settings tab also to non-administrators that may have access to this module. Administrators and SuperUsers will always see the Settings tab.
                              6. +
                            6. Optional. At Show languages for non-administrators?, to display the Languages tab to non-administrators that may have access to this module. This allow these users to perform additional tasks including enabling and activating languages as well as publishing translations and disabling localized content. Administrators and SuperUsers will always see the Languages tab.
                              7. +
                            7. Optional. At Show settings for non-administrators, to display the Settings tab also to non-administrators that may have access to this module. Administrators and SuperUsers will always see the Settings tab.

                            1. - +
                            diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 InstallAvailableLanguages.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 InstallAvailableLanguages.html index 9552b205f39..cacc0d4357d 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 InstallAvailableLanguages.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 InstallAvailableLanguages.html @@ -1,14 +1,14 @@  - +

                            Installing Available Languages

                            -

                            How to install one of the language resource packages that is included by default with the DNN application. Once installed, the language pack will be available to all sites within this installation.

                            +

                            How to install one of the language resource packages that is included by default with the DNN application. Once installed, the language pack will be available to all sites within this installation. Restricted to SuperUsers.

                            Tip: Language Packs can also be installed via the Host > Extensions page (See "Installing and/or Deploying Available Extensions") or the Admin > Advanced Configuration Settings page, See "Deploying Language Packs"

                              -
                            1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              2. -
                            2. Select the Languages tab.
                              3. +
                            3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              4. +
                            4. Select the Languages tab.
                            5. Click the Install Available Languages button located at the base of the module.

                            diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 Installing a Language Pack.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 Installing a Language Pack.html index 6b5694462bc..f01c38e17cf 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 Installing a Language Pack.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/01 Installing a Language Pack.html @@ -1,13 +1,13 @@  - +

                            Installing a Language Pack

                            -

                            How to install a language resource package using the Languages module. This will install the language pack across all sites within this installation.

                            +

                            How to install a language resource package using the Languages module. This will install the language pack across all sites within this installation. Restricted to SuperUsers.

                              -
                            1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              2. -
                            2. Select the Languages tab.
                              3. +
                            3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              4. +
                            4. Select the Languages tab.
                            5. Click the Install Language Pack button located at the base of the module.

                            diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Adding a New Language.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Adding a New Language.html index 91ac8e4f71e..ea5e152ddc7 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Adding a New Language.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Adding a New Language.html @@ -1,12 +1,12 @@  - +

                            Adding a New Language

                            -

                            How to add a new language to a site using the Languages module. A comprehensive suite of languages is included with the site however if the required language is not listed, or you have a custom language pack, you can instead install a language (See "Installing a Language Pack").

                            +

                            How to add a new language to a site using the Languages module. A comprehensive suite of languages is included with the site however if the required language is not listed, or you have a custom language pack, you can instead install a language (See "Installing a Language Pack"). Restricted to SuperUsers.

                              -
                            1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              2. +
                            2. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            3. Select the Languages tab.
                            4. Click the Add New Language button. This will open the Edit Language page.
                            @@ -18,7 +18,7 @@

                            Adding a New Language

                          2. At Language, select the language from the drop down list.
                          3. At Fallback Language, select which of the installed languages will be used as a fallback language if this language is removed.
                          4. - +

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Core Language Pack.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Core Language Pack.html index dcb15035787..c6f832d6db6 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Core Language Pack.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Core Language Pack.html @@ -1,13 +1,13 @@  - +

                          Creating a Core Language Pack

                          -

                          How to create a core language pack using the Languages module.

                          +

                          How to create a core language pack using the Languages module. Restricted to SuperUsers only.

                            -
                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. -
                          2. Select the Languages tab.
                            3. +
                          3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            4. +
                          4. Select the Languages tab.
                          5. Click the Create Language Pack button.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Full Language Pack.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Full Language Pack.html index d83e27d1af4..ad01ca878c3 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Full Language Pack.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Full Language Pack.html @@ -1,13 +1,13 @@  - +

                          Creating a Full Language Pack

                          -

                          How to create a full language pack using the Languages module.

                          +

                          How to create a full language pack using the Languages module. Restricted to SuperUsers only.

                            -
                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. -
                          2. Select the Languages tab.
                            3. +
                          3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            4. +
                          4. Select the Languages tab.
                          5. Click the Create Language Pack button.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Module Language Pack.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Module Language Pack.html index f11be80e75e..3132834b409 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Module Language Pack.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Module Language Pack.html @@ -1,13 +1,13 @@  - +

                          Creating a Module Language Pack

                          -

                          How to create a module language pack using the Languages module.

                          +

                          How to create a module language pack using the Languages module. Restricted to SuperUsers only.

                            -
                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. -
                          2. Select the Languages tab.
                            3. +
                          3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            4. +
                          4. Select the Languages tab.
                          5. Click the Create Language Pack button.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Provider Language Pack.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Provider Language Pack.html index ffd46b63f85..522aa473fd5 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Provider Language Pack.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating a Provider Language Pack.html @@ -1,13 +1,13 @@  - +

                          Creating a Provider Language Pack

                          -

                          How to create a provider language pack using the Languages module.

                          +

                          How to create a provider language pack using the Languages module. Restricted to SuperUsers only.

                            -
                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. -
                          2. Select the Languages tab.
                            3. +
                          3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            4. +
                          4. Select the Languages tab.
                          5. Click the Create Language Pack button.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating an Authentication System Language Pack.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating an Authentication System Language Pack.html index a60b593c33b..a37d8aae140 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating an Authentication System Language Pack.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Creating an Authentication System Language Pack.html @@ -1,13 +1,13 @@  - +

                          Creating an Authentication System Language Pack

                          -

                          How to create an authentication system language pack using the Languages module.

                          +

                          How to create an authentication system language pack using the Languages module. Restricted to SuperUsers only.

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                            2. -
                          2. Select the Languages tab.
                            3. +
                          3. Select the Languages tab.
                          4. Click the Create Language Pack button.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Editing Language Files - System, Host or Site.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Editing Language Files - System, Host or Site.html index f7cedfaa5eb..b5a64746bf9 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Editing Language Files - System, Host or Site.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Editing Language Files - System, Host or Site.html @@ -1,10 +1,10 @@  - +

                          Editing Language Files (System, Host or Site)

                          -

                          How to edit the Language files for a single site, the host installation or the full DNN system using the Languages module. System and Host files can only be managed by SuperUsers. In the below example, the name of the Host > Vendors page will be changed to "Advertising Partners" for the current site only.

                          +

                          How to edit the Language files for a single site, the host installation or the full DNN system using the Languages module. System and Host files can only be managed by SuperUsers. In the below example, the name of the Host > Vendors page will be changed to "Advertising Partners" for the current site only. Restricted to SuperUsers only.

                          1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                          2. Select the Languages tab.
                            3. @@ -23,7 +23,7 @@

                            Editing Language Files (System, Host or Site)

                              -
                            1. To edit a resource file, perform one of the following options:
                              • In the Localized Value text box, edit the text.

                              - OR -

                              • Click the Edit  button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                                2. In the Editor, enter the new text ensuring you include the desired replacement tokens displayed at Default Value.
                              2. +
                            2. To edit a resource file, perform one of the following options:
                              • In the Localized Value text box, edit the text.

                              - OR -

                              • Click the Edit  button. This displays the message "All unsaved changes will be lost if you continue. Are you sure you want to continue?"
                                2. In the Editor, enter the new text ensuring you include the desired replacement tokens displayed at Default Value.

                            diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Setting Fallback Languages.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Setting Fallback Languages.html index 374c382a0e4..d7e3d826ac7 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Setting Fallback Languages.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Setting Fallback Languages.html @@ -1,14 +1,14 @@  - +

                            Setting Fallback Languages

                            -

                            How to set the fallback language using the Languages module. The fallback language is used if the selected language is not available.

                            +

                            How to set the fallback language using the Languages module. The fallback language is used if the selected language is not available. Restricted to SuperUsers only.

                              -
                            1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              2. -
                            2. Select the Languages tab.
                              3. -
                            3. In the Edit column of the Culture grid, click the Edit this Language button beside the required language.
                              4. +
                            4. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                              5. +
                            5. Select the Languages tab.
                              6. +
                            6. In the Edit column of the Culture grid, click the Edit this Language button beside the required language.
                              @@ -20,7 +20,7 @@

                              Setting Fallback Languages

                              1. - +
                              diff --git a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Verifying Resource Files.html b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Verifying Resource Files.html index f65e3980762..77d1b248c9b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Verifying Resource Files.html +++ b/Documentation/Using the Control Panel/Admin Console/Languages/SuperUsers/Verifying Resource Files.html @@ -1,21 +1,21 @@  - +

                              Verifying Resource Files

                              How to verify the resource files for missing file, entries, obsolete entries and old files. This task enables the Host to verify all the installed language packs in the site and check their status against the default system language. The verification process will look at all the system default resource files and compare them to the localized version for all supported languages. -Once you receive the report, and if any issues are found, you can use the Languages Localization Editor to solve all the issues reported.

                              +Once you receive the report, and if any issues are found, you can use the Languages Localization Editor to solve all the issues reported. Restricted to SuperUsers only.

                                -
                              1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                                2. -
                              2. Select the Languages tab.
                                3. +
                              3. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
                                4. +
                              4. Select the Languages tab.
                              5. Click the Verify Language Resource Files button. This displays a report for each locale.

                                -
                              1. Click the Maximize Maximize button to view details of any missing files, entries or obsolete entries. More on the types of issues that can be found for any resource file:
                                2. +
                              2. Click the Maximize Maximize button to view details of any missing files, entries or obsolete entries. More on the types of issues that can be found for any resource file:
                                • Missing Resource Files: The localized version for a given resource file is missing. To correct this issue select the resource file on the Languages Localization Editor and the language where the error is given. The localized file will be automatically created.
                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Child List.html b/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Child List.html index d1728be999c..3359344d540 100644 --- a/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Child List.html +++ b/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Child List.html @@ -1,20 +1,19 @@  - + -

                                  Adding a Child List

                                  How to add a child list beneath a parent list that is maintained on either the Admin Lists module or the Host Lists module. Lists created by users other than SuperUsers are automatically encoded for security purposes to prevent HTML and JavaScript being injected into the page.

                                    -
                                  1. Navigate to Admin > Advanced Settings > Lists.
                                    2. +
                                  2. Navigate to Admin > Advanced Settings > Lists.
                                  3. Click the Add List link.
                                  4. In the List Name text box, enter a name for the list. E.g. Dolls
                                  5. At Parent List, select the list to add the new list under. E.g. Toys
                                  6. At Parent Entry, select the entry you to use as the new list. E.g. Toys.Dolls
                                  7. In the Entry Text text box, enter the name to be assigned to the List E.g. Rag Dolls
                                  8. In the Entry Value text box, enter the identifier of the first entry of the list. E.g. Rag
                                    9. -
                                  9. Optional. At Enable Sort Order, select from these options:
                                    • if you want to be able to reorder the entries in this list.
                                    • to use alphabetical sort order for list entries.
                                    10. +
                                  10. Optional. At Enable Sort Order, select from these options:
                                    • Mark  the check box if you want to be able to reorder the entries in this list.
                                    • Unmark  the check box to use alphabetical sort order for list entries.

                                  @@ -23,7 +22,7 @@

                                  Adding a Child List

                                • Click the Save link. The new list and the first entry for this list is now displayed, as shown below.

                              - +

                              \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Lists/Adding a List Entry.html b/Documentation/Using the Control Panel/Admin Console/Lists/Adding a List Entry.html index 8ae8ec0df7f..5d59843dd9e 100644 --- a/Documentation/Using the Control Panel/Admin Console/Lists/Adding a List Entry.html +++ b/Documentation/Using the Control Panel/Admin Console/Lists/Adding a List Entry.html @@ -1,19 +1,18 @@  - + -

                              Adding a List Entry

                              How to add a new list entry to an existing list using the Admin Lists page. Lists created by users other than SuperUsers are automatically encoded for security purposes to prevent HTML and JavaScript being injected into the page. List entries can be added to lists maintained by Administrators on the Admin > List page, as well as lists maintained by SuperUsers on the Host > List page. In the below example, the new list entry is being added to the Currency list that is maintained by SuperUsers using the Host > List module.

                                -
                              1. Navigate to Admin > Advanced Settings > Lists.
                                2. +
                              2. Navigate to Admin > Advanced Settings > Lists.
                              3. Click the Add List link.
                              4. In the List Name text box, enter a name for the list. E.g. Currency
                              5. At Parent List, leave this field set to None Specified.
                              6. In the Entry Text text box, enter the first entry (item) that will be in this list. E.g. Singapore Dollar (SGD)
                              7. In the Entry Value text box, enter the identifier or code for the first entry. E.g. SGD
                                8. -
                              8. Optional. At Enable Sort Order, select from these options:
                                • if you want to be able to reorder the entries in this list.
                                • to use alphabetical sort order for list entries.
                                9. +
                              9. Optional. At Enable Sort Order, select from these options:
                                • Mark  the check box if you want to be able to reorder the entries in this list.
                                • Unmark  the check box to use alphabetical sort order for list entries.

                              diff --git a/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Parent List.html b/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Parent List.html index 20dcc36ebad..e045e3d453c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Parent List.html +++ b/Documentation/Using the Control Panel/Admin Console/Lists/Adding a Parent List.html @@ -1,19 +1,18 @@  - + -

                              Adding a Parent List

                              How to add a parent list to the site using the Admin Lists page. This task can be used for custom modules that use lists. Lists created by users other than SuperUsers are automatically encoded for security purposes to prevent HTML and JavaScript being injected into the page.

                                -
                              1. Navigate to Admin > Advanced Settings > Lists.
                                2. +
                              2. Navigate to Admin > Advanced Settings > Lists.
                              3. Click the Add List link.
                              4. In the List Name text box, enter a name for the list.
                              5. At Parent List, leave this field set to None Specified.
                              6. In the Entry Text text box, enter the first entry (item) that will be in this list.
                              7. In the Entry Value text box, enter the identifier or code for the first entry.
                                8. -
                              8. Optional. At Enable Sort Order, select from these options:
                                • if you want to be able to reorder the entries in this list.
                                • to use alphabetical sort order for list entries.
                                9. +
                              9. Optional. At Enable Sort Order, select from these options:
                                • Mark  the check box if you want to be able to reorder the entries in this list.
                                • Unmark  the check box to use alphabetical sort order for list entries.

                              diff --git a/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List Entry.html b/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List Entry.html index c1e4e7d4278..cb7236db422 100644 --- a/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List Entry.html +++ b/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List Entry.html @@ -1,7 +1,6 @@  - + -

                              Deleting a List Entry

                              @@ -9,9 +8,9 @@

                              Deleting a List Entry

                              In the below example only one of the list entries can be edited because the Currency list is maintained by SuperUsers using the Host List module.

                                -
                              1. Navigate to Admin > Advanced Settings > Lists.
                                2. +
                              2. Navigate to Admin > Advanced Settings > Lists.
                              3. In the Lists section, navigate to and select the title of the required list. This displays the details of this list.
                                4. -
                              4. Click the Delete Delete button beside the entry to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
                                5. +
                              5. Click the Delete Delete button beside the entry to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"

                              diff --git a/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List.html b/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List.html index 821df55a17e..03287aa5bca 100644 --- a/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List.html +++ b/Documentation/Using the Control Panel/Admin Console/Lists/Deleting a List.html @@ -1,15 +1,14 @@  - + -

                              Deleting a List

                              How to delete a list from the Admin Lists page. Note: Only user generated lists can be deleted.

                                -
                              1. Navigate to Admin > Advanced Settings > Lists.
                                2. +
                              2. Navigate to Admin > Advanced Settings > Lists.
                              3. In the Lists section, navigate to and select the title of the required list. E.g. Country.Australia:Region. This displays details of this list and its related list entries.
                                4. -
                              4. Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item?"
                                5. +
                              5. Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item?"

                              diff --git a/Documentation/Using the Control Panel/Admin Console/Lists/Managing the Profanity List.html b/Documentation/Using the Control Panel/Admin Console/Lists/Managing the Profanity List.html index 100e2d6da50..fa8fcb85a4b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Lists/Managing the Profanity List.html +++ b/Documentation/Using the Control Panel/Admin Console/Lists/Managing the Profanity List.html @@ -1,12 +1,12 @@  - +

                              Managing the Profanity List (Site)

                              How to create and manage a list of replacement words for a site. This list allows you to replace unwanted or profane words that are added to messages sent using the Message Center module. Note: You can enter any keyboard characters into both the replaced and replacement fields. E.g. ****

                              - Profanity filters are disabled by default and therefore must be enabled on a site by a SuperUser in order to use this list. See "Configuring Messaging Settings"

                              + Profanity filters are disabled by default and therefore must be enabled on a site by a SuperUser in order to use this list.See "Configuring Messaging Settings"

                              1. Navigate to Admin > Advanced Settings > Lists.
                              2. Select the ProfanityFilter-0 list.
                                3. @@ -41,7 +41,7 @@

                                Deleting a filtered word

                              3. Click the OK button to confirm

                              - + Related Topics:

                              • diff --git a/Documentation/Using the Control Panel/Admin Console/Newsletters/About the Newsletters Module.html b/Documentation/Using the Control Panel/Admin Console/Newsletters/About the Newsletters Module.html index ee005c02d68..4ffec25d91f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Newsletters/About the Newsletters Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Newsletters/About the Newsletters Module.html @@ -1,13 +1,15 @@  - + -

                                About the Newsletters Module

                                -

                                The Newsletters module allows individual or bulk email messages (newsletters) to be sent to the members of one or more security roles and/or to one or more email addresses. Messages are sent to each recipient separately to prevent recipients from seeing each other's details. The module also identifies when a newsletter is set to send to an email address more than once and ensures only one copy of the newsletter is sent to that address. The message can be either plain text or HTML format. Files can be attached and replacement tokens can be included. Once a newsletter is sent, the sender receives the "Bulk Email Report for [Newsletter Subject]" message. See "The Bulk Email Report"

                                -

                                The Newsletters module is pre-installed on the Admin >Newsletters page and can also be deployed to sites and added to pages.

                                +

                                About Newsletters

                                +

                                Newsletters allows individual or bulk email messages (newsletters) to be sent to the members of one or more security roles and/or to one or more email addresses. Messages are sent to each recipient separately to prevent recipients from seeing each other's details. Newsletters identifies when a newsletter is set to send to an email address more than once and ensures only one copy of the newsletter is sent to that address. The message can be either plain text or HTML format. Files can be attached and replacement tokens can be included. Once a newsletter is sent, the sender receives the "Bulk Email Report for [Newsletter Subject]" message. See "The Bulk Email Report"

                                +

                                Newsletters is pre-installed on the Admin >Newsletters page and can also be deployed to sites and added to pages.

                                - All users who are authorized to view the module can send emails. Authenticated users must to have permissions granted to one or more folders of the site's Digital Asset Management module (Admin > File Management) to upload and/or select files. Unauthenticated users cannot attach files to messages. See "Modifying Folder Permissions"

                                + All users who are authorized to view Newsletters can send emails. Authenticated users must to have permissions granted to one or more folders of the site's Digital Asset Management module (Admin > File Management) to upload and/or select files. Unauthenticated users cannot attach files to messages. See "Modifying Folder Permissions"

                                +

                                + Newsletters require the following prerequisites to function correctly:

                                In order for the newsletter module to function correctly you must first:

                                  @@ -17,7 +19,7 @@

                                  About the Newsletters Module

                                -
                                The Newsletters Module +
                                Newsletters

                                \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending Newsletters in a Users Preferred Language.html b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending Newsletters in a Users Preferred Language.html index fb2003a4a80..7401900f02f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending Newsletters in a Users Preferred Language.html +++ b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending Newsletters in a Users Preferred Language.html @@ -1,7 +1,6 @@  - + -

                                Sending Newsletters in a User's Preferred Language

                                diff --git a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Basic Newsletter.html b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Basic Newsletter.html index c1d93bd9ff2..1464b4c7596 100644 --- a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Basic Newsletter.html +++ b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Basic Newsletter.html @@ -1,7 +1,6 @@  - + -

                                Sending a Basic Newsletter

                                @@ -28,7 +27,7 @@

                                Sending a Basic Newsletter

                                1. Select the Advanced Settings tab and then set these required settings: -
                                  1. At Replace Tokens?, .
                                  2. At Send Method, select BCC: One Email To Blind Distribution List ( Not Personalized ).
                                  2. +
                                  1. At Replace Tokens?, unmark  the check box.
                                  2. At Send Method, select BCC: One Email To Blind Distribution List ( Not Personalized ).

                                diff --git a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Newsletter with Tokens.html b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Newsletter with Tokens.html index d0a7888960f..f65784a86dd 100644 --- a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Newsletter with Tokens.html +++ b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Newsletter with Tokens.html @@ -13,7 +13,7 @@

                                Sending a Newsletter with Tokens

                                  -
                                1. Select the Advanced Settings tab and then set these required settings:
                                  1. At Replace Tokens?, .
                                  2. At Send Method, select To: One Message Per Email Address ( Personalized ).
                                  2. +
                                2. Select the Advanced Settings tab and then set these required settings:
                                  1. At Replace Tokens?, mark  the check box.
                                  2. At Send Method, select To: One Message Per Email Address ( Personalized ).

                                diff --git a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Personalized Newsletter without Tokens.html b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Personalized Newsletter without Tokens.html index c95f1227855..81297acc2cb 100644 --- a/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Personalized Newsletter without Tokens.html +++ b/Documentation/Using the Control Panel/Admin Console/Newsletters/Sending a Personalized Newsletter without Tokens.html @@ -1,7 +1,6 @@  - + -

                                Sending a Personalized Newsletter without Tokens

                                @@ -10,7 +9,7 @@

                                Sending a Personalized Newsletter without Tokens

                              • Navigate to Admin > Advanced Settings > Newsletters - OR - Go to a Newsletters module.
                              • Select the Message tab and complete the required fields. See "Sending a Basic Newsletter"
                              • Select the Advanced Settings tab and then set these required settings: -
                                1. At Replace Tokens?, .
                                2. At Send Method, select To: One Message Per Email Address ( Personalized ).
                                • +
                                1. At Replace Tokens?, unmark  the check box.
                                2. At Send Method, select To: One Message Per Email Address ( Personalized ).
                              • To set any of the optional Advanced Settings, See "Sending a Basic Newsletter"

                            diff --git a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Deleting a Page - Pages Module.html b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Deleting a Page - Pages Module.html index ac2de8afaa9..5748adcb214 100644 --- a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Deleting a Page - Pages Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Deleting a Page - Pages Module.html @@ -1,10 +1,10 @@  - +

                            Deleting a Page (Pages Module)

                            -

                            How to delete a page including any child pages using the Pages module. Deleted pages are stored in the Recycle Bin where they can be restored or permanently deleted. See "About the Recycle Bin Module". DNN Platform users must be granted Edit Page permissions to the page where the Pages module is located and Edit Page permissions to the page that is being deleted. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located and Delete permissions to the page that is being deleted.

                            +

                            How to delete a page including any child pages using the Pages module. Deleted pages are stored in the Recycle Bin where they can be restored or permanently deleted. See "About the Recycle Bin Module". DNN Platform users must be granted Edit Page permissions to the page where the Pages module is located and Edit Page permissions to the page that is being deleted. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located and Delete permissions to the page that is being deleted.

                            Note: The following pages cannot be deleted: any of the Admin and Host pages; any page defined as the Home, Splash, Login, User Registration or the Profile page; or the last visible site page.

                            1. Navigate to Admin > Page Management - OR - Go to a Pages modules.
                              2. @@ -16,7 +16,7 @@

                              Deleting a Page (Pages Module)

                              1. This displays the message "This will delete the selected page and all its child pages. Are you sure?"
                              2. - +
                              diff --git a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Editing Page Settings using the Pages Module.html b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Editing Page Settings using the Pages Module.html index 5c8f5da0a81..acfd35d0f1f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Editing Page Settings using the Pages Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Editing Page Settings using the Pages Module.html @@ -1,17 +1,17 @@  - +

                              Editing Page Settings using the Pages Module

                              -

                              How to view and or edit a selection of page settings for any page using the Pages module. DNN Platform users must be granted Edit Page permissions to the page where the Pages module is located and the page that is being edited. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located and Manage Settings permissions to the page that is being edited.

                              +

                              How to view and or edit a selection of page settings for any page using the Pages module. DNN Platform users must be granted Edit Page permissions to the page where the Pages module is located and the page that is being edited. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located and Manage Settings permissions to the page that is being edited.

                              Option One

                              1. Navigate to Admin > Page Management - OR - Go to a Pages modules.
                              2. In the left-hand navigation tree, click on a required page name. This displays the settings for this page to the right.
                              3. Go to the Common section and enter/edit any of the following settings: -
                                1. In the Page Name text box, enter a name for the page. If this page is displayed in the menu, this will be the name in the menu.
                                2. In the Page Title text box, enter a short, descriptive sentence summarizing the page content. The title is used by search engines to identify the information contained on the page. It is recommended that the title contains at least 5 highly descriptive words and does not exceed 200 characters.
                                3. At Include In Menu?, to include this page in the menu- OR - to hide the page.
                                4. At Disabled, select from these options: -
                                  • if the page name is not a link. I.e. When you click on the page name in the menu nothing happens. This option is typically selected for a parent page to provide a way for users to navigate to its child pages.
                                  • for this page name to be a link to the page. This is the default option.
                                5. Optional. At Secure?to force this page to use a secure connection or secure socket layer (SSL). This option requires the Administrator to configure the SSL Settings on the Admin > Site Settings page.
                                6. Optional. At Allow Indexed, to allow this page to be indexed by the search spider. See "About the Search Engine SiteMap Module"
                                4. +
                                1. In the Page Name text box, enter a name for the page. If this page is displayed in the menu, this will be the name in the menu.
                                2. In the Page Title text box, enter a short, descriptive sentence summarizing the page content. The title is used by search engines to identify the information contained on the page. It is recommended that the title contains at least 5 highly descriptive words and does not exceed 200 characters.
                                3. At Include In Menu?, to include this page in the menu- OR - to hide the page.
                                4. At Disabled, select from these options: +
                                  • Mark  the check box if the page name is not a link. I.e. When you click on the page name in the menu nothing happens. This option is typically selected for a parent page to provide a way for users to navigate to its child pages.
                                  • Unmark  the check box for this page name to be a link to the page. This is the default option.
                                5. Optional. At Secure? to force this page to use a secure connection or secure socket layer (SSL). This option requires the Administrator to configure the SSL Settings on the Admin > Site Settings page.
                                6. Optional. At Allow Indexed, to allow this page to be indexed by the search spider. See "About the Search Engine SiteMap Module"

                              @@ -55,7 +55,7 @@

                              Editing Page Settings using the Pages Module

                              1. Expand the Link section and edit/set any of these optional settings: -
                                1. At Link URL, to set this page to be a navigation link to another resource (rather than displaying the page itself), select or add the link here. See "About the Link Control"
                                2. At Permanently Redirect?, to notify the web browser that this page should be considered as permanently moved. This enables Search Engines to modify their URLs to directly link to the resource. Note: This setting is ignored if the Link Type is set to None.
                                2. +
                                1. At Link URL, to set this page to be a navigation link to another resource (rather than displaying the page itself), select or add the link here. See "About the Link Control"
                                2. At Permanently Redirect?, to notify the web browser that this page should be considered as permanently moved. This enables Search Engines to modify their URLs to directly link to the resource. Note: This setting is ignored if the Link Type is set to None.

                              @@ -72,7 +72,7 @@

                              Editing Page Settings using the Pages Module

                                -
                              1. Update page settings as required. See "Page Details Settings for Existing Pages", See "Advanced Settings for Existing Pages", or See "Setting Page Permissions"
                                2. +
                              2. Update page settings as required. See "Page Details Settings for Existing Pages", "Advanced Settings for Existing Pages", or "Setting Page Permissions"
                              3. Click the Update Page button.
                              diff --git a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Enabling-Disabling Page Link - Pages Module.html b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Enabling-Disabling Page Link - Pages Module.html index 525c602de2c..cbc04567c22 100644 --- a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Enabling-Disabling Page Link - Pages Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Enabling-Disabling Page Link - Pages Module.html @@ -1,13 +1,13 @@  - +

                              Enabling/Disabling Page Link (Pages Module)

                              -

                              How to prevent or allow a page to functioning as a link in the site menu using the Pages module. Pages with linking disabled are still visible in the menu; however no action is taken when a user clicks on the page in the menu. An example of when you might disable a link is when you have a parent page that doesn't have any content, but still allows users to navigate to its children. DNN Platform users must be granted Edit Page permissions to the page where the Pages module and Edit Page permissions to the page that is being edited. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located as well as Manage Settings permissions to the page being edite.

                              +

                              How to prevent or allow a page to functioning as a link in the site menu using the Pages module. Pages with linking disabled are still visible in the menu; however no action is taken when a user clicks on the page in the menu. An example of when you might disable a link is when you have a parent page that doesn't have any content, but still allows users to navigate to its children. DNN Platform users must be granted Edit Page permissions to the page where the Pages module and Edit Page permissions to the page that is being edited. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located as well as Manage Settings permissions to the page being edite.

                              1. Navigate to Admin > Page Management - OR - Go to a Pages modules.
                                2. -
                              2. Select from these methods:
                                • In the left-hand navigation tree, right-click on the required page and then select either Disable Link In Navigation or Enable Link In Navigation as required.
                                • Select the required page.
                                  1. Expand the Common section to the right.
                                  2. At Disabled?" to disable link - OR to enable link
                                  3. Click the Update Page button.
                                3. +
                              3. Select from these methods:
                                • In the left-hand navigation tree, right-click on the required page and then select either Disable Link In Navigation or Enable Link In Navigation as required.
                                • Select the required page.
                                  1. Expand the Common section to the right.
                                  2. At Disabled? to disable link - OR - to enable link
                                  3. Click the Update Page button.

                              diff --git a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Hiding-Showing a Page in Site Navigation.html b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Hiding-Showing a Page in Site Navigation.html index 2b62a5501ce..cd58efefe9f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Hiding-Showing a Page in Site Navigation.html +++ b/Documentation/Using the Control Panel/Admin Console/Page Management/Page Editors/Hiding-Showing a Page in Site Navigation.html @@ -1,13 +1,13 @@  - +

                              Hiding/Showing a Page in Site Navigation

                              -

                              How to hide or show a page to in the site menu using the Pages module. Note: Hidden pages display the Hidden icon in the Pages module for quick reference. However, if the page is also disabled, then the Disabled  icon will displayed instead. DNN Platform users must be granted Edit Page permissions to both the page where the Pages module is located and the page that is being edited. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located and Manage Settings permissions to the page that is being edited.

                              +

                              How to hide or show a page to in the site menu using the Pages module. Note: Hidden pages display the Hidden icon in the Pages module for quick reference. However, if the page is also disabled, then the Disabled  icon will displayed instead. DNN Platform users must be granted Edit Page permissions to both the page where the Pages module is located and the page that is being edited. Evoq Content users must be granted Add Content permissions to the page where the Pages module is located and Manage Settings permissions to the page that is being edited.

                              1. Navigate to Admin > Page Management - OR - Go to a Pages modules.
                                2. -
                              2. Select from these methods:
                                • In the left-hand navigation tree, right-click on the required page and then select either Hide From Navigation or   Show In Navigation from the drop down list.
                                • Select the required page.
                                  1. Expand the Common section to the right.
                                  2. At Include In Menu?, to include this page in site navigation - OR - to exclude this page.
                                  3. Click the Update Page button.
                                3. +
                              3. Select from these methods:
                                • In the left-hand navigation tree, right-click on the required page and then select either Hide From Navigation or   Show In Navigation from the drop down list.
                                • Select the required page.
                                  1. Expand the Common section to the right.
                                  2. At Include In Menu?, to include this page in site navigation - OR - to exclude this page.
                                  3. Click the Update Page button.

                              diff --git a/Documentation/Using the Control Panel/Admin Console/Page Management/SuperUsers/Managing Host Tabs.html b/Documentation/Using the Control Panel/Admin Console/Page Management/SuperUsers/Managing Host Tabs.html index 6cd4157b15c..86668df0636 100644 --- a/Documentation/Using the Control Panel/Admin Console/Page Management/SuperUsers/Managing Host Tabs.html +++ b/Documentation/Using the Control Panel/Admin Console/Page Management/SuperUsers/Managing Host Tabs.html @@ -16,7 +16,7 @@

                              Managing Host Tabs

                            2. You can now add new pages and manage existing Host pages.

                            - + Related Topics:

                            • diff --git a/Documentation/Using the Control Panel/Admin Console/Recycle Bin/Restoring Deleted Pages.html b/Documentation/Using the Control Panel/Admin Console/Recycle Bin/Restoring Deleted Pages.html index 3ae8a978f3a..4175f5e2691 100644 --- a/Documentation/Using the Control Panel/Admin Console/Recycle Bin/Restoring Deleted Pages.html +++ b/Documentation/Using the Control Panel/Admin Console/Recycle Bin/Restoring Deleted Pages.html @@ -1,19 +1,16 @@  - + -

                              Restoring Deleted Pages

                              -

                              How to restore one or more deleted pages to their previous location in the site menu and their previous location in the pages list on the Page Management module. Once a page is restored, you are then able to restore the modules that were previously located on the page(s).

                              -

                              - Authenticated users who have been granted Edit Module (Edit Content) permissions.

                              +

                              How to restore one or more deleted pages to their previous location in the site menu and their previous location in the pages list on the Page Management module. Once a page is restored, you are then able to restore the modules that were previously located on the page(s). Authenticated users who have been granted Edit Module (Edit Content) permissions.

                              Restoring a parent page and it's children

                              1. Navigate to Admin > Recycle Bin - OR - Navigate to a Recycle Bin module.
                              2. Select the Pages tab.
                              3. Select both the parent page and it's child pages which are be indented below their parent page.
                                4. -
                              4. Click the Restore Selected Page(s) link.
                                5. +
                              5. Click the Restore Selected Page(s) button.

                              @@ -25,14 +22,14 @@

                              Restoring child page(s)

                            • Navigate to Admin > Recycle Bin - OR - Navigate to a Recycle Bin module.
                            • Select the Pages tab.
                            • Click on a child page name to select it. To select multiple pages, hold down the Ctrl key when selecting.
                              • -
                            • Click the Restore Selected Page(s) link.
                              • +
                            • Click the Restore Selected Page(s) button.

                          Restoring a parent page without children

                          1. Navigate to Admin > Recycle Bin - OR - Navigate to a Recycle Bin module.
                          2. Select the Pages tab.
                          3. Select the a parent page name to select it. In the below example, the parent page that is selected is called DIY Kits and it's child pages are called Hot Rod Kits, Spare Parts, Sticker Mania, and Vintage Kits
                            4. -
                          4. Click the Restore Selected Page(s) link.
                            5. +
                          5. Click the Restore Selected Page(s) button.
                          \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Search Admin/About the Search Admin Module.html b/Documentation/Using the Control Panel/Admin Console/Search Admin/About the Search Admin Module.html index cf0b4236364..988b00edb6c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Search Admin/About the Search Admin Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Search Admin/About the Search Admin Module.html @@ -3,11 +3,11 @@ -

                          About the Search Admin Module

                          +

                          About Search Admin

                          Search Admin, located on the Admin > Advanced Settings > Search Admin page, enables Administrators to specify the settings associated with DNN's search capabilities. Search Admin enables search content to be re-indexed if there has been significant changes since the last indexing, manage synonym lists and select words to be ignored in searches.

                          The Search Admin module -
                          The Search Admin Module +
                          Search Admin

                          \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Search Admin/Re-Indexing Searched Content.html b/Documentation/Using the Control Panel/Admin Console/Search Admin/Re-Indexing Searched Content.html index 4a1058c6008..07c0a440822 100644 --- a/Documentation/Using the Control Panel/Admin Console/Search Admin/Re-Indexing Searched Content.html +++ b/Documentation/Using the Control Panel/Admin Console/Search Admin/Re-Indexing Searched Content.html @@ -17,7 +17,7 @@

                          Re-Indexing Searched Content

                        8. Click the Continue button to continue.

                        - + Related Topics:

                        • diff --git a/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Configuring the SiteMap Settings.html b/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Configuring the SiteMap Settings.html index 3ee56ce88a8..9782edfff93 100644 --- a/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Configuring the SiteMap Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Configuring the SiteMap Settings.html @@ -11,8 +11,8 @@

                          Configuring the SiteMap Settings

                        • The Sitemap URL field located at the top of the module displays the URL of your Sitemap as well as the Sitemap providers that are enabled. E.g. http://awesomecycles.biz/SiteMap.aspx
                        • Optional. Expand the Base Page URL's Settings section. Here you can modify the basic settings that apply to general DNN pages.
                          1. At Use page level based priorities?, select from these options: -
                            • to set the priority for each page based on the hierarchical level of the page. Top level (parent) pages will have a value of 1, second level (first level child pages) 0.9, third level 0.8, (second level child pages), etc. This setting will not change the value stored in the actual page but it will use the computed value when required.
                            • if you don't wish to use page level based priorities. Skip to step 3c.
                          2. In the Minimum Priority for pages text box, if Use page level based priorities? is checked, this field allows you set the lowest priority that will be used on low level pages. You must provide a valid number between 0.0 and 1.0.
                          3. At Include Hidden Pages? select from these options: -
                            • to include hidden pages (those not visible in the menu) in the Sitemap.
                            • to exclude hidden pages from the Sitemap. This is the default setting.
                          4. Click the Refresh Sitemap Priorities link.
                          • +
                          • to set the priority for each page based on the hierarchical level of the page. Top level (parent) pages will have a value of 1, second level (first level child pages) 0.9, third level 0.8, (second level child pages), etc. This setting will not change the value stored in the actual page but it will use the computed value when required.
                          • if you don't wish to use page level based priorities. Skip to step 3c.
                        • In the Minimum Priority for pages text box, if Use page level based priorities? is checked, this field allows you set the lowest priority that will be used on low level pages. You must provide a valid number between 0.0 and 1.0.
                        • At Include Hidden Pages? select from these options: +
                          • to include hidden pages (those not visible in the menu) in the Sitemap.
                          • to exclude hidden pages from the Sitemap. This is the default setting.
                        • Click the Refresh Sitemap Priorities link.

                          • diff --git a/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Setting the Sitemap Providers.html b/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Setting the Sitemap Providers.html index 21b2d8cf9b3..9ab2da9b392 100644 --- a/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Setting the Sitemap Providers.html +++ b/Documentation/Using the Control Panel/Admin Console/Search Engine Site Map/Setting the Sitemap Providers.html @@ -16,7 +16,7 @@

                          Setting the SiteMap Providers

                            -
                          1. At Enabled, select from these options:
                            • to enable this SiteMap provider. If only one provider is enabled, skip to Step 5.
                              1. Optional. At Override Priority, to override the priority given to pages crawled by a SiteMap provider - OR - to use the priority given to pages crawled by a SiteMap provider. 
                              2. Optional. In the Priority text box, enter a numerical value to set the priority for this provider.
                            • .to disable it.
                            2. +
                          2. At Enabled, select from these options:
                            • to enable this SiteMap provider. If only one provider is enabled, skip to Step 5.
                              1. Optional. At Override Priority, to override the priority given to pages crawled by a SiteMap provider - OR - to use the priority given to pages crawled by a SiteMap provider. 
                              2. Optional. In the Priority text box, enter a numerical value to set the priority for this provider.
                            • .to disable it.
                          3. Click the Update  button.
                          diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Role Group.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Role Group.html index 4261fc21da6..29b7ce2aa94 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Role Group.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Role Group.html @@ -1,11 +1,9 @@  - + -

                          Adding a Role Group

                          -

                          How to add a role group to a Security Role using the Security Roles module. Role Groups enable you to group multiple roles together, making them easier to manage. E.g. The Role Group called Staff could have the following Security Roles associated with it: All Staff, Telemarketing, Marketing, Sales, Information Technology, etc. Roles can be filtered by Role Group, which is useful on sites with a large number of roles. Once a role group has been added, one or more security roles can be added to the role group. See "Adding a Security Role (Basic Settings)" and See "Editing a Security Role"

                          1. Navigate to Admin > Security Roles - OR - Go to a Security Roles module.
                            2. @@ -18,7 +16,7 @@

                            Adding a Role Group

                            1. - +
                            diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role - Basic Settings.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role - Basic Settings.html index 6798166b281..52e06cc253b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role - Basic Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role - Basic Settings.html @@ -1,7 +1,6 @@  - + -

                            Adding a Security Role (Basic Settings)

                            @@ -14,9 +13,9 @@

                            Adding a Security Role (Basic Settings)

                          2. Optional. In the Description text box, enter a brief description of this role.
                          3. Optional. At Role Group, select a group for this role if desired. Note: One or more role groups must already be created to set this field. You can also associate a role with a role group at a later time. See "Adding a Role Group"
                          4. At Public Role?, select one of the following options: -
                            • if all users are able to view details of this role and subscribe to this role. Users can subscribe to or unsubscribe from these roles when they manage their profile.
                            • if the role is Private. Only Administrators can add a user to a private role unless it has an RSVP Code or RSVP Link (see below) that has been supplied to the user.
                            5. +
                            • Mark  the check box if all users are able to view details of this role and subscribe to this role. Users can subscribe to or unsubscribe from these roles when they manage their profile.
                            • Unmark  the check box if the role is Private. Only Administrators can add a user to a private role unless it has an RSVP Code or RSVP Link (see below) that has been supplied to the user.
                          5. At Auto Assignment, select one of the following options: -
                            • if users are automatically assigned to this role. This will expose the "Assign to existing users" field.
                              • At Assign to Existing Users, to assign all current and future users to this role - OR - to only assign any new users that are created to this role.
                            • if users must be manually added to the role. If the role is public, then users can add themselves. If the role is not public, then only Administrators and SuperUsers can add user to the role.
                            6. +
                            • Mark  the check box if users are automatically assigned to this role. This will expose the "Assign to existing users" field.
                              • At Assign to Existing Users, to assign all current and future users to this role - OR - to only assign any new users that are created to this role.
                            • Unmark  the check box if users must be manually added to the role. If the role is public, then users can add themselves. If the role is not public, then only Administrators and SuperUsers can add user to the role.
                          6. At Security Mode, select one of the following options:
                            • SecurityRole: Select to add a security role.
                            • SocialGroup: Select to add a social group. Social groups are displayed on the Social Groups module allowing site members to join, follow and participate in groups. @@ -30,7 +29,7 @@

                              Adding a Security Role (Basic Settings)

                              1. - +
                              diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with a Fee.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with a Fee.html index 47a570741de..80fbc2d5fdc 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with a Fee.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with a Fee.html @@ -1,7 +1,6 @@  - + -

                              Adding a Security Role with a Fee

                              @@ -15,9 +14,9 @@

                              Adding a Security Role with a Fee

                            • In the Description text box, enter a brief description of the Security Role.
                            • Optional. At Role Group, select a group for this role if required.
                            • At Public Role?, select one of the following options: -
                              • if all users are able to view details of this role and subscribe to this role. Public Roles can be maintained by user on their profile under Manage Service.
                              • .if the role is Private. Details of private roles are not displayed on the user profile page. Only Administrators can add a user to a Private role unless it has an RSVP Code (see below) which has been supplied to the user.
                              • +
                              • Mark  the check box if all users are able to view details of this role and subscribe to this role. Public Roles can be maintained by user on their profile under Manage Service.
                              • Unmark  the check box .if the role is Private. Details of private roles are not displayed on the user profile page. Only Administrators can add a user to a Private role unless it has an RSVP Code (see below) which has been supplied to the user.
                            • At Auto Assignment, select one of the following options: -
                              • if users are automatically assigned to this role. This will expose the "Assign to existing users" field.
                                • At Assign to Existing Users, to assign all current and future users to this role - OR - to only assign any new users that are created to this role.
                              • if users must be manually added to the role. If the role is public, then users can add themselves. If the role is not public, then only Administrators and SuperUsers can add user to the role.
                              • +
                              • Mark  the check box if users are automatically assigned to this role. This will expose the "Assign to existing users" field.
                                • At Assign to Existing Users, to assign all current and future users to this role - OR - to only assign any new users that are created to this role.
                              • Unmark  the check box if users must be manually added to the role. If the role is public, then users can add themselves. If the role is not public, then only Administrators and SuperUsers can add user to the role.
                            • At Security Mode, select one of the following options:
                              • Security Role: Select to add a security role.
                              • Social Group: Select to add a social group. Social groups are displayed on the Social Groups module allowing site members to join, follow and participate in groups. @@ -48,14 +47,14 @@

                                Adding a Security Role with a Fee

                                1. - +

                                - +

                                • diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with an RSVP Code.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with an RSVP Code.html index 32caa93fd1e..ec8f7cef522 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with an RSVP Code.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a Security Role with an RSVP Code.html @@ -23,7 +23,7 @@

                                  Adding a Security Role with an RSVP Code

                                  - + Related Topics:

                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a User to a Security Role.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a User to a Security Role.html index 44fa3f69f8c..b611ed4a0c1 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a User to a Security Role.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Adding a User to a Security Role.html @@ -1,7 +1,6 @@  - + -

                                    Adding a User to a Security Role

                                    @@ -13,20 +12,20 @@

                                    Adding a User to a Security Role

                                  • Optional. At Effective Date, click the Calendar button and select the first date the user can access this role. Where no date is selected access will be immediately granted. See "Working with the Calendar"
                                  • Optional. At Expiry Date, click the Calendar button and select the last date the user can access this role. Where no date is selected access will not expire.
                                  • Optional. At Send Notification?, select from the following options: -
                                    • to send a notification email to the user. This option is ticked by default.
                                    • to add the user to a role without sending them notification.
                                    • +
                                    • Mark  the check box to send a notification email to the user. This option is ticked by default.
                                    • Unmark  the check box to add the user to a role without sending them notification.

                            -
                          1. Click the Add User to Role link. The name of the user will be added to the list of users associated with this role.
                            2. +
                          2. Click the Add User to Role button. The name of the user will be added to the list of users associated with this role.

                          1. Repeat Steps 3-7 to add new users.
                            2. -
                          2. Click the Close link to return to the module.
                            3. +
                          3. Click the Close button to return to the module.
                          \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Creating a Membership Service .html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Creating a Membership Service .html index 06c46b7d930..da771c65e68 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Creating a Membership Service .html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Creating a Membership Service .html @@ -1,7 +1,6 @@  - + -

                          Creating a Membership Service

                          @@ -13,9 +12,9 @@

                          Creating a Membership Service

                        • In the Role Name text box, enter a name for the role.
                        • Optional. In the Description text box, enter a brief description of the role.
                        • Optional. At Role Group, select a role group for this role if required.
                          • -
                        • At Public Role?, to set this role as a Membership Service.
                          • +
                        • At Public Role?, to set this role as a Membership Service.
                        • Optional. At Auto Assignment, select from the following options: -
                          • to assign all users to this role. This includes both existing and new users.
                          • .if users must subscribe to the role.
                          • +
                          • Mark  the check box to assign all users to this role. This includes both existing and new users.
                          • Unmark  the check box if users must subscribe to the role.
                        • At Security Mode, select one of the following options:
                          • Security Role: Select to add a security role.
                          • Social Group: Select to add a social group. Social groups are displayed on the Social Groups module allowing site members to join, follow and participate in groups.
                          • Both: Select to add a role that is both a social group and a security role.
                        • At Status, select one of the following options: @@ -26,7 +25,7 @@

                          Creating a Membership Service

                          1. - +

                          Tip: The new role is now displayed as a member's service on the View Profile (also called the My Profile) module.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Deleting a Role Group .html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Deleting a Role Group .html index 86c26496709..bc134e4b506 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Deleting a Role Group .html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Deleting a Role Group .html @@ -1,17 +1,16 @@  - + -

                          Deleting a Role Group

                          How to delete a role group from the Security Roles module. Note: If a role group has associated roles, the delete option will not be displayed.

                          - You must first remove all roles belonging to a role group before deleting it. This can be achieved by editing each role associated with the Role Group and either changing the associated role group or disassociating the role group from all roles. See "Editing a Security Role"

                          + You must first remove all roles belonging to a role group before deleting it. This can be achieved by editing each role associated with the Role Group and either changing the associated role group or disassociating the role group from all roles. See "Editing a Security Role"

                          1. Navigate to Admin > Security Roles - OR - Go to a Security Roles module.
                          2. At Filter By Role Group, select the role group from the drop down list.
                            3. -
                          3. Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item".
                            4. +
                          4. Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item".
                          5. Click the OK button to confirm.

                          diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Role Group.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Role Group.html index 9f818445e1b..227e09f5217 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Role Group.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Role Group.html @@ -1,7 +1,6 @@  - + -

                          Editing a Role Group

                          @@ -16,7 +15,9 @@

                          Editing a Role Group

                          1. Edit the role group as required.
                            2. -
                            3. +
                          3. + +
                          \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Security Role.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Security Role.html index 80018ed3dec..56c080b4bc9 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Security Role.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Security Role.html @@ -1,7 +1,6 @@  - + -

                          Editing a Security Role

                          @@ -9,14 +8,16 @@

                          Editing a Security Role

                          1. Navigate to Admin > Security Roles - OR - Go to a Security Roles module.
                          2. If the required role is not displayed, at Filter By Role Group select the role from the drop down list.
                            3. -
                          3. Click the Edit button beside the role to be edited.
                            4. +
                          4. Click the Edit button beside the role to be edited.

                          1. Edit the settings as required.
                            2. -
                            3. +
                          3. + +
                          \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Users Security Role Access.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Users Security Role Access.html index 6db7d3e6918..51cee0efce9 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Users Security Role Access.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Editing a Users Security Role Access.html @@ -1,7 +1,6 @@  - + -

                          Editing a User's Security Role Access

                          @@ -13,12 +12,12 @@

                          Editing a User's Security Role Access

                        • Optional. At Effective Date, click the Calendar button and select the first date the user can access this role. Leave this field blank for immediate access to the role.
                        • Optional. At Expiry Date click the Calendar button and select the last date the user can access this role. Leave this field blank if access to the role does not expire.
                        • At Send Notification?, select from the following options: -
                          • to send a notification email to the user informing them of their new role access. This is the default setting.
                          • to add the user to the role without notifying them.
                          • +
                          • Mark  the check box to send a notification email to the user informing them of their new role access. This is the default setting.
                          • Unmark  the check box to add the user to the role without notifying them.
                        • Click the Add User To Role link. This either adds a new record for this user in the User Name table below, or updates the existing record.
                        • Click the Cancel button to return to the module.

                          • - +

                          • diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Obtaining an RSVP Link.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Obtaining an RSVP Link.html index ba361e2f25c..d4a4f321796 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Obtaining an RSVP Link.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Module Editors/Obtaining an RSVP Link.html @@ -20,7 +20,7 @@

                            Obtaining an RSVP Link

                          • Click the Cancel button to return to the module.

                            • - + Related Topics:

                            • diff --git a/Documentation/Using the Control Panel/Admin Console/Security Roles/Understanding Role Based Access.html b/Documentation/Using the Control Panel/Admin Console/Security Roles/Understanding Role Based Access.html index 5d959ee4679..244571dbbc8 100644 --- a/Documentation/Using the Control Panel/Admin Console/Security Roles/Understanding Role Based Access.html +++ b/Documentation/Using the Control Panel/Admin Console/Security Roles/Understanding Role Based Access.html @@ -32,7 +32,7 @@

                              Understanding Role Based Access

                            • Restrict access to view and manage pages. See "Setting Page Permissions"

                            - + Related Topics:

                            • diff --git a/Documentation/Using the Control Panel/Admin Console/SharePoint Connector/About the Admin SharePoint Connector Page.htm b/Documentation/Using the Control Panel/Admin Console/SharePoint Connector/About the Admin SharePoint Connector Page.htm index 008a8518afa..257e7236294 100644 --- a/Documentation/Using the Control Panel/Admin Console/SharePoint Connector/About the Admin SharePoint Connector Page.htm +++ b/Documentation/Using the Control Panel/Admin Console/SharePoint Connector/About the Admin SharePoint Connector Page.htm @@ -1,20 +1,20 @@  - + -

                              About the SharePoint Connector Module

                              +

                              About the SharePoint Connector

                              DNN Enterprise is for organizations with a sophisticated IT infrastructure and multiple content contributors that deploy DNN in critical web applications. The Microsoft SharePoint Connector enables organizations to leverage the power of the SharePoint Enterprise Content Management (ECM) solution and the flexibility of the DNN Web Content Management System (CMS). Organizations can securely, cost effectively publish documents stored in their SharePoint document repository to a public web site, extranet or intranet powered by DNN. The connector ensures that only the current version of documents is exposed, ensuring adherence to governance rules and best business practices.

                              The SharePoint Connector module enables SuperUsers and Administrators to synchronize files between a SharePoint site and a DNN site. Files that are maintained on SharePoint are the 'master' files that are then 'pushed' to your DNN site.

                              • - See "Installing DotNetNuke Connector (SharePoint 2007)" + See "Installing DotNetNuke Connector (SP2007)"
                              • - See "Installing DotNetNuke Connector (SharePoint 2010)" + See "Installing DotNetNuke Connector (SP2010)"
                              -

                              The SharePoint Connector module is located on both the Host > Advanced Settings >  SharePoint Connector page and the Admin > Advanced Settings > SharePoint Connector pages and can also be added to site pages.

                              +

                              The SharePoint Connector module is located on both the Host > Advanced Settings >  SharePoint Connector page and the Admin > Advanced Settings > SharePoint Connector pages and can also be added to site pages.

                              Features:

                                @@ -24,7 +24,7 @@

                                About the SharePoint Connector Module

                              -
                              The SharePoint Connector Module +
                              The SharePoint Connector

                              \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Site Log/About the Site Log Module.html b/Documentation/Using the Control Panel/Admin Console/Site Log/About the Site Log Module.html index 5119ecea445..61e9245007c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Log/About the Site Log Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Log/About the Site Log Module.html @@ -10,7 +10,7 @@

                              About the Site Log Module


                              The Site Log Module

                              - + Related Topics:

                              • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Log/Viewing a Site Report .html b/Documentation/Using the Control Panel/Admin Console/Site Log/Viewing a Site Report .html index 6ef09df50c1..674b8400807 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Log/Viewing a Site Report .html +++ b/Documentation/Using the Control Panel/Admin Console/Site Log/Viewing a Site Report .html @@ -18,7 +18,7 @@

                                Viewing a Site Report


                                Viewing a Site Log Report

                                - + Related Topics:

                                • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Redirection Management/Adding Advanced Site Redirections.html b/Documentation/Using the Control Panel/Admin Console/Site Redirection Management/Adding Advanced Site Redirections.html index 43d2401533e..cd4ca575f51 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Redirection Management/Adding Advanced Site Redirections.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Redirection Management/Adding Advanced Site Redirections.html @@ -1,13 +1,12 @@  - + -

                                  Adding Advanced Site Redirections

                                  How to create advanced redirection paths for a site. Advanced options include the ability to create a redirection that only applies to a page and its child pages or a redirection that applies to a full site. Redirections can be associated with one or more types of user devices or a set of rules can be applied to further limit a redirection.

                                    -
                                  1. Navigate to Admin > Advanced Settings > Site Redirection Management.
                                    2. +
                                  2. Navigate to Admin > Advanced Settings > Site Redirection Management.
                                  3. Select the Create a redirection using advanced options option.

                                  @@ -18,7 +17,7 @@

                                  Adding Advanced Site Redirections

                                • In the Site Redirection Name text box, enter a name for this redirection. This redirection is automatically enabled, however if you wish to disable it you can at Enable.
                                • At Redirecting, select from these options:
                                  • Page within this site: Choose this option to redirect users from a site page: -
                                    1. Select the page name from the drop down list. The current Home page of the site is selected by default.
                                    2. Optional. at Include all child pages if you wish apply this redirection to all of the child pages.
                                    3. At To, select the location you want to redirect uses to from these options: +
                                      1. Select the page name from the drop down list. The current Home page of the site is selected by default.
                                      2. Optional. at Include all child pages if you wish apply this redirection to all of the child pages.
                                      3. At To, select the location you want to redirect uses to from these options:
                                        • Site: Select to redirect users to another site within this installation and then select the site from the drop down list.
                                        • Page within this site: Select to redirect users to another page with this site and then select the page name from the drop down list.
                                        • URL: Select to redirect users to an external URL and then enter the redirection URL into the URL text box.
                                    4. Site: Select to create a redirection for the entire site.
                                      1. Select the site name from the drop down list.
                                      2. At To, select the location you want to redirect uses to from these options:
                                        • Site: Select to redirect users to another site within this installation and then select the site from the drop down list.
                                        • URL: Select to redirect users to an external URL and then enter the redirection URL into the URL text box.
                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/About the Site Settings Page.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/About the Site Settings Page.html index 067e80db093..517e37cf68d 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/About the Site Settings Page.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/About the Site Settings Page.html @@ -1,20 +1,37 @@  - + - -

                                  About the Site Settings Page

                                  - -

                                  The Site Settings page (Admin > Site Settings) enables Administrators to configure basic and advanced site settings including design, advertising, payment, DNN usability, and user registration settings, etc. Where two or more languages are enabled on a site, different site settings can be configured for each language as required.

                                  -

                                  Important. The Site Settings page includes a number of Advanced Settings (section names Site Aliases, SSL Settings, Messaging Settings, Host Settings and Client Resource Management) that are only visible to SuperUsers. These settings can also be accessed and managed under Host > Site Management. These settings are documented under the Site Management section in this manual. See "About the Site Management Page"

                                  -

                                  +

                                  About Site Settings

                                  +

                                  The Site Settings page (Admin > Site Settings) enables Administrators to configure basic and advanced site settings including design, advertising, payment, DNN usability, and user registration settings, etc. Where two or more languages are enabled on a site, different site settings can be configured for each language as required.

                                  +

                                  The Site Settings page -
                                  The Basic Settings tab of the Site Settings Module +
                                  Site Settings

                                  +

                                  The Site Settings page includes a number of Advanced Settings ( Site Aliases, SSL Settings, Messaging Settings, Host Settings and Client Resource Management) that are only visible to SuperUsers. These settings can also be accessed and managed under Host > Site Management. These settings are documented under the Site Management section in this manual. See "About the Site Management Page"

                                  -
                                  The Advanced Settings tab of the Site Settings Module as displayed to SuperUsers +
                                  Site Settings as displayed to SuperUsers

                                  +

                                  + + +

                                  +
                                    +
                                  • Site Alias: See "Adding a Site Alias", See "Configuring Site Alias Settings", See "Editing a Site Alias", See "Deleting a Site Alias"
                                    • +
                                  • + See "Configuring CRM for a Site" +
                                    • +
                                  • + See "Configuring Messaging Settings for a Site" +
                                    • +
                                  • + See "Editing Host Settings for a Site" +
                                    • +
                                  • + See "Setting SSL Settings for a Site" +
                                    • +
                                  \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Client Resource Management/Setting Client Resource Management.htm b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Client Resource Management/Setting Client Resource Management.htm index 5a429ccb985..0aa2ebc287b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Client Resource Management/Setting Client Resource Management.htm +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Client Resource Management/Setting Client Resource Management.htm @@ -12,10 +12,10 @@

                                  Setting Client Resource Management

                                • At Current Host Version, here you can view the version number that is assigned to client resources to assign with browser caching. This number is increased when an extension is installed, portal.css is updated, or when the server cache is cleared. This number applies to any processed file (combined and/or minified). Click the Increment Version link if you want to manually increase the number and force browsers to download new copies of the resource files.
                                • At Enable Composite Files, select from these options:
                                • Check the check box to enable composite files. The will combine files of the same type so the number of and size of files is reduced and this will reduce the number of file requests by the browser. This will significantly increase the page loading speed.
                                  • -
                                • At Minify CSS, select from the following options:
                                  • to enable CSS minification. This will reduce the size of individual files by removing comments, whitespace and CSS files that are no longer in use.
                                  • to disable.
                                  • -
                                • At Minify JS, select from these options:
                                  • to enable JS minification. This will reduce the size of the JavaScript code using JSMin.
                                  • to disable composite file.
                                  • +
                                • At Minify CSS, select from the following options:
                                  • to enable CSS minification. This will reduce the size of individual files by removing comments, whitespace and CSS files that are no longer in use.
                                  • to disable.
                                  • +
                                • At Minify JS, select from these options:
                                  • to enable JS minification. This will reduce the size of the JavaScript code using JSMin.
                                  • to disable composite file.
                                • - + Click the Update button.

                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/HomePage.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/HomePage.html index ea4b4bac3c8..f8a5cd3584f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/HomePage.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/HomePage.html @@ -21,7 +21,7 @@

                                  Setting the Home Page

                                  1. - + Click the Update button.
                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_Custom.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_Custom.html index 2bb30a8eef3..8e0fe9a40e5 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_Custom.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_Custom.html @@ -7,7 +7,7 @@

                                  Enabling a Custom Login Page

                                  How to set any page as the Login page for the site. This setting enables you to create a custom Login page rather than using the default login page which only displays the Account Login module. If a Login page is not set, the default Login page is used. The default login page requires the Login skin object to be included in the skin.

                                  - Create a custom login page as follows:

                                  + Create a custom login page as follows:

                                  1. Add a new page to your site (E.g. Login page). Your Login page must have the following:
                                    • All Users must be granted permissions to view the page.
                                    • An Account Log In module must be added to the page and visible to all users.
                                    2. @@ -26,7 +26,7 @@

                                    Enabling a Custom Login Page

                                    1. - + Click the Update button.
                                    diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_RestoreDefault.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_RestoreDefault.html index 28b5e269b28..0079e5eaf90 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_RestoreDefault.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/LoginPage_RestoreDefault.html @@ -18,7 +18,7 @@

                                    Restoring the Default Login Page

                                    1. - + Click the Update button.
                                    diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Custom.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Custom.html index de3e7ef1f1f..85d97702385 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Custom.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Custom.html @@ -19,7 +19,7 @@

                                    Setting a Custom Registration Page

                                    1. - + Click the Update button.
                                    diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Default.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Default.html index dd516ef6322..976dddb2864 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Default.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/RegistrationPage_Default.html @@ -18,7 +18,7 @@

                                    Restoring the Default Registration Page

                                    1. - + Click the Update button.
                                    diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/SearchResultsPage.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/SearchResultsPage.html index 0a0d4f2ae64..5bcb4fb56af 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/SearchResultsPage.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/SearchResultsPage.html @@ -18,11 +18,11 @@

                                    Setting the Search Results Page

                                    1. - + Click the Update button.

                                    - + Related Topics:

                                    • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/Splash Page.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/Splash Page.html index 4df33268347..1a1dd358a63 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/Splash Page.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/Splash Page.html @@ -21,7 +21,7 @@

                                      Enabling/Disabling a Splash Page

                                      1. - + Click the Update button.

                                      diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Custom.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Custom.html index 901d5478dab..6f993234ff2 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Custom.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Custom.html @@ -25,7 +25,7 @@

                                      Setting a Custom User Profile Page

                                      1. - + Click the Update button.
                                      diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Default.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Default.html index f9d129f9e1b..c0ee6335f34 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Default.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Page Management/UserProfilePage_Default.html @@ -18,7 +18,7 @@

                                      Restoring the Default User Profile Page

                                      1. - + Click the Update button.
                                      diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Payment Settings/Setting the Payment Processor.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Payment Settings/Setting the Payment Processor.html index 0cd65103e6a..f80264e5bf7 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Payment Settings/Setting the Payment Processor.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Payment Settings/Setting the Payment Processor.html @@ -22,9 +22,9 @@

                                      Setting the Payment Processor

                                    • At Use Sandbox?, select from these options
                                      • - to enable PayPal Sandbox.
                                        • + to enable PayPal Sandbox.
                                      • - to disable Sandbox and enable live transactions.
                                        • + to disable Sandbox and enable live transactions.

                                  @@ -32,7 +32,7 @@

                                  Setting the Payment Processor

                                  1. - + Click the Update button.
                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/Administrator.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/Administrator.html index 44c3a42f56d..5cdc88e9358 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/Administrator.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/Administrator.html @@ -18,7 +18,7 @@

                                  Setting the Primary Administrator

                                  1. - + Click the Update button.
                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/HideLoginControl.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/HideLoginControl.html index 9e5f4df9a61..5634754f2db 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/HideLoginControl.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Security Settings/HideLoginControl.html @@ -10,18 +10,18 @@

                                  Setting the Visibility of the Login Control

                                • Navigate to Admin > Site Settings.
                                • Select the Advanced Settings tab.
                                • Expand the Security Settings section.
                                  • -
                                • At Hide Login Control, to display the Login control - OR to hide the Login control. This option requires users to navigate to the /login.aspx page to view the login control. E.g. www.awesomecycles.biz//login.aspx.
                                  • +
                                • At Hide Login Control, to display the Login control - OR to hide the Login control. This option requires users to navigate to the /login.aspx page to view the login control. E.g. www.awesomecycles.biz//login.aspx.

                                  1. - + Click the Update button.

                                  - + Related Topics:

                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Site Aliases, SSL Settings and Host Settings.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Site Aliases, SSL Settings and Host Settings.html index a44c9a66c98..6534910c8e1 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Site Aliases, SSL Settings and Host Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Site Aliases, SSL Settings and Host Settings.html @@ -7,7 +7,7 @@

                                    Managing Messaging, Site Aliases, SSL, Host and CRM Settings

                                    Only SuperUsers can access the Site Aliases, SSL Settings, Host Settings and Client Resource Management (CRM) sections of the Site Settings page. These settings are covered in the Host > Site Management section of this manual.

                                    - + Related Topics:

                                    • Site Alias: See "Adding a Site Alias", See "Configuring Site Alias Settings", See "Editing a Site Alias", See "Deleting a Site Alias"
                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/Control Panel Options.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/Control Panel Options.html index 5ef1b65f5d4..c64782a705e 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/Control Panel Options.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/Control Panel Options.html @@ -20,11 +20,11 @@

                                      Configuring the Control Panel Options

                                      1. - + Click the Update button.

                                      - + Related Topics:

                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/EnablePopups.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/EnablePopups.html index cb9f374164d..a8e06246fd8 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/EnablePopups.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/EnablePopups.html @@ -10,14 +10,14 @@

                                        Enabling/Disabling Pop-Ups for Editing

                                      • Select the Advanced Settings tab.
                                      • Expand the Usability Settings section.
                                      • At Enable Pop-Ups?, select from these options: -
                                        • to pop-up a new window that is separate to the web browser when performing editing tasks.
                                        • to perform editing tasks within the web browser.
                                        • +
                                        • to pop-up a new window that is separate to the web browser when performing editing tasks.
                                        • to perform editing tasks within the web browser.

                                        Enabling pop-up editing

                                        1. - + Click the Update button.

                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/HideSystemFolders.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/HideSystemFolders.html index b6e7d7b38ca..7a1256a14d7 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/HideSystemFolders.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/HideSystemFolders.html @@ -10,14 +10,14 @@

                                        Hiding System Folders

                                      • Select the Advanced Settings tab.
                                      • Expand the Usability Settings section.
                                      • At Hide System Folders, select from these options: -
                                        • to prevent adding hidden and underscore folders.
                                        • to allow.
                                        • +
                                        • to prevent adding hidden and underscore folders.
                                        • to allow.

                                        1. - + Click the Update button.
                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/SiteTimeZone.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/SiteTimeZone.html index 1f8ced1b4b3..946d6964277 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/SiteTimeZone.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced Settings/Usability Settings/SiteTimeZone.html @@ -17,7 +17,7 @@

                                        Setting the Site TimeZone

                                        1. - + Click the Update button.

                                        Tip: Users can choose their Time Zone on their profile. See "Managing your User Profile"

                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced URL Settings/Managing Module Providers.htm b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced URL Settings/Managing Module Providers.htm index 7ee2e416ad5..10044e0e570 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced URL Settings/Managing Module Providers.htm +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Advanced URL Settings/Managing Module Providers.htm @@ -1,5 +1,5 @@  - + @@ -10,7 +10,7 @@

                                        Managing Extension URL Providers

                                      • Select the Advanced URL Settings tab.
                                      • Expand the Extension URL Providers section to view a list of any extension URL providers that are installed on this site.
                                      • In the Enabled column: -
                                        • beside a module provider to enable it.
                                        • beside a module provider to disable it.
                                        • +
                                        • Mark  the check box beside a module provider to enable it.
                                        • Unmark  the check box beside a module provider to disable it.
                                      • In the Action column, click the Edit button to load any provider-specific Settings page that the provider developer has included. Here you can edit these settings as required.
                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Enabling-Disabling Skin Widgets.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Enabling-Disabling Skin Widgets.html index 81bdf67737c..6ce89b7726e 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Enabling-Disabling Skin Widgets.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Enabling-Disabling Skin Widgets.html @@ -12,14 +12,14 @@

                                        Enabling/Disabling Skin Widgets

                                      • Select the Basic Settings tab.
                                      • Expand the Appearance section.
                                      • At Enable Skin Widgets, select from these options: -
                                        • to enable skin widgets.
                                        • to disable skin widgets.
                                        • +
                                        • to enable skin widgets.
                                        • to disable skin widgets.

                                        1. - + Click the Update button.
                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Body Background.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Body Background.html index 61e82988bf6..d9da3e2614d 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Body Background.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Body Background.html @@ -22,7 +22,7 @@

                                        Setting the Body Background

                                        1. - + Click the Update button.
                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Default Site Skin and Container.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Default Site Skin and Container.html index c5b966ed6e5..a509df795d7 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Default Site Skin and Container.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Default Site Skin and Container.html @@ -22,11 +22,11 @@

                                        Setting the Default Site Skin and Container

                                        1. - + Click the Update button.

                                        - + Related Topics:

                                        • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Edit Skin and Container.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Edit Skin and Container.html index 1e8a2f41d68..9a7d29af429 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Edit Skin and Container.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Edit Skin and Container.html @@ -21,11 +21,11 @@

                                          Setting the Edit Skin and Container

                                          1. - + Click the Update button.

                                          - + Related Topics:

                                          • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Favicon.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Favicon.html index 8fa8ec7d5db..10121718177 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Favicon.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Favicon.html @@ -22,7 +22,7 @@

                                            Setting the Favicon

                                            1. - + Click the Update button.
                                            diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Site Logo.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Site Logo.html index 73f38bb0be8..e26c63641f2 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Site Logo.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Appearance/Setting the Site Logo.html @@ -24,7 +24,7 @@

                                            Setting the Site Logo

                                            1. - + Click the Update button.

                                            diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Configuring your Site Details.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Configuring your Site Details.html index 4fb1b7dbf78..87b01216949 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Configuring your Site Details.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Configuring your Site Details.html @@ -1,7 +1,6 @@  - + -

                                            Configuring your Site Details

                                            @@ -26,7 +25,7 @@

                                            Configuring your Site Details

                                          • At GUID, you can view the GUID (globally unique identifier) which can be used to identify this site. Wikipedia.org defines a GUID as "a special type of identifier used in software applications in order to provide a reference number which is unique in any context (hence, "Globally"), for example, in defining the internal reference for a type of access point in a software application, or for creating unique keys in a database".
                                          • - +

                                            • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Enabling-Disabling Banner Advertising.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Enabling-Disabling Banner Advertising.html index 4ebd1f2ff59..882932a2b32 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Enabling-Disabling Banner Advertising.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Enabling-Disabling Banner Advertising.html @@ -19,11 +19,11 @@

                                            Enabling/Disabling Banner Advertising

                                            1. - + Click the Update button.

                                            - + Related Topics:

                                            • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Submitting your Site Map URL to Google.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Submitting your Site Map URL to Google.html index 466673212e8..8453e6ed87e 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Submitting your Site Map URL to Google.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/Basic Settings/Site Marketing/Submitting your Site Map URL to Google.html @@ -6,7 +6,7 @@

                                              Submitting your Site Map URL to Google

                                              How to submit a site map URL of your site to Google for improved search optimization.

                                              -

                                              Site name, description and keywords must been completed. See "Configuring your Site Details"

                                              +

                                              Site name, description and keywords must been completed. See "Configuring your Site Details"

                                              1. Navigate to Admin > Site Settings.
                                              2. Optional. Click on the country flag icon associated with the culture (language) to be updated. This field only displays when multiple languages are enabled. See "Viewing a Site in a Secondary Language". This field only displays when multiple languages are enabled.
                                                3. @@ -19,7 +19,7 @@

                                                Submitting your Site Map URL to Google

                                                1. On Google Webmaster Tools web page, complete the following steps: -
                                                  1. If you do not have a Google Account, sign up for one.
                                                  2. Sign in to Google Webmaster Tools with your Google account.
                                                  3. Go to the Dashboard.
                                                  4. In the Add Site text box, enter the URL of your site. E.g. http://www.domain.com/
                                                  6. Click the Verify link.
                                                  7. Select Upload an HTML file. This will display a unique file name. Copy this name.
                                                  2. +
                                                  1. If you do not have a Google Account, sign up for one.
                                                  2. Sign in to Google Webmaster Tools with your Google account.
                                                  3. Go to the Dashboard.
                                                  4. In the Add Site text box, enter the URL of your site. E.g. http://www.domain.com/
                                                  6. Click the Verify link.
                                                  7. Select Upload an HTML file. This will display a unique file name. Copy this name.
                                                2. Return to the Site Settings page of your DNN site and complete the following steps:
                                                  1. In the Verification text box, enter the file name.
                                                    2. diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Login Settings/Managing Login and Logout Settings.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Login Settings/Managing Login and Logout Settings.html index ed28dac3c7f..b41b4a38c54 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Login Settings/Managing Login and Logout Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Login Settings/Managing Login and Logout Settings.html @@ -6,7 +6,7 @@

                                                    Managing Login and Logout Settings

                                                    How to set login and logout options for this site using the Site Settings page. -
                                                    1. Navigate to Admin > Site Settings.
                                                    2. Select the User Account Settings tab.
                                                    3. Expand the Login section and set any of the following options.
                                                    4. At Use CAPTCHA For Associating Logins, to use the CAPTCHA security code for every authentication system that is enabled on this site - OR - to remove CAPTCHA from associated logins. CAPTCHA can optionally be enabled on the default DNN authentication method.
                                                    5. At Require a Valid Profile for Login, to require users to update their profile during login if their profile no longer meets the requirements for a valid profile. E.g. If the required fields for a valid profile have changed since the user last logged in - OR - if a valid profile is now required to login. This is the default setting.
                                                    6. At Use CAPTCHA to Retrieve Password, to display the CAPTCHA security box on the Retrieve Password page - OR - to disable CAPTCHA. This is the default setting.
                                                    7. +
                                                      1. Navigate to Admin > Site Settings.
                                                      2. Select the User Account Settings tab.
                                                      3. Expand the Login section and set any of the following options.
                                                      4. At Use CAPTCHA For Associating Logins, to use the CAPTCHA security code for every authentication system that is enabled on this site - OR - to remove CAPTCHA from associated logins. CAPTCHA can optionally be enabled on the default DNN authentication method.
                                                      5. At Require a Valid Profile for Login, to require users to update their profile during login if their profile no longer meets the requirements for a valid profile. E.g. If the required fields for a valid profile have changed since the user last logged in - OR - if a valid profile is now required to login. This is the default setting.
                                                      6. At Use CAPTCHA to Retrieve Password, to display the CAPTCHA security box on the Retrieve Password page - OR - to disable CAPTCHA. This is the default setting.
                                                      7. At Redirect After Login, select a page to redirect users to when they login to the site - OR - Select < None Specified > to disable redirection. -
                                                      8. At Redirect After Logout, select a page to redirect users to when they logout of the site - OR - Select < None Specified > to disable redirection.

                                                      • See "Setting the Visibility of the Login Control"
                                                      +
                                                    8. At Redirect After Logout, select a page to redirect users to when they logout of the site - OR - Select < None Specified > to disable redirection.

                                                    1. Click the Update button.

                                                    Related Topics:

                                                    • See "Setting the Visibility of the Login Control"
                                                    \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/01 Configuring Profile Settings.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/01 Configuring Profile Settings.html index 3dadcd6fe0f..45fc388d8d9 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/01 Configuring Profile Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/01 Configuring Profile Settings.html @@ -9,20 +9,20 @@

                                                    Configuring Profile Settings

                                                  2. Navigate to Admin >  Site Settings.
                                                  3. Select the User Account Settings tab.
                                                  4. Expand the Profile Settings section.
                                                    5. -
                                                  5. Optional. At Redirect Old Profile URL's, to redirect old profile URL's to the new custom profile URL's. This is the default setting. E.g. This would redirect an old URL such as http://domain.com/activityfeed/tabid/45/userID/4/default.aspx to the custom profile URL created by the user such as http://domain.com/james.
                                                    6. +
                                                  6. Optional. At Redirect Old Profile URL's, to redirect old profile URL's to the new custom profile URL's. This is the default setting. E.g. This would redirect an old URL such as http://domain.com/activityfeed/tabid/45/userID/4/default.aspx to the custom profile URL created by the user such as http://domain.com/james.
                                                  7. At Default Profile Visibility Mode, select the default visibility for profile fields:
                                                    • AllUsers: Fields will be visible to all users.
                                                    • MembersOnly: Fields will be visible to authenticated users only.
                                                    • AdminOnly: Fields will only be visible to Administrators and SuperUsers. This is the default setting.
                                                    • FriendsAndGroups: Fields will only be visible to friends of the user and members of any groups the user has joined.
                                                    8. -
                                                  8. At Display Profile Visibility, to allow users to modify the visibility of their profile fields by displaying the Visibility control to them on their user profile page. This is the default setting - OR - to prevent them from modifying the visibility of profile fields by removing the Visibility control.
                                                    9. +
                                                  9. At Display Profile Visibility, to allow users to modify the visibility of their profile fields by displaying the Visibility control to them on their user profile page. This is the default setting - OR - to prevent them from modifying the visibility of profile fields by removing the Visibility control.

                                                  1. - + Click the Update button.

                                                  - + Related Topics:

                                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Adding a New Profile Property.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Adding a New Profile Property.html index 765b9979374..737d79a386b 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Adding a New Profile Property.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Adding a New Profile Property.html @@ -19,9 +19,9 @@

                                                    Adding a New Profile Property

                                                  • Optional. In the Default Value text box, enter the default value for this field.
                                                  • Optional. In the Validation Expression text box, enter a regular expression to validate data entered into this field.
                                                  • Optional. At Required, select from these options: -
                                                    • to set the field as required. Existing users will be required to complete this field the next time they login to the site.
                                                    • to set this field as optional. Users can choose to complete this field on their profile at any time.
                                                    • -
                                                  • Optional. At Read Only, to set the field as editable by Administrators only. Other users can view this field but cannot edit it.
                                                    • -
                                                  • Optional. At Visible, to set the field as visible in the User Accounts module - OR - to hide it.
                                                    • +
                                                    • to set the field as required. Existing users will be required to complete this field the next time they login to the site.
                                                    • to set this field as optional. Users can choose to complete this field on their profile at any time.
                                                    +
                                                  • Optional. At Read Only, to set the field as editable by Administrators only. Other users can view this field but cannot edit it.
                                                    • +
                                                  • Optional. At Visible, to set the field as visible in the User Accounts module - OR - to hide it.
                                                  • Optional. In the View Over text box, enter the view order for this property.
                                                  • At Default Visibility, select one of the following options to set the default visibility of this property:
                                                    • All Users: All users can view this property by default.
                                                    • Members Only: Only registered users can view this property by default.
                                                    • Admin Only: Only Administrators can view this property by default.
                                                    • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Editing Profile Settings.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Editing Profile Settings.html index 7ab6d3753e6..8c6966dad8f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Editing Profile Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Editing Profile Settings.html @@ -26,9 +26,9 @@

                                                    Editing Profile Settings

                                                  • Optional. In the Length text box, enter the maximum character length for this field. This is only relevant to fields where users enter information such as Text and RichText data types.
                                                  • Optional. In the Default Value text box, enter the default value for this field.
                                                  • Optional. In the Validation Expression text box, enter a regular expression to validate data entered into this field.
                                                    • -
                                                  • Optional. At Required, to set the field as required - OR - to set it as optional.
                                                    • -
                                                  • Optional. At Read Only, to set the field as editable by Administrators only. Other users can view this field but cannot edit it.
                                                    • -
                                                  • Optional. At Visible, to set the field as visible in the User Accounts module - OR - to hide it.
                                                    • +
                                                  • Optional. At Required, to set the field as required - OR - to set it as optional.
                                                    • +
                                                  • Optional. At Read Only, to set the field as editable by Administrators only. Other users can view this field but cannot edit it.
                                                    • +
                                                  • Optional. At Visible, to set the field as visible in the User Accounts module - OR - to hide it.
                                                  • Optional. In the View Over text box, enter the view order for this property.
                                                  • At Default Visibility, select one of the following options to set the default visibility of this property:
                                                    • All Users: All users can view this property by default.
                                                    • Members Only: Only registered users can view this property by default.
                                                    • Admin Only: Only Administrators can view this property by default.
                                                    • diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Managing Profile Fields.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Managing Profile Fields.html index bec260ffe90..ee93bcb0994 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Managing Profile Fields.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Profile Settings/Managing Profile Fields.html @@ -15,8 +15,8 @@

                                                    Managing a Profile Field

                                                  • Click the Down button to move a field down one position on the profile page.
                                                  • Click the Up button to move a field up one position on the profile page.
                                                  • In the Required column, perform any of the following to set the fields that are required for a valid profile: -
                                                    • at the top of this column to set all fields as required - OR - at the top of this column to set all fields as optional.
                                                    • beside a field to set it as mandatory on the User's Profile page. The user will be prompted to update this field when they edit their profile. Note: The field will only be required at Registration if set under User Settings (See "Configuring a Custom Registration Form" and See "Configuring the Standard Registration Form") - OR - beside a field to set it as optional.
                                                    • -
                                                  • At Visible, select from the following options to set the visibility of fields on the Manage Profile page:
                                                    • located at the top of this column to set all fields as visible - OR - at the top of this column to hide all fields.
                                                    • beside a field to set it as visible - OR - beside a field to set it as not visible. +
                                                      • at the top of this column to set all fields as required - OR - at the top of this column to set all fields as optional.
                                                      • beside a field to set it as mandatory on the User's Profile page. The user will be prompted to update this field when they edit their profile. Note: The field will only be required at Registration if set under User Settings (See "Configuring a Custom Registration Form" and See "Configuring the Standard Registration Form") - OR - beside a field to set it as optional.
                                                      • +
                                                    • At Visible, select from the following options to set the visibility of fields on the Manage Profile page:
                                                      • located at the top of this column to set all fields as visible - OR - at the top of this column to hide all fields.
                                                      • beside a field to set it as visible - OR - beside a field to set it as not visible.

                                                @@ -24,7 +24,7 @@

                                                Managing a Profile Field

                                                1. - + Click the Update button.
                                                diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring a Custom Registration Form.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring a Custom Registration Form.html index b924b0b3063..3b802631129 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring a Custom Registration Form.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring a Custom Registration Form.html @@ -11,19 +11,19 @@

                                                Configuring a Custom Registration Form

                                              3. Select the User Account Settings tab.
                                              4. Expand the Registration Settings section and then modify one or more settings.
                                              5. At User Registration, select either Private, Public or Verified user registration. See "Enabling User Registration" for more information.
                                                6. -
                                              6. Optional. At Receive User Registration Notification, to send a notification email to the user when they register. Note: A registration email will always be sent if the User Registration field above is set to Private because the Administrator will need to receive the notification to approve the user account.
                                                7. -
                                              7. Optional. At Use Authentication Providers, to use Authentication providers during registration. Note: This setting may not be supported by all providers.
                                                8. +
                                              8. Optional. At Receive User Registration Notification, to send a notification email to the user when they register. Note: A registration email will always be sent if the User Registration field above is set to Private because the Administrator will need to receive the notification to approve the user account.
                                                9. +
                                              9. Optional. At Use Authentication Providers, to use Authentication providers during registration. Note: This setting may not be supported by all providers.
                                              10. In the Excluded Terms text box, enter a comma-delimited list of terms that user will be prevented from using in their Username or Display Name.
                                                11. -
                                              11. Optional. At Use Profanity Filter, to use the profanity filter for the Username and DisplayName fields during registration.
                                                12. +
                                              12. Optional. At Use Profanity Filter, to use the profanity filter for the Username and DisplayName fields during registration.

                                              1. At Registration Form Type, select Custom and modify one or more settings as required.
                                                1. In the Registration Fields text box, begin enter the name of a user account field that is required during registration. When the correct matching field is displayed, click on the field name to select it. If this setting is used, this will take precedence over the other settings. The possible fields include Username, Email, Password, ConfirmPassword, DisplayName and all the Profile Properties.
                                                2. At Require Unique Display Name, select from these options: -
                                                  • if each user will have a unique display name. If a user chooses a name that exists already this will suggest a modified name based on the user's first name and last name. Note: If this option is selected, you must ensure both Email and DisplayName are added to the Registration Fields text box above.
                                                  • .if multiple users can have the same display name. This is the default setting. +
                                                    • if each user will have a unique display name. If a user chooses a name that exists already this will suggest a modified name based on the user's first name and last name. Note: If this option is selected, you must ensure both Email and DisplayName are added to the Registration Fields text box above.
                                                    • .if multiple users can have the same display name. This is the default setting.
                                                  • In the Display Name Format text box, specify a format for the users display name. The format can include tokens for dynamic substitution such as [FIRSTNAME] [LASTNAME]. If a display name format is specified, the display name will no longer be editable through the user interface.
                                                  • In the User Name Validation text box, modify the user name validation expression if required.
                                                  • In the Email Address Validation text box, modify the provided email validation expression.
                                                  • At Password Expiry (in days) the number of days before a user's password expires is displayed. Users will be prompted to change their password the next time they login. Note 1: 0 = no expiry. Note: This field is only enforced if the user is using the regular DNN Authentication method. (I.e. They enter their User Name and Password when logging in). If the user logs in using alternate authentication methods such as Facebook, Live, Yahoo or Google, this setting will be ignored.
                                                  • At Password Expiry Reminder (in days) the number of days warning given to a user that they will be required to change their password is displayed.
                                                  • At Require a Valid Profile for Registration, select from these option: -
                                                    • to select to require users to enter a valid profile during registration. Valid Profiles require the User Name, First Name, Last Names, Display Name, Email Address and Password fields to all be completed. In addition, any other fields that have been set as required on in the Profile Setting section are required when registering on the site. See "Configuring Profile Settings", See "Editing Profile Settings", or See "Adding a New Profile Property"
                                                    • . the check box to disable. This is the default setting.
                                                  • At Use CAPTCHA For Registration, to use the CAPTCHA security code box during registration - OR - .to remove CAPTCHA. +
                                                    • to select to require users to enter a valid profile during registration. Valid Profiles require the User Name, First Name, Last Names, Display Name, Email Address and Password fields to all be completed. In addition, any other fields that have been set as required on in the Profile Setting section are required when registering on the site. See "Configuring Profile Settings", See "Editing Profile Settings", or See "Adding a New Profile Property"
                                                    • . the check box to disable. This is the default setting.
                                                  • At Use CAPTCHA For Registration, to use the CAPTCHA security code box during registration - OR - .to remove CAPTCHA.
                                                  • At Redirect After Registration, select the name of the page that users are redirected to after registering on the site - OR - Select < None Specified > to disable redirection.

                                              @@ -31,7 +31,7 @@

                                              Configuring a Custom Registration Form

                                              1. - + Click the Update button.
                                              diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring the Standard Registration Form.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring the Standard Registration Form.html index 9694c82f4d9..384a54da51a 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring the Standard Registration Form.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Configuring the Standard Registration Form.html @@ -11,23 +11,23 @@

                                              Configuring the Standard Registration Form

                                            • Select the User Account Settings tab.
                                            • Expand the Registration Settings section and then modify one or more settings.
                                            • At User Registration, select either Private, Public or Verified user registration. See "Enabling User Registration" and See "Disabling User Registration" for more information.
                                              • -
                                            • Optional. At Receive User Registration Notification, to send a notification email to the user when they register. Note: A registration email will always be sent if the User Registration field above is set to Private because the Administrator will need to receive the notification to approve the user account.
                                              • -
                                            • Optional. At Use Authentication Providers, to use Authentication providers during registration. Note: This setting may not be supported by all providers.
                                              • +
                                            • Optional. At Receive User Registration Notification, to send a notification email to the user when they register. Note: A registration email will always be sent if the User Registration field above is set to Private because the Administrator will need to receive the notification to approve the user account.
                                              • +
                                            • Optional. At Use Authentication Providers, to use Authentication providers during registration. Note: This setting may not be supported by all providers.
                                            • Optional. In the Excluded Terms text box, enter a comma-delimited list of terms that users will be prevented from using in their Username or Display Name. This is useful to prevent profanities or other unwanted words. Any excluded terms added here are in addition to those included with any profanity filters set.
                                              • -
                                            • Optional. At Use Profanity Filter, to enforce the profanity filter for both the Username and Display Name fields during registration.
                                              • +
                                            • Optional. At Use Profanity Filter, to enforce the profanity filter for both the Username and Display Name fields during registration.

                                                • -
                                              1. At Registration Form Type, select the Standard registration form.
                                                1. Optional. At Use Email Address as Username, to use the email address as a user name. This will remove the user name field from the registration form.
                                                2. At Require Unique Display Name, to set display names as unique. If a user chooses a name that exists already this will suggest a modified name based on the user's first name and last name - OR - .if more than one user can have the same display name. This option is unchecked by default. +
                                                3. At Registration Form Type, select the Standard registration form.
                                                  1. Optional. At Use Email Address as Username, to use the email address as a user name. This will remove the user name field from the registration form.
                                                  2. At Require Unique Display Name, to set display names as unique. If a user chooses a name that exists already this will suggest a modified name based on the user's first name and last name - OR - .if more than one user can have the same display name. This option is unchecked by default.
                                                  3. In the Display Name Format text box, enter tokens to set the format of the users display name. Setting this option will prevent users from editing their display name. You can optionally specify a format for the users display name. The format can include tokens for dynamic substitution such as [FIRSTNAME] [LASTNAME] and [USERNAME]. If a display name format is specified, the display name will no longer be editable through the user interface.
                                                  4. In the User Name Validation text box, modify the user name validation expression if required. E.g. [a-zA-Z0-9_]*$ -
                                                  5. In the Email Address Validation text box, modify the provided email validation expression.
                                                  6. Optional. At Use Random Password, to generate random passwords during registration, rather than displaying a password entry field.
                                                  7. Optional. At Require Password Confirmation, to require the registration form to display a password confirmation box.
                                                  8. Optional. In the Password Expiry (in days) text box, enter the number of days until a user's password expires. Users will be prompted to change their password the next time they login. Enter 0 if the password never expires. Note: This field is only enforced if the user is using the regular DNN Authentication method. (I.e. They enter their User Name and Password when logging in). If the user logs in using alternate authentication methods such as Facebook, Live, Yahoo or Google, this setting will be ignored.
                                                  9. In the Password Expiry Reminder (in days) text box, enter the number of days warning given to a user notifying them that their password is about to expire and they are required to change it.
                                                  10. The following nine (9) read only settings are managed using the Configuration Manager. See "Viewing Pre-Configured Registration Settings"
                                                  11. At Require a Valid Profile for Registration, to require users to enter a valid profile during registration. Valid Profiles require the User Name, First Name, Last Names, Display Name, Email Address and Password fields to all be completed. In addition, any other fields that have been set as required in the Profile Setting section are required when registering on the site. See "Managing a Profile Field" - OR - .to disable. This is the default setting.
                                                  12. At Use CAPTCHA For Registration, to use the CAPTCHA
                                                    security code box during registration - OR - .to remove CAPTCHA.
                                                  13. At Redirect After Registration, select the name of the page that users are redirected to after registering on the site - OR - Select < None Specified > to disable redirection.
                                                  4. +
                                                4. In the Email Address Validation text box, modify the provided email validation expression.
                                                5. Optional. At Use Random Password, to generate random passwords during registration, rather than displaying a password entry field.
                                                6. Optional. At Require Password Confirmation, to require the registration form to display a password confirmation box.
                                                7. Optional. In the Password Expiry (in days) text box, enter the number of days until a user's password expires. Users will be prompted to change their password the next time they login. Enter 0 if the password never expires. Note: This field is only enforced if the user is using the regular DNN Authentication method. (I.e. They enter their User Name and Password when logging in). If the user logs in using alternate authentication methods such as Facebook, Live, Yahoo or Google, this setting will be ignored.
                                                8. In the Password Expiry Reminder (in days) text box, enter the number of days warning given to a user notifying them that their password is about to expire and they are required to change it.
                                                9. The following nine (9) read only settings are managed using the Configuration Manager. See "Viewing Pre-Configured Registration Settings"
                                                10. At Require a Valid Profile for Registration, to require users to enter a valid profile during registration. Valid Profiles require the User Name, First Name, Last Names, Display Name, Email Address and Password fields to all be completed. In addition, any other fields that have been set as required in the Profile Setting section are required when registering on the site. See "Managing a Profile Field" - OR - .to disable. This is the default setting.
                                                11. At Use CAPTCHA For Registration, to use the CAPTCHA
                                                  security code box during registration - OR - .to remove CAPTCHA.
                                                12. At Redirect After Registration, select the name of the page that users are redirected to after registering on the site - OR - Select < None Specified > to disable redirection.
                                              2. - + Click the Update button.

                                              diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Disabling User Registration.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Disabling User Registration.html index cdf18191284..b03b04de379 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Disabling User Registration.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Disabling User Registration.html @@ -18,7 +18,7 @@

                                              Disabling User Registration

                                              1. - + Click the Update button.

                                              diff --git a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Enabling User Registration.html b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Enabling User Registration.html index 5fbff01e6c5..9705c8c3ed5 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Enabling User Registration.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Settings/User Account Settings/Registration Settings/Enabling User Registration.html @@ -18,9 +18,9 @@

                                              Enabling User Registration

                                                -
                                              1. Optional. At Receive User Registration Notification, to send a notification email to the user when they register. Note: A registration email will always be sent if the User Registration field above is set to Private because the Administrator will need to receive the notification to approve the user account.
                                                2. +
                                              2. Optional. At Receive User Registration Notification, to send a notification email to the user when they register. Note: A registration email will always be sent if the User Registration field above is set to Private because the Administrator will need to receive the notification to approve the user account.
                                              3. - You may now want to customize the registration settings for your site. See "Configuring the Standard Registration Form" or See "Configuring a Custom Registration Form"
                                                4. + Click the Update button. You may now want to customize the registration settings for your site. See "Configuring the Standard Registration Form" or See "Configuring a Custom Registration Form"

                                              diff --git a/Documentation/Using the Control Panel/Admin Console/Site Wizard/About the Site Wizard Module.html b/Documentation/Using the Control Panel/Admin Console/Site Wizard/About the Site Wizard Module.html index 09514e25878..b32c566539d 100644 --- a/Documentation/Using the Control Panel/Admin Console/Site Wizard/About the Site Wizard Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Site Wizard/About the Site Wizard Module.html @@ -1,50 +1,47 @@  - + -

                                              About the Site Wizard Module

                                              -

                                              The DNN Site Wizard is a simple step-by-step wizard that allows you to configure basic site setting, choose a site design and use a site template that can include site content.

                                              -

                                              - All users who are authorized to view the Site Wizard module can complete the wizard, however only authenticated users can change the site logo and must have file upload permission to upload a new logo image.

                                              -

                                              Using the Site Wizard

                                              +

                                              About the Site Wizard

                                              +

                                              The Site Wizard is a simple step-by-step wizard that allows you to configure basic site setting, choose a site design and use a site template that can include site content. + All users who are authorized to view the Site Wizard can complete the wizard, however only authenticated users can change the site logo and must have file upload permission to upload a new logo image.

                                              +

                                              Using the Site Wizard

                                              Tip: All pages of the Site Wizard are options. If you don't want to perform a change on a particular screen, simply click the Next link to skip to the next page of the Site Wizard.

                                                -
                                              1. Navigate to Admin > Advanced Settings > Site Wizard - OR - Go to a Site Wizard module.
                                                2. -
                                              2. On the Site Configuration Wizard page, review the introduction and then Click the Next button.
                                                3. +
                                              3. Navigate to Admin > Advanced Settings > Site Wizard - OR - Go to a Site Wizard.
                                                4. +
                                              4. On the Site Configuration Wizard page, review the introduction and then click the Next button.

                                              - +

                                                -
                                              1. On the Choose a Template for your site page, you can optionally choose a site template for the site. Templates contain pages with modules which may or may not include content. If you don't want to change templates, Click the Next link to continue. -
                                                1. At Build your site from a template (below), to display a list of the available templates.
                                                2. Click on the name of a template to select it. This displays a description of the selected template.
                                                3. Choose one of the following options to set how duplicate modules will be handled: -
                                                  • Ignore: Places a copy of any duplicated modules on the same page.
                                                  • Replace: Deletes the existing copy of the duplicate content and replaces it with the template copy. Deleted pages are moved to the Recycle Bin and the page name appended with _Old. E.g. The replaced Home page will be called Home_Old. Restoring these pages will only restore the page and not the modules or module content.
                                                  • Merge: Combines the existing information and template information into one module.
                                                4. Click the Next button.
                                                2. +
                                              2. On the Choose a Template for your site page, you can choose to change the site template. Templates include pages and modules that may or may not include content. If you don't want to change templates, click the Next button to continue. +
                                                1. At Build your site from a template (below), to display a list of templates for all languages installed on the site.
                                                2. Click on the name of a template to select it. This displays a description of the selected template.
                                                3. Choose one of the following options to set how duplicate modules will be handled: +
                                                  • Ignore: Places a copy of any duplicated modules on the same page.
                                                  • Replace: Deletes the existing copy of the duplicate content and replaces it with the template copy. Deleted pages are moved to the Recycle Bin and the page name appended with _Old. E.g. The replaced Home page will be called Home_Old. Restoring these pages will only restore the page and not the modules or module content.
                                                  • Merge: Combines the existing information and template information into one module.
                                                4. Click the Next button.

                                              - Step 2 - Choose a Template for your site + Step 2 - Choose a Template for your site

                                              1. On the Select a Skin for your Site page, you can select a new default skin for site pages. This won't change the skin used on pages that aren't using the default skin. Note: From this page onwards, you can click the Previous link to return to the previous page. -
                                                1. Optional. To preview a skin, click on the thumbnail image (where provided). This displays a larger image of the skin in a new Web browser.
                                                2. Select a skin.
                                                3. Click the Next button.
                                                2. +
                                                1. Optional. To preview a skin, click on the thumbnail image (where provided). This displays a larger image of the skin in a new Web browser.
                                                2. Select a skin.
                                                3. Click the Next button.

                                              - Step 3 - Select a Skin for your Site + Step 3 - Select a Skin for your Site

                                              1. On the Choose a Default Container for your site page, select a new default container to be used for modules. This won't change the container used on modules that aren't using the default container. -
                                                1. If you selected a skin at Step 3, the matching containers are displayed here and the default container is pre-selected.
                                                2. Optional. at Show All Containers to view all of the available containers.
                                                3. Optional. To preview a container click on a thumbnail image (where provided). This displays a larger image of the container in a new Web browser.
                                                4. Select a container.
                                                5. Click the Next button.
                                                2. +
                                                1. If you selected a skin at Step 3, the matching containers are displayed here and the default container is pre-selected.
                                                2. Optional. at Show All Containers to view all of the available containers.
                                                3. Optional. To preview a container click on a thumbnail image (where provided). This displays a larger image of the container in a new Web browser.
                                                4. Select a container.
                                                5. Click the Next button.

                                              - +

                                                -
                                              1. On the Add Site Details page, enter or edit the site details for this site. These are the default details used by search engines to index your site. -
                                                1. In the Name/Title text box, enter the name or title to be applied to the site. This will show in visitor's Web browser title.
                                                2. In the Description text box, enter description to be applied to the site. This will be the description that Internet search engines will display to visitors. The site must be submitted to these search engines.
                                                3. In the KeyWords text box, enter keywords to be applied to the site. This will be what the Internet search engines look for if you choose to submit your site to them.
                                                4. At Logo, upload and/or select a new site logo. See "Setting a File Link" or See "Uploading and Linking to a File"
                                                5. Click the Finish button. -
                                                2. +
                                              2. On the Add Site Details page, enter or edit the site details for this site. These are the default details used by search engines to index your site.
                                                1. In the Name/Title text box, enter the name or title to be applied to the site. This will show in visitor's Web browser title.
                                                2. In the Description text box, enter description to be applied to the site. This will be the description that Internet search engines will display to visitors. The site must be submitted to these search engines.
                                                3. In the KeyWords text box, enter keywords to be applied to the site. This will be what the Internet search engines look for if you choose to submit your site to them.
                                                4. At Logo, upload and/or select a new site logo. See "Setting a File Link" or See "Uploading and Linking to a File"
                                                5. Click the Finish button.

                                              - Step 5 - Add Site Details + Step 5 - Add Site Details

                                              1. You will not be redirected to the Home page of your site and any changes you made will be visible.
                                                2. diff --git a/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying a Default Site Container.html b/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying a Default Site Container.html index 503fe0ee84a..b27bce698a8 100644 --- a/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying a Default Site Container.html +++ b/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying a Default Site Container.html @@ -10,8 +10,8 @@

                                                Applying a Default Site Container

                                              2. Locate and optionally preview the required container. See "Previewing a Container Package"
                                              3. At Apply To, select one or both of the following options: -
                                                • Website: to apply the container to all site pages. -
                                                • Admin: to apply the container to all Admin Console pages.
                                                4. +
                                                • Website: to apply the container to all site pages. +
                                                • Admin: to apply the container to all Admin Console pages.
                                              4. Click the Apply link below the chosen container.

                                              diff --git a/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying the Default Site Skin.html b/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying the Default Site Skin.html index c8ee9e056ad..e37f3fee3c7 100644 --- a/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying the Default Site Skin.html +++ b/Documentation/Using the Control Panel/Admin Console/Skins/All Users/Applying the Default Site Skin.html @@ -10,7 +10,7 @@

                                              Applying the Default Site Skin

                                            • Locate and optionally preview the required skin. See "Previewing a Skin Package"
                                            • At Apply To, select one or both of the following options: -
                                              1. Website: to apply the skin to all site pages.
                                              2. Admin: to apply the skin to all Admin Console pages.
                                              • +
                                              1. Website: to apply the skin to all site pages.
                                              2. Admin: to apply the skin to all Admin Console pages.
                                            • Click the Apply link.

                                              • diff --git a/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Container Token Values.html b/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Container Token Values.html index d7209d71952..de279a8daf4 100644 --- a/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Container Token Values.html +++ b/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Container Token Values.html @@ -1,7 +1,6 @@  - + -

                                              Setting Container Token Values

                                              @@ -19,7 +18,9 @@

                                              Setting Container Token Values

                                            • In the Value text box, enter the value for the setting.
                                              • -
                                              • +
                                            • + +
                                              • \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Skin Token Values.html b/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Skin Token Values.html index f7a38805d03..514d5de1cda 100644 --- a/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Skin Token Values.html +++ b/Documentation/Using the Control Panel/Admin Console/Skins/Skin Designer/Setting Skin Token Values.html @@ -1,12 +1,12 @@  - +

                                              Setting Skin Token Values

                                              How to set the values of skin tokens using the Skin Designer module.

                                                -
                                              1. Navigate to Admin > Advanced Settings > Skins.
                                                2. +
                                              2. Navigate to Admin > Advanced Settings > Skins.
                                              3. Go to the Skin Designer module.
                                              4. At Skin, select a skin package. This lists all skins within this package at the File field below.
                                                5. @@ -18,7 +18,7 @@

                                                Setting Skin Token Values

                                              5. In the Value text box, enter the value for the setting.
                                              6. - +

                                              diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/About the User Accounts Module.html b/Documentation/Using the Control Panel/Admin Console/User Accounts/About the User Accounts Module.html index f510a667660..c8e89c7e1f7 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/About the User Accounts Module.html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/About the User Accounts Module.html @@ -1,18 +1,16 @@  - + -

                                              About the User Accounts Module

                                              -

                                              The User Accounts module enables the creation and management of registered user accounts, as well as assignment of security roles. The fields displayed on the module can be set, as well as the way user accounts are handled. New profile properties can be created. This Admin module is displayed on the Admin > User Accounts page and -can also be deployed to any page by an authorized user.

                                              -

                                              Note: This module forms part of the Users & Roles module package which is set as a Premium Module by default to reduce the instance of it being accidentally added to a page and revealing personal user information.

                                              +

                                              About User Accounts

                                              +

                                              User Accounts, located on the Admin > User Accounts page, enables the creation and management of registered user accounts, as well as assignment of security roles. The fields displayed on the module can be set, as well as the way user accounts are handled. New profile properties can be created. User Accounts can be deployed to any page by an authorized however because it forms part of the Users & Roles module package it is set as a Premium module by default to reduce the instance of it being accidentally added to a page and revealing personal user information it will not be displayed in the add module area by default.

                                              -
                                              The User Accounts Module +
                                              User Accounts

                                              - + Related Topics:

                                              • diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Adding A User to a Role.html b/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Adding A User to a Role.html index 4470214dab6..4997d95c60d 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Adding A User to a Role.html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Adding A User to a Role.html @@ -1,7 +1,6 @@  - + -

                                                Adding A User to a Role

                                                @@ -16,10 +15,10 @@

                                                Adding A User to a Role

                                                  -
                                                1. Optional. At Effective Date, click the Calendar button and select the first date the user can access this role. If no date is selected then access to this role is immediately granted. See "Working with the Calendar"
                                                  2. -
                                                2. Optional. At Expiry Date, click the Calendar button and select the last date the user can access this role. If no date is selected then access to this role will not expire.
                                                  3. +
                                                3. Optional. At Effective Date, click the Calendar button and select the first date the user can access this role. If no date is selected then access to this role is immediately granted. See "Working with the Calendar"
                                                  4. +
                                                4. Optional. At Expiry Date, click the Calendar button and select the last date the user can access this role. If no date is selected then access to this role will not expire.
                                                5. At Send Notification?, select from the following options: -
                                                  • to send a notification email to the user informing them of their new role access. This is the default setting.
                                                  • to add the user to the role without notifying them.
                                                  6. +
                                                  • Mark  the check box to send a notification email to the user informing them of their new role access. This is the default setting.
                                                  • Unmark  the check box to add the user to the role without notifying them.
                                                6. Click the Update User Role link. The updated role details are now displayed in the list below.

                                                @@ -27,7 +26,6 @@

                                                Adding A User to a Role

                                                1. Repeat Steps 3-8 to add this user to additional roles.
                                                  2. -
                                                2. Click the Cancel button to return to the module.
                                                \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Deleting a User from a Security Role .html b/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Deleting a User from a Security Role .html index ee03e31fab2..8c6448d16ea 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Deleting a User from a Security Role .html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/Administrators/Deleting a User from a Security Role .html @@ -1,23 +1,24 @@  - + -

                                                Deleting a User from a Security Role

                                                How to delete a user from a security role using the User Accounts module.

                                                  -
                                                1. Navigate to Admin >  User Accounts - OR - Go to a User Accounts module.
                                                  2. +
                                                2. Navigate to Admin >  User Accounts - OR - Go to a User Accounts module.
                                                3. Locate the required user using a filter or by performing a search.
                                                4. Click the Manage Roles  button beside the required user account.
                                                  5. -
                                                5. At Send Notification?, select from the following options:
                                                  • to send a notification email to the user informing them that they have been removed from the role. This is the default setting.
                                                  • to delete role access without sending a notification email.
                                                  6. -
                                                6. Click the Delete  button beside the role the user is to be deleted from. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                  7. +
                                                7. At Send Notification?, select from the following options:
                                                  • Mark  the check box to send a notification email to the user informing them that they have been removed from the role. This is the default setting.
                                                  • Unmark  the check box to delete role access without sending a notification email.
                                                  8. +
                                                8. Click the Delete  button beside the role the user is to be deleted from. This displays the message "Are You Sure You Wish To Delete This Item?"

                                                  -
                                                1. Click the OK button to confirm.
                                                  2. +
                                                2. + +
                                                3. Repeat Steps 5-6 to delete this user from additional roles.
                                                diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/All Users/Filtering User Accounts by Online Users.html b/Documentation/Using the Control Panel/Admin Console/User Accounts/All Users/Filtering User Accounts by Online Users.html index f1e5c11a1ad..e6cbf43a2b6 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/All Users/Filtering User Accounts by Online Users.html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/All Users/Filtering User Accounts by Online Users.html @@ -7,7 +7,7 @@

                                                Filtering User Accounts by Online Users

                                                How to filter user accounts to only view users who are currently logged in to this site using the User Accounts module.

                                                - This filter is integrated with the Users Online module. The Users Online module must be enabled by a SuperUser for this filter to work.

                                                + This filter is integrated with the Users Online module. The Users Online module must be enabled by a SuperUser for this filter to work.

                                                1. Navigate to Admin > User Accounts - OR - Go to a User Accounts module.
                                                2. Click the Online link. This displays the matching user account records.
                                                  3. diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/Configuring User Account Settings.html b/Documentation/Using the Control Panel/Admin Console/User Accounts/Configuring User Account Settings.html index b2587eb6e98..36791857f95 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/Configuring User Account Settings.html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/Configuring User Account Settings.html @@ -1,7 +1,6 @@  - + -

                                                  Configuring User Account Settings

                                                  diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Adding a User Account.html b/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Adding a User Account.html index 6e0f09a7da2..0478f5aaa30 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Adding a User Account.html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Adding a User Account.html @@ -1,12 +1,10 @@  - + -

                                                  Adding a User Account

                                                  - -

                                                  How to add new user account to the site using the User Accounts module. Important. If this site requires users to answer a question to retrieve their password adding or edit users, so these features have been disabled for this website.

                                                  +

                                                  How to add new user account to the site. Important. If this site requires users to answer a question to retrieve their password adding or edit users, so these features have been disabled for this website.

                                                  1. Navigate to Admin > User Accounts - OR - Go to a User Accounts module.
                                                  2. Click the Add New User link. This opens the Add New User interface.
                                                    3. @@ -16,13 +14,13 @@

                                                    Adding a User Account

                                                  3. In the Display Name text box, enter the name to be displayed to other site members. Note: This field may not be displayed. See "Configuring User Account Settings"
                                                  4. In the Email Address text box, enter a valid email address.
                                                  5. At Authorize, select from the following options: -
                                                    • if the user is authorized to access the site. This will automatically provide access to the Registered User role and any roles set for Auto Assignment. This is the default setting.
                                                    • if the new user is not yet authorized to access the site. The Administrator is required to authorize this account at a later date.
                                                    6. +
                                                    • Mark  the check box if the user is authorized to access the site. This will automatically provide access to the Registered User role and any roles set for Auto Assignment. This is the default setting.
                                                    • Unmark  the check box if the new user is not yet authorized to access the site. The Administrator is required to authorize this account at a later date.
                                                  6. At Notify, select from the following options: -
                                                    • to send a notification email to the user's email address. This is the default setting.
                                                    • if you don't wish to send notification. If the account is not authorized, you may like to send the notification at a later time.
                                                    7. +
                                                    • Mark  the check box to send a notification email to the user's email address. This is the default setting.
                                                    • Unmark  the check box if you don't wish to send notification. If the account is not authorized, you may like to send the notification at a later time.
                                                  7. To create the user's password, select from these options: -
                                                    • To generate a random password, at Random Password.
                                                    • To create a password manually: -
                                                      1. at Random Password.
                                                      2. In the Password text box, enter a password.
                                                      3. In the Confirm Password text box, re-enter the same password. Note: The site may be set to required unique passwords or they may need to fulfil certain criteria such as minimum character length. If the password you enter doesn't meet the site's criteria, you will be asked to enter a new password or opt for a random password.
                                                    8. -
                                                  8. Click the Add New User link.
                                                    9. +
                                                    • To generate a random password, at Random Password.
                                                    • To create a password manually: +
                                                      1. Unmark  the check box at Random Password.
                                                      2. In the Password text box, enter a password.
                                                      3. In the Confirm Password text box, re-enter the same password. Note: The site may be set to required unique passwords or they may need to fulfil certain criteria such as minimum character length. If the password you enter doesn't meet the site's criteria, you will be asked to enter a new password or opt for a random password.
                                                    +
                                                  9. Click the Add New User button.

                                                  diff --git a/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Editing a User Account.html b/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Editing a User Account.html index 63e7c885695..38292c483db 100644 --- a/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Editing a User Account.html +++ b/Documentation/Using the Control Panel/Admin Console/User Accounts/Module Editors/Editing a User Account.html @@ -1,7 +1,6 @@  - + -

                                                  Editing a User Account

                                                  @@ -17,7 +16,9 @@

                                                  Editing a User Account

                                                  1. Select the Manage User Credentials tab.
                                                  2. Edit one or more fields as required. Editable fields are the user's first name, last name, display name and email address.
                                                    3. -
                                                    4. +
                                                  4. + +
                                                  \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/About the Admin Vendors Module.html b/Documentation/Using the Control Panel/Admin Console/Vendors/About the Admin Vendors Module.html index a11e2a75280..9e180e8512c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/About the Admin Vendors Module.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/About the Admin Vendors Module.html @@ -1,34 +1,34 @@  - + -

                                                  About the Admin Vendors Module

                                                  -

                                                  The Vendors module, located on the Admin > Advanced Settings > Vendors page, allows Administrators to create and manage vendor accounts, vendor banners and affiliate accounts. The vendor accounts and banners created on this page are exclusive to this site. Another instance of the Vendors module is located on the Host > Vendors page which allows SuperUsers to create banners that can be displayed on any site within this DNN installation.

                                                  -

                                                  Banners can be images, text or script. Banners can also be displayed on the site using either the [BANNER] skin token or using the Banners module. The Vendors module collects banner statistics including tracking of clicks, views and impressions and tracks commission for banner advertising on other sites and commissions received from banner advertisement on this site.

                                                  -

                                                  The Vendors module can be deployed to any site page allowing other users to manage vendors exclusive to this site. +

                                                  About Admin Vendors

                                                  +

                                                  Vendors, located on the Admin > Advanced Settings > Vendors page, allows Administrators to create and manage vendor accounts, vendor banners and affiliate accounts. The vendor accounts and banners created on this page are exclusive to this site. Another instance of the Vendors module is located on the Host > Vendors page which allows SuperUsers to create banners that can be displayed on any site within this DNN installation.

                                                  +

                                                  Banners can be images, text or script. They can be displayed on the site using either the [BANNER] skin token or using the Banners module. Vendors collects banner statistics including tracking of clicks, views and impressions and tracks commission for banner advertising on other sites and commissions received from banner advertisement on this site.

                                                  +

                                                  Vendors can be deployed to any site page allowing other users to manage vendors exclusive to this site. Users with view permissions can view, search and filter vendor accounts. DNN Platform users require Edit permissions to create and manage vendors, banners and affiliate accounts. Evoq Content and Evoq Content Enterprise users require Edit Content permissions to create and manage vendors, banners and affiliate accounts.

                                                  Installation Note: This module is pre-installed on the site.

                                                  Module Version: The version number is always the same as the DNN framework version number.

                                                  -
                                                  The Vendors Module +
                                                  Host Vendors

                                                  • - "About the Banners Module" + See "About Banners"
                                                  • - "About Banner Types" + See "About Banner Types"
                                                  • - "Enabling/Disabling Banner Advertising" + See "Enabling/Disabling Banner Advertising"
                                                  • - "About the Host Vendors Module" + See "About Host Vendors"
                                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/About Vendor Affiliate Accounts.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/About Vendor Affiliate Accounts.html deleted file mode 100644 index d8915d47563..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/About Vendor Affiliate Accounts.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - -

                                                  About Vendor Affiliate Accounts

                                                  -

                                                  One or more affiliate accounts can be created for Vendors in the Vendors module. These accounts are used for tracking advertising of this site on other websites. DNN generates the link for other websites to use, so that it can track each time a visitor clicks through to the site, from an advertising website, so that the difficulty in collecting information for commissions to be paid can be easily managed.

                                                  - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Adding an Affiliate Referral Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Adding an Affiliate Referral Account .html deleted file mode 100644 index 55df4b3c257..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Adding an Affiliate Referral Account .html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -

                                                  Adding an Affiliate Referral Account

                                                  -

                                                  How to add affiliate referral account to a vendor in the Vendors module. This generates a link which affiliates can add to their website. The number of clicks and acquisitions for the link is tracked within the Affiliate Referral module, permitting the tracking of commission owing to the vendor.

                                                  -
                                                    -
                                                  1. Navigate to Admin > Advanced Settings >  Vendors.
                                                    2. -
                                                  2. Locate the required vendor account by selecting a filter or by doing a search.
                                                    3. -
                                                  3. Click the Edit button beside the required vendor account. This opens the Edit Vendors page.
                                                    4. -
                                                  4. Expand the Affiliate Referrals section. This displays any affiliate referral accounts associated with this vendor.
                                                    5. -
                                                  5. Click the Add New Affiliate button.
                                                    6. -
                                                  -

                                                  -

                                                  -
                                                    -
                                                  1. Optional. At Start Date, click the Calendar link and select a start date. See "Working with the Calendar"
                                                    2. -
                                                  2. Optional. At End Date, click the Calendar link and select an end date.
                                                    3. -
                                                  3. In the Cost Per Click ( CPC ) text box, enter the advertising charge. CPC is the commission paid to the vendor when a visitor is referred to your site.
                                                    4. -
                                                  4. In the Cost Per Acquisition ( CPA ) text box, enter the advertising charge. CPA is the commission paid to the vendor when a visitor becomes a member of your site.
                                                    5. -
                                                  5. -
                                                    6. -
                                                  - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Deleting an Affiliate Referral Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Deleting an Affiliate Referral Account .html deleted file mode 100644 index 7d2f2244af4..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Deleting an Affiliate Referral Account .html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -

                                                  Deleting an Affiliate Referral Account

                                                  -

                                                  How to permanently delete an affiliate referral account from the Vendors module.

                                                  -
                                                    -
                                                  1. Navigate to Admin > Advanced Settings >  Vendors.
                                                    2. -
                                                  2. Locate the required vendor account by selecting a filter or by doing a search.
                                                    3. -
                                                  3. Click the Edit button beside the required vendor account. This opens the Edit Vendors page.
                                                    4. -
                                                  4. Expand the Affiliate Referrals section. This displays any affiliate referral accounts associated with this vendor.
                                                    5. -
                                                  5. Click the Edit button beside the required record.
                                                    6. -
                                                  6. Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                    7. -
                                                  7. - -
                                                    8. -
                                                  - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Editing an Affiliate Referral Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Editing an Affiliate Referral Account .html deleted file mode 100644 index ca54497df65..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Editing an Affiliate Referral Account .html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - -

                                                  Editing an Affiliate Referral Account

                                                  -

                                                  How to edit the details of an affiliate referral account using the Vendors module.

                                                  -
                                                    -
                                                  1. Navigate to Admin > Advanced Settings >  Vendors.
                                                    2. -
                                                  2. Locate the required vendor account by selecting a filter or by doing a search.
                                                    3. -
                                                  3. Click the Edit Add button beside the required vendor account. This opens the Edit Vendors page.
                                                    4. -
                                                  4. Expand the Affiliate Referrals section. This displays any affiliate referral accounts associated with this vendor.
                                                    5. -
                                                  5. Click the Edit Add button beside the required record.
                                                    6. -
                                                  6. Edit fields as required.
                                                    7. -
                                                  7. - -
                                                    8. -
                                                  - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Sending Notification of Affiliate Referral Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Sending Notification of Affiliate Referral Account .html deleted file mode 100644 index 7b0b1f38169..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Affiliate Accounts/Sending Notification of Affiliate Referral Account .html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -

                                                  Sending Notification of Affiliate Referral Account

                                                  -

                                                  How to send an affiliate report email to an affiliate using the Vendors module. The report provides details of the site they have been made an affiliate of and the URL link to be used.

                                                  -
                                                    -
                                                  1. Navigate to Admin > Advanced Settings >  Vendors.
                                                    2. -
                                                  2. Locate the required vendor account by selecting a filter or by doing a search.
                                                    3. -
                                                  3. Click the Edit Add button beside the required vendor account. This opens the Edit Vendors page.
                                                    4. -
                                                  4. Expand the Affiliate Referrals section. This displays any affiliate referral accounts associated with this vendor.
                                                    5. -
                                                  5. Click the Edit Add button beside the required record.
                                                    6. -
                                                  6. Click the Send Notification link.
                                                    7. -
                                                  7. Click the Cancel button to return to the module.
                                                    8. -
                                                  - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Adding an Affiliate Referral Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Adding an Affiliate Referral Account .html index aef409b8b80..5c4280a2d2c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Adding an Affiliate Referral Account .html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Adding an Affiliate Referral Account .html @@ -20,11 +20,11 @@

                                                  Adding an Affiliate Referral Account

                                                3. In the Cost Per Click ( CPC ) text box, enter the advertising charge. CPC is the commission paid to the vendor when a visitor is referred to your site.
                                                4. In the Cost Per Acquisition ( CPA ) text box, enter the advertising charge. CPA is the commission paid to the vendor when a visitor becomes a member of your site.
                                                5. - + Click the Update button.

                                                - + Related Topics:

                                                • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Deleting an Affiliate Referral Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Deleting an Affiliate Referral Account .html index 17ca9c74ada..7162600fb97 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Deleting an Affiliate Referral Account .html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Affiliate Accounts/Deleting an Affiliate Referral Account .html @@ -14,7 +14,7 @@

                                                  Deleting an Affiliate Referral Account

                                                • Click the Edit button beside the required record.
                                                • Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                • - +
                                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Adding a New Vendor.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Adding a New Vendor.html index 422b65ae0f8..d7fcf06a88f 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Adding a New Vendor.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Adding a New Vendor.html @@ -5,7 +5,7 @@

                                                  Adding a New Vendor

                                                  -

                                                  How to add a vendor account using the Vendors module. Note: Mandatory fields are indicated with an asterisk ( * ). Where a check box is displayed beside a field, to make the field optional - OR - to make the field mandatory.

                                                  +

                                                  How to add a vendor account using the Vendors module. Note: Mandatory fields are indicated with an asterisk ( * ). Where a check box is displayed beside a field, to make the field optional - OR - to make the field mandatory.

                                                  1. Click the Add New Vendor link. This opens the Edit Vendors page.
                                                  2. In the Vendor Details section, complete all of these fields: @@ -15,7 +15,7 @@

                                                    Adding a New Vendor

                                                  3. In the Other Details section, the following optional field is available:
                                                  4. In the Website text box, enter the Vendor's website address. E.g. http://www.domain.com.
                                                  5. - + Click the Update button.

                                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html index f4759fce03b..4b6270658b8 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html @@ -10,14 +10,14 @@

                                                  Authorizing/Unauthorizing a Vendor Account

                                                • Locate the required vendor account by selecting a filter or doing a search - OR - Click the Unauthorized link to view all unauthorized vendor accounts.
                                                • Click the Edit button beside the vendor.
                                                • Go to the Other Details section.
                                                  • -
                                                • At Authorized, to authorize the account - OR - to unauthorize the account.
                                                  • +
                                                • At Authorized, to authorize the account - OR - to unauthorize the account.

                                                  1. - + Click the Update button.
                                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting a Vendor Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting a Vendor Account .html index 422f77d7078..9987904c6ba 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting a Vendor Account .html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting a Vendor Account .html @@ -16,7 +16,7 @@

                                                  Deleting a Vendor Account

                                                  1. - +
                                                  diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting all Unauthorized Vendors.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting all Unauthorized Vendors.html index 33e3f4f2964..b8d4ba822f4 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting all Unauthorized Vendors.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Deleting all Unauthorized Vendors.html @@ -10,7 +10,7 @@

                                                  Deleting all Unauthorized Vendors

                                                • Optional. Click the Unauthorized link to view unauthorized vendor accounts before deleting them.
                                                • Click the Delete Unauthorized Vendors link. This displays the message "Are You Sure You Wish To Delete These Items?"
                                                • - +

                                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Editing-Adding Vendor Account Details.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Editing-Adding Vendor Account Details.html index e0343a2dfa9..21e30e85c5c 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Editing-Adding Vendor Account Details.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Accounts/Editing-Adding Vendor Account Details.html @@ -13,7 +13,7 @@

                                                  Editing/Adding Vendor Account Details

                                                • In the Vendor Details section, edit any of the required fields.
                                                • In the Address Details section, edit/complete any the address fields.
                                                • In the Other Details section, edit/complete any of the following optional fields: -
                                                  1. In the Website text box, enter the Vendor's website address. E.g. www.domain.com
                                                  2. At Logo, select or upload a logo for this vendor. See the Common Tools > Link Control section for more details.
                                                  3. At Authorized, if the vendor account is authorized- OR - if the vendor account is not authorized. This setting enables Administrator(s) to easily identify unauthorized vendors however it doesn't prevent current banners from displaying in the Banners module.
                                                  • +
                                                  1. In the Website text box, enter the Vendor's website address. E.g. www.domain.com
                                                  2. At Logo, select or upload a logo for this vendor. See the Common Tools > Link Control section for more details.
                                                  3. At Authorized, if the vendor account is authorized- OR - if the vendor account is not authorized. This setting enables Administrator(s) to easily identify unauthorized vendors however it doesn't prevent current banners from displaying in the Banners module.
                                                • Expand the Vendor Classification section to access these fields which are not implemented:
                                                  1. In the Classifications box, define the classifications for the Vendor. This setting is not currently enabled.
                                                  2. In Key Wordstext box, enter key words for the Vendor.
                                                • Click the Update link.
                                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Script Banner to a Vendor.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Script Banner to a Vendor.html index f3da82e5bef..d64fd94b874 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Script Banner to a Vendor.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Script Banner to a Vendor.html @@ -20,12 +20,12 @@

                                                  Adding a Script Banner to a Vendor

                                                  • Select URL ( A Link To An External Resource ) and leave the text box empty. This sets the link to the Vendors website.
                                                  • Select URL ( A Link To An External Resource ) and enter the URL user will be taken to when they click on the banner name. This URL is also displayed below the banner.
                                                  • Select Page (A Page On Your Site ) and select the page users are taken to when they click on this banner.
                                                  • Select File (A File On Your Site ) and select the file to be displayed when a user clicks on this banner.
                                                • In the CPM/Cost text box, enter the cost per 1000 Impressions or the once off cost. E.g. For every 1000 impressions of the banner the Vendor will charge the listed amount. Alternatively, the vendor may charge a flat fee for banner advertising.
                                                • In the Impressions text box, enter the number of impressions the banner will display for. A impression is made each time a banner is displayed on the page.
                                                • At Start Date, click the Calendar link and select the first date the banner will be displayed.
                                                • At End Date, click the Calendar link and select the last date the banner will be displayed.
                                                • At Criteria, select one of the following options:
                                                  • And: Banner only expires if both the Impressions and the End Date has been met. I.e. The banner has reached its number of clicks AND a banner has expired.
                                                  • Or: Banner expires if either the Impressions or the End Date has been met. I.e. The banner has reached its number of clicks OR the banner has expired.
                                                • - This returns you to the Edit Vendor page.
                                                  • + Click the Update button. This returns you to the Edit Vendor page.
                                                • Optional. To view a preview of the newly added banner:
                                                  1. Expand the Banner Advertising section.
                                                  2. Click the Edit button beside the new banner. This opens the Edit Banner page which displays a preview of the banner.

                                                  • - + Related Topics:

                                                  • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Text Banner to a Vendor .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Text Banner to a Vendor .html index acf552f4a09..25872c6c8c3 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Text Banner to a Vendor .html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding a Text Banner to a Vendor .html @@ -30,7 +30,7 @@

                                                    Adding a Text Banner to a Vendor

                                                    1. - + Click the Update button.

                                                    @@ -38,7 +38,7 @@

                                                    Adding a Text Banner to a Vendor


                                                    Text Banner (with a one pixel border)

                                                    - + Related Topics:

                                                    • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding an Image Banner to a Vendor.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding an Image Banner to a Vendor.html index c66363b937e..da5874ac364 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding an Image Banner to a Vendor.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Adding an Image Banner to a Vendor.html @@ -25,7 +25,7 @@

                                                      Adding an Image Banner to a Vendor

                                                      1. - This returns you to the Edit Vendor page.
                                                        2. + Click the Update button.This returns you to the Edit Vendor page.
                                                      2. Optional. To view a preview of the newly added banner:
                                                        1. Expand the Banner Advertising section.
                                                        2. Click the Edit button beside the new banner. This opens the Edit Banner page which displays a preview of the banner.
                                                      @@ -34,7 +34,7 @@

                                                      Adding an Image Banner to a Vendor


                                                      Previewing a newly added image banner

                                                      - + Related Topics:

                                                      • diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Deleting a Vendor Banner .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Deleting a Vendor Banner .html index 383f41b6d42..4bc68f9f566 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Deleting a Vendor Banner .html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Deleting a Vendor Banner .html @@ -18,7 +18,7 @@

                                                        Deleting a Vendor Banner

                                                        1. Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                        2. - +
                                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Editing a Vendor Banner.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Editing a Vendor Banner.html index d00a3d8e3a4..e6369adde42 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Editing a Vendor Banner.html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Module Editors/Vendor Banners/Editing a Vendor Banner.html @@ -18,7 +18,7 @@

                                                        Editing a Vendor Banner

                                                        1. Edit the required fields.
                                                        2. - + Click the Update button.
                                                        diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Adding a New Vendor.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Adding a New Vendor.html deleted file mode 100644 index 9d78760739c..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Adding a New Vendor.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -

                                                        Adding a New Vendor

                                                        -

                                                        How to add a vendor account using the Vendors module. Note: Mandatory fields are indicated with an asterisk ( * ). Where a check box is displayed beside a field, to make the field optional - OR - to make the field mandatory.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Click the Add New Vendor link. This opens the Edit Vendors page.
                                                          3. -
                                                        3. In the Vendor Details section, complete all of these fields: -
                                                          1. In the Company* text box, enter the company name of the vendor.
                                                          2. In the First Name* text box, enter the first name of the contact person for the vendor.
                                                          3. In the Last Name* text box, enter the last name of the contact person for the vendor.
                                                          4. In the Email Address* text box, enter the email address of the contact person listed above.
                                                          4. -
                                                        4. Optional. In the Address Details section, complete the address details. Note: Address field names and required details may vary. -
                                                          1. In the Street text box, enter the street part of the Vendor's address. E.g. 10 Main Road
                                                          2. In the Unit # text box, enter the unit number. E.g. Unit 6, or Suite 6, etc.
                                                          3. In the City text box, enter the Vendor's city. E.g. Melbourne
                                                          4. At Country, select the Vendor's country.
                                                          5. In the Region text box, enter the Region/State/Province of the Vendor - OR - select from the drop down list where available. (See Host > Lists for more details on creating regions for countries).
                                                          6. In the Postal Code text box, enter the Vendor's postal code. E.g. 31234
                                                          7. In the Telephone text box, enter the Vendor's telephone number. E.g. +61 3 9421 6555
                                                          8. In the Cell text box, enter the Vendor's cell (mobile) number. E.g. 0400 100 100
                                                          9. In the Fax text box, enter the Vendor's facsimile number. E.g. + 61 3 9421 6444
                                                          5. -
                                                        5. In the Other Details section, the following optional field is available:
                                                          6. -
                                                        6. In the Website text box, enter the Vendor's website address. E.g. http://www.domain.com.
                                                          7. -
                                                        7. - -
                                                          8. -
                                                        -

                                                        - -

                                                        -

                                                        Tip: Once a new vendor is created the following additional settings will be available vendor logo, authorization, classifications, banner advertising, and affiliate referrals. To complete these additional fields, you must edit the vendor record.

                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html deleted file mode 100644 index d45aaa30389..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Authorizing-Unauthorizing a Vendor Account.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - -

                                                        Authorizing/Unauthorizing a Vendor Account

                                                        -

                                                        How to authorize or unauthorized a vendor account using the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account by selecting a filter or doing a search - OR - Click the Unauthorized link to view all unauthorized vendor accounts.
                                                          3. -
                                                        3. Click the Edit button beside the vendor.
                                                          4. -
                                                        4. Go to the Other Details section.
                                                          5. -
                                                        5. At Authorized, to authorize the account - OR - to unauthorize the account.
                                                          6. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. - -
                                                          2. -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Deleting a Vendor Account .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Deleting a Vendor Account .html deleted file mode 100644 index 794c144ddae..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Deleting a Vendor Account .html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -

                                                        Deleting a Vendor Account

                                                        -

                                                        How to permanently delete a vendor account from the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account.
                                                          3. -
                                                        3. Click the Edit button beside the required vendor.
                                                          4. -
                                                        4. Click the Delete link. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                          5. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. - Click the OK button to confirm deletion. -
                                                          2. -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Deleting all Unauthorized Vendors.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Deleting all Unauthorized Vendors.html deleted file mode 100644 index babde9f118a..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Deleting all Unauthorized Vendors.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - -

                                                        Deleting all Unauthorized Vendors

                                                        -

                                                        How to permanently delete all unauthorized vendors from the Vendors module. Deleting a vendor does not delete any related Vendor banners from the site's Digital Asset Management module which is located on the Admin > File Management page, however the banners will no longer be displayed in the banners module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Optional. Click the Unauthorized link to view unauthorized vendor accounts before deleting them.
                                                          3. -
                                                        3. Click the Delete Unauthorized Vendors button to display the message "Are You Sure You Wish To Delete These Items?"
                                                          4. -
                                                        4. Click the Yes button to confirm.
                                                          5. -
                                                        -

                                                        - -
                                                        Deleting all Unauthorized Vendors -

                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Editing-Adding Vendor Account Details.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Editing-Adding Vendor Account Details.html deleted file mode 100644 index d792829a667..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Accounts/Editing-Adding Vendor Account Details.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - -

                                                        Editing/Adding Vendor Account Details

                                                        -

                                                        How to edit existing vendor details and add new details such as a logo using the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account by selecting a filter or doing a search.
                                                          3. -
                                                        3. Click the Edit button beside the required vendor account. This opens the Edit Vendors page.
                                                          4. -
                                                        4. Edit any of the below fields as required.
                                                          5. -
                                                        5. In the Vendor Details section, edit any of the required fields.
                                                          6. -
                                                        6. In the Address Details section, edit/complete any the address fields.
                                                          7. -
                                                        7. In the Other Details section, edit/complete any of the following optional fields: -
                                                          1. In the Website text box, enter the Vendor's website address. E.g. www.domain.com
                                                          2. At Logo, select or upload a logo for this vendor. See "Setting a File Link" or See "Uploading and Linking to a File"
                                                          3. At Authorized, to authorize this vendor. Important. This setting enables Administrator(s) to easily identify unauthorized vendors however it doesn't prevent current banners from displaying in the Banners module - OR - to unauthorize this Vendor.
                                                          8. -
                                                        8. Expand the Vendor Classification section to access these fields which are not implemented: -
                                                          1. In the Classifications box, define the classifications for the Vendor. This setting is not currently enabled.
                                                          2. In Key Words text box, enter key words for the Vendor.
                                                          9. -
                                                        9. Expand the Banner Advertising section to add and manage banners. See the "Vendor Banners" section.
                                                          10. -
                                                        10. Expand the Affiliate Referrals section to add and manage affiliates. See the "Affiliate Referrals" section.
                                                          11. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. - -
                                                          2. -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding a Script Banner to a Vendor.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding a Script Banner to a Vendor.html deleted file mode 100644 index c138fdf93b0..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding a Script Banner to a Vendor.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - -

                                                        Adding a Script Banner to a Vendor

                                                        -

                                                        How to add a JavaScript banner to a vendor account using the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account by using a filter or by searching.
                                                          3. -
                                                        3. Click the Edit button beside the required Vendor. This opens the Edit Vendor page.
                                                          4. -
                                                        4. Expand the Banner Advertising section. This displays all banners associated with this vendor.
                                                          5. -
                                                        5. Click the Add New Banner link. This displays the Edit Banner page.
                                                          6. -
                                                        6. In the Banner Name text box, enter a name for this banner.
                                                          7. -
                                                        7. At Banner Type, select Script.
                                                          8. -
                                                        8. Optional. In the Banner Group text box, enter a name to group this banner with other banners. The banner group can then be entered into the banners module to set it to only display banners in this group.
                                                          9. -
                                                        9. In the Text/Script text box, enter the script for this banner.
                                                          10. -
                                                        10. Complete any of the following Optional settings - OR - Skip to Step 10. -
                                                          1. At URL, select one of the following options: -
                                                            • Select URL ( A Link To An External Resource ) and leave the text box empty. This sets the link to the Vendors website.
                                                            • Select URL ( A Link To An External Resource ) and enter the URL user will be taken to when they click on the banner name. This URL is also displayed below the banner.
                                                            • Select Page (A Page On Your Site ) and select the page users are taken to when they click on this banner.
                                                              • -
                                                            • - Select File (A File On Your Site ) and select the file to be displayed when a user clicks on this banner.
                                                          2. In the CPM/Cost text box, enter the cost per 1000 Impressions or the once off cost. E.g. For every 1000 impressions of the banner the Vendor will charge the listed amount. Alternatively, the vendor may charge a flat fee for banner advertising.
                                                          3. In the Impressions text box, enter the number of impressions the banner will display for. A impression is made each time a banner is displayed on the page.
                                                          4. At Start Date, click the Calendar link and select the first date the banner will be displayed. See "Working with the Calendar"
                                                          5. At End Date, click the Calendar link and select the last date the banner will be displayed.
                                                          6. At Criteria, select one of the following options: -
                                                              And: Banner only expires if both the Impressions and the End Date has been met. I.e. The banner has reached its number of clicks AND a banner has expired.
                                                          7. Or: Banner expires if either the Impressions or the End Date has been met. I.e. The banner has reached its number of clicks OR the banner has expired.
                                                          11. -
                                                        11. - This returns you to the Edit Vendor page.
                                                          12. -
                                                        12. Optional. To view a preview of the newly added banner: -
                                                          1. Expand the Banner Advertising section.
                                                          2. Click the Edit button beside the new banner. This opens the Edit Banner page which displays a preview of the banner.
                                                          13. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        • - See "Working with the Calendar" -
                                                          • -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding a Text Banner to a Vendor .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding a Text Banner to a Vendor .html deleted file mode 100644 index e66c8ca6a6e..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding a Text Banner to a Vendor .html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - -

                                                        Adding a Text Banner to a Vendor

                                                        -

                                                        How to add a text banner to a vendor account using the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Click the Edit button beside the required Vendor. This opens the Edit Vendor page.
                                                          3. -
                                                        3. Expand the Banner Advertising section. This displays all banners associated with this vendor.
                                                          4. -
                                                        4. Click the Add New Banner button. This opens the Edit Banner page.
                                                          5. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. In the Banner Name text box, enter the text to be displayed at the top of this banner. This text is displayed as a link to the vendor's website or to the URL, Page or File as set at the URL field below.
                                                          2. -
                                                        2. At Banner Type, select Text.
                                                          3. -
                                                        3. Optional. In the Banner Group text box, enter a name to group this banner with other banners. The banner group can then be entered into the banners module to set it to only display banners in this group.
                                                          4. -
                                                        4. Optional. At Image/Link, select an image to be associated with this banner. The image isn't displayed on the banner, instead the image name is displayed as a link to view the image. You can also select URL to add a link to an image, file or page. The full URL will be displayed on the text banner. See "Setting a File Link", See "Setting a Page Link" or See "Setting a URL Link"
                                                          5. -
                                                        5. In the Text/Script text box, enter the text of the banner. HTML formatting can be used.
                                                          6. -
                                                        6. Complete any of the following Optional settings - OR - Skip to Step 16.
                                                          7. -
                                                        7. At URL, select one of the following options: -
                                                          • Select URL ( A Link To An External Resource ) and leave the text box empty. This sets the link to the Vendor's website.
                                                          • Select URL ( A Link To An External Resource ) and enter the URL users go to when they click on the banner name. This URL also displays at the bottom of the banner.
                                                          • Select Page (A Page On Your Site ) and select the page users go to when they click on the banner name. The page number is also displayed at the bottom of the banner. E.g. 85
                                                          • Select File (A File On Your Site ) and select the file the user go to when they click on the banner name. The file ID number is also displayed at the bottom of the banner. E.g. FileID=148.
                                                          8. -
                                                        8. In the CPM/Cost text box, enter the cost per 1000 Impressions or the once off cost. E.g. For every 1000 impressions of the banner the vendor will charge the listed amount. Alternatively, the Vendor may charge a flat fee for banner advertising.
                                                          9. -
                                                        9. In the Impressions text box, enter the number of impressions the banner will display for.
                                                          10. -
                                                        10. At Start Date, click the Calendar button and select the first date the banner is displayed. See "Working with the Calendar"
                                                          11. -
                                                        11. At End Date, click the Calendar button and select the last date the banner is displayed.
                                                          12. -
                                                        12. At Criteria, select one of the following options: -
                                                          • And: Banner only expires if both the Impressions and the End Date has been met. I.e. The banner has reached its number of clicks AND a banner has expired.
                                                          • Or: Banner expires if either the Impressions or the End Date has been met. I.e. The banner has reached its number of clicks OR the banner has expired.
                                                          13. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. - -
                                                          2. -
                                                        -

                                                        - -
                                                        The text banner displayed using the Banners module -

                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding an Image Banner to a Vendor.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding an Image Banner to a Vendor.html deleted file mode 100644 index 75c809b16af..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Adding an Image Banner to a Vendor.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - -

                                                        Adding an Image Banner to a Vendor

                                                        - -

                                                        How to add an image banner to a vendor account using the Vendors module. Once the banner is created, it will display in any appropriately configured Banners modules on this site.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account by using a filter or by searching.
                                                          3. -
                                                        3. Click the Edit button beside the required Vendor. This opens the Edit Vendor page.
                                                          4. -
                                                        4. Expand the Banner Advertising section. This displays all banners associated with this vendor.
                                                          5. -
                                                        5. Click the Add New Banner link. This displays the Edit Banners page.
                                                          6. -
                                                        6. In the Banner Name text box, enter a name for this banner. If the Text/Script field below is left blank then the Banner Name is the alternate text for the banner.
                                                          7. -
                                                        7. At Banner Type, select either Banner, MicroButton, Button, Block, or Skyscraper.
                                                          8. -
                                                        8. Optional. In the Banner Group text box, enter a name to group this banner with other banners. The banner group can then be entered into the banners module to set it to only display banners in this group.
                                                          9. -
                                                        9. At Image/Link, select the image for this banner. See "Setting a File Link"
                                                          10. -
                                                        10. Complete any of the following optional settings - OR - Skip to Step 11. -
                                                          1. In the Text/Script text box, enter the text of the banner. This is the alternate text for this banner and is displayed when a user places their mouse over this image.
                                                          2. At URL, select one of the following options: -
                                                            • Select URL ( A Link To An External Resource ) and leave the text box empty. This sets the link to the Vendors website.
                                                            • Select URL ( A Link To An External Resource ) and enter the URL user will be taken to when they click on the banner name. This URL is also displayed below the banner.
                                                            • Select Page (A Page On Your Site ) and select the page users are taken to when they click on this banner.
                                                            • Select File (A File On Your Site ) and select the file to be displayed when a user clicks on this banner.
                                                          3. In the CPM/Cost text box, enter the cost per 1000 Impressions or the once off cost. E.g. For every 1000 impressions of the banner the Vendor will charge the listed amount. Alternatively, the vendor may charge a flat fee for banner advertising.
                                                          4. In the Impressions text box, enter the number of impressions the banner will display for. A impression is made each time a banner is displayed on the page.
                                                          5. At Start Date, click the Calendar button and select the first date the banner is displayed. See "Working with the Calendar"
                                                          6. At End Date, click the Calendar button and select the last date the banner is displayed.
                                                          7. At Criteria, select one of the following options: -
                                                            • And: Banner only expires if both the Impressions and the End Date has been met. I.e. The banner has reached its number of clicks AND a banner has expired.
                                                            • Or: Banner expires if either the Impressions or the End Date has been met. I.e. The banner has reached its number of clicks or it has expired.
                                                          11. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. - This returns you to the Edit Vendor page.
                                                          2. -
                                                        2. Optional. To view a preview of the newly added banner: -
                                                          1. Expand the Banner Advertising section.
                                                          2. Click the Edit button beside the new banner. This opens the Edit Banner page which displays a preview of the banner.
                                                          3. -
                                                        -

                                                        - -
                                                        Previewing a newly added image banner using the Vendors module -

                                                        -

                                                        - -
                                                        The image banner displayed in the Banners module -

                                                        -

                                                        - -

                                                        -
                                                          -
                                                        • - "Working with the Calendar" -
                                                          • -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Deleting a Vendor Banner .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Deleting a Vendor Banner .html deleted file mode 100644 index d938b4f60b3..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Deleting a Vendor Banner .html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -

                                                        Deleting a Vendor Banner

                                                        -

                                                        How to edit the properties of a banner using the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account by selecting a filter or doing a search.
                                                          3. -
                                                        3. Click the Edit button beside the required vendor account. This opens the Edit Vendors page.
                                                          4. -
                                                        4. Expand the Banner Advertising section. This displays all banners associated with this vendor.
                                                          5. -
                                                        5. Click the Edit button beside the banner to be deleted.
                                                          6. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. Click the Delete button. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                          2. -
                                                        2. Click the OK button to confirm.
                                                          3. -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Editing a Vendor Banner.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Editing a Vendor Banner.html deleted file mode 100644 index 8bf3137b9c7..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Editing a Vendor Banner.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -

                                                        Editing a Vendor Banner

                                                        -

                                                        How to edit the properties of a banner using the Vendors module.

                                                        -
                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. -
                                                        2. Locate the required vendor account by selecting a filter or doing a search.
                                                          3. -
                                                        3. Click the Edit button beside the required vendor account. This opens the Edit Vendors page.
                                                          4. -
                                                        4. Expand the Banner Advertising section. This displays all banners associated with this vendor.
                                                          5. -
                                                        5. Click the Edit button beside the banner to be edited.
                                                          6. -
                                                        -

                                                        - -

                                                        -
                                                          -
                                                        1. Edit the required fields.
                                                          2. -
                                                        2. - -
                                                          3. -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Emailing Banner Status to Vendor .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Emailing Banner Status to Vendor .html deleted file mode 100644 index 8c1a12c883a..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Emailing Banner Status to Vendor .html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - -

                                                        Emailing Banner Status to Vendor

                                                        -

                                                        How to send a banner status report to the related vendor using the Vendors module. The report contains the following information: Banner Name, Banner Description, Image Name, Number of CPM/Cost, Number of Impressions, Start Date, End Date, Number of Views, and Number of Click Through's.

                                                        -
                                                          -
                                                        1. Click the Edit button beside the required Vendor. This opens the Edit Vendor page.
                                                          2. -
                                                        2. Expand the Banner Advertising section. This displays all banners associated with this vendor.
                                                          3. -
                                                        3. Click the Edit button beside the required banner.
                                                          4. -
                                                        4. Click the Email Status to Vendor link at the base of the module. A success or failure message is displayed at top of the module letting you know if the email sent successfully.
                                                          5. -
                                                        5. Click the Cancel button to return to the module.
                                                          6. -
                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Viewing the Clicks and Views for a Banner.html b/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Viewing the Clicks and Views for a Banner.html deleted file mode 100644 index 825fc0fa124..00000000000 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Vendor Banners/Viewing the Clicks and Views for a Banner.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - -

                                                        Viewing the Clicks and Views for a Banner

                                                        -

                                                        How to view the number of times a banner has been viewed and clicked using the Vendors module.

                                                        -
                                                          -
                                                        1. Locate the required vendor account by using a filter or by searching.
                                                          2. -
                                                        2. Click the Edit button beside the required Vendor. This opens the Edit Vendor page.
                                                          3. -
                                                        3. Expand the Banner Advertising section. This displays all banners associated with this vendor including: -
                                                          • Views: The number of time a banner has been clicked on.
                                                          • Clicks: The number of times a banner has been displayed on a page.
                                                          4. -
                                                        -

                                                        - -
                                                        Viewing Banner Views and Clicks -

                                                        - - \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Admin Console/Vendors/Viewing All Vendor Accounts .html b/Documentation/Using the Control Panel/Admin Console/Vendors/Viewing All Vendor Accounts .html index d8285fdb974..d8142be1688 100644 --- a/Documentation/Using the Control Panel/Admin Console/Vendors/Viewing All Vendor Accounts .html +++ b/Documentation/Using the Control Panel/Admin Console/Vendors/Viewing All Vendor Accounts .html @@ -1,25 +1,28 @@  -

                                                        Viewing All Vendor Accounts

                                                        How to view all vendor accounts on the Vendors module.

                                                          -
                                                        1. Navigate to Admin > Advanced Settings >  Vendors.
                                                          2. +
                                                        2. Navigate to Admin > Advanced Settings >  Vendors.
                                                        3. Click the All link. This displays the first ten (10) matching records listed alphabetically by name. If there are more than ten matching records, then the Pager Control is displayed allowing you to access the other records.

                                                        - +
                                                        Viewing All Vendor Accounts

                                                        - +<<<<<<< HEAD:Documentation/Using the Control Panel/Admin Console/Vendors/All Users/Viewing All Vendor Accounts .html + Related Topics: +======= + Related Topics: +>>>>>>> ca0f44fd31959805ababe244bac2d4a832ee7107:Documentation/Using the Control Panel/Admin Console/Vendors/Viewing All Vendor Accounts .html

                                                        • - See "About the Pager" + See "About the Pager"
                                                        diff --git a/Documentation/Using the Control Panel/ControlBar_Admin.htm b/Documentation/Using the Control Panel/ControlBar_Admin.htm new file mode 100644 index 00000000000..6ad5d500488 --- /dev/null +++ b/Documentation/Using the Control Panel/ControlBar_Admin.htm @@ -0,0 +1,112 @@ + + + + + +

                                                        Overview of the ControlBar

                                                        +

                                                        The ControlBar Control Panel displays a single row of links with drop down menus across the very top of your web browser above your site. All of the links displayed on the left side have an associated drop down menu. The Admin menu is displayed to Administrators and SuperUsers. Users must have Edit Page permissions granted to access the Modules and Pages menus. Finally, the ControlBar can optionally be displayed to Module Editors providing them with a visual reminder that they can edit the current page.

                                                        +

                                                        The ControlBar as it is displayed to users with different editing permissions:

                                                        +

                                                        + +
                                                        ControlBar as displayed to SuperUsers +

                                                        +

                                                        + +
                                                        ControlBar as displayed to Administrators +

                                                        +

                                                        + +
                                                        ControlBar as displayed to Page Editors +

                                                        +

                                                        + +
                                                        ControlBar as displayed to Module Editors. This option may be disabled. +

                                                        +

                                                        On the right hand side of the ControlBar, is the Edit Page menu which allows users to change the view of the page, and access the page settings etc.

                                                        +

                                                        The Admin Menu

                                                        +

                                                        Administrators and SuperUsers can click on the Admin link to go to the Admin Console (See "About the Admin Console") - OR - Mouse over the Admin link to view the drop down Admin menu and then select the desired function. Functions are grouped together beneath two tabs, called "Common Settings" and "Advanced Settings", which are displayed down the left side of this drop down menu.

                                                        +

                                                        + +
                                                        Admin Menu (Common Settings) for DNN Platform +

                                                        +

                                                        + +
                                                        Admin Menu (Advanced Settings) for Evoq Content Enterprise +

                                                        +

                                                        A third tab called "Bookmarked Settings" displays any functions that have bookmarked by the current Administrator. This allows you to add your most commonly used features to this tab, simply by clicking the Add to Bookmarks button that is displayed when you hover over an option on the drop down menu.

                                                        +

                                                        + +

                                                        +

                                                        The Host Menu

                                                        +

                                                        The Host menu is only displayed to SuperUsers. SuperUsers can click on the Host link to go to the Host Console. See "About the Host Console" - OR - Mouse over the Host link to view the Host menu and select the desired function. As with the Admin menu, functions are grouped together beneath two tabs, called "Common Settings" and "Advanced Settings", which are displayed down the left side of this drop down menu. A third tab called "Bookmarked Settings" displays any functions that have been bookmarked by the current SuperUser.

                                                        Host Menu

                                                        +

                                                        The Tools Menu

                                                        +

                                                        The Tools menu as displayed to Administrators and SuperUsers.

                                                        +

                                                        + +
                                                        The Tools menu of the ControlBar as displayed to Administrators +

                                                        +

                                                        + +
                                                        The Tools menu of the ControlBar as displayed to SuperUsers +

                                                        +
                                                          +
                                                        • Upload File: Opens the upload file interface of the Digital Asset Management module that is located on the Admin > File Management page. See "Uploading Files"
                                                          • +
                                                        • Clear Cache: Select to clear the cache of all old files.
                                                          • +
                                                        • Recycle Application Pool: Select to restart the server and retrieve all new files.
                                                          • +
                                                        • Switch Sites: Select a new site to view by selecting a site from the list.
                                                          • +
                                                        +

                                                        The Help Menu

                                                        +

                                                        + +
                                                        The Help menu of the ControlBar +

                                                        +
                                                          +
                                                        • Online Help: Opens the Help resource for this site as set by your Host. See "Setting the Online Help URL"
                                                          • +
                                                        • Getting Started: Select to view the Getting Started with DNN page which contains links to resources including video tutorials, links to personalizing your site and more. This option is only displayed for new DNN installations.
                                                          • +
                                                        +

                                                        The Modules Menu

                                                        +

                                                        + +

                                                        +
                                                          +
                                                        • Add New Module: Adds a new module to the current page. Users must be granted Edit Content rights to the page. Users must be granted Add Content or Full Control rights to the page. See "Adding a New Module (ControlBar)"
                                                          • +
                                                        • Add Existing Module: Adds a new instance of an existing module to the current page. Users must be granted Edit Content rights to the page. Users must be granted Add Content or Full Control rights to the page. See "Adding an Existing Module (ControlBar)"
                                                          • +
                                                        • Find More Modules: Takes you to the Host Extensions Page. See "Installing Available Extensions" and "Deploying and Installing More Extensions"
                                                          • +
                                                        +

                                                        The Pages Menu

                                                        +

                                                        Page Management features are located beneath the Pages and Edit Page menus. Users must be granted Edit Page permissions to access these tools.

                                                        +

                                                        + +
                                                        The two Pages Menus of the ControlBar +

                                                        +

                                                        Pages Menu:

                                                        +
                                                          +
                                                        • Add New Page: Commence the process of adding a new page to the site. Users must be granted Add or Full Control permissions to the current page. See "Adding a New Page"
                                                          • +
                                                        • Copy Page: Select to copy the current (or any other) page including modifying modules. Users must be granted Copy or Full Control permissions to the current page. See "Copying a Page"
                                                          • +
                                                        • Import Page: Link to import a page. Users must be granted Import or Full Control permissions to the current page.See "Importing a New Page"
                                                          • +
                                                        +

                                                        Edit Page Menu:

                                                        +
                                                          +
                                                        • Edit This Page / Close Edit Mode: Select to enable or disable editing modules via the Action Menus on the current the page. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • Stay in Edit Mode: Once "Edit This Page" has been selected, you can to remain in Edit Mode when you navigate away from the current page onto other pages that you have the editing permissions for. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • View in Layout Mode: to view the page in Layout Mode. This displays the layout of the panes within the skin that is applied to this page and the title and module actions menu of each module within each pane. Use this view to quickly view and update the page layout. This view is helpful when you want to delete or move a module but cannot access the module action menu when the content is displayed. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • Mobile Preview: Opens the Mobile Preview popup that allows users to see how the current page is displayed on a mobile device. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • Page Settings: Opens the Page Settings page for the current page. The Permissions tab is only display to user with Full Control. Users must be granted Manage Settings or Full Control permissions to the current page. See "Editing Page Settings"
                                                          • +
                                                        • Page Appearance: Opens the Page Settings page with the Appearance section of the Advanced Settings tab expanded. Users must be granted Manage Settings or Full Control permissions to the current page. See "Advanced Settings for Existing Pages"
                                                          • +
                                                        • Page Localization: Opens the Page Settings - Localization tab for the current page. This option is only displayed when content localization is enabled on the site. Users must be belong to a translator role. See "Enabling Localized Content"
                                                          • +
                                                        • Page Permissions: Opens the Page Settings page for this page with the Permissions tab. Users must be granted Manage Settings or Full Control permissions to the current page. See "Setting Page Permissions" See "Setting Page Permissions"
                                                          • +
                                                        • Export Page: Link to export a page. Users must be granted Export or Full Control permissions to the current page.See "Exporting a Page"
                                                          • +
                                                        • Delete Page: Link to delete current page. This option is disabled if the current page is a special page, that is a page that has been set as either Home, User Profile, etc. Users must be granted Delete or Full Control permissions to the current page. See "Deleting a Page"
                                                          • +
                                                        +

                                                        The Users Menu

                                                        +

                                                        The Users menu is restricted to

                                                        +

                                                        + +

                                                        +
                                                          +
                                                        • Manage Users: Opens the Admin > User Accounts page. See "About the User Accounts Module"
                                                          • +
                                                        • Manage Role: Opens the Admin > Security Roles page. See "About the Security Roles Module"
                                                          • +
                                                        • Add New User: Opens the Add New User page. See "Adding a User Account"
                                                          • +
                                                        + + \ No newline at end of file diff --git a/Documentation/Using the Control Panel/ControlBar_SuperUser.htm b/Documentation/Using the Control Panel/ControlBar_SuperUser.htm new file mode 100644 index 00000000000..c892b99a32c --- /dev/null +++ b/Documentation/Using the Control Panel/ControlBar_SuperUser.htm @@ -0,0 +1,112 @@ + + + + + +

                                                        Overview of the ControlBar

                                                        +

                                                        The ControlBar Control Panel displays a single row of links with drop down menus across the very top of your web browser above your site. All of the links displayed on the left side have an associated drop down menu. The Admin menu is displayed to Administrators and SuperUsers. The Host menu is displayed to SuperUsers only. Users must have Edit Page permissions granted to access the Modules and Pages menus. Finally, the ControlBar can optionally be displayed to Module Editors providing them with a visual reminder that they can edit the current page.

                                                        +

                                                        The ControlBar as it is displayed to users with different editing permissions:

                                                        +

                                                        + +
                                                        ControlBar as displayed to SuperUsers +

                                                        +

                                                        + +
                                                        ControlBar as displayed to Administrators +

                                                        +

                                                        + +
                                                        ControlBar as displayed to Page Editors +

                                                        +

                                                        + +
                                                        ControlBar as displayed to Module Editors. This option may be disabled. +

                                                        +

                                                        On the right hand side of the ControlBar, is the Edit Page menu which allows users to change the view of the page, and access the page settings etc.

                                                        +

                                                        The Admin Menu

                                                        +

                                                        Administrators and SuperUsers can click on the Admin link to go to the Admin Console (See "About the Admin Console") - OR - Mouse over the Admin link to view the drop down Admin menu and then select the desired function. Functions are grouped together beneath two tabs, called "Common Settings" and "Advanced Settings", which are displayed down the left side of this drop down menu.

                                                        +

                                                        + +
                                                        Admin Menu (Common Settings) for DNN Platform +

                                                        +

                                                        + +
                                                        Admin Menu (Advanced Settings) for Evoq Content Enterprise +

                                                        +

                                                        A third tab called "Bookmarked Settings" displays any functions that have bookmarked by the current Administrator. This allows you to add your most commonly used features to this tab, simply by clicking the Add to Bookmarks button that is displayed when you hover over an option on the drop down menu.

                                                        +

                                                        + +

                                                        +

                                                        The Host Menu

                                                        +

                                                        The Host menu is only displayed to SuperUsers. SuperUsers can click on the Host link to go to the Host Console. See "About the Host Console" - OR - Mouse over the Host link to view the Host menu and select the desired function. As with the Admin menu, functions are grouped together beneath two tabs, called "Common Settings" and "Advanced Settings", which are displayed down the left side of this drop down menu. A third tab called "Bookmarked Settings" displays any functions that have been bookmarked by the current SuperUser.

                                                        Host Menu

                                                        +

                                                        The Tools Menu

                                                        +

                                                        The Tools menu as displayed to Administrators and SuperUsers.

                                                        +

                                                        + +
                                                        The Tools menu of the ControlBar as displayed to Administrators +

                                                        +

                                                        + +
                                                        The Tools menu of the ControlBar as displayed to SuperUsers +

                                                        +
                                                          +
                                                        • Upload File: Opens the upload file interface of the Digital Asset Management module that is located on the Admin > File Management page. Restricted to Administrators only. See "Uploading Files"
                                                          • +
                                                        • Clear Cache: Select to clear the cache of all old files. Restricted to SuperUsers only.
                                                          • +
                                                        • Recycle Application Pool: Select to restart the server and retrieve all new files. Restricted to SuperUsers only.
                                                          • +
                                                        • Switch Sites: Select a new site to view by selecting a site from the list. Restricted to SuperUsers only.
                                                          • +
                                                        +

                                                        The Help Menu

                                                        +

                                                        + +
                                                        The Help menu of the ControlBar +

                                                        +
                                                          +
                                                        • Online Help: Opens the Help resource for this site as set by your Host. Restricted to Administrators only. See "Setting the Online Help URL"
                                                          • +
                                                        • Getting Started: Select to view the Getting Started with DNN page which contains links to resources including video tutorials, links to personalizing your site and more. This option is only displayed for new DNN installations. Restricted to Administrators only.
                                                          • +
                                                        +

                                                        The Modules Menu

                                                        +

                                                        + +

                                                        +
                                                          +
                                                        • Add New Module: Adds a new module to the current page. Users must be granted Edit Content rights to the page. Users must be granted Add Content or Full Control rights to the page. See "Adding a New Module (ControlBar)"
                                                          • +
                                                        • Add Existing Module: Adds a new instance of an existing module to the current page. Users must be granted Edit Content rights to the page. Users must be granted Add Content or Full Control rights to the page. See "Adding an Existing Module (ControlBar)"
                                                          • +
                                                        • Find More Modules: Takes you to the Host Extensions Page. Restricted to SuperUsers only. See "Installing Available Extensions" and "Deploying and Installing More Extensions"
                                                          • +
                                                        +

                                                        The Pages Menu

                                                        +

                                                        Page Management features are located beneath the Pages and Edit Page menus. Users must be granted Edit Page permissions to access these tools.

                                                        +

                                                        + +
                                                        The two Pages Menus of the ControlBar +

                                                        +

                                                        Pages Menu:

                                                        +
                                                          +
                                                        • Add New Page: Commence the process of adding a new page to the site. Users must be granted Add or Full Control permissions to the current page. See "Adding a New Page"
                                                          • +
                                                        • Copy Page: Select to copy the current (or any other) page including modifying modules. Users must be granted Copy or Full Control permissions to the current page. See "Copying a Page"
                                                          • +
                                                        • Import Page: Link to import a page. Users must be granted Import or Full Control permissions to the current page.See "Importing a New Page"
                                                          • +
                                                        +

                                                        Edit Page Menu:

                                                        +
                                                          +
                                                        • Edit This Page / Close Edit Mode: Select to enable or disable editing modules via the Action Menus on the current the page. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • Stay in Edit Mode: Once "Edit This Page" has been selected, you can to remain in Edit Mode when you navigate away from the current page onto other pages that you have the editing permissions for. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • View in Layout Mode: to view the page in Layout Mode. This displays the layout of the panes within the skin that is applied to this page and the title and module actions menu of each module within each pane. Use this view to quickly view and update the page layout. This view is helpful when you want to delete or move a module but cannot access the module action menu when the content is displayed. Users must be granted Add Content or Full Control permissions to the current page.
                                                          • +
                                                        • Mobile Preview: Opens the Mobile Preview pop up that allows users to see how the current page is displayed on a mobile device. Users must be granted Add Content or Full Control permissions to the current page. See " Previewing Your Mobile Device Site"
                                                          • +
                                                        • Page Settings: Opens the Page Settings page for the current page. The Permissions tab is only display to user with Full Control. Users must be granted Manage Settings or Full Control permissions to the current page. See "Editing Page Settings"
                                                          • +
                                                        • Page Appearance: Opens the Page Settings page with the Appearance section of the Advanced Settings tab expanded. Users must be granted Manage Settings or Full Control permissions to the current page. See "Advanced Settings for Existing Pages"
                                                          • +
                                                        • Page Localization: Opens the Page Settings - Localization tab for the current page. This option is only displayed when content localization is enabled on the site. Users must be belong to a translator role. See "Enabling Localized Content"
                                                          • +
                                                        • Page Permissions: Opens the Page Settings page for this page with the Permissions tab. Users must be granted Manage Settings or Full Control permissions to the current page. See "Setting Page Permissions" See "Setting Page Permissions"
                                                          • +
                                                        • Export Page: Link to export a page. Users must be granted Export or Full Control permissions to the current page.See "Exporting a Page"
                                                          • +
                                                        • Delete Page: Link to delete current page. This option is disabled if the current page is a special page, that is a page that has been set as either Home, User Profile, etc. Users must be granted Delete or Full Control permissions to the current page. See "Deleting a Page"
                                                          • +
                                                        +

                                                        The Users Menu

                                                        +

                                                        The Users menu is restricted to Administrators only.

                                                        +

                                                        + +

                                                        +
                                                          +
                                                        • Manage Users: Opens the Admin > User Accounts page. See "About the User Accounts Module"
                                                          • +
                                                        • Manage Role: Opens the Admin > Security Roles page. See "About the Security Roles Module"
                                                          • +
                                                        • Add New User: Opens the Add New User page. See "Adding a User Account"
                                                          • +
                                                        + + \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Configuration Manager/Enabling Full Trust for DotNetNuke Sites.html b/Documentation/Using the Control Panel/Host Console/Configuration Manager/Enabling Full Trust for DotNetNuke Sites.html index 7d8115434c9..8dd8642ab51 100644 --- a/Documentation/Using the Control Panel/Host Console/Configuration Manager/Enabling Full Trust for DotNetNuke Sites.html +++ b/Documentation/Using the Control Panel/Host Console/Configuration Manager/Enabling Full Trust for DotNetNuke Sites.html @@ -1,5 +1,5 @@  - + @@ -7,7 +7,7 @@

                                                        Enabling Full Trust for DNN Sites

                                                        How to enable full trust on all DNN sites within this installation. By default the trust level for DNN set to medium level trust. However Full Trust is often required for Web applications.

                                                        Note: This task is a prerequisite for installing SharePoint Connector and the SearchCrawler.

                                                          -
                                                        1. Navigate to Host > Configuration Manager.
                                                          2. +
                                                        2. Navigate to Host > Configuration Manager.
                                                        3. At Configuration Files, select the web.config file. This loads the file into the File text box below.
                                                        4. In the File text box, locate the below text:
                                                          <trustlevel="Medium"originUrl=".*"/>

                                                          replace with the text:

                                                          <trustlevel="Full"originUrl=".*"/>
                                                        diff --git a/Documentation/Using the Control Panel/Host Console/Configuration Manager/Registration Setting.htm b/Documentation/Using the Control Panel/Host Console/Configuration Manager/Registration Setting.htm index 6507d05e5cb..450ab083799 100644 --- a/Documentation/Using the Control Panel/Host Console/Configuration Manager/Registration Setting.htm +++ b/Documentation/Using the Control Panel/Host Console/Configuration Manager/Registration Setting.htm @@ -1,5 +1,5 @@  - + @@ -12,9 +12,7 @@

                                                        Modifying Pre-Configured Registration Settings

                                                      • In the File text box, find and then edit one or more of these registration settings:
                                                        • enablePasswordRetrieval="true" : Enter True to enable password retrieval or False to disable. The default setting is true.
                                                        • enablePasswordReset="true" : Enter True to enable users to reset their passwords or False to disable. The default setting is true.
                                                        • requiresQuestionAndAnswer="true" : Enter True to require users to create a question and answer during registration or False to disable. Important. If set to true, Administrators will be prevented from adding new users and editing user accounts on the site. The default setting is true.
                                                        • minRequiredPasswordLength="7" : Edit the number (integer) to change the minimum password length. The default is 7.
                                                        • minRequiredNonalphanumericCharacters="0" : Edit the number (integer) to change the minimum number of non alphabetical numbers that must be included in the password. The default setting is 0.
                                                        • requiresUniqueEmail="false" : Edit True if a unique email address is required for each user account or False if the same email address can be used on multiple accounts. The default setting is false.
                                                        • passwordFormat="Encrypted" : Edit the storage format for the password: Hashed (SHA1), Clear or Encrypted (Triple-DES). The default setting is Encrypted.
                                                      • Click the Save Changes button.
                                                        • -

                                                        - -

                                                        +

                                                        Related Topics:

                                                        • See "Viewing Pre-Configured Registration Settings" diff --git a/Documentation/Using the Control Panel/Host Console/Configuration Manager/Sending Emails without the SMTP Server.html b/Documentation/Using the Control Panel/Host Console/Configuration Manager/Sending Emails without the SMTP Server.html index 8a4aa3ac923..76232f83867 100644 --- a/Documentation/Using the Control Panel/Host Console/Configuration Manager/Sending Emails without the SMTP Server.html +++ b/Documentation/Using the Control Panel/Host Console/Configuration Manager/Sending Emails without the SMTP Server.html @@ -40,7 +40,7 @@

                                                          Sending Emails without the SMTP Server

                                                          - + Related Topics:

                                                          • diff --git a/Documentation/Using the Control Panel/Host Console/Dashboard/About the Dashboard Module.html b/Documentation/Using the Control Panel/Host Console/Dashboard/About the Dashboard Module.html index 8f650399d88..c2eb30d5095 100644 --- a/Documentation/Using the Control Panel/Host Console/Dashboard/About the Dashboard Module.html +++ b/Documentation/Using the Control Panel/Host Console/Dashboard/About the Dashboard Module.html @@ -1,12 +1,11 @@  - + - -

                                                            About the Dashboard Module

                                                            -

                                                            The Dashboard module, located on the Host > Dashboard page, provides a snapshot of your DotNetNuke Application. Whilst most setting displayed on the Dashboard module are configured via the Host Setting page, others can be configured in the Web.config file which can be edited using the Configuration Manager.

                                                            -

                                                            The information on the Dashboard module is divided into these sections: Web Server, Database Server, Host, Portals, Modules, Skins. Here's an overview of the details displayed in each section:

                                                            +

                                                            About the Dashboard

                                                            +

                                                            The Dashboard page (Host > Dashboard) provides a snapshot of your DotNetNuke Application. Whilst most setting displayed on the Dashboard module are configured via the Host Setting page, others can be configured in the Web.config file which can be edited using the Configuration Manager.

                                                            +

                                                            Dashboard information is divided into these sections: Web Server, Database Server, Host, Portals, Modules, Skins. Here's an overview of the details displayed in each section:

                                                            Web Server: This tab displays the following information about the web server where this DNN Application is located:

                                                              @@ -41,7 +40,7 @@

                                                              About the Dashboard Module

                                                            • Software Platform: The full description of the SQL Server Software Platform installed. E.g. Microsoft SQL Server 2008 (SP2) - 10.0.4000.0 (X64) Sep 16 2010 19:43:16 Copyright (c) 1988-2008 Microsoft Corporation Express Edition (64-bit) on Windows NT 6.1 (Build 7601: Service Pack 1)
                                                            • Database Backup History: Displays the last 20 database backups for this DotNetNuke installation. This list may not be complete if you regularly clean your database backup history tables.
                                                            • Database Files: Displays a list of data and log files for this DotNetNuke installation.

                                                            Host: This host tab displays the following information regarding the host settings for this DNN Application: -

                                                            • DotNetNuke Product: The name for the DotNetNuke application you are running. E.g. DotNetNuke Platform
                                                            • DotNetNuke Version: +

                                                              • DotNetNuke Product: The name for the DotNetNuke application you are running. E.g. DotNetNuke Platform
                                                              • DotNetNuke Version: The version of DotNetNuke. E.g. 6.1.5
                                                              • Host GUID: The site's unique identifier. 3461026C-0271-4EB8-8273-45FCB37FA64F
                                                              • CAS Permissions: The Code Access Security (CAS) Permissions available for this site. E.g. ReflectionPermission, WebPermission, AspNetHostingPermission diff --git a/Documentation/Using the Control Panel/Host Console/Dashboard/Managing Dashboard Controls.html b/Documentation/Using the Control Panel/Host Console/Dashboard/Managing Dashboard Controls.html index 62edd1918a7..6f488bf81bc 100644 --- a/Documentation/Using the Control Panel/Host Console/Dashboard/Managing Dashboard Controls.html +++ b/Documentation/Using the Control Panel/Host Console/Dashboard/Managing Dashboard Controls.html @@ -1,7 +1,6 @@  - + -

                                                                Managing Dashboard Controls

                                                                @@ -17,7 +16,7 @@

                                                                Deleting a Dashboard Control

                                                                Reordering Dashboard Controls

                                                                • In the Dn column, click the Down button beside a control to move it one tab position to the left on the Dashboard, and then click the Apply Changes link.
                                                                  • -
                                                                • In the Up column, click the Up button beside a control to move that tab one position to the right on the Dashboard, and then click the Apply Changes link.
                                                                  • +
                                                                • In the Up column, click the Up button beside a control to move that tab one position to the right on the Dashboard, and then click the Apply Changes link.

                                                                @@ -25,7 +24,7 @@

                                                                Reordering Dashboard Controls

                                                                Enabling or Disabling all Dashboard Controls

                                                                1. In the Enabled column, click on the check box located at the very top of this column to set all fields as follows: -
                                                                  • to enable all controls.
                                                                  • to disable all controls.
                                                                  2. +
                                                                  • Mark  the check box to enable all controls.
                                                                  • Unmark  the check box to disable all controls.
                                                                2. Click the Apply Changes link.

                                                                @@ -34,7 +33,7 @@

                                                                Enabling or Disabling all Dashboard Controls

                                                                Enabling or Disabling a Dashboard Control

                                                                1. In the Enabled column, select from these options: -
                                                                  • beside a field to enable it.
                                                                  • beside a field to disable it. Disabling a dashboard control removes that tab from the Dashboard.
                                                                  2. +
                                                                  • Mark  the check box beside a field to enable it.
                                                                  • Unmark  the check box beside a field to disable it. Disabling a dashboard control removes that tab from the Dashboard.
                                                                2. Click the Apply Changes link.

                                                                diff --git a/Documentation/Using the Control Panel/Host Console/Device Detection Management/About the Device Detection Management Module.html b/Documentation/Using the Control Panel/Host Console/Device Detection Management/About the Device Detection Management Module.html index db919d4f376..a5faba3ea36 100644 --- a/Documentation/Using the Control Panel/Host Console/Device Detection Management/About the Device Detection Management Module.html +++ b/Documentation/Using the Control Panel/Host Console/Device Detection Management/About the Device Detection Management Module.html @@ -1,16 +1,18 @@  - + - -

                                                                About the Device Detection Management Module

                                                                -

                                                                The Device Detection module, located on the Host > Device Detection Management page, allows SuperUsers to search for and view relevant properties for a wide range of mobile devices.

                                                                -

                                                                - DNN Platform users who want to upgrade from the Lite device data plan to the Premium plan can obtain their licence from the DNNStore and then activate their licence here.

                                                                +

                                                                About Device Detection Management

                                                                +

                                                                The Device Detection Management page(Host > Device Detection Management) allows SuperUsers to search for and view relevant properties for a wide range of mobile devices.

                                                                +

                                                                Prerequisite. + DNN Platform users who want to upgrade from the Lite device data plan to the Premium plan can obtain + their license from the DNNStore and then activate their license here.

                                                                +

                                                                Prerequisite. DNN Platform users + who want to upgrade from the Lite device data plan to the Premium plan can obtain their licence from the DNNStore and then activate their licence here.

                                                                -
                                                                Device Detection module with Premium Data +
                                                                The Device Detection page with Premium Data

                                                                \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Assigning-Unassigning Premium Modules to Sites.html b/Documentation/Using the Control Panel/Host Console/Extensions/Assigning-Unassigning Premium Modules to Sites.html index 2cac87d7835..a4a84e37762 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Assigning-Unassigning Premium Modules to Sites.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Assigning-Unassigning Premium Modules to Sites.html @@ -1,7 +1,6 @@  - + -

                                                                Assigning/Unassigning Premium Modules to Sites

                                                                @@ -10,14 +9,14 @@

                                                                Assigning/Unassigning Premium Modules to Sites

                                                              • Navigate to Host > Extensions.
                                                              • Select the Installed Extensions tab.
                                                              • Expand the Modules section.
                                                                • -
                                                              • Click the Edit button beside the required module.
                                                                • +
                                                              • Click the Edit button beside the required module.
                                                              • Expand the Module Settings section.
                                                                • -
                                                              • At Is Premium Module?, .
                                                                • +
                                                              • At Is Premium Module?, mark  the check box.
                                                              • At Assigned Premium Modules, perform any of the following as required:
                                                                • To assign this premium module to a site, click on the site name in the UnAssigned list and then click the Add Add button. The selected site is now listed in the Assigned list.
                                                                • To assign this premium module to all sites, click the Add All Add All button. All sites are now listed in the Assigned list.
                                                                • To remove this premium module from a site, click on the site name in the Assigned list and then click the Remove Remove button. The selected site is now removed from the Assigned list and is listed the UnAssigned list.
                                                                • To remove this premium module from all sites, click the Remove All Remove All button. All sites are now removed from the Assigned list and listed in the UnAssigned list.

                                                                • - + Related Topics:

                                                                • diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module Package.html b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module Package.html index c51a981bc7d..cdc956a6ff8 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module Package.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module Package.html @@ -1,7 +1,6 @@  - + -

                                                                  Creating a Module Package

                                                                  @@ -11,22 +10,22 @@

                                                                  Creating a Module Package

                                                                • Navigate to Host > Extensions.
                                                                • Select the Installed Extensions section.
                                                                • Expand the Modules section.
                                                                  • -
                                                                • Click the Edit button beside the required module. This opens the Edit Extension page.
                                                                  • +
                                                                • Click the Edit button beside the required module. This opens the Edit Extension page.
                                                                • Click the Create Package link located at the base of this page. This opens the Create Package Wizard.
                                                                • On the Create Package - Create Package page, complete the following fields as required:
                                                                  1. At Use Existing Manifest, select from the following options: -
                                                                    • to use the existing manifest for the Package. +
                                                                      • Mark  the check box to use the existing manifest for the Package.
                                                                        1. At Choose Manifest File, select the manifest file from the drop down list. If this option is Step 5 will be skipped. -
                                                                      • if you don't want to use the existing manifest. +
                                                                • Unmark  the check box if you don't want to use the existing manifest.
                                                              • At Review Manifest, select from the following options: -
                                                                • to review the manifest before creating the new package. -
                                                                • .if you don't want to review the manifest. If this option is selected Step 7 will be skipped +
                                                                  • Mark  the check box to review the manifest before creating the new package. +
                                                                  • Unmark  the check box if you don't want to review the manifest. If this option is selected Step 7 will be skipped
                                                                • Click the Next button.

                                                                  • Creating a Package

                                                                • On the Create Package - Choose Files To Include page, complete the following fields as required:
                                                                  1. Optional. In the Folder text box, edit the folder name to select files from a different folder and then click the Refresh File List link to view the related files in the multi-line text box.
                                                                  2. At Include Source, select from the following options: -
                                                                    • to include the source code. -
                                                                    • .to include the installation files. +
                                                                      • Mark  the check box to include the source code. +
                                                                      • Unmark  the check box to include the installation files. Optional.
                                                                    • In the multi-line text box, modify the listed files if required: Highlight and delete any files you do not want to include in this package. Enter the name of any additional files you want to include in this package. @@ -54,11 +53,11 @@

                                                                      Creating a Module Package

                                                                      1. On the Create Package - Create Package page, complete the following fields:
                                                                        1. At Create Manifest File, select from the following options: -
                                                                          • to create a manifest file. - In the Manifest File Name text box, enter the file name to use for the manifest file.
                                                                          • .if you don't want to create a manifest file. +
                                                                            • Mark  the check box to create a manifest file. + In the Manifest File Name text box, enter the file name to use for the manifest file.
                                                                            • Unmark  the check box if you don't want to create a manifest file.
                                                                          • In the Manifest File Name text box, enter the file name to use for the manifest.
                                                                          • At Create Package, select from the following options: -
                                                                            • to create a zip file pack. -
                                                                              1. In the Archive File Name text box, enter the file name to use for the archive (zip) file.
                                                                            • .if you don't want to create a package file. +
                                                                              • Mark  the check box to create a zip file pack. +
                                                                                1. In the Archive File Name text box, enter the file name to use for the archive (zip) file.
                                                                              • Unmark  the check box if you don't want to create a package file.
                                                                            • In the Archive File Name text box, enter the file name to use for the archive zip file.
                                                                            • Click the Next button.

                                                                      @@ -66,8 +65,7 @@

                                                                      Creating a Module Package

                                                                      1. On the Create Package - Create Package Results page the results of the package creation are displayed. -
                                                                        2. -
                                                                      2. Click the Return link to return to the module.
                                                                        3. +
                                                                      \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from a Manifest.html b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from a Manifest.html index 8d5ada62f94..af506267d53 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from a Manifest.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from a Manifest.html @@ -1,7 +1,6 @@  - + -

                                                                      Creating a Module from a Manifest

                                                                      @@ -14,7 +13,7 @@

                                                                      Creating a Module from a Manifest

                                                                    • At Module Folder, the folder to use for the module.
                                                                    • In the Resource text box, enter the name for the module resource.
                                                                    • At Add Test Page?, select from these options: -
                                                                      • to add a test page for the new module. If selected, you will be taken to the test page once the module is created.
                                                                      • for no test page.
                                                                      • +
                                                                      • Mark  the check box to add a test page for the new module. If selected, you will be taken to the test page once the module is created.
                                                                      • Unmark  the check box for no test page.
                                                                    • Click the Create Module link.
                                                                  diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from an Existing Control.html b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from an Existing Control.html index 4528d4939ee..2388a8daf32 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from an Existing Control.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a Module from an Existing Control.html @@ -1,7 +1,6 @@  - + -

                                                                  Creating a Module from an Existing Control

                                                                  @@ -16,7 +15,7 @@

                                                                  Creating a Module from an Existing Control

                                                                • In the Name text box, enter a friendly module name.
                                                                • Optional. In the Description text box, enter the module description.
                                                                • At Add Test Page?, select from these options: -
                                                                  • to add a test page for the new module. If selected, you will be taken to the test page once the module is created.
                                                                  • for no test page.
                                                                  • +
                                                                  • Mark  the check box to add a test page for the new module. If selected, you will be taken to the test page once the module is created.
                                                                  • Unmark  the check box for no test page.
                                                                • Click the Create Module link.
                                                                  • diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Extension.html b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Extension.html index 218f15eee9f..e829847e00e 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Extension.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Extension.html @@ -1,7 +1,6 @@  - + -

                                                                  Creating a New Extension

                                                                  @@ -18,7 +17,7 @@

                                                                  Creating a New Extension

                                                                • Optional. This step only appears when adding a Module. On the Module Specific Details page, complete these fields:
                                                                  1. Optional. In the Folder Name text box, edit the name of the folder for this module. The default folder name is the module name.
                                                                  2. At Module Category, select the category for this module from these options:
                                                                    • Admin: Select for modules that are typically only available to Administrators.
                                                                    • Enterprise: Select for modules that are only available in Evoq Content Enterprise.
                                                                    • Host: Select for modules that are typically only available to SuperUsers.
                                                                    • Professional: Select to view modules that are only available in Evoq Content and Evoq Content Enterprise.
                                                                    • Uncategorized: Select if this module doesn't belong to any of the above categories.
                                                                  3. In the Business Controller Class text box, enter fully qualified namespace of the class that implements the Modules Features (IPortable, ISearchable)
                                                                  4. In the Dependencies text box, enter any dependencies for this module.
                                                                  5. In the Permissions text box, enter any Code Access Security Permissions which this module requires.
                                                                  6. At Is Portable?, identifies if the module is IPortable.
                                                                  7. At Is Searchable?, identifies if the module is ISearchable
                                                                  8. At Is Upgradable?, identifies if the module is Upgradable.
                                                                  9. At Is Premium Module?, select from these options: -
                                                                    • to set the module as premium. Premium modules are not automatically assigned to new sites.
                                                                    • if this isn't a premium module. Once completed, the module will be available to all sites.
                                                                  10. Click the Next button.
                                                                  • +
                                                                  • Mark  the check box to set the module as premium. Premium modules are not automatically assigned to new sites.
                                                                  • Unmark  the check box if this isn't a premium module. Once completed, the module will be available to all sites.
                                                                • Click the Next button.
                                                                • On the Owner Details page, complete these fields:
                                                                  1. In the Owner text box, enter the name of the owner of this package.
                                                                  2. In the Organization text box, enter the name of the organization responsible for this package.
                                                                  3. In the Url text box, enter the URL of the organization.
                                                                  4. In the Email Address text box, enter a contact email address for this package.
                                                                  5. Click the Next button. This returns you to the Extensions module.
                                                                  • diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Module.html b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Module.html index 941dfbfc2b0..c16344b4551 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Module.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Creating a New Module.html @@ -1,11 +1,9 @@  - + -

                                                                  Creating a New Module

                                                                  -

                                                                  How to create a new module using a manual process for undertaking custom module upload. Important. Recommended for experienced DNN module programmers only.

                                                                  1. Navigate to Host > Extensions.
                                                                    2. @@ -19,7 +17,7 @@

                                                                    Creating a New Module

                                                                  2. In the Module Name text box, enter the name of this module.
                                                                  3. Optional. In the Description text box, enter the module description.
                                                                  4. At Add Test Page?, select from these options: -
                                                                    • to add a test page for the new module. If selected, you will be taken to the test page once the module is created.
                                                                    • for no test page.
                                                                    5. +
                                                                    • Mark  the check box to add a test page for the new module. If selected, you will be taken to the test page once the module is created.
                                                                    • Unmark  the check box for no test page.

                                                                  diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Deploying and Installing More Extensions.html b/Documentation/Using the Control Panel/Host Console/Extensions/Deploying and Installing More Extensions.html index 7635a488fbb..97edcbd7142 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Deploying and Installing More Extensions.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Deploying and Installing More Extensions.html @@ -1,5 +1,5 @@  - + @@ -19,7 +19,7 @@

                                                                  Deploying and Installing More Extensions

                                                                  1. Locate the required extension. Note: If you are searching for a free DotNetNuke Project Module, click the Price: Low - High link to view free modules at the top of the list as has been done in the above image.
                                                                  2. Select from these options: -
                                                                    • Click the Buy [Extension Name] button for extensions which require payments. This will transfer you to the DotNetNuke Store (http://store.dnnsoftware.com/) where you can complete this purchase. Once you are finished you can return to your DNN site and deploy the extension. See "Fetching List of Purchased Extensions"
                                                                    • Click the Deploy [Extension Name] button to deploy free extensions.
                                                                      1. Click the Deploy link to deploy this extension to your site. Note: You can also click the Download link to download the extension to your site for further use.

                                                                      1. Click the Cancel button if you don't want to install this extension at this time. This adds the extension to the Available Extensions tab where it can be installed at a later time - OR - Click the Install Extension link to install now and continue this tutorial

                                                                      1. On the Release Notes page, review the release notes and then click the Next button.
                                                                      2. On the Review License page:
                                                                      3. At License, review the license for this extension.
                                                                        1. At Accept License?to agree to the license terms.
                                                                        2. Click the Next button.
                                                                        3. On the Package Installation Report page, review the package installation results and then click the Return link.
                                                                      4. On the Package Information page, review the package information and then click the Next button.
                                                                    3. +
                                                                    • Click the Buy [Extension Name] button for extensions which require payments. This will transfer you to the DotNetNuke Store (http://store.dnnsoftware.com/) where you can complete this purchase. Once you are finished you can return to your DNN site and deploy the extension. See "Fetching List of Purchased Extensions"
                                                                    • Click the Deploy [Extension Name] button to deploy free extensions.
                                                                      1. Click the Deploy link to deploy this extension to your site. Note: You can also click the Download link to download the extension to your site for further use.

                                                                      1. Click the Cancel button if you don't want to install this extension at this time. This adds the extension to the Available Extensions tab where it can be installed at a later time - OR - Click the Install Extension link to install now and continue this tutorial

                                                                      1. On the Release Notes page, review the release notes and then click the Next button.
                                                                      2. On the Review License page:
                                                                      3. At License, review the license for this extension.
                                                                        1. At Accept License? to agree to the license terms.
                                                                        2. Click the Next button.
                                                                        3. On the Package Installation Report page, review the package installation results and then click the Return link.
                                                                      4. On the Package Information page, review the package information and then click the Next button.
                                                                  \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Editing Module Extension Settings.html b/Documentation/Using the Control Panel/Host Console/Extensions/Editing Module Extension Settings.html index 90fccc24369..2775fa7e7db 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Editing Module Extension Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Editing Module Extension Settings.html @@ -1,7 +1,6 @@  - + -

                                                                  Editing Module Extension Settings

                                                                  @@ -10,10 +9,10 @@

                                                                  Editing Module Extension Settings

                                                                • Navigate to Host > Extensions.
                                                                • Select the Installed Extensions tab.
                                                                • Expand the Modules section.
                                                                  • -
                                                                • Click the Edit this Extension button beside the required module.
                                                                  • +
                                                                • Click the Edit this Extension button beside the required module.
                                                                • Go to the Module Settings section and edit one or more of these fields as required:
                                                                  1. In the Folder Name text box, edit the name of the folder for this module.
                                                                  2. At Module Category, select the category this module will be listed under in the Module section of the RibbonBar Control Panel. Options are Admin, Common, Enterprise, Professional. Note: The Common category is the default category displayed in the RibbonBar therefore you should use this for the modules you use frequently.
                                                                  3. In the Business Controller Class text box, edit the fully qualified namespace of the class that implements the Modules Features (IPortable, ISearchable, etc.).
                                                                  4. In the Dependencies text box, enter any dependencies for this module.
                                                                  5. In the Permissions text box, enter any Code Access Security Permissions your module requires here.
                                                                  6. At Is Portable?, this field will display True if the module supports the IPortable interface that enables content to be exported and imported, or False if IPortable is not supported.
                                                                  7. At Is Searchable?, this field will display True if the module supports the ISearchable interface that enables content to be indexed, or False if search is not supported.
                                                                  8. At Is Upgradable?, this field will display True if the module supports the IUpgradable interface that allows it to run custom code when upgraded, or False if upgrading is not supported.
                                                                  9. At Module Sharing, select from these options:
                                                                    • Unknown: Module sharing has not been indicated for this module. If this module is shared, a warning message will be displayed to the user explaining that it is unknown if module sharing is supported.
                                                                    • Unsupported: Module sharing is not supported by this module.
                                                                    • Supported: Module sharing is supported by this module.
                                                                  10.  At Is Premium Module? select from these options: -
                                                                    • to set the module as premium.
                                                                    • to set the modules as not premium.
                                                                  • +
                                                                  • Mark  the check box to set the module as premium.
                                                                  • Unmark  the check box to set the modules as not premium.
                                                                • Click the Update Extension link to save any changes.
                                                                • Click the Cancel button to return to the module.
                                                                  • diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Enabling-Disabling a Premium Module.html b/Documentation/Using the Control Panel/Host Console/Extensions/Enabling-Disabling a Premium Module.html index 31ba8d6d661..824980773f6 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Enabling-Disabling a Premium Module.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Enabling-Disabling a Premium Module.html @@ -1,7 +1,6 @@  - + -

                                                                  Enabling/Disabling a Premium Module

                                                                  @@ -10,9 +9,9 @@

                                                                  Enabling/Disabling a Premium Module

                                                                • Navigate to Host >  Extensions.
                                                                • Select the Installed Extensions tab.
                                                                • Expand the Modules section.
                                                                  • -
                                                                • Click the Edit button beside the required module.
                                                                  • +
                                                                • Click the Edit button beside the required module.
                                                                • Expand the Module Settings section.
                                                                  • -
                                                                • At Is Premium Module? select from these options:
                                                                  • to set this module as premium. SuperUsers can then choose to assign this module to one or more sites thereby allowing Administrators to deploy it. Alternatively, SuperUsers can add a single instances of this module to sites.
                                                                  • if this module isn't premium. This module will be available to all new and existing sites.
                                                                  • +
                                                                • At Is Premium Module? select from these options:
                                                                  • Mark  the check box to set this module as premium. SuperUsers can then choose to assign this module to one or more sites thereby allowing Administrators to deploy it. Alternatively, SuperUsers can add a single instances of this module to sites.
                                                                  • Unmark  the check box if this module isn't premium. This module will be available to all new and existing sites.

                                                                  • Setting a module as premium diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Installing Available Extensions.html b/Documentation/Using the Control Panel/Host Console/Extensions/Installing Available Extensions.html index 4a01dab4c54..6a89d0d0124 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Installing Available Extensions.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Installing Available Extensions.html @@ -1,7 +1,6 @@  - + -

                                                                  Installing and/or Deploying Available Extensions

                                                                  @@ -21,7 +20,7 @@

                                                                  Installing and/or Deploying Available Extensions

                                                                • On the Review License page:
                                                                  1. At License, review the license for this extension.
                                                                    2. -
                                                                  2. At Accept License?to agree to the license terms.
                                                                    3. +
                                                                  3. At Accept License? to agree to the license terms.
                                                                  4. Click the Next button.
                                                                • On the Package Installation Report page, review the package installation results.
                                                                  • diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Managing Authentication System Settings.html b/Documentation/Using the Control Panel/Host Console/Extensions/Managing Authentication System Settings.html index 0b9a3ba4525..51b38cbb7bc 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Managing Authentication System Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Managing Authentication System Settings.html @@ -1,5 +1,5 @@  - + @@ -9,7 +9,7 @@

                                                                  Managing Authentication System Settings

                                                                • Navigate to Host > Extensions.
                                                                • Select the Installed Extensions tab.
                                                                • Expand the Authentication Systems section.
                                                                  • -
                                                                • Click the Edit button beside the authentication system to be edited. This opens the Edit Extension page.
                                                                  • +
                                                                • Click the Edit button beside the authentication system to be edited. This opens the Edit Extension page.

                                                                  • @@ -18,7 +18,7 @@

                                                                  Managing Authentication System Settings

                                                                • Expand the Authentication Settings section.
                                                                • At Enabled, select from these options: -
                                                                  • to enable this authentication system on all sites in this DNN installation. This allows Administrators to enable and configure this authentication system on their site.
                                                                  • to disable the authentication system on all sites in this DNN installation. Skip to Step 11.
                                                                  • +
                                                                  • Mark  the check box to enable this authentication system on all sites in this DNN installation. This allows Administrators to enable and configure this authentication system on their site.
                                                                  • Unmark  the check box to disable the authentication system on all sites in this DNN installation. Skip to Step 11.
                                                                • Optional. In the Authentication Type text box, enter/edit the type of authentication System. E.g. Facebook.
                                                                • Optional. In the Login Control Source text box, enter/edit the location of the source files of the login control for this authentication system. E.g. DesktopModules/AuthenticationServices/LiveID/Login.ascx
                                                                • Optional. In the Logoff Control Source text box, enter/edit the location of the source files of the logoff control for this authentication system. E.g. DesktopModules/AuthenticationServices/LiveID/Logoff.ascx
                                                                  • @@ -32,7 +32,7 @@

                                                                  Managing Authentication System Settings

                                                                • Click the Update Extension link.

                                                                  • - + Related Topics:

                                                                  • diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Adding a Module Control.html b/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Adding a Module Control.html index 024678f0a56..d98c614f2e1 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Adding a Module Control.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Adding a Module Control.html @@ -1,16 +1,15 @@  - + -

                                                                    Adding a Module Control

                                                                    -

                                                                    How to add a module control using the Extensions module.

                                                                    +

                                                                    How to add a module control.

                                                                    1. Navigate to Host > Extensions.
                                                                    2. Select the Installed Extensions tab.
                                                                    3. Expand the Modules section.
                                                                      4. -
                                                                    4. Click the Edit button beside the required module.
                                                                      5. +
                                                                    5. Click the Edit button beside the required module.
                                                                    6. Expand the Module Definitions section.
                                                                    7. Click the Add Module Control link to open the Edit Module Control page.
                                                                    @@ -31,22 +30,16 @@

                                                                    Adding a Module Control

                                                                  • Optional. At Icon, select an icon from the drop down list. This icon is displayed in the Module Header if supported by the skin.
                                                                  • Optional. In the Help URL text box, enter a URL to a web page with information on how to use the module/interface.
                                                                    • -
                                                                  • -

                                                                    At Supports Popups?, select from these options:

                                                                    -
                                                                      -
                                                                    • if the module control supports modal popup's (e.g. popup editing pages)
                                                                      • -
                                                                    • if popup's aren't supported. This is the default setting.
                                                                      • -
                                                                    -
                                                                    • +
                                                                  • At Supports Popups?, select from these options:
                                                                    • Mark  the check box if the module control supports modal popup's (e.g. popup editing pages)
                                                                    • Unmark  the check box if popup's aren't supported. This is the default setting.
                                                                  • At Supports Partial Rendering?, select from these options: -
                                                                    • if the module control supports AJAX partial rendering. This is the default setting.
                                                                    • if partial rendering is not supported.
                                                                    • +
                                                                    • Mark  the check box if the module control supports AJAX partial rendering. This is the default setting.
                                                                    • Unmark  the check box if partial rendering is not supported.

                                                                    1. - +
                                                                    diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Deleting a Module Control.html b/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Deleting a Module Control.html index 878128863f6..a67891f777c 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Deleting a Module Control.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Deleting a Module Control.html @@ -1,7 +1,6 @@  - + -

                                                                    Deleting a Module Control

                                                                    @@ -10,7 +9,7 @@

                                                                    Deleting a Module Control

                                                                  • Navigate to Host > Extensions.
                                                                  • Select the Installed Extensions tab.
                                                                  • Expand the Modules section.
                                                                    • -
                                                                  • Click the Edit button beside the required module.
                                                                    • +
                                                                  • Click the Edit button beside the required module.
                                                                  • Expand the Module Definitions section.
                                                                  • In the Module Controls list, click the Delete Delete button beside the control to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                                    • @@ -19,7 +18,7 @@

                                                                    Deleting a Module Control

                                                                    1. - +
                                                                    diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Editing a Module Control.html b/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Editing a Module Control.html index 2a28078fe1e..7d599876813 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Editing a Module Control.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Module Definitions and Controls/Editing a Module Control.html @@ -1,7 +1,6 @@  - + -

                                                                    Editing a Module Control

                                                                    @@ -10,9 +9,9 @@

                                                                    Editing a Module Control

                                                                  • Navigate to Host > Extensions.
                                                                  • Select the Installed Extensions tab.
                                                                  • Expand the Modules section.
                                                                    • -
                                                                  • Click the Edit Add button beside the required module.
                                                                    • +
                                                                  • Click the Edit Add button beside the required module.
                                                                  • Expand the Module Definitions section.
                                                                    • -
                                                                  • Click the Edit Add button beside the required control. This opens the Edit Module Control page.
                                                                    • +
                                                                  • Click the Edit Add button beside the required control. This opens the Edit Module Control page.

                                                                    • @@ -20,7 +19,7 @@

                                                                    Editing a Module Control

                                                                    1. Edit one or more fields as required. See "Adding a Module Control"
                                                                    2. - +
                                                                    diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Uninstalling an Extension.html b/Documentation/Using the Control Panel/Host Console/Extensions/Uninstalling an Extension.html index eacc36c9356..96b542533b7 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Uninstalling an Extension.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Uninstalling an Extension.html @@ -1,7 +1,6 @@  - + -

                                                                    Uninstalling an Extension

                                                                    @@ -11,16 +10,14 @@

                                                                    Uninstalling an Extension

                                                                  • Select the Installed Extensions tab.
                                                                  • Expand the section which the required extension is associated with.
                                                                  • Click the UnInstall This ExtensionUninstall Package button beside the extension to be uninstalled. This opens the Uninstall Package page.
                                                                    • -
                                                                  • Optional. - at Delete Files to permanently remove the resource files associated with the language. (Warning. Removing the resource files for a language will remove the languages permanently. The only way to regain a language deleted in this manner is to re-enter all of the language values into a new language.)
                                                                    • -
                                                                  • Click the UnInstall Package link. This displays the message "Are You Sure You Wish To Delete This Item?"
                                                                    • +
                                                                  • Optional. at Delete Files to permanently remove the resource files associated with the language. (Warning. Removing the resource files for a language will remove the languages permanently. The only way to regain a language deleted in this manner is to re-enter all of the language values into a new language.)
                                                                    • +
                                                                  • Click the UnInstall Package button. This displays the message "Are You Sure You Wish To Delete This Item?"

                                                                    1. Click the Yes button to confirm. This displays the Package Uninstall Logs for you to review.
                                                                      2. -
                                                                    2. Click the Return link to return to the module.
                                                                    \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Extensions/Using the Install Extension Wizard.html b/Documentation/Using the Control Panel/Host Console/Extensions/Using the Install Extension Wizard.html index fd635aa2e6f..f536c13c9d9 100644 --- a/Documentation/Using the Control Panel/Host Console/Extensions/Using the Install Extension Wizard.html +++ b/Documentation/Using the Control Panel/Host Console/Extensions/Using the Install Extension Wizard.html @@ -1,34 +1,32 @@  - + -

                                                                    Using the Install Extension Wizard

                                                                    How to install an extension using the Install Extension Wizard. This tutorial assumes are currently viewing the Upload New Extension page of the Install Extension Wizard. This wizard can be accessed via the action menu of certain modules such as the Dashboard and Extensions module.

                                                                    -
                                                                      -
                                                                    1. On the Upload New Extension Package page: -
                                                                        -
                                                                      1. Click the Browse... button.
                                                                        2. -
                                                                      -
                                                                      2. -
                                                                    -

                                                                    -
                                                                      -
                                                                        -
                                                                      1. Select the required file from your computer.
                                                                        2. -
                                                                      2. Click the Click the Next button.
                                                                        3. -
                                                                      -
                                                                    1. Optional. The Upload Results page will be displayed if there is an unusual result such as a legacy Skin or Container, or the language package has already been uploaded. In this case, select the required action and click the Next link - OR - Click Cancel and start again.
                                                                      2. -
                                                                    2. On the Package Information page, review the package information and then click the Click the Next button.
                                                                      3. -
                                                                    3. On the Release Notes page, review the release notes and then click the Click the Next button.
                                                                      4. -
                                                                    4. On the Review License page:
                                                                      5. -
                                                                        -
                                                                      1. At License, review the license for this extension.
                                                                        2. -
                                                                      2. At Accept License? to agree to the license terms.
                                                                        3. -
                                                                      3. Click the Next button.
                                                                        4. -
                                                                      -
                                                                    5. On the Package Installation Report page, review the package installation results and then click the Return link to return to the module that you accessed the Wizard from. Note: The newly added extension is now listed on the Installed Extensions tab of the Extensions module.
                                                                      6. -
                                                                    +
                                                                      +
                                                                    1. On the Upload New Extension Package page: +
                                                                      1. Click the Browse... button.
                                                                      2. +
                                                                    +

                                                                    + +

                                                                    +
                                                                      +
                                                                        +
                                                                      1. Select the required file from your computer.
                                                                        2. +
                                                                      2. Click the Click the Next button.
                                                                        3. +
                                                                      +
                                                                    1. Optional. The Upload Results page will be displayed if there is an unusual result such as a legacy Skin or Container, or the language package has already been uploaded. In this case, select the required action and click the Next link - OR - Click Cancel and start again.
                                                                      2. +
                                                                    2. On the Package Information page, review the package information and then click the Click the Next button.
                                                                      3. +
                                                                    3. On the Release Notes page, review the release notes and then click the Click the Next button.
                                                                      4. +
                                                                    4. On the Review License page:
                                                                      5. +
                                                                        +
                                                                      1. At License, review the license for this extension.
                                                                        2. +
                                                                      2. At Accept License? to agree to the license terms.
                                                                        3. +
                                                                      3. Click the Next button.
                                                                        4. +
                                                                      +
                                                                    5. On the Package Installation Report page, review the package installation results and then click the Return link to return to the module that you accessed the Wizard from. Note: The newly added extension is now listed on the Installed Extensions tab of the Extensions module.
                                                                      6. +
                                                                    \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Adding New Editor Configurations.html b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Adding New Editor Configurations.html index 0273d4c7875..6bf160bf29b 100644 --- a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Adding New Editor Configurations.html +++ b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Adding New Editor Configurations.html @@ -1,16 +1,15 @@  - + -

                                                                    Adding New Editor Configurations

                                                                    How to create different configurations for the DotNetNuke.RadEditorProvider for registered users, Administrators and SuperUsers. These configurations can be applied to a single page on the current site, all pages of the current site, or all pages of all sites within this installation.

                                                                      -
                                                                    1. Optional. To create a configuration that is unique to a single site, navigate to the required site. See "Overview of the ControlBar Control Panel" or See "Overview of the RibbonBar Control Panel"
                                                                      2. +
                                                                    2. Optional. To create a configuration that is unique to a single site, navigate to the required site. See "Overview of the ControlBar" or "Overview of the RibbonBar"
                                                                    3. Navigate to Host > HTML Editor Manager.
                                                                    4. In the left hand navigation tree, select the configuration that you want to base this new configuration on. E.g. Everyone (as selected in the below image). This displays the Editor Configuration tab to the right.
                                                                      5. -
                                                                    5. Click the Copy button.
                                                                      6. +
                                                                    6. Click the Copy button.

                                                                    @@ -24,7 +23,7 @@

                                                                    Adding New Editor Configurations

                                                                      -
                                                                    1. Click the Create link.
                                                                      2. +
                                                                    2. Click the Create button.
                                                                    3. The new configuration is now displayed in navigation tree to the right. E.g. Users (Page "About Us" only)

                                                                    diff --git a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Configuring The Editor Provider for Everyone.html b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Configuring The Editor Provider for Everyone.html index 79da4e3d09b..2c86ccefb77 100644 --- a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Configuring The Editor Provider for Everyone.html +++ b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Configuring The Editor Provider for Everyone.html @@ -1,7 +1,6 @@  - + -

                                                                    Configuring The Editor Provider for Everyone

                                                                    diff --git a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Editing Editor Configurations.html b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Editing Editor Configurations.html index cb41fe55e2b..026f7e67cdf 100644 --- a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Editing Editor Configurations.html +++ b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Editing Editor Configurations.html @@ -1,7 +1,6 @@  - + -

                                                                    Editing Editor Configurations

                                                                    diff --git a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Overview of the Editor Configuration Settings.html b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Overview of the Editor Configuration Settings.html index 6a46ff11919..03ece29bd86 100644 --- a/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Overview of the Editor Configuration Settings.html +++ b/Documentation/Using the Control Panel/Host Console/HTML Editor Manager/Overview of the Editor Configuration Settings.html @@ -1,7 +1,6 @@  - + -

                                                                    Overview of the Editor Configuration Settings

                                                                    @@ -37,10 +36,8 @@

                                                                    Common Settings

@@ -97,10 +94,8 @@

Common Settings

@@ -128,10 +123,8 @@

Common Settings

@@ -151,10 +144,8 @@

Common Settings

diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/CDN Settings/CDN Settings.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/CDN Settings/CDN Settings.html index 2fddb51a6b0..07cf791af3f 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/CDN Settings/CDN Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/CDN Settings/CDN Settings.html @@ -8,8 +8,8 @@

CDN Settings

  • Navigate to Host > Site Settings Host Settings.
  • Select the Advanced Settings tab.
  • Expand the CDN Settings section.
    • -
  • Optional. At Enable Microsoft AJAX CDN, if you want to use js files from the Microsoft CDN. The URL used to retrieve AJAX libraries will now be similar to "http://ajax.microsoft.com/ajax/3.5/MicrosoftAjax.js". If you leave it unchecked the URL to the AJAX libraries will look similar to this "http://yourwebsite.com/Resources/Shared/scripts/MSAJAX/MicrosoftAjax.js"
    • -
  • Optional. At Enable Telerik CDN, if you wish to use the libraries from the Telerik CDN.
    • +
  • Optional. At Enable Microsoft AJAX CDN, if you want to use js files from the Microsoft CDN. The URL used to retrieve AJAX libraries will now be similar to "http://ajax.microsoft.com/ajax/3.5/MicrosoftAjax.js". If you leave it unchecked the URL to the AJAX libraries will look similar to this "http://yourwebsite.com/Resources/Shared/scripts/MSAJAX/MicrosoftAjax.js"
    • +
  • Optional. At Enable Telerik CDN, if you wish to use the libraries from the Telerik CDN.
  • If you want to use your own CDN to deliver the Telerik js libraries you can specify the normal and secure URLs in the telerik CDN URL text boxes.

    • @@ -17,7 +17,7 @@

    CDN Settings

    1. - + Click the Update button.
    diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Client Resource Management/Client Resource Management.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Client Resource Management/Client Resource Management.html index c6ac4d6b130..bce584956ae 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Client Resource Management/Client Resource Management.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Client Resource Management/Client Resource Management.html @@ -10,10 +10,10 @@

    Client Resource Management

  • Expand the Client Resource Management section.
  • At Current Host Version, here you can view the version number that is assigned to client resources to assign with browser caching. This number is increased when an extension is installed, portal.css is updated, or when the server cache is cleared. This number applies to any processed file (combined and/or minified). Click the Increment Version link if you want to manually increase the number and force browsers to download new copies of the resource files.
  • At Enable Composite Files, select from these options: -
    • to enable composite files. The will combine files of the same type so the number of and size of files is reduced and this will reduce the number of file requests by the browser. This will significantly increase the page loading speed. +
      • to enable composite files. The will combine files of the same type so the number of and size of files is reduced and this will reduce the number of file requests by the browser. This will significantly increase the page loading speed.
        1. At Minify CSS, select from these options: -
          • to enable CSS minification. This will reduce the size of individual files by removing comments, whitespace and CSS files that are no longer in use.
          • to disable.
        2. At Minify JS, select from these options: -
          • to enable JS minification. This will reduce the size of the JavaScript code using JSMin.
          • to disable.
      • to disable composite file. +
        • to enable CSS minification. This will reduce the size of individual files by removing comments, whitespace and CSS files that are no longer in use.
        • to disable.
      • At Minify JS, select from these options: +
        • to enable JS minification. This will reduce the size of the JavaScript code using JSMin.
        • to disable.
      • to disable composite file.

      • @@ -21,7 +21,7 @@

      Client Resource Management

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Friendly URL Settings/Deleting a Friendly URL Rule.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Friendly URL Settings/Deleting a Friendly URL Rule.html index 2b5be0c40d1..4ad62869b17 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Friendly URL Settings/Deleting a Friendly URL Rule.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Friendly URL Settings/Deleting a Friendly URL Rule.html @@ -17,7 +17,7 @@

      Deleting a Friendly URL Rule

      1. - +
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/JQuery Settings/Setting the JQuery Settings.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/JQuery Settings/Setting the JQuery Settings.html index f4d38eaf4d3..80e6d83d122 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/JQuery Settings/Setting the JQuery Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/JQuery Settings/Setting the JQuery Settings.html @@ -13,9 +13,9 @@

      Setting the JQuery Settings

    • At Installed jQuery Version, view the version string embedded in the local jQuery script.
    • At Installed jQuery UI Version, view the version string embedded in the local jQuery UI script.
    • At Use jQuery Debug Version?, select from these options: -
      • to use the standard jQuery script file.
      • to use a minified version which significantly reduces the size of the JavaScript file, but decreases readability of the JavaScript.
      • +
      • to use the standard jQuery script file.
      • to use a minified version which significantly reduces the size of the JavaScript file, but decreases readability of the JavaScript.
    • At Use Hosted jQuery Version?, select from these options: -
      • to use the URL entered in the Hosted jQuery URL field for the jQuery file.
      • to use local copies of the file.
      • +
      • to use the URL entered in the Hosted jQuery URL field for the jQuery file.
      • to use local copies of the file.
    • In the Hosted jQuery URL text box, enter the full URL for the jQuery script. By default this is set to the latest jQuery minified script hosted on Google's CDN servers for optimum performance.
    • In the Hosted jQuery UI URL text box, enter is the full URL for the jQuery UI script. By default this is set to the latest jQuery UI minified script hosted on Google's CDN servers for optimum performance
      • @@ -24,7 +24,7 @@

      Setting the JQuery Settings

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Membership Management/Membership Management.htm b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Membership Management/Membership Management.htm index 6880e240c7f..28fabe95131 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Membership Management/Membership Management.htm +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Membership Management/Membership Management.htm @@ -10,13 +10,13 @@

      Membership Management

    • Select the Advanced Settings tab.
    • Expand the Membership Management section.
    • At Reset link timeout (minutes) you can override the default time of 60 minutes to your own setting. When the time elapses the password reset link sent out will no longer be valid.
      • -
    • At Is Password History enabled, to maintain a list of recently used passwords and prevent users from re-using their old passwords.
      • +
    • At Is Password History enabled, to maintain a list of recently used passwords and prevent users from re-using their old passwords.
    • If you are using password history then you should set the Number of passwords to store. The default is 5.
      • -
    • At Enable password banned list, if you do not wish to check entered passwords against a list of common passwords.
      • -
    • At Enable password strength check, if you do not want to display the password strength meter on the registration form.
      • -
    • At Enable IP address checking, if you wish to setup Login IP Filters. See "Login Filters" on page 1
      • +
    • At Enable password banned list, if you do not wish to check entered passwords against a list of common passwords.
      • +
    • At Enable password strength check, if you do not want to display the password strength meter on the registration form.
      • +
    • At Enable IP address checking, if you wish to setup Login IP Filters. See "Login Filters" on page 1
    • - + Click the Update button.

      • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Authenticated Cacheability.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Authenticated Cacheability.html index b600095fec7..d6075611700 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Authenticated Cacheability.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Authenticated Cacheability.html @@ -18,7 +18,7 @@

      Setting Authenticated Cacheability

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Page State Persistence.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Page State Persistence.html index e8813453687..b9fab3f3c5a 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Page State Persistence.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting Page State Persistence.html @@ -25,7 +25,7 @@

      Setting Page State Persistence

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Caching Period for all Sites.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Caching Period for all Sites.html index d564e6ce410..216a7c24135 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Caching Period for all Sites.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Caching Period for all Sites.html @@ -20,7 +20,7 @@

      Setting the Caching Period for all Sites

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Module Caching Provider.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Module Caching Provider.html index 73eea4d8b1e..0d8f2d69e2d 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Module Caching Provider.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Performance Settings/Setting the Module Caching Provider.html @@ -20,7 +20,7 @@

      Setting the Module Caching Provider

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Configuring Proxy Settings.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Configuring Proxy Settings.html index 117ecdab5ca..6716d739004 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Configuring Proxy Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Configuring Proxy Settings.html @@ -20,7 +20,7 @@

      Configuring Proxy Settings

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Setting the Web Request Timeout Period.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Setting the Web Request Timeout Period.html index 73a4ccad350..76515d785c3 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Setting the Web Request Timeout Period.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Proxy Settings/Setting the Web Request Timeout Period.html @@ -17,7 +17,7 @@

      Setting the Web Request Timeout Period

      1. - + Click the Update button.
      diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Setting the SMTP Server and Port.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Setting the SMTP Server and Port.html index 9d741934761..bc2f3a5b957 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Setting the SMTP Server and Port.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Setting the SMTP Server and Port.html @@ -16,18 +16,18 @@

      Setting the SMTP Server and Port

      • Anonymous: Username and password are not required to send outgoing mail. This is the default option.
      • Basic: Select for basic username and password authentication:
        1. In the SMTP Username text box, enter a SMTP Username if required.
        2. In the SMTP Password text box, enter a SMTP Password if required.
      • NTLM: Select to use NT LAN Manager authentication.
    • In the SMTP Enable SSL, select from the following options: -
      • to enable SSL.
      • to disable SSL.
      • +
      • to enable SSL.
      • to disable SSL.

      Setting web request timeout

      1. - + Click the Update button.

      - + Related Topics:

      • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Testing Outgoing Email Settings.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Testing Outgoing Email Settings.html index 64ed64c31e3..8b0942fc529 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Testing Outgoing Email Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/SMTP Server Settings/Testing Outgoing Email Settings.html @@ -7,7 +7,7 @@

        Testing Outgoing Email Settings

        How to test the outgoing mail settings that apply to all sites within this DNN installation.

        - The SMTP Server must be configured. See "Setting the SMTP Server and Port"

        + The SMTP Server must be configured. See "Setting the SMTP Server and Port"

        1. Navigate to Host > Host Settings Host Settings.
        2. Select the Advanced Settings tab.
          3. diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Search/Search.htm b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Search/Search.htm index 626f0634a0f..ae7b8d26caa 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Search/Search.htm +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Advanced Settings/Search/Search.htm @@ -17,7 +17,7 @@

          Configuring Search Admin Word Length

          1. - + Click the Update button.
          diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Error Messages.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Error Messages.html index b0b36900cd6..98a64bd8c30 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Error Messages.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Error Messages.html @@ -11,14 +11,14 @@

          Enabling/Disabling Custom Error Messages

        3. Navigate to Host > Host Settings Host Settings.
        4. Select the Basic Settings tab.
        5. Expand the Appearance section.
        6. At Use Custom Error Messages?, select from these options: -
          • to enable custom error messages.
          • to disable custom error messages.
          7. +
          • to enable custom error messages.
          • to disable custom error messages.

        Enabling custom error messages

        1. - + Click the Update button.
        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Module CSS Classes.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Module CSS Classes.html index 8b7fb480266..2e0052cbe62 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Module CSS Classes.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling Custom Module CSS Classes.html @@ -11,14 +11,14 @@

        Enabling/Disabling Custom Module CSS Classes

      • Select the Basic Settings tab.
      • Expand the Appearance section.
      • At Use Custom Module Css Class?, select from these options: -
        • to enable custom CSS classes.
        • to disable custom CSS classes.
        • +
        • to enable custom CSS classes.
        • to disable custom CSS classes.

        1. - + Click the Update button.
        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling DNN Copyright Credits.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling DNN Copyright Credits.html index 8e94b8f54a6..8dab621aa2b 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling DNN Copyright Credits.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Enabling-Disabling DNN Copyright Credits.html @@ -12,14 +12,14 @@

        Enabling/Disabling DNN Copyright Credits

      • Select the Basic Settings tab.
      • Expand the Appearance section.
      • At Show Copyright Credits, select from these options: -
        • to display credits.
        • to hide credits.
        • +
        • to display credits.
        • to hide credits.

        DNN Copyright Credits enabled

        1. - + Click the Update button.
        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Edit Skin and Container.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Edit Skin and Container.html index 914a9215fe4..ab52795a6ab 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Edit Skin and Container.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Edit Skin and Container.html @@ -19,7 +19,7 @@

        Setting the Host Edit Skin and Container

        1. Optional. Click the Preview Edit Skin and Container link to preview the selected skin and container in a new Web browser.
        2. - + Click the Update button.
        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Skin and Container.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Skin and Container.html index 1d143f337d2..ba499bf3a4f 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Skin and Container.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Appearance/Setting the Host Skin and Container.html @@ -19,7 +19,7 @@

        Setting the Host Skin and Container

        1. Optional. Click the Preview Host Skin and Container link to preview the selected skin and container in a new Web browser.
        2. - + Click the Update button.
        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Checking for DNN Framework Upgrades.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Checking for DNN Framework Upgrades.html index 11473ef0851..49c1fba98e7 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Checking for DNN Framework Upgrades.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Checking for DNN Framework Upgrades.html @@ -11,14 +11,14 @@

        Checking for DNN Framework Upgrades

      • Select the Basic Settings tab.
      • Expand the Configuration section.
      • At Check For Upgrades?, select from these options: -
        • to enable DNN to check for downloads.
        • to disable.
        • +
        • to enable DNN to check for downloads.
        • to disable.

        Check for and download DNN core framework upgrades

        1. - The Update button will now be displayed allowing you to go directly to the dnnsoftware.com website, login and download the Upgrade Package.
          2. + Click the Update button. The Update button will now be displayed allowing you to go directly to the dnnsoftware.com website, login and download the Upgrade Package.

        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Displaying Beta Message.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Displaying Beta Message.html index 0c58d5ad892..ef7b9686fd1 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Displaying Beta Message.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Displaying Beta Message.html @@ -12,14 +12,14 @@

        Displaying Beta Message

      • Select the Basic Settings tab.
      • Expand the Configuration section.
      • At Display Beta Message?, select from these options: -
        • to display a message.
        • to hide message.
        • +
        • to display a message.
        • to hide message.

        Displaying Beta Message in Web site browser

        1. - + Click the Update button.
        diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Viewing Configuration Details.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Viewing Configuration Details.html index 0ef64a389c0..3c3550cdc3d 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Viewing Configuration Details.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Configuration/Viewing Configuration Details.html @@ -13,10 +13,10 @@

        Viewing Configuration Details

        • DotNetNuke Product: The DotNetNuke product you are running. E.g. DotNetNuke Platform
        • DotNetNuke Version: The version of this DotNetNuke installation. E.g. 06.02.00
          • -
        • Optional. At Display Beta Message?: to display a message in the title bar of your Browser indicating if you DNN site is running on a beta version. +
        • Optional. At Display Beta Message?: to display a message in the title bar of your Browser indicating if you DNN site is running on a beta version. This field is only displayed if you are running a Beta version of DNN.
          • -
        • Optional. At Check For Upgrades?: to set this DNN Installation to check the DotNetNuke web site for new framework upgrades. +
        • Optional. At Check For Upgrades?: to set this DNN Installation to check the DotNetNuke web site for new framework upgrades. See "Checking for DNN Framework Upgrades"
        • At Upgrade Available?, if the Check For Upgrades setting is enabled, then an icon will be displayed at this field whenever an upgrade is available.
        • Data Provider: The provider name which is identified as the default data provider in the web.config file.
          • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Enabling Remember Me on Login Control.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Enabling Remember Me on Login Control.html index 4ce57e81dd5..ed82b351078 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Enabling Remember Me on Login Control.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Enabling Remember Me on Login Control.html @@ -10,14 +10,14 @@

          Enabling Remember Me on Login Control

        • Select the Basic Settings tab.
        • Expand the Host Details section.
        • At Enable Remember me on login controls?, select from the following options: -
          • to enable the Remember Login check box.
          • to remove the Remember Me control.
          • +
          • to enable the Remember Login check box.
          • to remove the Remember Me control.

          Enabling the Remember Me option on the Login control (Account Login module)

          1. - + Click the Update button.

          diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Fallback Skin Doctype.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Fallback Skin Doctype.html index eac7d023369..5af85c1769d 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Fallback Skin Doctype.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Fallback Skin Doctype.html @@ -18,7 +18,7 @@

          Setting the Fallback Skin Doctype

          1. - + Click the Update button.
          diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Details.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Details.html index 45f39996201..df085318a2c 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Details.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Details.html @@ -21,7 +21,7 @@

          Setting the Host Details

          1. - + Click the Update button.
          diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Site.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Site.html index c0264ec2c6d..7c73ba74594 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Site.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Host Details/Setting the Host Site.html @@ -17,7 +17,7 @@

          Setting the Host Site

          1. - + Click the Update button.
          diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Enabling-Disabling Anonymous Demo Signup.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Enabling-Disabling Anonymous Demo Signup.html index e85daeb1cbb..b216b89ddb6 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Enabling-Disabling Anonymous Demo Signup.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Enabling-Disabling Anonymous Demo Signup.html @@ -13,14 +13,14 @@

          Enabling/Disabling Anonymous Demo Signup

        • Expand the Payment Settings section.
        • Optional. In the Demo Period text box, enter the number of Days the demonstration site is available. Note: Enter -1 for no end date.
        • At Anonymous Demo Signup?, select one of the following options: -
          • to permit all visitors access to the Create New Child Site page. If this option is selected, a sign up link must be made available to enable sign up. See Step 6 for more details.
          • if only the Host can create new child sites. This is the default setting.
          • +
          • to permit all visitors access to the Create New Child Site page. If this option is selected, a sign up link must be made available to enable sign up. See Step 6 for more details.
          • if only the Host can create new child sites. This is the default setting.

          1. - + Click the Update button.
          2. Optional. To create a sign up link:
            1. Navigate to Host >Host Settings Site Management.
            2. Select Add New Site from the module actions menu - OR - Click the Add New Site link.
            3. Copy the URL from the Address field of the Web browser.
            4. Add this link on one or more pages as required using the Links module. The link will look something like this "http://awesomecycles.biz/dotnetnuke/tabid/17/ctl/Signup/mid/321/portalid/0/Default.aspx"
            3. diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting Child Site Hosting Fee.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting Child Site Hosting Fee.html index fdb6b7a5117..5eb7d10b142 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting Child Site Hosting Fee.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting Child Site Hosting Fee.html @@ -22,7 +22,7 @@

            Setting Child Site Hosting Fee

            1. - + Click the Update button.
            diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting the Payment Processor for Site Hosting.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting the Payment Processor for Site Hosting.html index 1dc6c2a5c56..79d5322270b 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting the Payment Processor for Site Hosting.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Basic Settings/Payment Settings/Setting the Payment Processor for Site Hosting.html @@ -26,7 +26,7 @@

            Setting the Payment Processor for Site Hosting

            1. - + Click the Update button.
            diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Adding a Request Filter.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Adding a Request Filter.html index 329fa849546..fcd9665c40c 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Adding a Request Filter.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Adding a Request Filter.html @@ -1,15 +1,14 @@  - + -

            Adding a Request Filter

            -

            How to add a request filter to your DotNetNuke installation. For more information, See "Configuring the Request Filter". Note: The following Yellow Warning message displays when you choose to add a request filter: Yellow Warning WARNING: Adding an incorrect request filter rule may prevent you or your customers from being able to access your DotNetNuke website, and may require you to manually edit the DotNetNuke.config file to remove the incorrectly configured rule.

            +

            How to add a request filter to your DotNetNuke installation. For more information, See "Configuring the Request Filter". Note: The following warning message displays when you choose to add a request filter: WARNING: Adding an incorrect request filter rule may prevent you or your customers from being able to access your DotNetNuke website, and may require you to manually edit the DotNetNuke.config file to remove the incorrectly configured rule.

            1. Navigate to Host > Host Settings Host Settings.
            2. Select the Other Settings tab.
              3. -
            3. At Enable Request Filters?, .
              4. +
            4. At Enable Request Filters?, .
            5. Click the Add New Rule link.
            6. In the Server Variable text box, enter the Server Variable to use when filtering incoming requests. A complete list of valid Server Variables can be viewed by clicking on the MSDN link located to the left of this field.
            7. At Operation, select the operator to use when comparing the incoming request against the specified server variable and value list from these options: Equal, NotEqual, or Regex.
              8. diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Allowing-Disallowing Content Localization.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Allowing-Disallowing Content Localization.html index 198f64a870e..54308c86a60 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Allowing-Disallowing Content Localization.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Allowing-Disallowing Content Localization.html @@ -1,7 +1,6 @@  - + -

              Allowing/Disallowing Content Localization

              @@ -10,20 +9,20 @@

              Allowing/Disallowing Content Localization

            8. Navigate to Host > Host Settings Host Settings.
            9. Select the Other Settings tab.
            10. At Allow Content Localization?, select from the following options: -
              • to allow content localization.
              • to disable content localization and return the site to the default "en-us" (US English) setting. This is the default setting.
              11. +
              • Mark  the check box to allow content localization.
              • Unmark  the check boxto disable content localization and return the site to the default "en-us" (US English) setting. This is the default setting.

            1. - The "Enable Localized Content" button is now displayed on the Admin > Languages module, allowing Administrators to enable localized content as required.
              2. + Click the Update button. The "Enable Localized Content" button is now displayed on the Admin > Languages module, allowing Administrators to enable localized content as required.

            - + Related Topics:

            • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/AsyncPostbacks.htm b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/AsyncPostbacks.htm index a431497d327..e3c2675d008 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/AsyncPostbacks.htm +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/AsyncPostbacks.htm @@ -1,5 +1,5 @@  - + @@ -15,7 +15,7 @@

              Setting the Timeout for Asynchronous Postbacks

              1. - +
              diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Site Log Settings for all Sites.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Site Log Settings for all Sites.html index f0ea73211ed..77ba29923bc 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Site Log Settings for all Sites.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Site Log Settings for all Sites.html @@ -19,11 +19,11 @@

              Configuring Site Log Settings for all Sites

              1. - + Click the Update button.

              - + Related Topics:

              • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Users Online Settings.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Users Online Settings.html index cbe1f3dddbd..9329c4692ba 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Users Online Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Configuring Users Online Settings.html @@ -1,7 +1,6 @@  - + -

                Configuring Users Online Settings

                @@ -10,7 +9,7 @@

                Configuring Users Online Settings

              • Navigate to Host > Host Settings Host Settings.
              • Select the Other Settings tab.
              • At Enable Users Online, select from the following options: -
                • to enable user tracking.
                • to disable user tracking. This is the default setting.
                • +
                • Mark  the check box to enable user tracking.
                • Unmark  the check box to disable user tracking. This is the default setting.
              • In the Users Online Time text box, enter the time period in minutes. The default setting is 20 minutes. E.g. If a user has not interacted with the site for more than 20 minutes, they will be considered offline and are not tracked further.

          @@ -18,11 +17,11 @@

          Configuring Users Online Settings

          1. - + Click the Update button.

          - + Related Topics:

          • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Deleting a Request Filter.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Deleting a Request Filter.html index 99ec9b8469e..5c5e9a7fdf9 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Deleting a Request Filter.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Deleting a Request Filter.html @@ -1,22 +1,21 @@  - + -

            Deleting a Request Filter

            How to permanently delete a request filter that has been added to this DNN installation.

            -
              -
            1. Navigate to Host > Host Settings Host Settings.
              2. -
            2. Select the Other Settings tab.
              3. -
            3. At Enable Request Filters?, .
              4. -
            4. Click the Delete Delete button beside the filter to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
              5. -
            -

            -Deleting a request filter -

            -
              -
            1. Click the OK button to confirm.
              2. -
            +
              +
            1. Navigate to Host > Host Settings Host Settings.
              2. +
            2. Select the Other Settings tab.
              3. +
            3. At Enable Request Filters?, .
              4. +
            4. Click the Delete Delete button beside the filter to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
              5. +
            +

            + Deleting a request filter +

            +
              +
            1. Click the OK button to confirm.
              2. +
            \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Disabling-Enabling Event Log Buffer.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Disabling-Enabling Event Log Buffer.html index 1cad2df7793..8e6a12c5c3a 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Disabling-Enabling Event Log Buffer.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Disabling-Enabling Event Log Buffer.html @@ -1,25 +1,24 @@  - + -

            Disabling/Enabling Event Log Buffer

            How to enable or disable the Event Log Buffer for all new sites.

            -
              -
            1. Navigate to Host > Host Settings Host Settings.
              2. -
            2. Select the Other Settings tab.
              3. -
            3. At Enable Event Log Buffer, select from the following options:
              4. -
                -
              • to enable.
                • -
              • to disable.
                • -
              -
            -

            -Enabling the Event Log buffer -

            -
              -
              2. -
            +
              +
            1. Navigate to Host > Host Settings Host Settings.
              2. +
            2. Select the Other Settings tab.
              3. +
            3. At Enable Event Log Buffer, select from the following options:
              4. +
                +
              • Mark  the check box toenable.
                • +
              • Unmark  the check box to disable.
                • +
              +
            +

            + Enabling the Event Log buffer +

            +
              +
            1. Click the Update button.
              2. +
            \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Editing a Request Filter.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Editing a Request Filter.html index 2c33bbe3699..88504d9e692 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Editing a Request Filter.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Editing a Request Filter.html @@ -1,7 +1,6 @@  - + -

            Editing a Request Filter

            @@ -9,8 +8,8 @@

            Editing a Request Filter

            1. Navigate to Host > Host Settings Host Settings.
            2. Select the Other Settings tab.
              3. -
            3. At Enable Request Filters?, .
              4. -
            4. Click the Edit button beside the filter to be edited.
              5. +
            5. At Enable Request Filters?, .
              6. +
            6. Click the Edit button beside the filter to be edited.

            Editing a request filter diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Auto-Sync of the File System.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Auto-Sync of the File System.html index 5ce5c50cb8b..622b38f89c1 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Auto-Sync of the File System.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Auto-Sync of the File System.html @@ -1,26 +1,21 @@  - + -

            Enabling/Disabling Auto-Sync of the File System

            How to enable or disable automatic synchronization of the file system.

            -
              -
            1. Navigate to Host > Host Settings Host Settings.
              2. -
            2. Select the Other Settings tab.
              3. -
            3. At Auto-Sync File System?, select from the following options: -
                -
              • to enable.
                • -
              • to disable.
                • -
              -
              4. -
            -

            -Enabling auto-sync of files -

            -
              -
              2. -
            +
              +
            1. Navigate to Host > Host Settings Host Settings.
              2. +
            2. Select the Other Settings tab.
              3. +
            3. At Auto-Sync File System?, select from the following options: +
              • Mark  the check box to enable.
              • Unmark  the check box to disable.
              4. +
            +

            + Enabling auto-sync of files +

            +
              +
            1. Click the Update button.
              2. +
            \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Online Module Help.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Online Module Help.html index a453d5f45df..ef2fdc2321b 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Online Module Help.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Online Module Help.html @@ -1,37 +1,31 @@  - + -

            Enabling/Disabling Online Module Help

            How to enable or disable online help option on the module actions menu. If enabled, a Help URL for the module will need to be added to the module. For custom modules, this URL should be provided by the module development company.

            -
              -
            1. Navigate to Host > Host Settings Host Settings.
              2. -
            2. Select the Other Settings tab.
              3. -
            3. At Enable Module Online Help, select from these options:
              4. -
                -
              • to enable.
                • -
              • to disable.
                • -
              -
            -

            - -

            -
              -
            1. In Help URL text box, choose one of these options: -
                -
              1. To restore Online Help URL to the default DotNetNuke Online Help: Enter http://www.dnnsoftware.com/Help.
                2. -
              2. To set a custom URL: Enter the URL to your help resource.
                3. -
              3. To disable Online Help: Leave this field blank.
                4. -
              -
              2. -
            -

            -Setting the Online Help URL -

            -
              -
              2. -
            +
              +
            1. Navigate to Host > Host Settings Host Settings.
              2. +
            2. Select the Other Settings tab.
              3. +
            3. At Enable Module Online Help, select from these options:
              4. +
                +
              • Mark  the check box to enable.
                • +
              • Unmark  the check box to disable.
                • +
              +
            +

            + +

            +
              +
            1. In Help URL text box, choose one of these options: +
              1. To restore Online Help URL to the default DotNetNuke Online Help: Enter http://www.dnnsoftware.com/Help.
              2. To set a custom URL: Enter the URL to your help resource.
              3. To disable Online Help: Leave this field blank.
              2. +
            +

            + Setting the Online Help URL +

            +
              +
            1. Click the Update button.
              2. +
            \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Request Filter Settings.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Request Filter Settings.html index a2cd179046f..6e9fd577609 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Request Filter Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling Request Filter Settings.html @@ -1,26 +1,21 @@  - + -

            Enabling/Disabling Request Filter Settings

            How to enable or disable the request filter settings.

            -
              -
            1. Navigate to Host > Host Settings Host Settings.
              2. -
            2. Select the Other Settings tab.
              3. -
            3. At Enable Request Filters?, select from the following options: -
                -
              • to enable request filters. This displays any existing request filters and enables new rules to be added.
                • -
              • to disable request filters.
                • -
              -
              4. -
            -

            - -

            -
              -
              2. -
            +
              +
            1. Navigate to Host > Host Settings Host Settings.
              2. +
            2. Select the Other Settings tab.
              3. +
            3. At Enable Request Filters?, select from the following options: +
              • Mark  the check box to enable request filters. This displays any existing request filters and enables new rules to be added.
              • Unmark  the check box to disable request filters.
              4. +
            +

            + +

            +
              +
            1. Click the Update button.
              2. +
            \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling the Scheduler.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling the Scheduler.html index dd044b9984a..5af555b32ed 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling the Scheduler.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Enabling-Disabling the Scheduler.html @@ -17,11 +17,11 @@

            Enabling/Disabling the Scheduler

            1. - + Click the Update button.

            - + Related Topics:

            • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Managing Allowable File Extensions.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Managing Allowable File Extensions.html index 7d33200f030..5d0deccadb6 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Managing Allowable File Extensions.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Managing Allowable File Extensions.html @@ -1,26 +1,23 @@  - + -

              Managing Allowable File Extensions

              How to add, edit and remove the file extensions that are allowed to be uploaded to this DNN installation by site Administrators and other authorized users. The following file extensions are permitted by default: swf, jpg, jpeg, jpe, gif, bmp, png, doc, docx, xls, xlsx, ppt, pptx, pdf, txt, xml, xsl, xsd, css, zip, template, htmtemplate, ico, avi, mpg, mpeg, mp3, wmv, mov and wav.

              -
                -
              1. Navigate to Host > Host Settings Host Settings.
                2. -
              2. Select the Other Settings tab.
                3. -
              3. In Allowable File Extensions window, perform one of the following: -
                  -
                • To add a file extension: Enter the extension preceded by a comma ( , ). E.g. ,fla,wma
                  • -
                • To remove a file extension: Remove the three letter extension and the preceding comma ( , ).
                  • -
                -
                4. -
              -

              - -

              -
                -
                2. -
              +
                +
              1. Navigate to Host > Host Settings Host Settings.
                2. +
              2. Select the Other Settings tab.
                3. +
              3. In Allowable File Extensions window, perform one of the following: +
                • To add a file extension: Enter the extension preceded by a comma ( , ). E.g. ,fla,wma
                • To remove a file extension: Remove the three letter extension and the preceding comma ( , ).
                4. +
              +

              + +

              +
                +
              1. + +
                2. +
              \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/NumberOfMessages.htm b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/NumberOfMessages.htm index ed12eb54cd9..03d1a5b59ee 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/NumberOfMessages.htm +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/NumberOfMessages.htm @@ -1,5 +1,5 @@  - + @@ -15,7 +15,7 @@

              Setting the Number of Messages sent in each Batch

              1. - +
              diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Auto-Unlock Time for User Accounts.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Auto-Unlock Time for User Accounts.html index 7aaf167de17..781cdbbe68f 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Auto-Unlock Time for User Accounts.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Auto-Unlock Time for User Accounts.html @@ -1,26 +1,23 @@  - + -

              Setting the Auto-Unlock Time for User Accounts

              How to set the auto-unlock time period following multiple unsuccessful attempts to login to a user account. After an account is locked out due to unsuccessful login attempts, it can be automatically unlocked with a successful authentication after the set period of time has elapsed.

              -
                -
              1. Navigate to Host > Host Settings Host Settings.
                2. -
              2. Select the Other Settings tab.
                3. -
              3. In the Auto-Unlock Accounts After text box, select from these options: -
                  -
                1. Enter the number of Minutes a user must wait until the account can be automatically unlocked. The default setting is 10 minutes.
                  2. -
                2. Enter "0" minutes to disable auto-unlock feature. In this case, SuperUsers must unlock the account manually to enable the user to login.
                  3. -
                -
                4. -
              -

              - -

              -
                -
                2. -
              +
                +
              1. Navigate to Host > Host Settings Host Settings.
                2. +
              2. Select the Other Settings tab.
                3. +
              3. In the Auto-Unlock Accounts After text box, select from these options: +
                1. Enter the number of Minutes a user must wait until the account can be automatically unlocked. The default setting is 10 minutes.
                2. Enter "0" minutes to disable auto-unlock feature. In this case, SuperUsers must unlock the account manually to enable the user to login.
                4. +
              +

              + +

              +
                +
              1. + +
                2. +
              \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Default Control Panel.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Default Control Panel.html index 89439e50205..fb2e7fe2957 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Default Control Panel.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Default Control Panel.html @@ -25,7 +25,7 @@

              Setting the Default Control Panel

              1. - + Click the Update button.

              @@ -33,7 +33,7 @@

              Setting the Default Control Panel


              Setting the Control Panel

              - + Related Topics:

              • diff --git a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Online Help URL.html b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Online Help URL.html index 63886dcdb7c..a295ef10d43 100644 --- a/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Online Help URL.html +++ b/Documentation/Using the Control Panel/Host Console/Host Settings/Other Settings/Setting the Online Help URL.html @@ -1,26 +1,23 @@  - + -

                Setting the Online Help URL

                How to set the URL for the Online Help service for all sites. This is the URL associated with the Online Help button accessed via module actions menus. Leave this field blank to remove Online Help from the Admin and Host consoles of DotNetNuke. This is the URL associated with the Online Help button accessed via module actions menus. Leave this field blank to remove Online Help for the Admin/Host areas of DotNetNuke. The default setting is to the Online Help provided by DNN Corp which is located at http://www.dnnsoftware.com/help.

                -
                  -
                1. Navigate to Host > Host Settings Host Settings.
                  2. -
                2. Select the Other Settings tab.
                  3. -
                3. In Help URL text box, choose one of these options: -
                    -
                  1. To restore Online Help URL to the default DotNetNuke Online Help: Enter http://www.dnnsoftware.com/Help
                    2. -
                  2. To set a custom URL: Enter the URL to your help resource.
                    3. -
                  3. To disable Online Help: Leave this field blank.
                    4. -
                  -
                  4. -
                -

                -Setting the Online Help URL

                -
                  -
                  2. -
                +
                  +
                1. Navigate to Host > Host Settings Host Settings.
                  2. +
                2. Select the Other Settings tab.
                  3. +
                3. In Help URL text box, choose one of these options: +
                  1. To restore Online Help URL to the default DotNetNuke Online Help: Enter http://www.dnnsoftware.com/Help
                  2. To set a custom URL: Enter the URL to your help resource.
                  3. To disable Online Help: Leave this field blank.
                  4. +
                +

                + Setting the Online Help URL +

                +
                  +
                1. + +
                  2. +
                \ No newline at end of file diff --git a/Documentation/Using the Control Panel/Host Console/Lists/Adding a Child List.html b/Documentation/Using the Control Panel/Host Console/Lists/Adding a Child List.html index 31b50e42676..cc05a506f63 100644 --- a/Documentation/Using the Control Panel/Host Console/Lists/Adding a Child List.html +++ b/Documentation/Using the Control Panel/Host Console/Lists/Adding a Child List.html @@ -1,7 +1,6 @@  - + -

                Adding a Child List

                @@ -14,7 +13,7 @@

                Adding a Child List

              • At Parent Entry, select the entry you to use as the new list. E.g. Country.Australia
              • In the Entry Text text box, enter the name to be assigned to the List E.g. Victoria
              • In the Entry Value text box, enter the identifier of the first entry of the list. E.g. VIC
                • -
              • Optional. At Enable Sort Order, select from these options:
                • if you want to be able to reorder the entries in this list.
                • to use alphabetical sort order for list entries.
                • +
              • Optional. At Enable Sort Order, select from these options:
                • Mark  the check box if you want to be able to reorder the entries in this list.
                • Unmark  the check box to use alphabetical sort order for list entries.

                • diff --git a/Documentation/Using the Control Panel/Host Console/Lists/Adding a Parent List.html b/Documentation/Using the Control Panel/Host Console/Lists/Adding a Parent List.html index e5af9ca0fec..d9c05e8bb13 100644 --- a/Documentation/Using the Control Panel/Host Console/Lists/Adding a Parent List.html +++ b/Documentation/Using the Control Panel/Host Console/Lists/Adding a Parent List.html @@ -1,7 +1,6 @@  - + -

                Adding a Parent List

                @@ -20,13 +19,13 @@

                Adding a Parent List

              • In the Entry Text text box, enter the first entry (item) that will be in this list. E.g. Forms
              • In the Entry Value text box, enter the identifier or code for the first entry. E.g. FM or Form. Note: When creating a categories list for the Documents module, the Entry Value is displayed as the category name.
              • Optional. At Enable Sort Order, select from these options: -
                • if you want to be able to reorder the entries in this list.
                • to use alphabetical sort order for list entries.
                • +
                • Mark  the check box if you want to be able to reorder the entries in this list.
                • Unmark  the check box to use alphabetical sort order for list entries.

                  -
                1. Click the Save link.
                  2. +
                2. Click the Save button.
                3. The newly added parent list is now displayed, enabling you to commence adding list entries to this list.

                diff --git a/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List Entry.html b/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List Entry.html index d3fb054b8e0..620443990a5 100644 --- a/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List Entry.html +++ b/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List Entry.html @@ -1,7 +1,6 @@  - + -

                Deleting a List Entry

                @@ -10,7 +9,7 @@

                Deleting a List Entry

                1. Navigate to Host > Lists.
                2. In the folder list, navigate to and select the list containing the list entry to be deleted. This displays the details of this list to the right.
                  3. -
                3. Click the Delete button beside the entry to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
                  4. +
                4. Click the Delete button beside the entry to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
                  6. diff --git a/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List.html b/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List.html index 5840863b8b6..dcb1a88d417 100644 --- a/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List.html +++ b/Documentation/Using the Control Panel/Host Console/Lists/Deleting a List.html @@ -1,7 +1,6 @@  - + -

                  Deleting a List

                  diff --git a/Documentation/Using the Control Panel/Host Console/Lists/Managing the Host Profanity List.html b/Documentation/Using the Control Panel/Host Console/Lists/Managing the Host Profanity List.html index f2291a0e345..99754ef0ce3 100644 --- a/Documentation/Using the Control Panel/Host Console/Lists/Managing the Host Profanity List.html +++ b/Documentation/Using the Control Panel/Host Console/Lists/Managing the Host Profanity List.html @@ -1,7 +1,6 @@  - + -

                  Managing the Profanity List (Host)

                  @@ -16,7 +15,7 @@

                  Managing the Profanity List (Host)

                  Getting Started

                    -
                  1. Click the Edit button beside the list entry called "FindThisText". This list entry has been added as an example and should be updated with real information.
                    2. +
                  2. Click the Edit button beside the list entry called "FindThisText". This list entry has been added as an example and should be updated with real information.
                  3. In the Entry Text text box, enter the text to be replaced.
                  4. In the Entry Value text box, enter the replacement word.
                  5. Click the Save button.
                    6. @@ -30,20 +29,20 @@

                    Adding a Filtered Word

                  Editing a Filtered Word

                    -
                  1. Click the Edit button beside the list entry called "FindThisText". This list entry has been added as an example and should be updated with real information.
                    2. +
                  2. Click the Edit button beside the list entry called "FindThisText". This list entry has been added as an example and should be updated with real information.
                  3. In the Entry Text text box, enter the text to be replaced.
                  4. In the Entry Value text box, enter the replacement word.
                  5. Click the Save button.

                  Deleting a Filtered Word

                    -
                  1. Click the Delete button beside the entry to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"
                    2. +
                  2. Click the Delete button beside the entry to be deleted. This displays the message "Are You Sure You Wish To Delete This Item?"

                  - + Related Topics:

                  • diff --git a/Documentation/Using the Control Panel/Host Console/Schedule/Adding a Task.html b/Documentation/Using the Control Panel/Host Console/Schedule/Adding a Task.html index 53cf97e1544..9476ec0286f 100644 --- a/Documentation/Using the Control Panel/Host Console/Schedule/Adding a Task.html +++ b/Documentation/Using the Control Panel/Host Console/Schedule/Adding a Task.html @@ -1,7 +1,6 @@  - + -

                    Adding a Task

                    @@ -24,7 +23,7 @@

                    Adding a Task

                    1. - + Click the Update button.
                    diff --git a/Documentation/Using the Control Panel/Host Console/Schedule/Editing a Task.html b/Documentation/Using the Control Panel/Host Console/Schedule/Editing a Task.html index 293e9b6d2ab..281a77a7c23 100644 --- a/Documentation/Using the Control Panel/Host Console/Schedule/Editing a Task.html +++ b/Documentation/Using the Control Panel/Host Console/Schedule/Editing a Task.html @@ -16,7 +16,7 @@

                    Editing a Task

                    1. - + Click the Update button.
                    diff --git a/Documentation/Using the Control Panel/Host Console/Schedule/Enabling-Disabling a Task.html b/Documentation/Using the Control Panel/Host Console/Schedule/Enabling-Disabling a Task.html index ce5a6d774b4..21bcfd59404 100644 --- a/Documentation/Using the Control Panel/Host Console/Schedule/Enabling-Disabling a Task.html +++ b/Documentation/Using the Control Panel/Host Console/Schedule/Enabling-Disabling a Task.html @@ -1,22 +1,26 @@  - + -

                    Enabling/Disabling a Task

                    -

                    How to enable or disable a task in the Schedule module.

                    +

                    How to enable or disable a scheduled task.

                    1. Navigate to Host > Advanced Settings >   Schedule.
                      2. +<<<<<<< HEAD +
                    2. Click the Edit button beside the task to be edited.
                      3. +
                    3. At Schedule Enabled, to enable this task - OR - to disable this task.
                      4. +=======
                    4. Click the Edit button beside the task to be edited.
                      5. -
                    5. At Schedule Enabled, to enable this task - OR - to disable this task.
                      6. +
                    6. At Schedule Enabled, to enable this task - OR - to disable this task.
                      7. +>>>>>>> ca0f44fd31959805ababe244bac2d4a832ee7107

                    Enabling/Disabling Scheduled Tasks

                    1. - + Click the Update button.
                    diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Adding a Site.html b/Documentation/Using the Control Panel/Host Console/Site Management/Adding a Site.html index 951e34af6a1..1d952aac888 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Adding a Site.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Adding a Site.html @@ -1,5 +1,5 @@  - + @@ -18,16 +18,14 @@

                    Adding a Site

                    1. At Use Current User as Administrator, select from these options:
                        2. -
                      1. - to make the SuperUser who is creating this site the Administrator of the new site. This allows this SuperUser to login to the new site with their existing login credentials.
                        2. -
                      2. - to create a new Administrator account, then complete all of the following fields: +
                      3. Mark  the check box to make the SuperUser who is creating this site the Administrator of the new site. This allows this SuperUser to login to the new site with their existing login credentials.
                        4. +
                      4. Unmark  the check box to create a new Administrator account, then complete all of the following fields:
                        1. In the Administrator User Name text box, enter a username for the Administrator.
                        2. In the First Name text box, enter the Administrator's first name.
                        3. In the Last Name text box, enter the Administrator's last name.
                        4. In the Email text box, enter the Administrator's email address.
                        5. In the Password text box, enter a password for the Administrator.
                        6. In the Confirm text box, re-enter the password for the Administrator.

                      -
                    2. Click the Create Site link. This returns you to default page of the Site Management module where the newly added site is listed.
                      3. +
                    3. Click the Create Site button. This returns you to default page of the Site Management module where the newly added site is listed.

                    diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Configuring CRM for a Single Site.html b/Documentation/Using the Control Panel/Host Console/Site Management/Configuring CRM for a Single Site.html index bbbe132ea4d..1f6676eda27 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Configuring CRM for a Single Site.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Configuring CRM for a Single Site.html @@ -1,24 +1,24 @@  - +

                    Configuring CRM for a Site

                    -

                    How to configure the Client Resource Management settings.

                    +

                    How to configure the Client Resource Management settings. Restricted to SuperUsers only.

                    As DNN allows for multiple extensions to be on the same page, there is a possibility that one or more of these extensions (skins/containers/modules) may use the same JavaScript or css files. To ensure only a single copy of these files are loaded DotNetNuke has always had an API that CSS/JavaScript files should call - this improved performance and safeguarded against extensions failing due to multiple copies existing. With the 6.1.0 release, this API was changed to use Client Resource Management, which in addition to the traditional function also allows users to optionally compress these files and combine them into a small number of downloads e.g. Three JavaScript files could be combined into one, improving performance as the browser only loads 1 file rather than 3. For more details on CRM see http://www.dnnsoftware.com/Community/Learn/Wiki/Page/Client-Resource-Management-API

                    Whilst the CRM will detect changes in files it's aware of and increment the version number accordingly so that users get updated versions of the file(s), it's possible to select the increment site version number to "force" this conversion

                    Composite files are used to reduce the numbers of file(s) loaded when a page loads. As browsers can load a limited number of files simultaneously (known as parallelism), reducing the number of files will improve performance as the browser does not have to wait to download one file before downloading another -in addition each file has an overhead in making the initial connection (known as network latency), so sites will less files also load quicker.

                    It is a best practice from a performance perspective to enable both minification and compression, however they are disabled by default as on rare occasions the minification/compression may cause the css or js files to not work as expected.

                      -
                    1. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                      2. +
                    2. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                    3. Select the Advanced Settings tab.
                    4. Expand the Client Resource Management section.
                    5. At Override Host Settings, select from these options: -
                      • to use the default settings. Skip to Step 6.
                      • to modify the default settings. +
                        • Unmark  the check box to use the default settings. Skip to Step 6.
                        • Mark  the check box to modify the default settings.
                          • Site Version: The version number of the client resources on your site is displayed here. As this version number changes, each user will be forced to download the new version of the files. Click the Increment Site Version link to increment the site version. It is recommended the version be incremented only when necessary.
                          • Enable Composite Files: Composite files are combinations of resources (JavaScript and CSS) created to reduce the number of file requests by the browser. Enabling this setting will significantly increase the page loading speed.
                            • Minify CSS: CSS minification will reduce the size of the CSS code by using regular expressions to remove comments, whitespace and "dead css". This field is only available when composite files are enabled.
                            • Minify JS: JS minification will reduce the size of the JavaScript code using JSMin. This field is only available when composite files are enabled.
                      • - + Click the Update button.

                    diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Configuring Messaging Settings.html b/Documentation/Using the Control Panel/Host Console/Site Management/Configuring Messaging Settings.html index 623f831c692..0cea4d45543 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Configuring Messaging Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Configuring Messaging Settings.html @@ -1,12 +1,12 @@  - +

                    Configuring Messaging Settings for a Site

                    -

                    How to configure the Messaging settings for a single site.

                    +

                    How to configure the Messaging settings for a single site. Restricted to SuperUsers only.

                      -
                    1. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                      2. +
                    2. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                    3. Select the Advanced Settings tab.
                    4. Expand the Messaging Settings section.
                    5. At Throttling Interval in Minutes, select the number of minutes after which a user can send the next message from the drop down list. Zero indicates no restrictions. Restrictions do not apply to Administrators or SuperUsers.
                      6. @@ -16,14 +16,14 @@

                      Configuring Messaging Settings for a Site

                    6. At Allow Attachments, select from these options:
                      • Yes: Select to allow users to attach files and images to their messages.
                      • No: Select to prevent users from attaching files and images to their messages.
                    7. - + Click the Update button.

                    - + Related Topics:

                    • diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Deleting Expired Sites.html b/Documentation/Using the Control Panel/Host Console/Site Management/Deleting Expired Sites.html index ee80ba905cf..d56896736a9 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Deleting Expired Sites.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Deleting Expired Sites.html @@ -1,14 +1,13 @@  - + -

                      Deleting Expired Sites

                      How to delete all sites whose hosting has expired. The expiry date is displayed in the Expires column.

                        -
                      1. Navigate to Host > Site Management.
                        2. +
                      2. Navigate to Host > Site Management.
                      3. Optional. Click the Expired link to view all expired sites.
                      4. Click the Delete Expired Sites button. Note: This option is only available if one or more expired sites exist. This displays the message "Are You Sure You Wish To Delete These Items?"
                      5. diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Deleting a Site.html b/Documentation/Using the Control Panel/Host Console/Site Management/Deleting a Site.html index 6e2680ff904..1c7bcb83841 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Deleting a Site.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Deleting a Site.html @@ -1,5 +1,5 @@  - + diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Editing Host Settings for a Site.html b/Documentation/Using the Control Panel/Host Console/Site Management/Editing Host Settings for a Site.html index d4e689ac76a..6f53daacc23 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Editing Host Settings for a Site.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Editing Host Settings for a Site.html @@ -1,13 +1,13 @@  - +

                        Editing Host Settings for a Site

                        How to edit hosting settings including hosting space, page quota, user quota, site log history and premium modules for a site. -Once a premium module has been added to a site, it can then be deployed to that site by an Administrator. Note: This task can also be performed using the Extensions module.

                        +Once a premium module has been added to a site, it can then be deployed to that site by an Administrator. Note: This task can also be performed using the Extensions module. Restricted to SuperUsers.

                          -
                        1. Navigate to Host >  Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                          2. +
                        2. Navigate to Host >  Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                        3. Select the Advanced Settings tab.
                        4. Expand the Host Settings section.
                        5. At Expiry Date, click the Calendar icon and select the date when the hosting contract for this site will expire. @@ -20,14 +20,14 @@

                          Editing Host Settings for a Site

                        6. In the User Quota text box, enter the maximum number of users allowed for this site - OR - Leave this field blank for unlimited user accounts.
                        7. In the Site Log History (Days) text box, enter the number of days that Site Log activity is kept for this site - OR - Enter zero ( 0 ) to disable this site log.
                          8. -
                        8. At Available Modules, beside a module to assign it to this site - OR - beside a module to unassign it from this site.At Available Modules, beside a module to assign it to this site - OR - beside a module to unassign it from this site.At Available Modules, beside a module to assign it to this site - OR - beside a module to unassign it from this site.
                          9. +
                        9. At Available Modules, beside a module to assign it to this site - OR - beside a module to unassign it from this site.At Available Modules, beside a module to assign it to this site - OR - beside a module to unassign it from this site.At Available Modules, beside a module to assign it to this site - OR - beside a module to unassign it from this site.

                        1. - + Click the Update button.
                        diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Exporting a Site Template.html b/Documentation/Using the Control Panel/Host Console/Site Management/Exporting a Site Template.html index c087e50edf7..91a0997ba69 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Exporting a Site Template.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Exporting a Site Template.html @@ -1,5 +1,5 @@  - + @@ -19,13 +19,13 @@

                        Exporting a Site Template

                        1. Go to the Advanced Configuration section:
                          2. -
                        2.  At Include Content, select from the following options:
                          • to copy site content to the template. This will copy the content of any modules which have export/import capabilities.
                          • to NOT copy the site content.
                          3. -
                        3.  At Include Files, select from the following options:
                          • to export all site files and folder structure created in Digital Asset Management (File Management) when creating the new template.
                          • if yo don't want to copy the site files and folders.
                          4. -
                        4.  At Include Roles, select from the following options:
                          • to export roles when creating the new template.
                          • if you don't want the roles included in the export file.
                          5. -
                        5.  At Include Profile Properties, select from the following options:
                          • to export unique profile properties that have been defined on this site when creating the new template.
                          • if you don't want the profile property definitions included in the export file.
                          6. -
                        6.  At Include Module Deployment Permissions, select from the following options:
                          • to include module deploy permissions into the exported template. Please be aware that if you select this option, it may also be necessary to export Roles as well.
                          • if you don't want the module deployment permissions included in the export file.
                          7. -
                        7. The Export As Multilingual Site? option will be displayed if you have multiple languages enabled on the site. Select from these options:
                          • if you only want to export one language.
                            1. Select the language you want to export.
                          • to export two or more languages. The default language will automatically be included.
                            1. At Export pages in selected languages, beside any language you don't want to include in the export.
                          8. -
                        8. At Pages to Export, beside the pages that you don't want to export.
                          9. +
                        9.  At Include Content, select from the following options:
                          • Mark  the check box to copy site content to the template. This will copy the content of any modules which have export/import capabilities.
                          • Unmark  the check box to NOT copy the site content.
                          10. +
                        10.  At Include Files, select from the following options:
                          • Mark  the check box to export all site files and folder structure created in Digital Asset Management (File Management) when creating the new template.
                          • Unmark  the check box if yo don't want to copy the site files and folders.
                          11. +
                        11.  At Include Roles, select from the following options:
                          • Mark  the check box to export roles when creating the new template.
                          • Unmark  the check box if you don't want the roles included in the export file.
                          12. +
                        12.  At Include Profile Properties, select from the following options:
                          • Mark  the check box to export unique profile properties that have been defined on this site when creating the new template.
                          • Unmark  the check box if you don't want the profile property definitions included in the export file.
                          13. +
                        13.  At Include Module Deployment Permissions, select from the following options:
                          • Mark  the check box to include module deploy permissions into the exported template. Please be aware that if you select this option, it may also be necessary to export Roles as well.
                          • Unmark  the check box if you don't want the module deployment permissions included in the export file.
                          14. +
                        14. The Export As Multilingual Site? option will be displayed if you have multiple languages enabled on the site. Select from these options:
                          • Unmark  the check box if you only want to export one language.
                            1. Select the language you want to export.
                          • Mark  the check box to export two or more languages. The default language will automatically be included.
                            1. At Export pages in selected languages, beside any language you don't want to include in the export.
                          15. +
                        15. At Pages to Export, beside the pages that you don't want to export.
                        16. Click the Export Template button.

                        diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Setting SSL Settings for a Single Site.html b/Documentation/Using the Control Panel/Host Console/Site Management/Setting SSL Settings for a Single Site.html index a3a41fadcbc..9d82679e99c 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Setting SSL Settings for a Single Site.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Setting SSL Settings for a Single Site.html @@ -1,18 +1,18 @@  - +

                        Setting SSL Settings for a Site

                        How to set the SSL settings for an individual site. -

                        + Restricted to SuperUsers only.

                          -
                        1. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                          2. +
                        2. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                        3. Select the Advanced Settings tab.
                        4. Expand the SSL Settings section.
                          5. -
                        5. Optional. At SSL Enabled?, if an SSL Certificate has been installed for this site. +
                        6. Optional. At SSL Enabled?, if an SSL Certificate has been installed for this site.
                          7. -
                        7. Optional. At SSL Enforced?, if pages which are not marked as secure are not accessible with SSL (https). +
                        8. Optional. At SSL Enforced?, if pages which are not marked as secure are not accessible with SSL (https).
                        9. Optional. In the SSL URL text box, enter a URL which will be used for secure connections for this site. This is only required if the SSL Certificate does not match your standard URL. E.g. www.secure.domain.com
                        10. Optional. In the Standard URL text box, enter your standard site URL for non-secure connections.
                          11. @@ -22,7 +22,7 @@

                          Setting SSL Settings for a Site

                          1. - + Click the Update button.
                          diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Adding a Site Alias.html b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Adding a Site Alias.html index 558bec6869a..6ec21b7ad68 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Adding a Site Alias.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Adding a Site Alias.html @@ -1,10 +1,10 @@  - +

                          Adding a Site Alias

                          -

                          How to add multiple domain names that can be used to navigate to a site. This could be a local address (i.e. local host), an IP address (i.e. 146.0.0.2), a full URL (i.e. www.domain.com), or a server name (i.e. MYSERVER).

                          +

                          How to add multiple domain names that can be used to navigate to a site. This could be a local address (i.e. local host), an IP address (i.e. 146.0.0.2), a full URL (i.e. www.domain.com), or a server name (i.e. MYSERVER). Restricted to SuperUsers only.

                          1. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                          2. Select the Advanced Settings tab.
                            3. diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Configuring Site Alias Settings.html b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Configuring Site Alias Settings.html index 18a193e9117..31ec88a1dfb 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Configuring Site Alias Settings.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Configuring Site Alias Settings.html @@ -1,10 +1,10 @@  - +

                            Configuring Site Alias Settings

                            -

                            How to choose the site alias mapping mode and set the default alias for a site. Note: This setting is only effective in single site configuration only.

                            +

                            How to choose the site alias mapping mode and set the default alias for a site. Note: This setting is only effective in single site configuration only. Restricted to SuperUsers only.

                            1. Navigate to Host > Site Management and then click on the Edit button beside the title of the required site to open the Edit Sites page - OR - Navigate to Admin > Site Settings.
                            2. Go to Advanced Settings > Site Aliases.
                              3. @@ -17,7 +17,7 @@

                              Configuring Site Alias Settings

                              1. - + Click the Update button.
                              diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Deleting a Site Alias .html b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Deleting a Site Alias .html index fd92ef374ec..bbe7d79cc50 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Deleting a Site Alias .html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Deleting a Site Alias .html @@ -1,10 +1,10 @@  - +

                              Deleting a Site Alias

                              -

                              How to delete a site alias, also known as a HTTP alias, from a site using the Site Alias module. Once an alias has been deleted, the name of the site alias can then be reused if required.

                              +

                              How to delete a site alias, also known as a HTTP alias, from a site using the Site Alias module. Once an alias has been deleted, the name of the site alias can then be reused if required. Restricted to SuperUsers only.

                              1. Navigate to Host > Site Management and click the Edit button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                              2. Select the Advanced Settings tab.
                                3. @@ -16,7 +16,7 @@

                                Deleting a Site Alias

                                1. - +
                                diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Editing a Site Alias .html b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Editing a Site Alias .html index 91ce5af46ad..68b0eb710fc 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Editing a Site Alias .html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Site Aliases/Editing a Site Alias .html @@ -1,10 +1,10 @@  - +

                                Editing a Site Alias

                                -

                                How to edit site aliases (also known as HTTP aliases) that are used by DNN to identify sites when they are accessed by a web or mobile device browser.

                                +

                                How to edit site aliases (also known as HTTP aliases) that are used by DNN to identify sites when they are accessed by a web or mobile device browser. Restricted to SuperUsers only.

                                1. Navigate to Host >  Site Management and click the Edit  button beside the title of the required site - OR - Navigate to Admin > Site Settings.
                                2. Select the Advanced Settings tab.
                                  3. diff --git a/Documentation/Using the Control Panel/Host Console/Site Management/Viewing any Site.html b/Documentation/Using the Control Panel/Host Console/Site Management/Viewing any Site.html index bccd9a1c65b..41c850e76ac 100644 --- a/Documentation/Using the Control Panel/Host Console/Site Management/Viewing any Site.html +++ b/Documentation/Using the Control Panel/Host Console/Site Management/Viewing any Site.html @@ -1,12 +1,12 @@  - +

                                  Viewing any Site

                                  How to go to the home page of any site within this DNN installation using the Site Management module.

                                    -
                                  1. Navigate to Host > Site Management.
                                    2. +
                                  2. Navigate to Host > Site Management.
                                  3. In the Site Aliases column, click on the one of the site aliases to go to home page of that site.

                                  @@ -14,14 +14,14 @@

                                  Viewing any Site

                                  Tip: You can also change sites using the Switch Sites tool under the Tools section of the ControlBar, or on the Tools page of the RibbonBar.

                                  - +

                                    -
                                  • - See "Overview of the ControlBar Control Panel" +
                                  • + See "Overview of the ControlBar"
                                  • - See "Overview of the RibbonBar Control Panel" + See "Overview of the RibbonBar"
                                  diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Adding a SuperUser Account.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Adding a SuperUser Account.html index 9cc6a93d2dc..bd053241fcd 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Adding a SuperUser Account.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Adding a SuperUser Account.html @@ -1,7 +1,6 @@  - + -

                                  Adding a SuperUser Account

                                  @@ -15,12 +14,12 @@

                                  Adding a SuperUser Account

                                3. In the Display Name text box, enter the name to be displayed to other site members.
                                4. In the Email Address text box, enter a valid email address.
                                5. At Authorize, select from the following options: -
                                  • if the user is authorized to access the site. This will automatically provide access to the SuperUser role.
                                  • if the new user is not yet authorized to access the site. A SuperUser must authorize this account at a later date.
                                  6. +
                                  • Mark  the check box if the user is authorized to access the site. This will automatically provide access to the SuperUser role.
                                  • Unmark  the check box if the new user is not yet authorized to access the site. A SuperUser must authorize this account at a later date.
                                6. At Notify, select from the following options: -
                                  • to send a notification email to the SuperUser's email address. This is the default setting.
                                  • if you don't wish to send notification. If the account is not authorized, you may like to send the notification at a later time.
                                  7. +
                                  • Mark  the check box to send a notification email to the SuperUser's email address. This is the default setting.
                                  • Unmark  the check box if you don't wish to send notification. If the account is not authorized, you may like to send the notification at a later time.
                                7. To create the user's password, select from these options: -
                                  • at Random Password to generate a random password
                                  • To create a password manually: -
                                    1. at Random Password.
                                    2. In the Password text box, enter a password.
                                    3. In the Confirm Password text box, re-enter the same password. Note: The site may be set to required unique passwords. In this case, choose a new password, or opt for a random password.
                                  8. +
                                  • Mark  the check box at Random Password to generate a random password
                                  • To create a password manually: +
                                    1. Unmark  the check box at Random Password.
                                    2. In the Password text box, enter a password.
                                    3. In the Confirm Password text box, re-enter the same password. Note: The site may be set to required unique passwords. In this case, choose a new password, or opt for a random password.

                                diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Configuring SuperUser Account Settings.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Configuring SuperUser Account Settings.html index 82507ae05b8..5ada44b307c 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Configuring SuperUser Account Settings.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Configuring SuperUser Account Settings.html @@ -1,5 +1,5 @@  - + @@ -8,7 +8,7 @@

                                Configuring SuperUser Account Settings

                                1. Navigation to Host > SuperUser Accounts.
                                2. - +
                                3. Select the User Accounts Settings tab.
                                4. Optional. Check the check box beside each field to be displayed on the SuperUser Accounts module. @@ -17,7 +17,7 @@

                                  Configuring SuperUser Account Settings

                                  • All: Select to display all user accounts on the User Accounts module. Records are displayed in alpha-numerical order. E.g. 1,2,3,a,b,c.
                                  • First Letter: All user accounts for the first letter of the alphabet are displayed.
                                  • None: Select to hide all user accounts on the User Accounts module.
                                5. At Users per Page, click the Up and Down icons to set the number of records that are displayed on each page of the SuperUser Accounts module. The default setting is 10 records.
                                6. - + Click the Update button.

                                diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Deleting a SuperUser Account .html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Deleting a SuperUser Account .html index 0f1c7fbdb20..19695bfd698 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Deleting a SuperUser Account .html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Deleting a SuperUser Account .html @@ -10,7 +10,7 @@

                                Deleting a SuperUser Account

                              3. Find the SuperUser to be deleted using a filter or by searching.
                              4. Click the Delete button beside their record. This displays the message "Are You Sure You Wish To Delete This Item?"
                              5. - + Click the OK button to confirm.
                              diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Editing a SuperUser Account.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Editing a SuperUser Account.html index 62f24615d83..21abeea367b 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Editing a SuperUser Account.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Editing a SuperUser Account.html @@ -14,7 +14,7 @@

                              Editing a SuperUser Account

                            3. Select the Manage User Credentials tab.
                            4. Edit one or more fields as required. Editable fields are the first name, last name, display name and email address.
                            5. - + Click the Update button.
                            diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Filtering SuperUser Accounts by Online Users.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Filtering SuperUser Accounts by Online Users.html index b32efdf0624..7e09fdb3afc 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Filtering SuperUser Accounts by Online Users.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Filtering SuperUser Accounts by Online Users.html @@ -7,7 +7,7 @@

                            Filtering SuperUser Accounts by Online Users

                            How to filter SuperUser accounts to only view users who are currently logged in to this site using the SuperUser Accounts module.

                            - This filter is integrated with the Users Online module which must be enabled before the Online details can be displayed on this module. See "Configuring Users Online Settings"

                            + Prerequisite. This filter is integrated with the Users Online module which must be enabled before the Online details can be displayed on this module. See "Configuring Users Online Settings"

                            1. Navigate to Host > Advanced Settings > SuperUser Accounts.
                            2. Click the Online link.
                              3. diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Managing a SuperUsers Profile.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Managing a SuperUsers Profile.html index 731a9b948ce..e6441301b6b 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Managing a SuperUsers Profile.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Managing a SuperUsers Profile.html @@ -13,7 +13,7 @@

                              Managing a SuperUser's Profile

                            3. Select the Manage Profile tab.
                            4. Edit any fields as required. See "Managing your User Profile"
                            5. - + Click the Update button.
                            diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing Multiple Deleted SuperUser Accounts.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing Multiple Deleted SuperUser Accounts.html index 567a612eceb..4e9f4d49384 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing Multiple Deleted SuperUser Accounts.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing Multiple Deleted SuperUser Accounts.html @@ -9,7 +9,7 @@

                            Removing Multiple Deleted SuperUser Accounts

                          3. Navigate to Host > Advanced Settings > SuperUser Accounts.
                          4. Click the Remove Deleted Users button. This displays the message "Are You Sure You Wish To Remove These Items?"
                          5. - + Click the OK button to confirm.
                          diff --git a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing a Deleted SuperUser Account.html b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing a Deleted SuperUser Account.html index eb93a56a7b8..44b2738739e 100644 --- a/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing a Deleted SuperUser Account.html +++ b/Documentation/Using the Control Panel/Host Console/SuperUser Accounts/Removing a Deleted SuperUser Account.html @@ -10,7 +10,7 @@

                          Removing a Deleted SuperUser Account

                        11. Find the user to be deleted using a filter or by searching.
                        12. Click the Remove button beside their record. This displays the message "Are You Sure You Wish To Remove This Item?"
                        13. - + Click the OK button to confirm.
                        diff --git a/Documentation/Using the Control Panel/Host Console/Vendors/About the Host Vendors Module.html b/Documentation/Using the Control Panel/Host Console/Vendors/About the Host Vendors Module.html index 07b1c009afd..3c9712450d0 100644 --- a/Documentation/Using the Control Panel/Host Console/Vendors/About the Host Vendors Module.html +++ b/Documentation/Using the Control Panel/Host Console/Vendors/About the Host Vendors Module.html @@ -1,25 +1,22 @@  - + - -

                        About the Host Vendors Module

                        -

                        The Vendors module which is located on the Admin > Advanced Settings > Vendors page allows SuperUsers to manage vendor accounts and advertising banners. Banners managed using this instance of the Vendors module can be displayed on any site within this DNN installation using the Banners module. Banners can also be displayed on pages that have the [BANNER] skin token. Banners can be images, text or script. Each banner record records a number of statistics including tracking of clicks, views and impressions. The Vendors module tracks commission for banner advertising on other sites and commissions received from banner advertisement on this site.

                        -

                        For details on working with the Vendors module, see the tutorials in the Admin Console section. See "About the Admin Vendors Module"

                        -

                        Important. Another instance of Vendors module is located on the Admin > Advanced Settings > Vendors page. Banners created in the Admin Vendors module are exclusive to that site.

                        -

                        Installation Note: This module is pre-installed on the site.

                        - +

                        About Host Vendors

                        +

                        Vendors, located on the Host > Advanced Settings > Vendors page, allows SuperUsers to manage vendor accounts and advertising banners. Banners managed using this instance of the Vendors module can be displayed on any site within this DNN installation using the Banners module. Banners can also be displayed on pages that have the [BANNER] skin token. Banners can be images, text or script. Each banner record records a number of statistics including tracking of clicks, views and impressions. The Vendors module tracks commission for banner advertising on other sites and commissions received from banner advertisement on this site.

                        +

                        For details on working with Vendors, see the tutorials in the Admin Console section. See "About Admin Vendors"

                        +

                        Important. Another instance of Vendors module is located on the Admin > Advanced Settings > Vendors page. Banners created on the Admin Vendors page are exclusive to that site.


                        The Vendors Module

                        -

                        - +

                        +

                        -
                          +
                          • - See "About the Banners Module" + See "About Banners"
                          diff --git a/Documentation/Using the Control Panel/Host Console/WhatsNew/About the Whats New Module.html b/Documentation/Using the Control Panel/Host Console/WhatsNew/About the Whats New Module.html index 79321a21ee1..8ac52bcb873 100644 --- a/Documentation/Using the Control Panel/Host Console/WhatsNew/About the Whats New Module.html +++ b/Documentation/Using the Control Panel/Host Console/WhatsNew/About the Whats New Module.html @@ -1,19 +1,17 @@  - + - -

                          About the What's New Module

                          -

                          The What's New module displays an expandable section for the current release and prior releases. Users can expand a section to view a summary of the major features for each release including lists of the Major Highlights, Security Fixes, and Updated Modules/Providers.

                          -

                          Installation Note: This module is pre-installed on the site.

                          +

                          About What's New

                          +

                          What's New, located on the Host >  What's New page, displays an expandable section for the current release and prior releases. Users can expand a section to view a summary of the major features for each release including lists of the Major Highlights, Security Fixes, and Updated Modules/Providers.

                          Module Version: The version number is always the same as the DNN framework version number.

                          -
                          The What's New Module +
                          The What's New page

                          - +

                          • Project Home: http://dnnwhatsnew.codeplex.com/
                            • diff --git a/Documentation/Using the Control Panel/Overview of the Control Bar Control Panel.htm b/Documentation/Using the Control Panel/Overview of the Control Bar Control Panel.htm index 5e065b663f8..f131c45c616 100644 --- a/Documentation/Using the Control Panel/Overview of the Control Bar Control Panel.htm +++ b/Documentation/Using the Control Panel/Overview of the Control Bar Control Panel.htm @@ -1,10 +1,10 @@  - + -

                            Overview of the ControlBar Control Panel

                            -

                            The ControlBar Control Panel displays a single row of links with drop down menus across the very top of your web browser above your site. All of the links displayed on the left side have an associated drop down menu. The Admin menu is displayed to Administrators and SuperUsers. The Host menu is displayed to SuperUsers only. Users must have Edit Page permissions granted to access the Modules and Pages menus. Finally, the ControlBar can optionally be displayed to Module Editors providing them with a visual reminder that they can edit the current page.

                            +

                            Overview of the ControlBar

                            +

                            The ControlBar displays a single row of links with drop down menus across the very top of your web browser above your site. All of the links displayed on the left side have an associated drop down menu. The Admin menu is displayed to Administrators and SuperUsers. The Host menu is displayed to SuperUsers only. Users must have Edit Page permissions granted to access the Modules and Pages menus. Finally, the ControlBar can optionally be displayed to Module Editors providing them with a visual reminder that they can edit the current page.

                            The ControlBar as it is displayed to users with different editing permissions:

                            @@ -50,7 +50,7 @@

                            The Tools Menu


                            The Tools menu of the ControlBar as displayed to SuperUsers

                              -
                            • Upload File: Opens the upload file interface of the Digital Asset Management module that is located on the Admin > File Management page. See "Uploading Files"
                              • +
                            • Upload File: Opens the upload file interface of the Digital Asset Management module that is located on the Admin > File Management page. See "Uploading Files"
                            • Clear Cache: Select to clear the cache of all old files.
                            • Recycle Application Pool: Select to restart the server and retrieve all new files.
                            • Switch Sites: Select a new site to view by selecting a site from the list.
                              • @@ -61,7 +61,7 @@

                              The Help Menu


                              The Help menu of the ControlBar

                                -
                              • Online Help: Opens the Help resource for this site as set by your Host. See "Setting the Online Help URL"
                                • +
                              • Online Help: Opens the Help resource for this site as set by your Host. See "Setting the Online Help URL"
                              • Getting Started: Select to view the Getting Started with DNN page which contains links to resources including video tutorials, links to personalizing your site and more. This option is only displayed for new DNN installations.

                              The Modules Menu

                              @@ -88,18 +88,18 @@

                              The Pages Menu

                              Edit Page Menu:

                              • Edit This Page / Close Edit Mode: Select to enable or disable editing modules via the Action Menus on the current the page. Users must be granted Add Content or Full Control permissions to the current page.
                                • -
                              • Stay in Edit Mode: Once "Edit This Page" has been selected, you can to remain in Edit Mode when you navigate away from the current page onto other pages that you have the editing permissions for. Users must be granted Add Content or Full Control permissions to the current page.
                                • -
                              • View in Layout Mode: to view the page in Layout Mode. This displays the layout of the panes within the skin that is applied to this page and the title and module actions menu of each module within each pane. Use this view to quickly view and update the page layout. This view is helpful when you want to delete or move a module but cannot access the module action menu when the content is displayed. Users must be granted Add Content or Full Control permissions to the current page.
                                • -
                              • Mobile Preview: Opens the Mobile Preview popup that allows users to see how the current page is displayed on a mobile device. Users must be granted Add Content or Full Control permissions to the current page. See "Previewing Your Mobile Device Site"
                                • +
                              • Stay in Edit Mode: Once "Edit This Page" has been selected, you can to remain in Edit Mode when you navigate away from the current page onto other pages that you have the editing permissions for. Users must be granted Add Content or Full Control permissions to the current page.
                                • +
                              • View in Layout Mode: to view the page in Layout Mode. This displays the layout of the panes within the skin that is applied to this page and the title and module actions menu of each module within each pane. Use this view to quickly view and update the page layout. This view is helpful when you want to delete or move a module but cannot access the module action menu when the content is displayed. Users must be granted Add Content or Full Control permissions to the current page.
                                • +
                              • Mobile Preview: Opens the Mobile Preview popup that allows users to see how the current page is displayed on a mobile device. Users must be granted Add Content or Full Control permissions to the current page.
                              • Page Settings: Opens the Page Settings page for the current page. The Permissions tab is only display to user with Full Control. Users must be granted Manage Settings or Full Control permissions to the current page. See "Editing Page Settings"
                              • Page Appearance: Opens the Page Settings page with the Appearance section of the Advanced Settings tab expanded. Users must be granted Manage Settings or Full Control permissions to the current page. See "Advanced Settings for Existing Pages"
                              • Page Localization: Opens the Page Settings - Localization tab for the current page. This option is only displayed when content localization is enabled on the site. Users must be belong to a translator role. See "Enabling Localized Content"
                                • -
                              • Page Permissions: Opens the Page Settings page for this page with the Permissions tab. Users must be granted Manage Settings or Full Control permissions to the current page. See "Setting Page Permissions" See "Setting Page Permissions"
                                • +
                              • Page Permissions: Opens the Page Settings page for this page with the Permissions tab. Users must be granted Manage Settings or Full Control permissions to the current page. See "Setting Page Permissions" See "Setting Page Permissions"
                              • Export Page: Link to export a page. Users must be granted Export or Full Control permissions to the current page.See "Exporting a Page"
                                • -
                              • Delete Page: Link to delete current page. This option is disabled if the current page is a special page, that is a page that has been set as either Home, User Profile, etc. Users must be granted Delete or Full Control permissions to the current page. See "Deleting a Page"
                                • +
                              • Delete Page: Link to delete current page. This option is disabled if the current page is a special page, that is a page that has been set as either Home, User Profile, etc. Users must be granted Delete or Full Control permissions to the current page. See "Deleting a Page"

                              The Users Menu

                              -

                              The Users menu is restricted to

                              +

                              The Users menu is restricted to

                              diff --git a/Documentation/Using the Control Panel/Overview of the Iconbar Control Panel.html b/Documentation/Using the Control Panel/Overview of the Iconbar Control Panel.html index 10e439221f1..4671c96d11d 100644 --- a/Documentation/Using the Control Panel/Overview of the Iconbar Control Panel.html +++ b/Documentation/Using the Control Panel/Overview of the Iconbar Control Panel.html @@ -1,10 +1,10 @@  - + -

                              Overview of the Iconbar Control Panel

                              -

                              The Iconbar Control Panel provides a single interface from which authorized users can access page and module management tools, shortcuts to six common administration tasks and quick links to the Admin and Host Consoles.

                              +

                              Overview of the Iconbar

                              +

                              The Iconbar provides a single interface from which authorized users can access page and module management tools, shortcuts to six common administration tasks and quick links to the Admin and Host Consoles.

                              Maximizing/Minimizing the Iconbar

                              How to hide or display the Iconbar using the Maximize/Minimize button. This functionality isn't available to Module Editors. The default visibility is set by Administrators.

                                @@ -51,7 +51,7 @@

                                Common Tasks Section

                              1. Users Users: Opens the Admin > User Account page. See "About the User Accounts Module"
                              2. Roles Roles: Opens the Admin > Security Roles page. See "About the Security Roles Module"
                              3. Files Files: Opens the Admin > File Management page. See "About the Digital Asset Management Module"
                                4. -
                              4. Help Help: Opens the Online Help resource associated with the site. See "Setting the Online Help URL"
                                5. +
                              5. Help Help: Opens the Online Help resource associated with the site. See "Setting the Online Help URL"
                              6. Extensions Extensions: Opens the Admin > Extensions page. See "About the Admin Extensions Module"
                            diff --git a/Documentation/Using the Control Panel/Overview of the RibbonBar Control Panel.html b/Documentation/Using the Control Panel/Overview of the RibbonBar Control Panel.html index 865a98d06bf..0e497828a77 100644 --- a/Documentation/Using the Control Panel/Overview of the RibbonBar Control Panel.html +++ b/Documentation/Using the Control Panel/Overview of the RibbonBar Control Panel.html @@ -1,10 +1,10 @@  - + -

                            Overview of the RibbonBar Control Panel

                            -

                            The RibbonBar Control Panel displays a single row of options at the very top of your web browser above your DNN site. The links displayed on the left side of the RibbonBar each have drop down menus. The Mode drop down list on the right side of the RibbonBar allows you to preview your site in a number of ways.

                            +

                            Overview of the RibbonBar

                            +

                            The RibbonBar displays a single row of options at the very top of your web browser above your DNN site. The links displayed on the left side of the RibbonBar each have drop down menus. The Mode drop down list on the right side of the RibbonBar allows you to preview your site in a number of ways.

                            The Admin menu is displayed to Administrators and SuperUsers. The Host menu is displayed to SuperUsers only. In DNN Platform, users must have Edit Page permissions granted to access the Modules and Pages menus. The permissions required for Evoq Content and Evoq Content Enterprise are listed in the below tables.

                            The collapsed RibbonBar displays a row of links on the left hand side and a Mode drop down list on the right hand side. Depending on the users editing permissions for the current page, there will be between none and five menus displayed on the left side. I.e. SuperUsers have access to five menus (Host, Admin, Modules, Pages and Tools), Administrators have access four menus (Admin, Modules, Pages and Tools), Page Editors have access to two menus (Modules and Pages) and Module Editors cannot access any menus, however they may be able to view the Mode drop down list depending on the Control Panel configuration.

                            @@ -57,18 +57,18 @@

                            The Pages Menu

                            Actions Section

                            • -  Page Settings: Link to edit current page settings. See "Editing Page Settings". DNN Platform users must be granted Edit Page permissions. DNN Content and Evoq Content Enterprise users must be granted Manage Settings permissions.
                              • +  Page Settings: Link to edit current page settings. See "Editing Page Settings". DNN Platform users must be granted Edit Page permissions. DNN Content and Evoq Content Enterprise users must be granted Manage Settings permissions.
                            • - Add: Select to add a new page and configure setting. See "Adding a New Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Add Page permissions.
                              • + Add: Select to add a new page and configure setting. See "Adding a New Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Add Page permissions.
                            • -  Copy: Select to copy the current (or any other) page including modifying modules. See "Copying a Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Copy Page permissions.
                              • +  Copy: Select to copy the current (or any other) page including modifying modules. See "Copying a Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Copy Page permissions.
                            •  Delete: Link to delete current page. See "Deleting a Page". This option is disabled if the current page is a special page, that is a page that has been set as either Home, User Profile, etc. -DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Delete Page permissions.
                              • +DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Delete Page permissions.
                            • -  Import: Link to import a page. See "Importing a New Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Import Page permissions.
                              • +  Import: Link to import a page. See "Importing a New Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Import Page permissions.
                            • -  Export: Link to export a page. See "Exporting a Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Export Page permissions.
                              • +  Export: Link to export a page. See "Exporting a Page". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Export Page permissions.

                            Copy Actions Section

                            @@ -77,14 +77,14 @@

                            The Pages Menu

                            Copy Permissions to Children: Copy current page permission to children pages. See "Copying Permissions to Children Pages". Enabled if page has child pages. In DNN Platform, only Administrator can perform this task.Evoq Content and Evoq Content Enterprise users must be granted Manage Settings permissions.
                          • - Copy Design to Children: Copy current page design (skin and container settings) to children. See "Copying Design to Child Pages". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Manage Settings permissions.
                            • + Copy Design to Children: Copy current page design (skin and container settings) to children. See "Copying Design to Child Pages". DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Manage Settings permissions.

                          Add New Page Section

                          • Add New Page: Add a new page directly from the Control Panel. See "Quick Add a New Page (RibbonBar Only)"
                          • Update Current Page: Update the page name, menu options and skin for the current page. -DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Manage Settings permissions.
                            • +DNN Platform users must be granted Edit Page permissions. Evoq Content and Evoq Content Enterprise users must be granted Manage Settings permissions.

                          @@ -167,7 +167,7 @@

                          Setting the RibbonBar Mode

                          -

                          Preview: The Preview mode displays the current page as it would be viewed on a specified mobile device. See "Previewing Your Mobile Device Site"

                          +

                          Preview: The Preview mode displays the current page as it would be viewed on a specified mobile device.

                          diff --git a/Website/DesktopModules/Admin/Portals/SiteSettings.ascx.cs b/Website/DesktopModules/Admin/Portals/SiteSettings.ascx.cs index fe4862ec57e..4127121568d 100644 --- a/Website/DesktopModules/Admin/Portals/SiteSettings.ascx.cs +++ b/Website/DesktopModules/Admin/Portals/SiteSettings.ascx.cs @@ -204,24 +204,11 @@ private void BindMarketing(PortalInfo portal) cboSearchEngine.DataSource = searchEngines; cboSearchEngine.DataBind(); - var aliases = TestablePortalAliasController.Instance.GetPortalAliasesByPortalId(portal.PortalID).ToList(); - if (PortalController.IsChildPortal(portal, Globals.GetAbsoluteServerPath(Request))) - { - txtSiteMap.Text = Globals.AddHTTP(Globals.GetDomainName(Request)) + @"/SiteMap.aspx?portalid=" + portal.PortalID; - } - else - { - if (aliases.Count > 0) - { - //Get the first Alias - var objPortalAliasInfo = (PortalAliasInfo)aliases[0]; - txtSiteMap.Text = Globals.AddHTTP(objPortalAliasInfo.HTTPAlias) + @"/SiteMap.aspx"; - } - else - { - txtSiteMap.Text = Globals.AddHTTP(Globals.GetDomainName(Request)) + @"/SiteMap.aspx"; - } - } + string portalAlias = !String.IsNullOrEmpty(PortalSettings.DefaultPortalAlias) + ? PortalSettings.DefaultPortalAlias + : PortalSettings.PortalAlias.HTTPAlias; + txtSiteMap.Text = Globals.AddHTTP(portalAlias) + @"/SiteMap.aspx"; + optBanners.SelectedIndex = portal.BannerAdvertising; if (UserInfo.IsSuperUser) { diff --git a/Website/DesktopModules/Admin/Security/User.ascx.cs b/Website/DesktopModules/Admin/Security/User.ascx.cs index 1ab3fd9c986..1037657e97f 100644 --- a/Website/DesktopModules/Admin/Security/User.ascx.cs +++ b/Website/DesktopModules/Admin/Security/User.ascx.cs @@ -379,6 +379,7 @@ public override void DataBind() numSites.Text=String.Format(Localization.GetString("UpdateUserName", LocalResourceFile), portals.Count.ToString()); cboSites.Visible = true; cboSites.DataSource = portals; + cboSites.DataTextField = "PortalName"; cboSites.DataBind(); renameUserPortals.Visible = true; diff --git a/Website/DesktopModules/Admin/Tabs/ManageTabs.ascx.cs b/Website/DesktopModules/Admin/Tabs/ManageTabs.ascx.cs index 021b6ae58a7..140010a9599 100644 Binary files a/Website/DesktopModules/Admin/Tabs/ManageTabs.ascx.cs and b/Website/DesktopModules/Admin/Tabs/ManageTabs.ascx.cs differ diff --git a/Website/Providers/DataProviders/SqlDataProvider/07.01.02.SqlDataProvider b/Website/Providers/DataProviders/SqlDataProvider/07.01.02.SqlDataProvider index 30e4a8a8385..d0084bab1a0 100644 --- a/Website/Providers/DataProviders/SqlDataProvider/07.01.02.SqlDataProvider +++ b/Website/Providers/DataProviders/SqlDataProvider/07.01.02.SqlDataProvider @@ -577,7 +577,26 @@ ORDER BY ModuleId Go +/* update GetPortalsByUser Procedure */ +/*************************************/ +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}[{objectQualifier}GetPortalsByUser]') AND type in (N'P', N'PC')) + DROP PROCEDURE {databaseOwner}[{objectQualifier}GetPortalsByUser] +GO + +CREATE PROCEDURE {databaseOwner}[{objectQualifier}GetPortalsByUser] + @userID int +AS + + SELECT {databaseOwner}{objectQualifier}vw_Portals.* +FROM {databaseOwner}{objectQualifier}UserPortals INNER JOIN + {databaseOwner}{objectQualifier}vw_Portals ON + {databaseOwner}{objectQualifier}UserPortals.PortalId = {databaseOwner}{objectQualifier}vw_Portals.PortalID +WHERE ({databaseOwner}{objectQualifier}UserPortals.UserId = @userID) + AND ({databaseOwner}{objectQualifier}vw_Portals.DefaultLanguage = {databaseOwner}{objectQualifier}vw_Portals.CultureCode) + + +GO /************************************************************/ /***** SqlDataProvider *****/ /************************************************************/ \ No newline at end of file diff --git a/Website/admin/ControlPanel/ControlBar.ascx b/Website/admin/ControlPanel/ControlBar.ascx index c028e6ddb5c..9352ef24b60 100644 --- a/Website/admin/ControlPanel/ControlBar.ascx +++ b/Website/admin/ControlPanel/ControlBar.ascx @@ -314,7 +314,7 @@
                          - +
    • +   diff --git a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.csproj b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.csproj index f26ea7ee147..c8d02284184 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.csproj +++ b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.csproj @@ -187,7 +187,9 @@ - + + ASPXCodeBehind + diff --git a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/LinkClickUrlHandler.ashx.cs b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/LinkClickUrlHandler.ashx.cs index f6ceda2ae8e..41748b5b147 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/LinkClickUrlHandler.ashx.cs +++ b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/LinkClickUrlHandler.ashx.cs @@ -286,13 +286,15 @@ public override void HandleRequest() case "GetLinkInfo": if (dialogParams.Track) { + link = link.Replace(@"\", @"/"); + //this section is for when the user clicks ok in the dialog box, we actually create a record for the linkclick urls. if (! (dialogParams.LinkUrl.ToLower().Contains("linkclick.aspx"))) { dialogParams.LinkClickUrl = GetLinkClickURL(ref dialogParams, ref link); } - _urlController.UpdateUrl(dialogParams.PortalId, link, GetURLType(DotNetNuke.Common.Globals.GetURLType(link)), dialogParams.TrackUser, true, dialogParams.ModuleId, false); + _urlController.UpdateUrl(dialogParams.PortalId, link, GetURLType(Globals.GetURLType(link)), dialogParams.TrackUser, true, dialogParams.ModuleId, false); } else diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs index 7d6ad6bb51f..1101bea75ae 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/Controllers/Search/SearchControllerTests.cs @@ -1562,6 +1562,19 @@ public void SearchController_Add_Does_Not_Throw_On_Empty_Url() Assert.DoesNotThrow(() => _internalSearchController.AddSearchDocument(doc)); } + [Test] + public void SearchController_Add_Does_Not_Throw_On_Empty_Title() + { + var doc = new SearchDocument + { + UniqueKey = Guid.NewGuid().ToString(), + SearchTypeId = OtherSearchTypeId, + ModifiedTimeUtc = DateTime.UtcNow + }; + + Assert.DoesNotThrow(() => _internalSearchController.AddSearchDocument(doc)); + } + #endregion #region IsActive Tests diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePage.cs index 80350b0d73c..c70a671b3c0 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePage.cs @@ -229,6 +229,12 @@ public void Clear(By locator) FindElement(locator).Clear(); } + public void WaitAndClear(By locator) + { + Trace.WriteLine(BasePage.TraceLevelElement + "Wait and Clear the input field"); + WaitForElement(locator).Clear(); + } + public void Click(By locator) { Trace.WriteLine(BasePage.TraceLevelElement + "Find and Click: '" + locator + "'"); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePages/ExtensionsPage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePages/ExtensionsPage.cs index d5364b26e97..dd5b4495af8 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePages/ExtensionsPage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/BasePages/ExtensionsPage.cs @@ -17,7 +17,7 @@ public ExtensionsPage(IWebDriver driver) : base(driver) public static string ModulesPanel = "//h2[@id='Panel-Modules']"; public static string ModulesAccordion = ModulesPanel + "/a"; - public static string ModulesExtensionsList = ModulesPanel + "/following-sibling :: //tr[contains(@class, 'Item')]"; + public static string ModulesExtensionsList = ModulesPanel + "/following-sibling :: *//tr[contains(@class, 'Item')]"; public static string CoreLanguagePacksPanel = "//h2[@id='Panel-Core Language Packs']"; public static string CoreLanguagePacksAccordion = CoreLanguagePacksPanel + "/a"; public static string CoreLanguagePacksList = CoreLanguagePacksPanel + "/following-sibling :: *//tr[contains(@class, 'Item')]"; diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/ControlPanelIDs.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/ControlPanelIDs.cs index b01a368b6d6..dda9d73a439 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/ControlPanelIDs.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/ControlPanelIDs.cs @@ -6,8 +6,12 @@ namespace DNNSelenium.Common.BaseClasses { - public class ControlPanelIDs + public class ControlPanelIDs { + public static string CompanyLogo = "//a/img[@id = 'dnn_dnnLOGO_imgLogo']"; + public static string AwesomeCycles = "Awesome-Cycles-Logo.png"; + public static string AnovaMobility = "logo_Anova.png"; + public static string PageTitleID = "//span[contains(@id, 'dnnTITLE_titleLabel')]"; public static string PageHeaderID = "//span[@id= 'dnn_dnnBreadcrumb_lblBreadCrumb']/a[last()]"; @@ -18,7 +22,10 @@ public class ControlPanelIDs public static string SocialRegisterLink = "//a[@id='dnn_userLogin_registerLink']"; public static string SocialLoginLink = "//a[@id='dnn_userLogin_loginLink']"; - public static string SocialLogoutLink = ""; + public static string SocialUserLink = "//a[@id = 'dnn_dnnUser_userNameLink']"; + + public static string SocialUserMenu = "//ul[@class = 'userMenu']"; + public static string SocialLogoutLink = "//a[@id = 'dnn_userLogin_logoffLink']"; public static string MessageLink = "dnn_dnnUser_messageLink"; public static string NotificationLink = "dnn_dnnUser_notificationLink"; diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/TestBase.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/TestBase.cs index db250e01142..0860233425d 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/TestBase.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/BaseClasses/TestBase.cs @@ -50,9 +50,10 @@ public static IWebDriver StartDriver (string browserType) case "chrome": { ChromeOptions chromeOptions = new ChromeOptions(); - chromeOptions.AddArgument("--disable-keep-alive"); + //chromeOptions.AddArgument("--disable-keep-alive"); - driver = new ChromeDriver("Drivers", chromeOptions); + //driver = new ChromeDriver("Drivers", chromeOptions); + driver = new ChromeDriver("Drivers"); break; } } diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminLanguagesPage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminLanguagesPage.cs index 58bac1fa848..bfc27adee44 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminLanguagesPage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminLanguagesPage.cs @@ -26,8 +26,8 @@ public override string PageHeaderLabel public static string EnableLocalizedContent = "//a[contains(@id, '_languageEnabler_cmdEnableLocalizedContent')]"; public static string DisableLocalizedContent = "//a[contains(@id, '_languageEnabler_cmdDisableLocalization')]"; public static string EnableLocalizedContentUpdateButton = "//a[contains(@id, '_EnableLocalizedContent_updateButton')]"; - public static string LocalizationTable = - "//table[contains(@id, 'languageEnabler_languagesGrid')]//th[5]/table[contains(@class, 'DnnGridNestedTable')]"; + public static string LanguagesTable = "//table[contains(@id, 'languageEnabler_languagesGrid')]"; + public static string LocalizationTable = LanguagesTable + "//th[5]/table[contains(@class, 'DnnGridNestedTable')]"; public void OpenUsingUrl(string baseUrl) { @@ -95,7 +95,7 @@ public void EnableLanguage(string packName) { OpenTab(By.XPath(LanguagesTab)); - WaitForElement(By.XPath("//table[contains(@id, '_languageEnabler_languagesGrid')]//span[text() = '" + packName + "']")); + WaitForElement(By.XPath(LanguagesTable + "//span[text() = '" + packName + "']")); CheckBoxCheck(By.XPath("//tr[td//span[text() = '" + packName + "']]/td/input")); @@ -106,7 +106,7 @@ public void DisableLanguage(string packName) { OpenTab(By.XPath(LanguagesTab)); - WaitForElement(By.XPath("//table[contains(@id, '_languageEnabler_languagesGrid')]//span[text() = '" + packName + "']")); + WaitForElement(By.XPath(LanguagesTable + "//span[text() = '" + packName + "']")); CheckBoxUncheck(By.XPath("//tr[td//span[text() = '" + packName + "']]/td/input")); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminPageManagementPage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminPageManagementPage.cs index f99007849d7..89e96732b91 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminPageManagementPage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/AdminPageManagementPage.cs @@ -23,6 +23,8 @@ public override string PageHeaderLabel get { return "Page Management"; } } + public static string PageList = "//div[contains(@id, 'Tabs_ctlPages')]"; + public static string WebsitePagesRadioButton = "//input[contains(@id, 'Tabs_rblMode_0')]"; public static string HostPagesRadioButton = "//input[contains(@id, 'Tabs_rblMode_1')]"; public static string ExpandAllLink = "//a[contains(@id, 'Tabs_cmdExpandTree')]"; diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/HostExtensionsPage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/HostExtensionsPage.cs index 363694b7d86..5d475817516 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/HostExtensionsPage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/HostExtensionsPage.cs @@ -31,6 +31,7 @@ public override string PageHeaderLabel public static string UninstallExtensionButton = "//a[contains(@id, '_EditExtension_cmdDelete')]"; public static string UnistallPackageButton = "//a[contains(@id, '_cmdUninstall')]"; public static string Return2Button = "//a[contains(@id, '_UnInstall_cmdReturn2')]"; + public static string DeleteCheckBox = "//input[@id = 'dnn_ctr_UnInstall_chkDelete']"; public static string ExtensionTypeArrow = "//a[contains(@id, '_cboExtensionType_Arrow')]"; public static string ExtensionTypeDropDown = "//div[contains(@id, '_wizNewExtension_cboExtensionType_DropDown')]"; @@ -113,10 +114,10 @@ public void DeleteLanguagePack(string panelName, string packName) ScrollIntoView(element, 100); element.Click(); - WaitForElement(By.XPath("//input[contains(@id, 'UnInstall_chkDelete')]")).ScrollIntoView(); - WaitForElement(By.XPath("//input[@id = 'dnn_ctr_UnInstall_chkDelete']")).WaitTillEnabled(30); - WaitForElement(By.XPath("//input[@id = 'dnn_ctr_UnInstall_chkDelete']")).Info(); - CheckBoxCheck(By.XPath("//input[@id = 'dnn_ctr_UnInstall_chkDelete']")); + WaitForElement(By.XPath(DeleteCheckBox)).ScrollIntoView(); + WaitForElement(By.XPath(DeleteCheckBox)).WaitTillEnabled(30); + WaitForElement(By.XPath(DeleteCheckBox)).Info(); + CheckBoxCheck(By.XPath(DeleteCheckBox)); Trace.WriteLine(BasePage.TraceLevelPage + "Click on Uninstall Package button :"); ClickOnButton(By.XPath(HostExtensionsPage.UnistallPackageButton)); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/LoginPage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/LoginPage.cs index 47fc636428e..daf413ac663 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/LoginPage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/LoginPage.cs @@ -82,10 +82,23 @@ public void LoginUsingLoginLinkAndFrame(string userName, string password) Trace.WriteLine(BasePage.TraceLevelComposite + "Login using 'Login' link:"); LetMeOut(); - FindElement(By.XPath(ControlPanelIDs.LoginLink)).Click(); + string selector = WaitForElement(By.XPath(ControlPanelIDs.CompanyLogo)).GetAttribute("src"); - WaitAndSwitchToFrame(30); + Trace.WriteLine(BasePage.TraceLevelElement + selector); + + if (selector.EndsWith(ControlPanelIDs.AwesomeCycles)) + { + FindElement(By.XPath(ControlPanelIDs.LoginLink)).Click(); + } + else + { + FindElement(By.XPath(ControlPanelIDs.SocialLoginLink)).Click(); + } + //FindElement(By.XPath(ControlPanelIDs.LoginLink)).Click(); + + WaitAndSwitchToFrame(30); + Trace.WriteLine(BasePage.TraceLevelElement + "Click on : " + ControlPanelIDs.SocialUserLink + "]"); DoLoginUsingLoginLink(userName, password); WaitAndSwitchToWindow(30); @@ -120,19 +133,61 @@ public void LoginAsHost(string baseUrl) public void LetMeOut() { Trace.WriteLine(BasePage.TraceLevelPage + "Logout"); - WaitForElement(By.Id(ControlPanelIDs.LogoutLinkID), 20).Info(); + + string selector = WaitForElement(By.XPath(ControlPanelIDs.CompanyLogo)).GetAttribute("src"); + + Trace.WriteLine(BasePage.TraceLevelElement + selector); + + if (selector.EndsWith(ControlPanelIDs.AwesomeCycles)) + { + WaitForElement(By.Id(ControlPanelIDs.LogoutLinkID), 20).Info(); + + Trace.WriteLine(BasePage.TraceLevelElement + "Click on button: " + ControlPanelIDs.LogoutLink + "]"); + if (ElementPresent(By.XPath(ControlPanelIDs.LogoutLink))) + { + FindElement(By.XPath(ControlPanelIDs.LogoutLink)).Click(); + WaitForElement(By.XPath(ControlPanelIDs.LoginLink), 20).WaitTillVisible(20); + } + } + else + { + if (ElementPresent(By.XPath(ControlPanelIDs.SocialUserLink))) + { + Trace.WriteLine(BasePage.TraceLevelElement + "Click on : " + ControlPanelIDs.SocialUserLink + "]"); + WaitAndClick(By.XPath(ControlPanelIDs.SocialUserLink)); + Trace.WriteLine(BasePage.TraceLevelElement + "Click on : " + ControlPanelIDs.SocialLogoutLink + "]"); + WaitAndClick(By.XPath(ControlPanelIDs.SocialLogoutLink)); + WaitForElement(By.XPath(ControlPanelIDs.SocialLoginLink)); + } + } + + + /*WaitForElement(By.Id(ControlPanelIDs.LogoutLinkID), 20).Info(); Trace.WriteLine(BasePage.TraceLevelElement + "Click on button: " + ControlPanelIDs.LogoutLink + "]"); if (ElementPresent(By.XPath(ControlPanelIDs.LogoutLink))) { FindElement(By.XPath(ControlPanelIDs.LogoutLink)).Click(); WaitForElement(By.XPath(ControlPanelIDs.LoginLink), 20).WaitTillVisible(20); - } + }*/ } public void DoRegisterUsingRegisterLink(string userName, string displayName, string emailAddress, string password) { - WaitForElement(By.XPath(ControlPanelIDs.RegisterLink), 20).WaitTillVisible(20).Click(); + string selector = WaitForElement(By.XPath(ControlPanelIDs.CompanyLogo)).GetAttribute("src"); + + Trace.WriteLine(BasePage.TraceLevelElement + selector); + + if (selector.EndsWith(ControlPanelIDs.AwesomeCycles)) + { + WaitForElement(By.XPath(ControlPanelIDs.RegisterLink), 20).WaitTillVisible(20).Click(); + } + else + { + WaitForElement(By.XPath(ControlPanelIDs.SocialRegisterLink), 20).WaitTillVisible(20).Click(); + } + + //WaitForElement(By.XPath(ControlPanelIDs.RegisterLink), 20).WaitTillVisible(20).Click(); Trace.WriteLine(BasePage.TraceLevelPage + "Register a User:"); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/ManageUsersPage.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/ManageUsersPage.cs index 2df8e750542..87b5ea95650 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/ManageUsersPage.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/ManageUsersPage.cs @@ -117,7 +117,7 @@ public void EditUser(string userName) { Trace.WriteLine(BasePage.TraceLevelPage + "Edit the User:"); - Click(By.XPath("//tr[td[contains(text(), '" + userName + "')]]/td/a[contains(@href, 'Edit')]")); + Click(By.XPath("//tr[td[text() = '" + userName + "']]/td/a[contains(@href, 'Edit')]")); } public void AuthorizeUser(string userName) diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/Modules.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/Modules.cs index 66aee1939fb..cc4dd12945a 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/Modules.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/CorePages/Modules.cs @@ -113,6 +113,7 @@ public override string PageHeaderLabel public static string ContentPaneID = "//div[@id = 'content']/div[1]"; public static string ContentPaneLowerID = "//div[contains(@id, 'dnn_contentPaneLower')]"; public static string LeftPaneID = "//div[contains(@id,'dnn_leftPane')]"; + public static string RightPaneID = "//div[contains(@id,'dnn_rightPane')]"; public static string SideBarPaneID = "//div[contains(@id,'dnn_sidebarPane')]"; public static string FooterLeftOuterPaneID = "//div[contains(@id,'dnn_footerLeftOuterPane')]"; public static string FooterLeftPaneID = "//div[contains(@id, 'dnn_footerLeftPane')]"; @@ -164,8 +165,11 @@ public override string PageHeaderLabel public static string ToFooterRightOuterPane = "//li[text() = 'To footerRightOuterPane']"; public static string ModuleSettingsTab = "//a[@href = '#msModuleSettings']"; + public static string PageSettingsTab = "//a[@href = '#msPageSettings']"; public static string ModuleTitleTextBox = "//input[contains(@id, 'ModuleSettings_txtTitle')]"; + public static string ModuleContainerArrow = "//a[contains(@id, '_moduleContainerCombo_Arrow')]"; + public static string ModuleContainerDropDown = "//div[contains(@id, '_moduleContainerCombo_DropDown')]"; public static string UpdateButton = "//a[contains(@id, 'ModuleSettings_cmdUpdate')]"; @@ -322,21 +326,37 @@ public void AddContentToHTMLModule(string moduleNumber, string moduleContent) Thread.Sleep(1000); } - public void EditModuleSettings(string moduleNumber, string moduleTitle) + public void ChangeModuleTitle(string moduleNumber, string moduleTitle) { - Trace.WriteLine(BasePage.TraceLevelComposite + "Edit Module Settings:"); + Trace.WriteLine(BasePage.TraceLevelComposite + "Edit Module Settings: Change Module Title"); SelectFromSettingsMenu(moduleNumber, SettingsOption); OpenTab(By.XPath(ModuleSettingsTab)); - WaitForElement(By.XPath(ModuleTitleTextBox)); + //WaitForElement(By.XPath(ModuleTitleTextBox)); - Clear(By.XPath(ModuleTitleTextBox)); + WaitAndClear(By.XPath(ModuleTitleTextBox)); Type(By.XPath(ModuleTitleTextBox), moduleTitle); ClickOnButton(By.XPath(UpdateButton)); Thread.Sleep(1000); } + + public void SetModuleContainer(string moduleNumber, string moduleContainer) + { + Trace.WriteLine(BasePage.TraceLevelComposite + "Edit Module Settings: Set Module Container"); + + SelectFromSettingsMenu(moduleNumber, SettingsOption); + + OpenTab(By.XPath(PageSettingsTab)); + WaitForElement(By.XPath(ModuleContainerArrow)); + + SlidingSelectByValue(By.XPath(ModuleContainerArrow), By.XPath(ModuleContainerDropDown), moduleContainer); + + ClickOnButton(By.XPath(UpdateButton)); + + Thread.Sleep(1000); + } } } diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSearch.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSearch.cs index 96210a00dc1..3612ca8be0b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSearch.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSearch.cs @@ -33,7 +33,7 @@ public void Login() public void VerifyQuickSearch(BasePage currentPage) { - currentPage.WaitAndType(By.XPath(ControlPanelIDs.SearchBox), "awesome"); + currentPage.WaitAndType(By.XPath(ControlPanelIDs.SearchBox), "home"); currentPage.WaitForElement(By.XPath("//ul[@class = 'searchSkinObjectPreview']"), 60); Assert.IsTrue(currentPage.ElementPresent(By.XPath("//li/a[@class = 'searchSkinObjectPreview_more']")), @@ -46,16 +46,16 @@ public void VerifyQuickSearch(BasePage currentPage) public void VerifySearchResults(BasePage currentPage) { - currentPage.WaitAndType(By.XPath(ControlPanelIDs.SearchBox), "awesome"); + currentPage.WaitAndType(By.XPath(ControlPanelIDs.SearchBox), "home"); currentPage.Click(By.XPath(ControlPanelIDs.SearchButton)); var searchPage = new SearchPage(_driver); searchPage.WaitForElement(By.XPath("//div[@class = 'dnnSearchResultContainer']"), 60); - Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT Page Title for '" + searchPage.PageTitleLabel + "' page:"); - StringAssert.Contains(searchPage.PageTitleLabel, - searchPage.WaitForElement(By.XPath(ControlPanelIDs.PageTitleID)).Text, - "The wrong page is opened or The title of " + searchPage.PageTitleLabel + " page is changed"); + Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT Page Title for '" + searchPage.PageHeaderLabel + "' page:"); + StringAssert.Contains(searchPage.PageHeaderLabel.ToUpper(), + searchPage.WaitForElement(By.XPath(ControlPanelIDs.PageHeaderID)).Text.ToUpper(), + "The wrong page is opened or The title of " + searchPage.PageHeaderLabel + " page is changed"); Assert.That(searchPage.FindElements(By.XPath(SearchPage.ResultsList)).Count, Is.AtLeast(1), "At least one item is displayed"); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSecurityRoles.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSecurityRoles.cs index 66812cd35ca..c47b1e38c2b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSecurityRoles.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSecurityRoles.cs @@ -67,6 +67,7 @@ public void Test001_AddSecurityRole() manageRolesPage.AddNewSecurityRole(_roleName); manageRolesPage.OpenUsingControlPanel(_baseUrl); + manageRolesPage.WaitForElement(By.XPath(ManageRolesPage.SecurityRolesTable)); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the number of elements in the list increased by 1"); @@ -89,6 +90,7 @@ public void Test002_EditSecurityRole() manageRolesPage.AddDescriptionToSecurityRole(_roleName, _roleDescription); + manageRolesPage.WaitForElement(By.XPath(ManageRolesPage.SecurityRolesTable)); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the Security description is present in the list"); Assert.That(_roleDescription, Is.EqualTo(manageRolesPage.FindElement(By.XPath("//tr[td[text() = '" + _roleName + "']]/td[4]")).Text), @@ -107,6 +109,7 @@ public void Test003_DeleteSecurityRole() manageRolesPage.DeleteSecurityRole(_roleName); + manageRolesPage.WaitForElement(By.XPath(ManageRolesPage.SecurityRolesTable)); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the number of elements in the list decreased by 1"); Assert.That(itemNumber - 1, Is.EqualTo(manageRolesPage.FindElements(By.XPath(ManageRolesPage.SecurityRolesList)).Count), diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSetup.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSetup.cs index 166d257da45..fa85cf171cd 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSetup.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTSetup.cs @@ -56,7 +56,7 @@ public void RunBeforeBVTTests() driver.Quit(); } - //[TearDown] + [TearDown] public void RunAfterBVTTests() { Trace.WriteLine(BasePage.TraceLevelComposite + "BVT Teardown"); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTUsers.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTUsers.cs index 0c9a6daeb23..aae618b5154 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTUsers.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/BVT/BVTUsers.cs @@ -117,61 +117,5 @@ public void Test003_RemoveDeletedUser() "The User is not removed correctly"); } - [Test] - public void Test004_RegisterUser() - { - Trace.WriteLine(BasePage.RunningTestKeyWord + "'Register the User'"); - - var mainPage = new MainPage(_driver); - mainPage.OpenUsingUrl(_baseUrl); - - var loginPage = new LoginPage(_driver); - loginPage.RegisterUser(_registeredUserName, _registeredUserDisplayName, "registereduser@mail.com", _registeredUserPassword); - - _driver.Navigate().Refresh(); - - loginPage.LoginAsHost(_baseUrl); - - var manageUsersPage = new ManageUsersPage(_driver); - manageUsersPage.OpenUsingUrl(_baseUrl); - - manageUsersPage.AuthorizeUser(_registeredUserName); - - manageUsersPage.OpenUsingControlPanel(_baseUrl); - - loginPage.LoginUsingLoginLink(_registeredUserName, _registeredUserPassword); - - mainPage.OpenUsingUrl(_baseUrl); - - Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the User is present on the screen"); - Assert.That(mainPage.FindElement(By.XPath(ControlPanelIDs.RegisterLink)).Text, Is.EqualTo(_registeredUserDisplayName), - "The registered User is not logged in correctly"); - } - - [Test] - public void Test005_RegisteredUserChangesProfile() - { - Trace.WriteLine(BasePage.RunningTestKeyWord + "'Registered User changes Profile'"); - - var loginPage = new LoginPage(_driver); - loginPage.LetMeOut(); - - loginPage.OpenUsingUrl(_baseUrl); - loginPage.DoLoginUsingUrl(_registeredUserName, _registeredUserPassword); - - var manageUserProfilePage = new ManageUserProfilePage(_driver); - manageUserProfilePage.OpenUsingLink(_baseUrl); - - manageUserProfilePage.AddCity(_cityName); - - var userAccountPage = new UserAccountPage(_driver); - userAccountPage.OpenUsingLink(_baseUrl); - - userAccountPage.OpenMyProfileInfo(); - - Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the City Info is present on the screen"); - Assert.That(userAccountPage.FindElement(By.XPath(UserAccountPage.LocationCity)).Text, Is.EqualTo(_cityName), - "The City Info is not displayed correctly"); - } } } \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/P1/P1Pages.cs b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/P1/P1Pages.cs index 3145250974b..0ff64c8b4fd 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/P1/P1Pages.cs +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Common/Tests/P1/P1Pages.cs @@ -95,7 +95,7 @@ public void Test001_AddWebPage() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addWebAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addWebAfter + " ']]//div/span[text() = '" + _pageName + " ']")), "The page is not present in the list"); } @@ -115,28 +115,28 @@ public void Test002_AddWebMultiplePages() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName1 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addWebAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addWebAfter + " ']]//div/span[text() = '" + _pageName1 + " ']")), "The page " + _pageName1 + " is not present in the list"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName2 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addWebAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addWebAfter + " ']]//div/span[text() = '" + _pageName2 + " ']")), "The page " + _pageName2 + " is not present in the list"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName3 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + _pageName3 + " ']")), "The page " + _pageName3 + " is not present in the list"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName4 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + _pageName4 + " ']")), "The page " + _pageName4 + " is not present in the list"); } @@ -173,14 +173,14 @@ public void Test004_MoveWebPage() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is NOT present in the old location"); Assert.IsFalse( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addWebAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addWebAfter + " ']]//div/span[text() = '" + _pageName + " ']")), "The page " + _pageName + " is present in the list after Page '" + _addWebAfter + "'"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is present in the new location"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _moveAfterWebPage + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _moveAfterWebPage + " ']]//div/span[text() = '" + _pageName + " ']")), "The page " + _pageName + " is not present in the list"); } @@ -199,7 +199,7 @@ public void Test005_DeleteWebPage() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is NOT present in the list"); Assert.IsFalse( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addWebAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addWebAfter + " ']]//div/span[text() = '" + _pageName + " ']")), "The page " + _pageName + " is present in the list"); } @@ -217,12 +217,12 @@ public void Test006_AddHostPage() adminPageManagementPage.OpenUsingButtons(_baseUrl); adminPageManagementPage.RadioButtonSelect(By.XPath(AdminPageManagementPage.HostPagesRadioButton)); - adminPageManagementPage.WaitForElement(By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//span[text() = 'Host ']")); + adminPageManagementPage.WaitForElement(By.XPath(AdminPageManagementPage.PageList + "//span[text() = 'Host ']")); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addHostAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addHostAfter + " ']]//div/span[text() = '" + _pageName + " ']")), "The page is not present in the list"); } @@ -244,28 +244,28 @@ public void Test007_AddHostMultiplePages() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName1 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addHostAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addHostAfter + " ']]//div/span[text() = '" + _pageName1 + " ']")), "The page " + _pageName1 + " is not present in the list"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName2 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addHostAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addHostAfter + " ']]//div/span[text() = '" + _pageName2 + " ']")), "The page " + _pageName2 + " is not present in the list"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName3 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + _pageName3 + " ']")), "The page " + _pageName3 + " is not present in the list"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName4 + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _pageName2 + " ']]//div/span[text() = '" + _pageName4 + " ']")), "The page " + _pageName4 + " is not present in the list"); } @@ -303,14 +303,14 @@ public void Test009_MoveHostPage() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is NOT present in the old location"); Assert.IsFalse( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addHostAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addHostAfter + " ']]//div/span[text() = '" + _pageName + " ']")), "The page " + _pageName + " is present in the list after Page '" + _addHostAfter + "'"); Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is present in the new location"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _moveAfterHostPage + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _moveAfterHostPage + " ']]//div/span[text() = '" + _pageName + " ']")), "The page " + _pageName + " is not present in the list"); } @@ -329,7 +329,7 @@ public void Test010_DeleteHostPage() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _pageName + "is NOT present in the list"); Assert.IsFalse( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _addHostAfter + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _addHostAfter + " ']]//div/span[text() = '" + _pageName + " ']")), "The page " + _pageName + " is present in the list"); } @@ -360,7 +360,7 @@ public void Test011_CopyPage() Trace.WriteLine(BasePage.TraceLevelPage + "ASSERT the page: " + _copiedPageName + "is present in the list"); Assert.IsTrue( adminPageManagementPage.ElementPresent( - By.XPath("//div[contains(@id, 'Tabs_ctlPages')]//li[div/span[text() = '" + _parentPageName + + By.XPath(AdminPageManagementPage.PageList + "//li[div/span[text() = '" + _parentPageName + " ']]//div/span[text() = '" + _copiedPageName + " ']")), "The page is not present in the list"); } diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Platform/BVT/BVTData.xml b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Platform/BVT/BVTData.xml index 6653567d422..a579c600a87 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Platform/BVT/BVTData.xml +++ b/DNN Platform/Tests/DotNetNuke.Tests.Selenium.Platform/BVT/BVTData.xml @@ -2,9 +2,9 @@ - t public void AdvancedUrlProvider_SpaceEncoding(Dictionary testFields) { var settings = UrlTestFactoryClass.GetSettings("FriendlyUrl", "SpaceEncoding"); + settings.ReplaceSpaceWith = " "; string spaceEncoding = testFields.GetValue("SpaceEncoding"); diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/Settings.csv b/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/Settings.csv index 94ceec16ddb..67383a19cff 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/Settings.csv +++ b/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/Settings.csv @@ -1,4 +1,4 @@ -Key, Value -UrlFormat, advanced -FriendlyAdminHostUrls, true -PageExtensionUsageType, AlwaysUse \ No newline at end of file +Key, Value, +UrlFormat, advanced, +FriendlyAdminHostUrls, true, +PageExtensionUsageType, AlwaysUse, diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/TestFile.csv b/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/TestFile.csv index 470105c3bc7..265adcbf620 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/TestFile.csv +++ b/DNN Platform/Tests/DotNetNuke.Tests.Urls/TestFiles/FriendlyUrl/SpaceEncoding/TestFile.csv @@ -1,7 +1,10 @@ -Test, Scheme, SpaceEncoding, Page Name, Params, Expected Url, -Default 1QS, http://, , Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx -Plus 1QS, http://, +, Home, &view=Show Code, http://{alias}/Home/view/Show+Code.aspx -Unicode 1QS, http://, %20, Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx -Default 2QS, http://, , Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx -Plus 2QS, http://, +, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add+Item/mid/100.aspx -Unicode 2QS, http://, %20, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx \ No newline at end of file +Test, Scheme, SpaceEncoding, Page Name, Params, Expected Url, +Default About Us, http://, , About Us, , http://{alias}/About%20Us.aspx +Plus About Us, http://, +, About Us, , http://{alias}/About+Us.aspx +Unicode About Us, http://, %20, About Us, , http://{alias}/About%20Us.aspx +Default 1QS, http://, , Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx +Plus 1QS, http://, +, Home, &view=Show Code, http://{alias}/Home/view/Show+Code.aspx +Unicode 1QS, http://, %20, Home, &view=Show Code, http://{alias}/Home/view/Show%20Code.aspx +Default 2QS, http://, , Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx +Plus 2QS, http://, +, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add+Item/mid/100.aspx +Unicode 2QS, http://, %20, Home, &ctl=Add Item&mid=100, http://{alias}/Home/ctl/Add%20Item/mid/100.aspx \ No newline at end of file diff --git a/Documentation/Advanced Site Management/Content Localization/About Content Localization.html b/Documentation/Advanced Site Management/Content Localization/About Content Localization.html index 5fca1215e34..c4130cb919c 100644 --- a/Documentation/Advanced Site Management/Content Localization/About Content Localization.html +++ b/Documentation/Advanced Site Management/Content Localization/About Content Localization.html @@ -7,7 +7,7 @@

    About Content Localization

    Content Localization allows Administrators and translators to create localized module content in multiple languages (cultures).

    - More than one language must be deployed (See "Installing Available Languages") and enabled on the site, See "Enabling/Disabling a Language".

    + Prerequisite. More than one language must be deployed (See "Installing Available Languages") and enabled on the site, See "Enabling/Disabling a Language".

    Content localization must also be allowed on the site by a SuperUser (See "Allowing/Disallowing Content Localization")

    \ No newline at end of file diff --git a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/01 Creating Localized Pages for a Language.html b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/01 Creating Localized Pages for a Language.html index e299c244b13..6ccac21ab17 100644 --- a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/01 Creating Localized Pages for a Language.html +++ b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/01 Creating Localized Pages for a Language.html @@ -1,17 +1,16 @@  - +

    Creating Localized Pages for a Language

    How to create localized pages for a language that has been added to the site but does not yet have localized pages created. This can occur if localization was enabled when a language was disabled or if localization was enabled but not all pages were set as translatable, therefore the individual pages need to be chosen. Users must be granted Edit Module/Add Content permissions to the Languages module.

    -

    - Localized content must be enabled. See "Enabling Localized Content"

    +

    Localized content must be enabled. See "Enabling Localized Content"

      -
    1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
      2. +
    2. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
    3. Select the Languages tab.
    4. Optional. In the Enabled column of the Culture grid, beside the language if it is not yet enabled.
      5. -
    5. In the Content Location - No of Pages column of the Culture grid, click the Create Pages In This Language button beside the required language.
      6. +
    6. In the Content Location - No of Pages column of the Culture grid, click the Create Pages In This Language button beside the required language.

    diff --git a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/03 Making a Page Translatable.htm b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/03 Making a Page Translatable.htm index e3965098a29..624655bb81a 100644 --- a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/03 Making a Page Translatable.htm +++ b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/03 Making a Page Translatable.htm @@ -6,7 +6,7 @@

    Making a Page Translatable

    How to make a page translatable by creating a translatable version of the page and all modules on that page in each of the enabled languages.

    - A translation for a page can be created by either an Administrator or a translator. If this task is performed by an Administrator a translation will be made for each culture. Translators can use this feature to create translatable version of a page my language only. Translations for other cultures can later be added by other translators or Administrators using the Languages module. See "Adding Missing Language Translations to a Page"

    + Prerequisite. A translation for a page can be created by either an Administrator or a translator. If this task is performed by an Administrator a translation will be made for each culture. Translators can use this feature to create translatable version of a page my language only. Translations for other cultures can later be added by other translators or Administrators using the Languages module. See "Adding Missing Language Translations to a Page"

    Using the Languages Module

    1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
      2. diff --git a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/09 Changing Translatable Modules to Reference Modules.htm b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/09 Changing Translatable Modules to Reference Modules.htm index 5c88b23df35..ef959d6afa7 100644 --- a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/09 Changing Translatable Modules to Reference Modules.htm +++ b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/09 Changing Translatable Modules to Reference Modules.htm @@ -16,7 +16,7 @@

      Changing Translatable Modules to Reference Modules

      1. - The selected module is now a reference copy of the default language module and the module name cannot be edited.
        2. + Click the Update button. The selected module is now a reference copy of the default language module and the module name cannot be edited.

      diff --git a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/13 Changing Reference Modules to Translatable Modules.htm b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/13 Changing Reference Modules to Translatable Modules.htm index a283b90cece..bb8757b10f9 100644 --- a/Documentation/Advanced Site Management/Content Localization/Choosing Translations/13 Changing Reference Modules to Translatable Modules.htm +++ b/Documentation/Advanced Site Management/Content Localization/Choosing Translations/13 Changing Reference Modules to Translatable Modules.htm @@ -16,7 +16,7 @@

      Changing Reference Modules to Translatable Modules

      1. - + Click the Update button.

      diff --git a/Documentation/Advanced Site Management/Content Localization/Configuring Content Localization/01 Enabling Localized Content.html b/Documentation/Advanced Site Management/Content Localization/Configuring Content Localization/01 Enabling Localized Content.html index c30dba65836..9da4e1bdbfc 100644 --- a/Documentation/Advanced Site Management/Content Localization/Configuring Content Localization/01 Enabling Localized Content.html +++ b/Documentation/Advanced Site Management/Content Localization/Configuring Content Localization/01 Enabling Localized Content.html @@ -1,14 +1,14 @@  - +

      Enabling Localized Content

      How to create a localized copy of the current site content for each of the enabled languages using the Languages module. This creates a translator role ( titled Translator and then appended with the country code. E.g. Translator (EN-AU) ) for each enabled language. This also enables the Localization tab under Page Settings for all site pages. See "Page Details Settings for Existing Pages"

      - Localized content must be enabled by a SuperUser. Localized content cannot be disabled once it has been enabled. See "Allowing/Disallowing Content Localization"

      + Localized content must be enabled by a SuperUser. Localized content cannot be disabled once it has been enabled. See "Allowing/Disallowing Content Localization"

      In DNN Platform, any user (including unauthenticated users) who is granted Edit Module permissions. In Evoq Content and Evoq Content Enterprise, any user (including unauthenticated users) who is granted Edit Content permissions.

        -
      1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
        2. +
      2. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
      3. Select the Languages tab.
      4. Click the Enable Localized Content button.
      diff --git a/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing Localized Content.html b/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing Localized Content.html index 89b8691428c..613e7fb50c8 100644 --- a/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing Localized Content.html +++ b/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing Localized Content.html @@ -1,15 +1,14 @@  - - +

      Publishing All Translated Pages for a Language

      How to publish translated pages using the Languages module. Publishing only affects the pages that have been marked as translated (See "Setting a Page as Translated"). Once pages are published, the view permissions of published pages are updated to be the same as for the default language.

      In DNN Platform, any user (including unauthenticated users) who has been granted Edit Module permissions. In users (including unauthenticated users, any user (including unauthenticated users) who has been granted Edit Content permissions.

      - A language must be set as "Active" before it can be published (See "Activating/Deactiving a Language"). Pages should be translated prior to publishing, See "Translating a Page"

      + A language must be set as "Active" before it can be published (See "Activating/Deactiving a Language"). Pages should be translated prior to publishing, See "Translating a Page"

        -
      1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
        2. +
      2. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
      3. Select the Languages tab.
      4. In the Culture grid, go to the Content Localization - Publish column.
      5. Click the Publish Pages button. This displays the message "Would you like to publish all pages in the [selected] language?"
        6. diff --git a/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing a Secondary Language Page.html b/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing a Secondary Language Page.html index afeae67b879..b3e992f25ad 100644 --- a/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing a Secondary Language Page.html +++ b/Documentation/Advanced Site Management/Content Localization/Publishing/Publishing a Secondary Language Page.html @@ -1,6 +1,5 @@  - - +

        Publishing a Single Page Translation

        How to publish individual translations of a single page. This updates the view permissions for the selected page so they are the same as the default language version of the page.

        @@ -19,7 +18,7 @@

        Using the ControlBar

        Using the Languages Module

          -
        1. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
          2. +
        2. Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
        3. Select the Content Localization tab.
        4. At Select a Page, find or select the required page.
        5. At Published , to translate the page.
          6. diff --git a/Documentation/Advanced Site Management/Content Localization/Translating/03 Translating a Module.html b/Documentation/Advanced Site Management/Content Localization/Translating/03 Translating a Module.html index 41d5d00db19..fab318b33e5 100644 --- a/Documentation/Advanced Site Management/Content Localization/Translating/03 Translating a Module.html +++ b/Documentation/Advanced Site Management/Content Localization/Translating/03 Translating a Module.html @@ -1,7 +1,6 @@  - + -

          Translating a Module

          diff --git a/Documentation/Advanced Site Management/Content Localization/Translating/09 Setting a Page as Translated.html b/Documentation/Advanced Site Management/Content Localization/Translating/09 Setting a Page as Translated.html index 7d8ebcfd24e..fec0461929c 100644 --- a/Documentation/Advanced Site Management/Content Localization/Translating/09 Setting a Page as Translated.html +++ b/Documentation/Advanced Site Management/Content Localization/Translating/09 Setting a Page as Translated.html @@ -1,7 +1,6 @@  - + -

          Setting a Page as Translated

          @@ -9,8 +8,8 @@

          Setting a Page as Translated

          The page content should be translated. See "Translating a Page"

            -
          1. Select Page Localization from the Edit Page menu of the ControlBar - OR - Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
            2. -
          2. Perform one of the following options:
            • Go to the Page Modules section of the required language and click the Translated? button. This sets all translatable modules as translated.
            • At Translated, to set the full page as translated.
            3. +
          3. Select Page Localization from the Edit Page menu of the ControlBar - OR - Navigate to Admin > Advanced Settings > Languages - OR - Go to a Languages module.
            4. +
          4. Perform one of the following options:
            • Go to the Page Modules section of the required language and click the Translated? button. This sets all translatable modules as translated.
            • At Translated, to set the full page as translated.
          5. Click the Update Localization button.

          Next Step: If this page is now ready to publish live on your site, See "Publishing a Single Page Translation". Note: A language must be activated before pages can be published. See "Activating/Deactiving a Language"

          diff --git a/Documentation/Advanced Site Management/Content Localization/Working with Multi-Language Sites/01 Viewing a Site in the Default Language.html b/Documentation/Advanced Site Management/Content Localization/Working with Multi-Language Sites/01 Viewing a Site in the Default Language.html index 43b39980bca..379f64b4c69 100644 --- a/Documentation/Advanced Site Management/Content Localization/Working with Multi-Language Sites/01 Viewing a Site in the Default Language.html +++ b/Documentation/Advanced Site Management/Content Localization/Working with Multi-Language Sites/01 Viewing a Site in the Default Language.html @@ -1,5 +1,5 @@  - + diff --git a/Documentation/Advanced Site Management/Mobile Devices Support/About Mobile Devices Support.html b/Documentation/Advanced Site Management/Mobile Devices Support/About Mobile Devices Support.html index 6f2e4dfff17..2b6b122c733 100644 --- a/Documentation/Advanced Site Management/Mobile Devices Support/About Mobile Devices Support.html +++ b/Documentation/Advanced Site Management/Mobile Devices Support/About Mobile Devices Support.html @@ -8,7 +8,7 @@

          About Mobile Devices Support

          Once you've created your mobile site, you can create redirection paths for different mobile devices, See "About the Site Redirection Management Module"

          To preview your mobile device site, DNN Content Evoq and DNN Content Evoq Enterprise customers can use the emulator on the Control Panel. DNN Platform users can use an emulator (E.g. http://www.electricplum.com/dlsim.html) to emulate the experience of your site visitors.

          - + Related Topics:

          • diff --git a/Documentation/Advanced Site Management/Mobile Devices Support/Creating a MicroSite.html b/Documentation/Advanced Site Management/Mobile Devices Support/Creating a MicroSite.html index 60588006a76..27e708f22f0 100644 --- a/Documentation/Advanced Site Management/Mobile Devices Support/Creating a MicroSite.html +++ b/Documentation/Advanced Site Management/Mobile Devices Support/Creating a MicroSite.html @@ -20,7 +20,7 @@

            Creating a MicroSite

            - + Related Topics:

            • diff --git a/Documentation/Advanced Site Management/Mobile Devices Support/Creating a Standalone Mobile Site.html b/Documentation/Advanced Site Management/Mobile Devices Support/Creating a Standalone Mobile Site.html index 30b09c3ec69..96e718c26a0 100644 --- a/Documentation/Advanced Site Management/Mobile Devices Support/Creating a Standalone Mobile Site.html +++ b/Documentation/Advanced Site Management/Mobile Devices Support/Creating a Standalone Mobile Site.html @@ -24,7 +24,7 @@

              Creating a Standalone Mobile + Related Topics:

              • diff --git a/Documentation/Advanced Site Management/Mobile Devices Support/Previewing Your Mobile Device Site.html b/Documentation/Advanced Site Management/Mobile Devices Support/Previewing Your Mobile Device Site.html index dae1f7ea32c..f073332b7e6 100644 --- a/Documentation/Advanced Site Management/Mobile Devices Support/Previewing Your Mobile Device Site.html +++ b/Documentation/Advanced Site Management/Mobile Devices Support/Previewing Your Mobile Device Site.html @@ -25,7 +25,7 @@

                Previewing Your Mobile Device Site


                Preview Mode: Showing the Products page being redirected to Products-Mobile page in a BlackBerry Bold 9000 Portrait aspect ratio.

                - + Related Topics:

                • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/About Modules.html b/Documentation/Building Your Site/Adding and Managing Modules/About Modules.html index c815aa47b52..b263bb891b6 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/About Modules.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/About Modules.html @@ -28,7 +28,7 @@

                  About Modules

                - + Related Topics:

                • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Adding a New Module - Control Bar.html b/Documentation/Building Your Site/Adding and Managing Modules/Adding a New Module - Control Bar.html index 597e05220a3..d5ddf30b624 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Adding a New Module - Control Bar.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Adding a New Module - Control Bar.html @@ -68,7 +68,7 @@

                  Option Two - Insert Module

                  - + Related Topics:

                  • For modules that you can now add content, See "Adding Module Content"
                    • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Control Bar.html b/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Control Bar.html index 8610c81dcc1..af1c446e4ab 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Control Bar.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Control Bar.html @@ -57,7 +57,7 @@

                    Option Two - Insert Module

                    - + Related Topics:

                    • For modules that allow you to add content, See "Adding Module Content"
                      • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Iconbar.html b/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Iconbar.html index f6c5aff3361..f292186e4e5 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Iconbar.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - Iconbar.html @@ -19,7 +19,7 @@

                      Adding an Existing Module (Iconbar)

                    • Click the Add Module To Page Add Module To Page link. For modules that enable you to add content.

        - + Related Topics:

        • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - RibbonBar.html b/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - RibbonBar.html index 4e85647f6f2..ee65f28a671 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - RibbonBar.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Adding an Existing Module - RibbonBar.html @@ -33,7 +33,7 @@

          Adding an Existing Module (RibbonBar)

      Note: When adding an existing module from another site, a warning message will be displayed advising that the module may not support module sharing. Exceptions are the HTML/HTML Pro and Journal modules which have be developed with module sharing capabilities.

      - + Related Topics:

      • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Deleting a Module.html b/Documentation/Building Your Site/Adding and Managing Modules/Deleting a Module.html index 66676cbb25a..eb4ecf9c522 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Deleting a Module.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Deleting a Module.html @@ -17,11 +17,11 @@

        Deleting a Module

        1. - + Click the OK button to confirm.

        - + Related Topics:

        • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Editing Module Content.html b/Documentation/Building Your Site/Adding and Managing Modules/Editing Module Content.html index 8d1fd7d5236..33c338c0794 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Editing Module Content.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Editing Module Content.html @@ -18,7 +18,7 @@

          Editing Module Content

          1. Edit the fields.
          2. - + Click the OK button to confirm.

          Editing modules with multiple items such as the Announcements and Links modules:

          @@ -31,11 +31,11 @@

          Editing Module Content

          1. Edit the fields.
          2. - + Click the OK button to confirm.

          - + Related Topics:

          • diff --git a/Documentation/Building Your Site/Adding and Managing Modules/Module Actions Menu.html b/Documentation/Building Your Site/Adding and Managing Modules/Module Actions Menu.html index d682c1bf80d..2bab8e8ec1c 100644 --- a/Documentation/Building Your Site/Adding and Managing Modules/Module Actions Menu.html +++ b/Documentation/Building Your Site/Adding and Managing Modules/Module Actions Menu.html @@ -13,7 +13,7 @@

            Module Actions Menu

            Opening the Module Actions Menu

            How to view the options available to you on the module actions menu. Note: Some menu options are role restricted.

            - If the Control Panel is displayed, it must be in Edit Mode to view and access the module action menu.

            + Prerequisite. If the Control Panel is displayed, it must be in Edit Mode to view and access the module action menu.

            The tools of the module action menu are divided into the three following groups:

            • @@ -79,7 +79,7 @@

              Manage Tools

            • This opens the Module Settings page.
            • Edit one or more settings as required.
            • - + Click the OK button to confirm.
      -
    • - to auto-resize the height of the Editor to match content height. This removes the Editor scroll bar.
      • -
    • - to restore the height set for the Editor and display a scroll bar.
      • +
    • Mark  the check box to auto-resize the height of the Editor to match content height. This removes the Editor scroll bar.
      • +
    • Unmark  the check box to restore the height set for the Editor and display a scroll bar.
      -
    • - to insert a new line when the Enter key is pressed. This option also enables you to insert paragraph tags by pressing Ctrl+M or the New Paragraph button.
      • -
    • - to insert a new paragraph when the Enter key is pressed. In this option, a paragraph tag is entered when the Enter key is pressed. In addition, pressing Shift+Enter inserts a tag. Note: Lists are types of paragraphs and they accept the same attributes as paragraph tags. This means that whenever you insert a list in your HTML, you will insert a new paragraph. This makes it impossible to start bulleted/numbered list with the line being blank.
      • +
    • Mark  the check box to insert a new line when the Enter key is pressed. This option also enables you to insert paragraph tags by pressing Ctrl+M or the New Paragraph button.
      • +
    • Unmark  the check box to insert a new paragraph when the Enter key is pressed. In this option, a paragraph tag is entered when the Enter key is pressed. In addition, pressing Shift+Enter inserts a tag. Note: Lists are types of paragraphs and they accept the same attributes as paragraph tags. This means that whenever you insert a list in your HTML, you will insert a new paragraph. This makes it impossible to start bulleted/numbered list with the line being blank.
      -
    • - to use relative URL's. E.g. /Home.aspx
      • -
    • - use absolute URL's. E.g. http://awesomecycles.biz/Home.aspx
      • +
    • Mark  the check box to use relative URL's. E.g. /Home.aspx
      • +
    • Unmark  the check box use absolute URL's. E.g. http://awesomecycles.biz/Home.aspx
      -
    • - to enable the "Link To Portal Page" drop down list in the toolbar to display a hierarchical list of the site pages.
      • -
    • - to disable site links. Note: The "Link To Portal Page" option still displays however the drop down list is blank.
      • +
    • Mark  the check box to enable the "Link To Portal Page" drop down list in the toolbar to display a hierarchical list of the site pages.
      • +
    • Unmark  the check box to disable site links. Note: The "Link To Portal Page" option still displays however the drop down list is blank.