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

Breadcrumb fix and some other small fixes

Browse source
This commit is contained in:
vfedosevich 2014-08-07 18:26:21 +03:00
parent 10f3586e84
commit 9652dbc59f
12 changed files with 194 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

135
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config Normal file
View file

@ -0,0 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<Controls>
<!--<Control key="" />-->
<!--<Control key="create_organization" />-->
<!--Home-->
<Control key="organization_home" />
<!--Organization-->
<Control key="users" />
<Control key="edit_user" general_key="users" /> <!--?-->
<Control key="create_user" general_key="users" />
<Control key="user_memberof" general_key="users" />
<!--<Control key="organization_user_setup" />-->
<Control key="secur_groups" />
<Control key="create_secur_group" general_key="secur_groups" />
<Control key="secur_group_settings" general_key="secur_groups" />
<Control key="secur_group_memberof" general_key="secur_groups" />
<Control key="org_domains" />
<Control key="org_add_domain" general_key="org_domains" />
<!--Exchange-->
<Control key="mailboxes" />
<!--<Control key="archivingmailboxes" />-->
<Control key="create_mailbox" general_key="mailboxes" />
<Control key="mailbox_settings" general_key="mailboxes" />
<Control key="mailbox_mobile" general_key="mailboxes" />
<Control key="mailbox_mobile_details" general_key="mailboxes" />
<Control key="mailbox_addresses" general_key="mailboxes" />
<Control key="mailbox_mailflow" general_key="mailboxes" />
<Control key="mailbox_permissions" general_key="mailboxes" />
<Control key="mailbox_advanced" general_key="mailboxes" />
<Control key="mailbox_setup" general_key="mailboxes" />
<Control key="mailbox_memberof" general_key="mailboxes" />
<Control key="contacts" />
<Control key="create_contact" general_key="contacts" />
<Control key="contact_settings" general_key="contacts" />
<Control key="contact_mailflow" general_key="contacts" />
<Control key="dlists" />
<Control key="create_dlist" general_key="dlists" />
<Control key="dlist_settings" general_key="dlists" />
<Control key="dlist_addresses" general_key="dlists" />
<Control key="dlist_mailflow" general_key="dlists" />
<Control key="dlist_permissions" general_key="dlists" />
<Control key="dlist_memberof" general_key="dlists" />
<Control key="disclaimers" />
<Control key="disclaimers_settings" general_key="disclaimers" />
<Control key="public_folders" />
<Control key="create_public_folder" general_key="public_folders" />
<Control key="public_folder_settings" general_key="public_folders" />
<Control key="public_folder_addresses" general_key="public_folders" />
<Control key="public_folder_mailflow" general_key="public_folders" />
<Control key="public_folder_mailenable" general_key="public_folders" />
<Control key="domains" />
<Control key="add_domain" general_key="domains" />
<Control key="domain_records" general_key="domains" />
<Control key="storage_usage" />
<Control key="storage_usage_details" general_key="storage_usage" />
<!--<Control key="storage_limits" />-->
<Control key="activesync_policy" />
<Control key="mailboxplans" />
<Control key="retentionpolicy" />
<Control key="retentionpolicytag" />
<Control key="add_mailboxplan" general_key="mailboxplans" /> <!--?-->
<!--CRM-->
<Control key="CRMOrganizationDetails" />
<Control key="CRMUsers" />
<Control key="CRMUserRoles" general_key="CRMUsers" />
<Control key="create_crm_user" general_key="CRMUsers" />
<Control key="crm_storage_settings" />
<!--SharePoint-->
<Control key="sharepoint_sitecollections" />
<Control key="sharepoint_edit_sitecollection" general_key="sharepoint_sitecollections" />
<Control key="sharepoint_backup_sitecollection" general_key="sharepoint_sitecollections" />
<Control key="sharepoint_restore_sitecollection" general_key="sharepoint_sitecollections" />
<Control key="sharepoint_storage_settings" />
<Control key="sharepoint_storage_usage" />
<!--BlackBerry-->
<Control key="blackberry_users" />
<Control key="create_new_blackberry_user" general_key="blackberry_users" />
<Control key="edit_blackberry_user" general_key="blackberry_users" />
<!--OCS-->
<Control key="ocs_users" />
<Control key="create_new_ocs_user" general_key="ocs_users" />
<Control key="edit_ocs_user" general_key="ocs_users" />
<!--Lync-->
<Control key="lync_users" general_key="" />
<Control key="create_new_lync_user" general_key="lync_users" />
<Control key="edit_lync_user" general_key="lync_users" />
<Control key="lync_userplans" />
<Control key="add_lyncuserplan" general_key="lync_userplans" />
<Control key="lync_federationdomains" />
<Control key="add_lyncfederation_domain" general_key="lync_federationdomains" />
<Control key="lync_phonenumbers" />
<Control key="allocate_phonenumbers" general_key="lync_phonenumbers" />
<!--EnterpriseStorage-->
<Control key="enterprisestorage_folders" />
<Control key="create_enterprisestorage_folder" general_key="enterprisestorage_folders" />
<Control key="enterprisestorage_folder_settings" general_key="enterprisestorage_folders" />
<Control key="enterprisestorage_drive_maps" />
<Control key="create_enterprisestorage_drive_map" general_key="enterprisestorage_drive_maps" />
</Controls>

