Skip to content
This repository has been archived by the owner on Feb 12, 2018. It is now read-only.

Commit

Permalink
UI changes for messaging to all users
Browse files Browse the repository at this point in the history
  • Loading branch information
@peppertree
peppertree committed Feb 24, 2015
1 parent b4784f0 commit 85b50d1
Show file tree
Hide file tree
Showing 7 changed files with 152 additions and 168 deletions.
22 changes: 17 additions & 5 deletions App_LocalResources/View.ascx.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,6 @@
<data name="btnSendMessages.Text" xml:space="preserve">
<value>Send Messages</value>
</data>
<data name="lblMessageNotes.Text" xml:space="preserve">
<value>You may send an internal message to all the users in the current view</value>
</data>
<data name="lblSendMessagesTitle.Text" xml:space="preserve">
<value>Send Internal Message to Users</value>
</data>
Expand All @@ -609,8 +606,8 @@
<data name="InternalMessagesSent.Text" xml:space="preserve">
<value>Messages sent sucessfully.</value>
</data>
<data name="lblEmailNotes.Text" xml:space="preserve">
<value>You may send an e-mail directly to the account's e-mail address for the users in the current view</value>
<data name="lblMessagingNotes.Text" xml:space="preserve">
<value>Send a message to all users in the currently selected view</value>
</data>
<data name="lblSendEmailsTitle.Text" xml:space="preserve">
<value>Send Emails to Users</value>
Expand All @@ -633,4 +630,19 @@
<data name="cmdHardDeleteSelected.Text" xml:space="preserve">
<value>Remove selected users</value>
</data>
<data name="btnCancelMessaging.Text" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="lblMessagesBody.Text" xml:space="preserve">
<value>Body:</value>
</data>
<data name="lblMessagesSubject.Text" xml:space="preserve">
<value>Subject:</value>
</data>
<data name="MessagingModeEmail.Text" xml:space="preserve">
<value>E-Mail</value>
</data>
<data name="MessagingModeMessage.Text" xml:space="preserve">
<value>Internal Message</value>
</data>
</root>
5 changes: 0 additions & 5 deletions Settings.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
<asp:CheckBox ID="chkAllowExport" runat="server" />
</div>

<div class="dnnFormItem">
<dnn:Label ID="lblAllowSendEmails" runat="server" resourcekey="lblAllowSendEmails"></dnn:Label>
<asp:CheckBox ID="chkAllowSendEmails" runat="server" />
</div>

<div class="dnnFormItem">
<dnn:Label ID="lblAllowSendMessages" runat="server" resourcekey="lblAllowSendMessages"></dnn:Label>
<asp:CheckBox ID="chkAllowSendMessages" runat="server" />
Expand Down
38 changes: 10 additions & 28 deletions Settings.ascx.designer.vb
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Settings.ascx.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ Namespace Connect.Modules.UserManagement.AccountManagement
If (Settings.Contains("AllowDelete")) Then chkAllowDelete.Checked = CType(Settings("AllowDelete"), Boolean)
If (Settings.Contains("AllowHardDelete")) Then chkAllowHardDelete.Checked = CType(Settings("AllowHardDelete"), Boolean)
If (Settings.Contains("AllowExport")) Then chkAllowExport.Checked = CType(Settings("AllowExport"), Boolean)
If (Settings.Contains("AllowEmailUsers")) Then chkAllowSendEmails.Checked = CType(Settings("AllowEmailUsers"), Boolean)
If (Settings.Contains("AllowMessageUsers")) Then chkAllowSendMessages.Checked = CType(Settings("AllowMessageUsers"), Boolean)

If Settings.Contains("AllowedRoles") Then
Expand Down Expand Up @@ -84,7 +83,6 @@ Namespace Connect.Modules.UserManagement.AccountManagement
objModules.UpdateTabModuleSetting(TabModuleId, "AllowDelete", chkAllowDelete.Checked.ToString)
objModules.UpdateTabModuleSetting(TabModuleId, "AllowHardDelete", chkAllowHardDelete.Checked.ToString)
objModules.UpdateTabModuleSetting(TabModuleId, "AllowExport", chkAllowExport.Checked.ToString)
objModules.UpdateTabModuleSetting(TabModuleId, "AllowEmailUsers", chkAllowSendEmails.Checked.ToString)
objModules.UpdateTabModuleSetting(TabModuleId, "AllowMessageUsers", chkAllowSendMessages.Checked.ToString)
objModules.UpdateTabModuleSetting(TabModuleId, "AllowReports", chkAllowReports.Checked.ToString)
Dim strAllowedRoles As String = ""
Expand Down
76 changes: 31 additions & 45 deletions View.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,8 @@
<asp:Linkbutton ID="btnExport" runat="server" CssClass="dnnSecondaryAction" />
</asp:Panel>

<asp:Panel ID="pnlEmailUsers" runat="server" CssClass="connect_btnContainer">
<a href="#" class="cmdEmailUsers dnnSecondaryAction"><%= Localization.GetString("btnEmailUsers", LocalResourceFile)%></a>
</asp:Panel>

