Merge
This commit is contained in:
commit
77f2e98a5f
16 changed files with 265 additions and 29 deletions
|
@ -588,6 +588,9 @@
|
|||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
|
||||
<ModuleData ref="SpaceMenu"/>
|
||||
</Module>
|
||||
<Module moduleDefinitionID="OrganizationMenu" title="OrganizationMenu" container="Clear.ascx">
|
||||
</Module>
|
||||
</Content>
|
||||
|
@ -638,11 +641,21 @@
|
|||
</Content>
|
||||
<Pages>
|
||||
<Page name="DiskspaceReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="DiskspaceReport" title="DiskspaceReport" container="Edit.ascx" icon="table_zoom_48.png" />
|
||||
</Content>
|
||||
</Page>
|
||||
<Page name="BandwidthReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="BandwidthReport" title="BandwidthReport" container="Edit.ascx" icon="table_zoom_48.png" />
|
||||
</Content>
|
||||
|
@ -652,26 +665,51 @@
|
|||
<Page name="Configuration" roles="Administrator" enabled="false" align="left">
|
||||
<Pages>
|
||||
<Page name="VirtualServers" roles="Administrator" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="VirtualServers" title="VirtualServers" container="Edit.ascx" icon="network_48.png" />
|
||||
</Content>
|
||||
</Page>
|
||||
<Page name="Servers" roles="Administrator" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="Servers" title="Servers" container="Edit.ascx" icon="computer_48.png" />
|
||||
</Content>
|
||||
</Page>
|
||||
<Page name="IPAddresses" roles="Administrator" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="IPAddresses" title="IPAddresses" container="Edit.ascx" icon="adress_48.png" />
|
||||
</Content>
|
||||
</Page>
|
||||
<Page name="PhoneNumbers" roles="Administrator" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="PhoneNumbers" title="PhoneNumbers" container="Edit.ascx" icon="adress_48.png" />
|
||||
</Content>
|
||||
</Page>
|
||||
<Page name="SystemSettings" roles="Administrator" skin="Browse1.ascx">
|
||||
<Content id="LeftPane">
|
||||
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
|
||||
<ModuleData ref="UserMenu"/>
|
||||
</Module>
|
||||
</Content>
|
||||
<Content id="ContentPane">
|
||||
<Module moduleDefinitionID="SystemSettings" title="SystemSettings" container="Edit.ascx" icon="tool_48.png" />
|
||||
</Content>
|
||||
|
|
|
@ -31,9 +31,11 @@
|
|||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="TopMenu">
|
||||
<wsp:TopMenu ID="menu" runat="server" />
|
||||
<wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
|
||||
<asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
|
||||
<wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
|
||||
</div>
|
||||
|
||||
<div id="Top">
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 589 B |
|
@ -15,10 +15,15 @@
|
|||
|
||||
.TopMenu ul.AspNet-Menu ul ul
|
||||
{
|
||||
top: -0.3em;
|
||||
top: -1em;
|
||||
z-index: 502;
|
||||
}
|
||||
|
||||
.TopMenu ul.AspNet-Menu li ul li.AspNet-Menu-WithChildren
|
||||
{
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.TopMenu ul.AspNet-Menu li ul li.AspNet-Menu-WithChildren span
|
||||
{
|
||||
color: #000000 !important;
|
||||
|
@ -47,6 +52,16 @@
|
|||
background-image: none !important;
|
||||
}
|
||||
|
||||
.TopMenu li.AspNet-Menu-Leaf a img
|
||||
{
|
||||
border-style:None;
|
||||
height:16px;
|
||||
width:16px;
|
||||
border-width:0px;
|
||||
padding-right: 3px;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
/*
|
||||
.TopMenu ul.AspNet-Menu li
|
||||
{
|
||||
|
@ -66,7 +81,6 @@
|
|||
|
||||
.TopMenu ul.AspNet-Menu li span
|
||||
{
|
||||
cursor: pointer;
|
||||
color: #ffffff;
|
||||
padding: 8px 25px 8px 15px;
|
||||
background: transparent url(../Images/menu_popup.gif) right center no-repeat;
|
||||
|
|
|
@ -67,7 +67,7 @@ namespace WebsitePanel.Portal
|
|||
MenuItem item = new MenuItem(
|
||||
GetLocalizedString("Text.OrganizationHome"),
|
||||
"",
|
||||
"",
|
||||
imagePath + "home24.png",
|
||||
PortalUtils.EditUrl("ItemID", PanelRequest.ItemID.ToString(), "organization_home", "SpaceID=" + PanelSecurity.PackageId));
|
||||
|
||||
items.Add(item);
|
||||
|
|
|
@ -123,6 +123,12 @@
|
|||
<data name="lblEnterpriseServerFQDN.Text" xml:space="preserve">
|
||||
<value>BlackBerry Enterprise Server FQDN:</value>
|
||||
</data>
|
||||
<data name="lblHandheldcleanupPath.Text" xml:space="preserve">
|
||||
<value>handheldcleanup.exe utility Path:</value>
|
||||
</data>
|
||||
<data name="lblMAPIProfile.Text" xml:space="preserve">
|
||||
<value>BlackBerry MAPI Profile:</value>
|
||||
</data>
|
||||
<data name="lblPassword.Text" xml:space="preserve">
|
||||
<value>Authentication password:</value>
|
||||
</data>
|
||||
|
|
|
@ -6,16 +6,21 @@
|
|||
<asp:TextBox runat="server" ID="txtPath" MaxLength="256" Width="200px" />
|
||||
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtPath" Display="Dynamic" ErrorMessage="*" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="lblHandheldcleanupPath" meta:resourcekey="lblHandheldcleanupPath" /></td>
|
||||
<td>
|
||||
<asp:TextBox runat="server" ID="txtHandheldcleanupPath" MaxLength="256" Width="200px" />
|
||||
<asp:RequiredFieldValidator ID="RequiredFieldValidator7" runat="server" ControlToValidate="txtHandheldcleanupPath" Display="Dynamic" ErrorMessage="*" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="Label1" meta:resourcekey="lblUser" /></td>
|
||||
<td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="lblUser" meta:resourcekey="lblUser" /></td>
|
||||
<td>
|
||||
<asp:TextBox runat="server" ID="txtUser" MaxLength="256" Width="200px" />
|
||||
<asp:RequiredFieldValidator ID="RequiredFieldValidator4" runat="server" ControlToValidate="txtUser" Display="Dynamic" ErrorMessage="*" />
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="lblPassword" meta:resourcekey="lblPassword" /></td>
|
||||
<td>
|
||||
|
@ -39,5 +44,12 @@
|
|||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="SubHead" width="200" nowrap><asp:Label runat="server" ID="lblMAPIProfile" meta:resourcekey="lblMAPIProfile" /></td>
|
||||
<td>
|
||||
<asp:TextBox runat="server" ID="txtMAPIProfile" MaxLength="256" Width="200px" />
|
||||
<asp:RequiredFieldValidator ID="RequiredFieldValidator6" runat="server" ControlToValidate="txtMAPIProfile" Display="Dynamic" ErrorMessage="*" />
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
|
@ -42,9 +42,11 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
public void BindSettings(StringDictionary settings)
|
||||
{
|
||||
txtPath.Text = settings[Constants.UtilityPath];
|
||||
txtHandheldcleanupPath.Text = settings[Constants.HandheldcleanupPath];
|
||||
txtPassword.Text = settings[Constants.Password];
|
||||
txtEnterpriseServer.Text = settings[Constants.EnterpriseServer];
|
||||
txtEnterpriseServerFQDN.Text = settings[Constants.EnterpriseServerFQDN];
|
||||
txtMAPIProfile.Text = settings[Constants.MAPIProfile];
|
||||
ViewState["PWD"] = settings[Constants.Password];
|
||||
txtUser.Text = settings[Constants.UserName];
|
||||
}
|
||||
|
@ -52,10 +54,12 @@ namespace WebsitePanel.Portal.ProviderControls
|
|||
public void SaveSettings(StringDictionary settings)
|
||||
{
|
||||
settings[Constants.UtilityPath] = txtPath.Text;
|
||||
settings[Constants.HandheldcleanupPath] = txtHandheldcleanupPath.Text;
|
||||
settings[Constants.EnterpriseServer] = txtEnterpriseServer.Text;
|
||||
settings[Constants.EnterpriseServerFQDN] = txtEnterpriseServerFQDN.Text;
|
||||
settings[Constants.Password] = (txtPassword.Text.Length > 0) ? txtPassword.Text : (string)ViewState["PWD"];
|
||||
settings[Constants.UserName] = txtUser.Text;
|
||||
settings[Constants.MAPIProfile] = txtMAPIProfile.Text;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -40,13 +40,40 @@ namespace WebsitePanel.Portal.ProviderControls {
|
|||
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
|
||||
|
||||
/// <summary>
|
||||
/// Label1 control.
|
||||
/// lblHandheldcleanupPath control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label Label1;
|
||||
protected global::System.Web.UI.WebControls.Label lblHandheldcleanupPath;
|
||||
|
||||
/// <summary>
|
||||
/// txtHandheldcleanupPath control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtHandheldcleanupPath;
|
||||
|
||||
/// <summary>
|
||||
/// RequiredFieldValidator7 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator7;
|
||||
|
||||
/// <summary>
|
||||
/// lblUser control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblUser;
|
||||
|
||||
/// <summary>
|
||||
/// txtUser control.
|
||||
|
@ -146,5 +173,32 @@ namespace WebsitePanel.Portal.ProviderControls {
|
|||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator5;
|
||||
|
||||
/// <summary>
|
||||
/// lblMAPIProfile control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblMAPIProfile;
|
||||
|
||||
/// <summary>
|
||||
/// txtMAPIProfile control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtMAPIProfile;
|
||||
|
||||
/// <summary>
|
||||
/// RequiredFieldValidator6 control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator6;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue