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

New provider CRM2015

Browse source
This commit is contained in:
dev_amdtel 2015-03-14 18:40:22 +03:00
parent 9064cb2eb8
commit e80de0a081
24 changed files with 215875 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
View file

@ -220,7 +220,7 @@
<value>Organization Home</value>
</data>
<data name="Text.CRM2013Group" xml:space="preserve">
<value>CRM 2013</value>
<value>CRM 2013/2015</value>
</data>
<data name="Text.RetentionPolicy" xml:space="preserve">
<value>Retention Policy</value>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
View file

@ -151,7 +151,7 @@
<value>Contacts</value>
</data>
<data name="Text.CRM2013Group" xml:space="preserve">
<value>Hosted Organization - CRM 2013</value>
<value>Hosted Organization - CRM 2013/2015</value>
</data>
<data name="Text.CRMGroup" xml:space="preserve">
<value>Hosted Organization - CRM</value>

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMUserRoles.ascx
View file

@ -20,8 +20,10 @@
</div>
<div class="FormBody">
<wsp:SimpleMessageBox id="messageBox" runat="server" />
<div class="FormButtonsBarClean">
<div class="FormButtonsBarCleanLeft">
<div>
<div>
<table>
<tr height="23">
<td class="FormLabel150"><asp:Localize runat="server" ID="locDisplayName" meta:resourcekey="locDisplayName" /></td>
@ -55,8 +57,7 @@
<br />
</div>
<div class="FormButtonsBarCleanRight">
<div>
<asp:GridView ID="gvRoles" runat="server" AutoGenerateColumns="False" EnableViewState="true"
Width="100%" CssSelectorClass="NormalGridView"
AllowPaging="False" AllowSorting="False" DataKeyNames="RoleID" >
@ -74,6 +75,7 @@
</asp:GridView>
</div>
<br />
<asp:Button runat="server" ID="btnUpdate" Text="Save Changes" meta:resourcekey="btnUpdate" CssClass="Button1" onclick="btnUpdate_Click" />
<asp:Button runat="server" ID="btnSaveExit" Text="Save Changes and Exit" CssClass="Button1"
meta:resourcekey="btnSaveExit" OnClick="btnSaveExit_Click"></asp:Button>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
View file

@ -280,7 +280,7 @@
<tr >
<td class="OrgStatsGroup" width="100%" colspan="2">
<asp:Localize ID="locCRM2013" runat="server" meta:resourcekey="locCRM2013"
Text="CRM 2013"></asp:Localize>
Text="CRM 2013/2015"></asp:Localize>
</td>
</tr>
<tr class="OrgStatsRow">