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

Commit 6f7789e

Browse files
peppertreepeppertree
committed
Fnal 01.02.00 changes
1 parent d184575 commit 6f7789e

20 files changed

Lines changed: 244 additions & 90 deletions

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,10 @@ $RECYCLE.BIN/
149149

150150
# Mac crap
151151
.DS_Store
152+
*.zip
153+
*.cache
154+
*.dll
155+
*.pdb
156+
obj/Release/Connect.Modules.AccountUpdate.xml
157+
obj/Release/Connect_AccountUpdate.vbproj.FileListAbsolute.txt
158+
*.cache

‎App_LocalResources/Settings.ascx.resx‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="ControlTitle_settings.Text" xml:space="preserve">
121-
<value>Registration Settings</value>
121+
<value>Account Update Settings</value>
122122
</data>
123123
<data name="lblUsernameMode.Text" xml:space="preserve">
124124
<value>Username Mode:</value>
@@ -130,28 +130,28 @@
130130
<value>Let the user select</value>
131131
</data>
132132
<data name="Username_UseEmail.Text" xml:space="preserve">
133-
<value>Create from E-Mail Address</value>
133+
<value>Strore from E-Mail Address</value>
134134
</data>
135135
<data name="Username_FirstletterLastname.Text" xml:space="preserve">
136-
<value>Create in the form [Firstletter from Firstname + .Lastname]</value>
136+
<value>Strore in the form [Firstletter from Firstname + .Lastname]</value>
137137
</data>
138138
<data name="Displayname_FirstletterLastname" xml:space="preserve">
139-
<value>Create in the form [Firstletter from Firstname + .Lastname]</value>
139+
<value>Strore in the form [Firstletter from Firstname + .Lastname]</value>
140140
</data>
141141
<data name="Displayname_FirstnameLastname" xml:space="preserve">
142-
<value>Create in the form [Firstname.Lastname]</value>
142+
<value>Strore in the form [Firstname.Lastname]</value>
143143
</data>
144144
<data name="Displayname_FreeEnter.Text" xml:space="preserve">
145145
<value>Let the user select</value>
146146
</data>
147147
<data name="Displayname_FromEmail" xml:space="preserve">
148-
<value>Create from E-Mail Address</value>
148+
<value>Strore from E-Mail Address</value>
149149
</data>
150150
<data name="Displayname_Lastname" xml:space="preserve">
151-
<value>Create from Lastname</value>
151+
<value>Strore from Lastname</value>
152152
</data>
153153
<data name="lblAddToRole.Help" xml:space="preserve">
154-
<value>You may optionally select a role that the user is being added to once registering through this module instance</value>
154+
<value>You may optionally select a role that the user is being added to once updating its profile through this module instance</value>
155155
</data>
156156
<data name="lblAddToRole.Text" xml:space="preserve">
157157
<value>Add to Role on Submit:</value>
@@ -187,15 +187,33 @@
187187
<value>Usermanagement Page:</value>
188188
</data>
189189
<data name="Username_FirstnameLastname" xml:space="preserve">
190-
<value>Create in the form [Firstname.Lastname]</value>
190+
<value>Strore in the form [Firstname.Lastname]</value>
191191
</data>
192192
<data name="Username_Lastname" xml:space="preserve">
193-
<value>Create from Lastname</value>
193+
<value>Strore from Lastname</value>
194194
</data>
195195
<data name="lblInterface.Help" xml:space="preserve">
196196
<value>Enter the external interface qualifier. See &lt;a href="https://github.com/DNN-Connect/UserAccountUpdate/wiki/External-Interfaces" target="_blank"&gt;this article&lt;/a&gt; on how to do that and how it can help you.</value>
197197
</data>
198198
<data name="lblInterface.Text" xml:space="preserve">
199199
<value>External Interface</value>
200200
</data>
201+
<data name="lblRemoveFromRole.Help" xml:space="preserve">
202+
<value>You may optionally select a role that the user is being removed from once updating its profile through this module instance</value>
203+
</data>
204+
<data name="lblRemoveFromRole.Text" xml:space="preserve">
205+
<value>Remove from Role</value>
206+
</data>
207+
<data name="lblAddToRoleStatus.Help" xml:space="preserve">
208+
<value>Select the status of the role membership after submitting the form</value>
209+
</data>
210+
<data name="lblAddToRoleStatus.Text" xml:space="preserve">
211+
<value>Role status after submit:</value>
212+
</data>
213+
<data name="StatusApproved.Text" xml:space="preserve">
214+
<value>Approved</value>
215+
</data>
216+
<data name="StatusPending.Text" xml:space="preserve">
217+
<value>Pending</value>
218+
</data>
201219
</root>

‎AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("01.01.00")>
35-
<Assembly: AssemblyFileVersion("01.01.00")>
34+
<Assembly: AssemblyVersion("01.02.00")>
35+
<Assembly: AssemblyFileVersion("01.02.00")>

‎Connect_AccountUpdate.dnn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Connect AccountUpdateForm" type="Module" version="01.01.00">
3+
<package name="Connect AccountUpdateForm" type="Module" version="01.02.00">
44
<friendlyName>Connect: AccountUpdate</friendlyName>
55
<description>A community module that handles account updates in DNN</description>
66
<iconFile>Images/icon_extensions.gif</iconFile>

‎ReleaseNotes.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@
88
<div class="License">
99
<h3>Release Notes</h3>
1010

