zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsp_10267, show progress dialog when expanding/collapsing nodes in import resources to hosting space

Browse source
This commit is contained in:
Olov Karlsson 2014-11-10 15:06:20 +01:00
parent 6f2893de81
commit 1334426d54
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx
View file

@ -6,8 +6,7 @@
function TreeViewCheckBoxClicked(Check_Event) function TreeViewCheckBoxClicked(Check_Event)
{ {
var objElement; var objElement;
try try {
{
objElement = window.event.srcElement; objElement = window.event.srcElement;
} }
catch (Error) catch (Error)
@ -16,18 +15,19 @@
if (objElement != null) if (objElement != null)
{ {
if (objElement.tagName == "INPUT" && objElement.type == "checkbox") if (objElement.tagName == "IMG" && objElement.href.indexOf('folder.png') == -1 && objElement.href.indexOf('empty.gif') == -1) {
{ ShowProgressDialog('');
__doPostBack("", ""); ShowProgressDialogInternal();
} }
} }
else else
{ {
if (Check_Event != null) if (Check_Event != null)
{ {
if (Check_Event.target.toString() == "[object HTMLInputElement]") if (Check_Event.target.tagName == "IMG" && Check_Event.target.href.indexOf('folder.png') == -1 && objElement.href.indexOf('empty.gif') == -1)
{ {
__doPostBack("", ""); ShowProgressDialog('');
ShowProgressDialogInternal();
} }
} }
} }
@ -36,7 +36,7 @@
<div class="FormBody"> <div class="FormBody">
<asp:treeview runat="server" id="tree" populatenodesfromclient="true" NodeIndent="10" <asp:treeview runat="server" id="tree" populatenodesfromclient="true" NodeIndent="10"
showexpandcollapse="true" expanddepth="0" ontreenodepopulate="tree_TreeNodePopulate" OnTreeNodeCheckChanged="tree_TreeNodeCheckChanged" > showexpandcollapse="true" expanddepth="0" ontreenodepopulate="tree_TreeNodePopulate" OnTreeNodeCheckChanged="tree_TreeNodeCheckChanged" OnTreeNodeExpanded="tree_TreeNodeExpanded">
<LevelStyles> <LevelStyles>
<asp:TreeNodeStyle CssClass="FileManagerTreeNode" /> <asp:TreeNodeStyle CssClass="FileManagerTreeNode" />
<asp:TreeNodeStyle CssClass="FileManagerTreeNode" /> <asp:TreeNodeStyle CssClass="FileManagerTreeNode" />

14
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceImportResources.ascx.cs
View file

@ -49,9 +49,6 @@ namespace WebsitePanel.Portal
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
// enable async tasks
//EnableAsyncTasksSupport();
if (!IsPostBack) if (!IsPostBack)
{ {
tree.Attributes.Add("onClick", "TreeViewCheckBoxClicked(event)"); tree.Attributes.Add("onClick", "TreeViewCheckBoxClicked(event)");
@ -71,6 +68,7 @@ namespace WebsitePanel.Portal
rootNode = new TreeNode(); rootNode = new TreeNode();
rootNode.ImageUrl = PortalUtils.GetThemedImage("folder.png"); rootNode.ImageUrl = PortalUtils.GetThemedImage("folder.png");
rootNode.Text = GetLocalizedString("Text.Resources"); rootNode.Text = GetLocalizedString("Text.Resources");
rootNode.SelectAction = TreeNodeSelectAction.None;
rootNode.Value = "Root"; rootNode.Value = "Root";
rootNode.Expanded = true; rootNode.Expanded = true;
tree.Nodes.Add(rootNode); tree.Nodes.Add(rootNode);
@ -84,6 +82,7 @@ namespace WebsitePanel.Portal
node.Value = "-" + type.ItemTypeId.ToString(); node.Value = "-" + type.ItemTypeId.ToString();
node.Text = GetSharedLocalizedString("ServiceItemType." + type.DisplayName); node.Text = GetSharedLocalizedString("ServiceItemType." + type.DisplayName);
node.PopulateOnDemand = true; node.PopulateOnDemand = true;
node.SelectAction = TreeNodeSelectAction.None;
node.ImageUrl = PortalUtils.GetThemedImage("folder.png"); node.ImageUrl = PortalUtils.GetThemedImage("folder.png");
rootNode.ChildNodes.Add(node); rootNode.ChildNodes.Add(node);
} }
@ -93,6 +92,7 @@ namespace WebsitePanel.Portal
node.Value = "+100"; node.Value = "+100";
node.Text = GetSharedLocalizedString("ServiceItemType.HostHeader"); node.Text = GetSharedLocalizedString("ServiceItemType.HostHeader");
node.PopulateOnDemand = true; node.PopulateOnDemand = true;
node.SelectAction = TreeNodeSelectAction.None;
node.ImageUrl = PortalUtils.GetThemedImage("folder.png"); node.ImageUrl = PortalUtils.GetThemedImage("folder.png");
rootNode.ChildNodes.Add(node); rootNode.ChildNodes.Add(node);
@ -113,6 +113,7 @@ namespace WebsitePanel.Portal
node.Text = item; node.Text = item;
node.Value = itemTypeId.ToString() + "|" + item; node.Value = itemTypeId.ToString() + "|" + item;
node.ShowCheckBox = true; node.ShowCheckBox = true;
node.SelectAction = TreeNodeSelectAction.None;
e.Node.ChildNodes.Add(node); e.Node.ChildNodes.Add(node);
} }
} }
@ -130,6 +131,7 @@ namespace WebsitePanel.Portal
headerNode.Text = GetSharedLocalizedString("ServiceItemType.HostHeader"); headerNode.Text = GetSharedLocalizedString("ServiceItemType.HostHeader");
headerNode.Value = "+" + itemTypeId.ToString(); headerNode.Value = "+" + itemTypeId.ToString();
headerNode.ShowCheckBox = true; headerNode.ShowCheckBox = true;
headerNode.SelectAction = TreeNodeSelectAction.None;
e.Node.ChildNodes.Add(headerNode); e.Node.ChildNodes.Add(headerNode);
foreach (string item in items) foreach (string item in items)
@ -152,6 +154,7 @@ namespace WebsitePanel.Portal
userNode.Text = objectData[0]; userNode.Text = objectData[0];
userNode.Value = "+" + itemTypeId.ToString() + "|" + objectData[1]; userNode.Value = "+" + itemTypeId.ToString() + "|" + objectData[1];
userNode.ShowCheckBox = true; userNode.ShowCheckBox = true;
userNode.SelectAction = TreeNodeSelectAction.None;
headerNode.ChildNodes.Add(userNode); headerNode.ChildNodes.Add(userNode);
} }
@ -159,6 +162,7 @@ namespace WebsitePanel.Portal
siteNode.Text = objectData[3]; siteNode.Text = objectData[3];
siteNode.Value = "+" + itemTypeId.ToString() + "|" + item; siteNode.Value = "+" + itemTypeId.ToString() + "|" + item;
siteNode.ShowCheckBox = true; siteNode.ShowCheckBox = true;
userNode.SelectAction = TreeNodeSelectAction.None;
userNode.ChildNodes.Add(siteNode); userNode.ChildNodes.Add(siteNode);
} }
@ -238,5 +242,9 @@ namespace WebsitePanel.Portal
} }
} }
} }
protected void tree_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
}
} }
} }