Merge pull request #17 from bdukes/master

Text and packaging. Closes #13, #14, #15, & #16
EngageSoftware · Oct 22, 2012 · 7c1dcfc · 7c1dcfc
2 parents 2efc693 + 139ae88
commit 7c1dcfc
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 6 deletions.
diff --git a/EngageTake-Out.Build b/EngageTake-Out.Build
@@ -378,11 +378,13 @@
     <include name="**/*.xsd" />
     <exclude name="Licenses/EULA-*"/>
     <exclude name="ReleaseNotes_*.htm"/>
+    <exclude name="CustomDictionary.xml"/>
     <exclude name="??.??.??.txt" />
     <exclude name="_ReSharper.*/**"/>
     <exclude name="**/obj/**"/>
     <exclude name="${referencesDirectory}/**"/>
     <exclude name="packages/**" />
+    <exclude name="Take-Out.Tests/**" />
   </patternset>
   <patternset id="source.fileset">
     <include name="**/*.js"/>
@@ -401,10 +403,14 @@
     <include name="**/*.txt"/>
     <include name="Licenses/EULA-*"/>
     <include name="ReleaseNotes_*.htm"/>
+    <include name="CustomDictionary.xml"/>
     <include name="??.??.??.txt" />
     <include name="MSBuild/*.dll"/>
     <include name="MSBuild/*.targets"/>
+    <include name=".nuget/**"/>
     <exclude name="**/obj/**"/>
     <exclude name="Release.txt" />
+    <exclude name="_ReSharper.*/**" />
+    <exclude name="packages/**" />
   </patternset>
 </project>
diff --git a/EngageTake-Out.csproj b/EngageTake-Out.csproj
@@ -128,7 +128,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="module.scss" />
-    <Content Include="ReleaseNotes_01.00.00.htm" />
+    <Content Include="ReleaseNotes_01.00.01.htm" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

diff --git a/Models/ViewModels/ViewTakeOutViewModel.cs b/Models/ViewModels/ViewTakeOutViewModel.cs
@@ -26,5 +26,9 @@ public ViewTakeOutViewModel()
         /// <summary>Gets the portal settings.</summary>
         /// <value>The portal settings.</value>
         public IList<PortalSettingViewModel> PortalSettings { get; private set; }
+
+        /// <summary>Gets or sets a value indicating whether to show the success message.</summary>
+        /// <value><c>true</c> if the success message should be shown; otherwise, <c>false</c>.</value>
+        public bool ShowSuccessMessage { get; set; }
     }
 }
diff --git a/Presenters/ViewTakeOutPresenter.cs b/Presenters/ViewTakeOutPresenter.cs
@@ -94,6 +94,8 @@ private void View_OrderPlaced(object sender, OrderPlacedEventArgs e)
                     this.moduleSettingsService.UpdateModuleSetting(setting.SettingName, setting.Selected.ToString(CultureInfo.InvariantCulture));
                     this.View.Model.PortalSettings.Add(setting);
                 }