1
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
View file

@ -18,6 +18,7 @@ body {font-family:'Segoe UI Light','Open Sans',Arial; color:#333; margin:0px; pa
#Breadcrumb .Path {padding:20px; margin-bottom:20px; background-color:#f5f5f5;}
#Breadcrumb .Path img {display:none;}
#Breadcrumb .Path a:not(:last-child):after, #Breadcrumb .Path span a:after {content:'/\00a0'; padding:0 5px 0 10px; color:#999; display:inline-block;}
#Breadcrumb .Path .OrgSpan a:last-child:after {content: none;}
#Breadcrumb .Path a, #Breadcrumb .Path a:Active, #Breadcrumb .Path a:Visited, #Breadcrumb .Path a:Hover {color:#428bca; font-size:13px; line-height:1.428571429;}
#Breadcrumb .Path a:last-child {color:#999;}
#Breadcrumb .Path a:hover {text-decoration:none;}

30
WebsitePanel/Sources/WebsitePanel.WebPortal/Code/PortalUtils.cs
View file

@ -56,10 +56,12 @@ namespace WebsitePanel.Portal
public const string CONFIG_FOLDER = "~/App_Data/";
public const string SUPPORTED_THEMES_FILE = "SupportedThemes.config";
public const string SUPPORTED_LOCALES_FILE = "SupportedLocales.config";
public const string EXCHANGE_SERVER_HIERARCHY_FILE = "ESModule_ControlsHierarchy.config";
public const string USER_ID_PARAM = "UserID";
public const string SPACE_ID_PARAM = "SpaceID";
public const string SEARCH_QUERY_PARAM = "Query";
public static string CultureCookieName
{
get { return PortalConfiguration.SiteSettings["CultureCookieName"]; }
@ -981,6 +983,34 @@ namespace WebsitePanel.Portal
return "~/Default.aspx?" + String.Join("&", url.ToArray());
}
#endregion
public static string GetGeneralESControlKey(string controlKey)
{
string generalControlKey = string.Empty;
string appData = HttpContext.Current.Server.MapPath(CONFIG_FOLDER);
string xmlFilePath = Path.Combine(appData, EXCHANGE_SERVER_HIERARCHY_FILE);
if (File.Exists(xmlFilePath))
{
try
{
XmlDocument xmlDoc = new XmlDocument();
xmlDoc.Load(xmlFilePath);
XmlElement xmlNode = (XmlElement)xmlDoc.SelectSingleNode(string.Format("/Controls/Control[@key='{0}']", controlKey));
if (xmlNode.HasAttribute("general_key"))
{
generalControlKey = xmlNode.GetAttribute("general_key");
}
else generalControlKey = xmlNode.GetAttribute("key");
}
catch
{
}
}
return generalControlKey;
}
}
}

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/App_LocalResources/LyncAddFederationDomain.ascx.resx
View file

@ -138,4 +138,7 @@
<data name="Text.PageName" xml:space="preserve">
<value>Lync Add Federation Domain</value>
</data>
<data name="locTitle.Text" xml:space="preserve">
<value>Lync Add Federation Domain</value>
</data>
</root>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/App_LocalResources/LyncAllocatePhoneNumbers.ascx.resx
View file

@ -126,4 +126,7 @@
<data name="Text.PageName" xml:space="preserve">
<value>Phone Numbers</value>
</data>
<data name="locTitle.Text" xml:space="preserve">
<value>Lync Allocate Phone Numbers</value>
</data>
</root>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/App_LocalResources/LyncPhoneNumbers.ascx.resx
View file

@ -124,6 +124,9 @@
<value>Quotas</value>
</data>
<data name="Text.PageName" xml:space="preserve">
<value>Phone Numbers</value>
<value>Lync Phone Numbers</value>
</data>
<data name="locTitle.Text" xml:space="preserve">
<value>Lync Phone Numbers</value>
</data>
</root>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/App_LocalResources/LyncUsers.ascx.resx
View file