11+
<p class="Owner">
12+
<b>Version 01.02.00</b><br /><br />
13+
</p>
14+
<p>Extended Token Support</p>
15+
<h4>Changes</h4>
16+
<ul>
17+
<li>New conditional token: [IFSOCIALMEMBERSHIPPENDING:XXX]...[/IFSOCIALMEMBERSHIPPENDING:XXX] renders everything in between the tokens if the current user is in the specified XXX social group and the group membership is pending.</li>
18+
<li>New conditional token: [IFSOCIALMEMBERSHIPAPPROVED:XXX]...[/IFSOCIALMEMBERSHIPAPPROVED:XXX] renders everything in between the tokens if the current user is in the specified XXX social group and the group membership is pending.</li>
19+
<li>New conditional token: [IFSOCIALMEMBERSHIPNONE:XXX]...[/IFSOCIALMEMBERSHIPNONE:XXX] renders everything in between the tokens if the current user is not yet in the specified XXX social group and also has not applied yet for becoming a member.</li>
20+
<li>New conditional token: [IFISINROLE:XXX]...[/IFISINROLE:XXX] renders everything in between the tokens if the current user is in the specified XXX role.</li>
21+
<li>New conditional token: [IFNOTISINROLE:XXX]...[/IFNOTISINROLE:XXX] renders everything in between the tokens if the current user is not in the specified XXX role.</li>
22+
<li>New control token: [CTL:ROLEMEMBERSHP:XXX] renders a checkbox that - once checked - will add the user account to the specified XXX role.</li>
23+
<li>New control token: [CTL:ROLEMEMBERSHP:XXX:Pending] will do the same but will rather make the role membership pending.</li>
24+
<li>New Setting: When adding users to a role through the modulesettings you can now set the status of that role membership</li>
25+
</ul>
26+
1127
<p class="Owner">
1228
<b>Version 01.00.01</b><br /><br />
1329
</p>

‎Resources.zip‎

1.39 KB
Binary file not shown.

‎Settings.ascx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
<asp:DropDownList ID="drpAddToRole" runat="server" DataTextField="RoleName" DataValueField="RoleId"></asp:DropDownList>
4141
</div>
4242

43+
<div class="dnnFormItem">
44+
<dnn:Label ID="lblAddToRoleStatus" runat="server" Text="Role status once submitted:"></dnn:Label>
45+
<asp:DropDownList ID="drpRoleStatus" runat="server">
46+
<asp:ListItem Text="Pending" Value="Pending"></asp:ListItem>
47+
<asp:ListItem Text="Approved" Value="Approved"></asp:ListItem>
48+
</asp:DropDownList>
49+
</div>
50+
4351
<div class="dnnFormItem">
4452
<dnn:Label ID="lblRemoveFromRole" runat="server" Text="Add to role on submit:"></dnn:Label>
4553
<asp:DropDownList ID="drpRemoveFromRole" runat="server" DataTextField="RoleName" DataValueField="RoleId"></asp:DropDownList>

‎Settings.ascx.designer.vb‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Settings.ascx.vb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Namespace Connect.Modules.UserManagement.AccountUpdate
2525
If (Settings.Contains("RemoveFromRoleOnSubmit")) Then drpRemoveFromRole.SelectedValue = Settings("RemoveFromRoleOnSubmit").ToString()
2626
If (Settings.Contains("NotifyRole")) Then drpNotifyRole.Items.FindByText(Settings("NotifyRole").ToString()).Selected = True
2727
If (Settings.Contains("NotifyUser")) Then chkNotifyUser.Checked = CType(Settings("NotifyUser"), Boolean)
28+
If (Settings.Contains("AddToRoleStatus")) Then drpRoleStatus.SelectedValue = CType(Settings("AddToRoleStatus"), String)
2829

2930
End If
3031
Catch exc As Exception 'Module failed to load
@@ -46,6 +47,7 @@ Namespace Connect.Modules.UserManagement.AccountUpdate
4647
'we need the rolename for sending mails to users, therefor store here the rolename rather than the id!
4748
objModules.UpdateTabModuleSetting(TabModuleId, "NotifyRole", drpNotifyRole.SelectedItem.Text)
4849
objModules.UpdateTabModuleSetting(TabModuleId, "NotifyUser", chkNotifyUser.Checked.ToString)
50+
objModules.UpdateTabModuleSetting(TabModuleId, "AddToRoleStatus", drpRoleStatus.SelectedValue)
4951

5052
Catch exc As Exception 'Module failed to load
5153
ProcessModuleLoadException(Me, exc)

‎Templates/Default/Form.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11

2+
<p>
3+
[IFSOCIALMEMBERSHIPPENDING:Association Member]
4+
Hello pending member
5+
[/IFSOCIALMEMBERSHIPPENDING:Association Member]
6+
7+
[IFSOCIALMEMBERSHIPAPPROVED:Association Member]
8+
Hello approved member
9+
[/IFSOCIALMEMBERSHIPAPPROVED:Association Member]
10+
11+
[IFSOCIALMEMBERSHIPNONE:Association Member]
12+
Hello non-member
13+
[/IFSOCIALMEMBERSHIPNONE:Association Member]
14+
15+
</p>
16+
217
<div class="dnnForm dnnClear">
318

419
<div class="dnnFormItem dnnClear">

0 commit comments

Comments
 (0)