+
+                this.View.Model.ShowSuccessMessage = true;
             }
             catch (Exception exc)
             {

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("4769abd9-9653-4bb2-a1a3-8b5596e2a5d5")]
-[assembly: AssemblyVersion("1.0.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.*")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
 
 [assembly: InternalsVisibleTo("Engage.Take-Out.Tests")]
diff --git a/ReleaseNotes_01.00.00.htm → ReleaseNotes_01.00.01.htm b/ReleaseNotes_01.00.00.htm → ReleaseNotes_01.00.01.htm
@@ -1,7 +1,8 @@
 <div class="Normal">
 	<h3>Change Log</h3>
     <ul>
-        <li>Created this module</li>
+        <li>Select from the list of site settings which should be included in the module export</li>
+        <li>To include the settings in a site template, make sure that the "Include Context" option is checked</li>
         <li>More details can be found on the <a href="https://github.com/EngageSoftware/Engage-Take-Out/issues/milestones?state=closed">Change Log</a></li>
     </ul>
     <!--<h3>Known Issues</h3>

diff --git a/Views/App_LocalResources/ViewTakeOut.ascx.resx b/Views/App_LocalResources/ViewTakeOut.ascx.resx
@@ -112,15 +112,109 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ControlPanelMode.Text" xml:space="preserve">
+    <value>Control Panel Mode</value>
+    <comment>Usability</comment>
+  </data>
+  <data name="ControlPanelSecurity.Text" xml:space="preserve">
+    <value>Control Panel Security</value>
+    <comment>Usability</comment>
+  </data>
+  <data name="ControlPanelVisibility.Text" xml:space="preserve">
+    <value>Control Panel Visibility</value>
+    <comment>Usability</comment>
+  </data>
+  <data name="DefaultAdminContainer.Text" xml:space="preserve">
+    <value>Default Edit Container</value>
+    <comment>Appearance</comment>
+  </data>
+  <data name="DefaultAdminSkin.Text" xml:space="preserve">
+    <value>Default Edit Skin</value>
+    <comment>Appearance</comment>
+  </data>
+  <data name="DefaultPortalAlias.Text" xml:space="preserve">
+    <value>Default Site Alias</value>
+    <comment>Site Aliases</comment>
+  </data>
+  <data name="DefaultPortalContainer.Text" xml:space="preserve">
+    <value>Default Site Container</value>
+    <comment>Appearance</comment>
+  </data>
+  <data name="DefaultPortalSkin.Text" xml:space="preserve">
+    <value>Default Site Skin</value>
+    <comment>Appearance</comment>
+  </data>
+  <data name="EnablePopups.Text" xml:space="preserve">
+    <value>Enable Pop-Ups?</value>
+    <comment>Usability</comment>
+  </data>
+  <data name="EnableSkinWidgets.Text" xml:space="preserve">
+    <value>Enable Skin Widgets?</value>
+    <comment>Appearance</comment>
+  </data>
+  <data name="FavIconPath.Text" xml:space="preserve">
+    <value>Favicon.ico path</value>
+    <comment>Appearance</comment>
+  </data>
+  <data name="HideFoldersEnabled.Text" xml:space="preserve">
+    <value>Hide System Folders?</value>
+    <comment>Usability</comment>
+  </data>
+  <data name="InlineEditorEnabled.Text" xml:space="preserve">
+    <value>Inline Editor Enabled?</value>
+    <comment>Usability</comment>
+  </data>
+  <data name="Intro.Text" xml:space="preserve">
+    <value>Select the site settings that should be included with the export.  Make sure that you check the "Include Content" check box when creating a site template in order to include these settings with the template.</value>
+  </data>
+  <data name="paypalsandbox.Text" xml:space="preserve">
+    <value>Use PayPal Sandbox?</value>
+    <comment>Payment</comment>
+  </data>
+  <data name="paypalsubscriptioncancelreturn.Text" xml:space="preserve">
+    <value>PayPal Cancel URL</value>
+    <comment>Payment</comment>
+  </data>
+  <data name="paypalsubscriptionreturn.Text" xml:space="preserve">
+    <value>PayPal Return URL</value>
+    <comment>Payment</comment>
+  </data>
   <data name="Place Order.Text" xml:space="preserve">
     <value>Place Order</value>
   </data>
   <data name="Place Order.ToolTip" xml:space="preserve">
     <value>Set the checked settings to be included with the settings export</value>
   </data>
+  <data name="PortalAliasMapping.Text" xml:space="preserve">
+    <value>Site Alias Mapping Mode</value>
+    <comment>Site Aliases</comment>
+  </data>
+  <data name="SSLEnabled.Text" xml:space="preserve">
+    <value>SSL Enabled?</value>
+    <comment>SSL</comment>
+  </data>
+  <data name="SSLEnforced.Text" xml:space="preserve">
+    <value>SSL Enforced?</value>
+    <comment>SSL</comment>
+  </data>
+  <data name="SSLURL.Text" xml:space="preserve">
+    <value>SSL URL</value>
+    <comment>SSL</comment>
+  </data>
+  <data name="STDURL.Text" xml:space="preserve">
+    <value>Standard URL</value>
+    <comment>SSL</comment>
+  </data>
+  <data name="Success.Text" xml:space="preserve">
+    <value>Your order has been successfully placed!  The selected settings will be included in the export.</value>
+  </data>
+  <data name="TimeZone.Text" xml:space="preserve">
+    <value>Site Time Zone</value>
+    <comment>Security</comment>
+  </data>
 </root>
diff --git a/Views/ViewTakeOut.ascx b/Views/ViewTakeOut.ascx
@@ -1,6 +1,9 @@
 <%@ Control Language="C#" AutoEventWireup="false" CodeBehind="ViewTakeOut.ascx.cs" Inherits="Engage.Dnn.TakeOut.ViewTakeOut" EnableViewState="false" %>
 <%@ Import Namespace="Globals=DotNetNuke.Common.Globals" %>
 <p class="dnnFormMessage dnnFormInfo"><%:LocalizeString("Intro") %></p>
+<asp:PlaceHolder runat="server" Visible="<%#Model.ShowSuccessMessage %>">
+    <p class="dnnFormMessage dnnFormSuccess"><%:LocalizeString("Success") %></p>
+</asp:PlaceHolder>
 
 <asp:Repeater ID="SettingsRepeater" runat="server" DataSource="<%#Model.PortalSettings.OrderBy(ps => ps.SettingName) %>">
     <HeaderTemplate><ul class="take-out-settings"></HeaderTemplate>
@@ -15,6 +18,9 @@
     <FooterTemplate></ul></FooterTemplate>
 </asp:Repeater>
 
+<asp:PlaceHolder runat="server" Visible="<%#Model.ShowSuccessMessage %>">
+    <p class="dnnFormMessage dnnFormSuccess"><%:LocalizeString("Success") %></p>
+</asp:PlaceHolder>
 <asp:Button runat="server" ResourceKey="Place Order" ToolTip='<%#LocalizeString("Place Order.ToolTip") %>' OnClick="PlaceOrderButton_Click" />
 
 <script runat="server">