@ -153,4 +153,7 @@
<data name="gvUsersLogin.Header" xml:space="preserve">
<value>Login</value>
</data>
<data name="Text.PageName" xml:space="preserve">
<value>Lync Users</value>
</data>
</root>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/UserControls/AllocatePackagePhoneNumbers.ascx.cs
View file

@ -149,7 +149,8 @@ namespace WebsitePanel.Portal.UserControls
protected void btnCancel_Click(object sender, EventArgs e)
{
Response.Redirect(HostModule.EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), ListAddressesControl));
Response.Redirect(HostModule.EditUrl("ItemID", PanelRequest.ItemID.ToString(), ListAddressesControl,
PortalUtils.SPACE_ID_PARAM + "=" + PanelSecurity.PackageId));
}
protected void radioExternalSelected_CheckedChanged(object sender, EventArgs e)

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx
View file

@ -18,11 +18,11 @@
<asp:Image ID="imgSep2" runat="server" SkinID="PathSeparatorWhite" /> <asp:HyperLink ID="lnkCurrentPage" runat="server"></asp:HyperLink>
<span id="spanOrgn" runat="server">
<span id="spanOrgn" class="OrgSpan" runat="server">
<asp:Image ID="imgSep3" runat="server" SkinID="PathSeparatorWhite" />
<asp:HyperLink ID="lnkOrgn" runat="server">Organization</asp:HyperLink>
<asp:Image ID="imgSep4" runat="server" SkinID="PathSeparatorWhite" />
<asp:Label ID="lbOrgCurPage" runat="server" ForeColor="#000000">Home</asp:Label>
<asp:HyperLink ID="lnkOrgCurPage" runat="server">Home</asp:HyperLink>
</span>
<wsp:SpaceOrgsSelector ID="SpaceOrgs" runat="server" />

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
View file

@ -127,7 +127,10 @@ namespace WebsitePanel.Portal.SkinControls
"SpaceID=" + PanelSecurity.PackageId.ToString());
lnkOrgn.Text = org.Name;
string ctrlKey = Request[DefaultPage.CONTROL_ID_PARAM].ToLower(System.Globalization.CultureInfo.InvariantCulture);
string curCtrlKey = PanelRequest.Ctl.ToLower();
string ctrlKey = PortalUtils.GetGeneralESControlKey(Request[DefaultPage.CONTROL_ID_PARAM].ToLower(System.Globalization.CultureInfo.InvariantCulture));
if (curCtrlKey == "edit_user") ctrlKey = PanelRequest.Context.ToLower() == "user" ? "users" : "mailboxes";
ModuleDefinition definition = PortalConfiguration.ModuleDefinitions[EXCHANGE_SERVER_MODULE_DEFINTION_ID];
ModuleControl control = null;
@ -136,7 +139,10 @@ namespace WebsitePanel.Portal.SkinControls
if (!String.IsNullOrEmpty(control.Src))
{
lbOrgCurPage.Text = PortalUtils.GetLocalizedString(DM_FOLDER_VIRTUAL_PATH + control.Src, PAGE_NANE_KEY);
lnkOrgCurPage.Text = PortalUtils.GetLocalizedString(DM_FOLDER_VIRTUAL_PATH + control.Src, PAGE_NANE_KEY);
lnkOrgCurPage.NavigateUrl = PortalUtils.EditUrl(
"ItemID", PanelRequest.ItemID.ToString(), ctrlKey,
"SpaceID=" + PanelSecurity.PackageId.ToString());
}
}
}

32
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.designer.cs generated
View file

@ -1,31 +1,3 @@
// Copyright (c) 2014, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// - Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
//
// - Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// - Neither the name of the Outercurve Foundation nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@ -140,13 +112,13 @@ namespace WebsitePanel.Portal.SkinControls {
protected global::System.Web.UI.WebControls.Image imgSep4;
/// <summary>
/// lbOrgCurPage control.
/// lnkOrgCurPage 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 lbOrgCurPage;
protected global::System.Web.UI.WebControls.HyperLink lnkOrgCurPage;
/// <summary>
/// SpaceOrgs control.

1
WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
View file

@ -229,6 +229,7 @@
<Content Include="App_Data\SiteSettings.config">
<SubType>Designer</SubType>
</Content>
<Content Include="App_Data\ESModule_ControlsHierarchy.config" />
<None Include="App_Data\SupportedThemes.config" />
<None Include="App_Data\Countries.config" />
<None Include="App_Data\CountryStates.config" />