<asp:Panel ID="pnlMessageUsers" runat="server" CssClass="connect_btnContainer">
<a href="#" class="cmdMessageUsers dnnSecondaryAction"><%= Localization.GetString("btnMessageUsers", LocalResourceFile)%></a>
<asp:HyperLink ID="btnMessageUsers" runat="server" CssClass="dnnSecondaryAction"></asp:HyperLink>
</asp:Panel>

<asp:Panel ID="pnlReport" runat="server" CssClass="connect_btnContainer">
Expand Down Expand Up @@ -484,42 +480,42 @@
</ul>

</asp:Panel>
</div>

</div>

<div class="ConnectSendEmails dnnDialog dnnClear" style="display:none" title='<%= Localization.GetString("lblSendEmailsTitle", LocalResourceFile)%>'>
<p><%= Localization.GetString("lblEmailNotes", LocalResourceFile)%></p>
<asp:Panel ID="pnlRoleMessaging" runat="server" Visible="false">

<div style="padding-bottom:10px;">
<dnn:dnnTextBox ID="txtEmailSubjectAll" runat="server" Width="600px" Height="25px"></dnn:dnnTextBox>
</div>

<div style="padding-top:20px;padding-bottom:20px;">
<dnn:dnnEditor ID="txtEmailBodyAll" runat="server" Width="600px" Height="275px"></dnn:dnnEditor>
</div>

<ul class="dnnActions">
<li><asp:Button ID="btnSendEmails" runat="server" resourcekey="btnSendEmails" CssClass="dnnPrimaryAction" /></li>
</ul>
</div>
<p class="connect_note"><asp:Literal ID="lblMessagingNotes" runat="server"></asp:Literal></p>

<div class="dnnClear">

<div class="ConnectSendMessages dnnDialog dnnClear" style="display:none" title='<%= Localization.GetString("lblSendMessagesTitle", LocalResourceFile)%>'>
<p><%= Localization.GetString("lblMessageNotes", LocalResourceFile)%></p>
<div style="padding-bottom: 10px;">

<asp:RadioButtonList ID="rblMessagingMode" runat="server" RepeatDirection="Horizontal">
<asp:ListItem Text="Message" Value="m" Selected></asp:ListItem>
<asp:ListItem Text="Email" Value="e"></asp:ListItem>
</asp:RadioButtonList>

</div>

<div style="padding-bottom:10px;">
<asp:Label ID="Label1" runat="server" resourcekey="lblMessageSubject"></asp:Label><br />
<asp:TextBox ID="txtMessageSubjectAll" runat="server" Width="600px"></asp:TextBox>
</div>
<div>
<asp:Label ID="lblMessagesSubject" runat="server" resourcekey="lblMessagesSubject"></asp:Label><br />
<dnn:dnnTextBox ID="txtEmailSubjectAll" runat="server" Width="600px" Height="25px"></dnn:dnnTextBox>
</div>

<div style="padding-top:20px;padding-bottom:20px;">
<asp:Label ID="Label2" runat="server" resourcekey="lblMessageBody"></asp:Label><br />
<asp:TextBox ID="txtMessageBodyAll" runat="server" Width="600px" TextMode="MultiLine" Rows="5"></asp:TextBox>
<div style="padding-top:10px;padding-bottom:20px;">
<asp:Label ID="lblMessagesBody" runat="server" resourcekey="lblMessagesBody"></asp:Label><br />
<dnn:dnnEditor ID="txtEmailBodyAll" runat="server" Width="600px" Height="275px"></dnn:dnnEditor>
</div>

</div>

<ul class="dnnActions">
<li><asp:Button ID="btnSendMessages" runat="server" resourcekey="btnSendMessages" CssClass="dnnPrimaryAction" /></li>
<li><asp:Button ID="btnCancelMessaging" runat="server" resourcekey="btnCancelMessaging" CssClass="dnnSecondaryAction" /></li>
</ul>

</asp:Panel>
</div>

<ul class="dnnActions">
<li><asp:Button ID="btnSendMessages" runat="server" resourcekey="btnSendMessages" CssClass="dnnPrimaryAction" /></li>
</ul>

</div>

<div class="ConnectRoleMembershipApproval dnnDialog dnnClear" title='<%= Localization.GetString("lblRoleApprovalTitle", LocalResourceFile)%>'>
Expand Down Expand Up @@ -787,17 +783,7 @@
var roleidval = $(this).data("roleid");
var url = '<%= NavigateUrl(TabId, "", "uid=' + uidval + '", "RoleId=' + roleidval + '", "Action=' + actionval + '")%>';
window.location.href = url;
});
$('.cmdEmailUsers').click(function () {
$(".ConnectSendEmails").dialog({ modal: true, dialogClass: 'dnnFormPopup', width: 650});
$(".ConnectSendEmails").parent().appendTo(jQuery("form:first"));
});
$('.cmdMessageUsers').click(function () {
$(".ConnectSendMessages").dialog({ modal: true, dialogClass: 'dnnFormPopup', width: 650});
$(".ConnectSendMessages").parent().appendTo(jQuery("form:first"));
});
var sf = $.ServicesFramework(<%= ModuleId %>);
var autosuggesturl = sf.getServiceRoot('ConnectAccounts') + 'Users/AutoSuggestResult';
Expand Down
Loading

0 comments on commit 85b50d1

Please sign in to comment.