Merge pull request #71 from DNNCommunity/develop

Released v7.3.0

Author: valadas

AnnouncementsEdit.ascx

@@ -9,7 +9,7 @@
 <%@ Register TagPrefix="dnn" TagName="FilePickerUploader" Src="~/controls/filepickeruploader.ascx" %>
 <%@ Import Namespace="DotNetNuke.Services.Localization" %>
 <%@ Register TagPrefix="dnn" Namespace="DotNetNuke.UI.WebControls" Assembly="DotNetNuke" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls" Assembly="DotNetNuke.Web.Deprecated" %>
+<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls.Internal" Assembly="DotNetNuke.Web" %>
 <div class="dnnForm dnnAnnouncementForm dnnClear" id="AnnouncementsForm">
     <ul class="dnnAdminTabNav dnnClear" id="">
         <li id="contentTab" runat="server"><a href="#dnnContent"><%=LocalizeString("content.Tab")%></a></li>
@@ -67,19 +67,11 @@
             </div>
             <div class="dnnFormItem">
                 <dnn:Label ID="plPublishDate" Suffix=":" ControlName="publishDate" runat="server" />
- 			    <div class="dateDiv"><dnn:DnnDatePicker ID="publishDate" runat="server" /></div>
-            </div>
-             <div class="dnnFormItem">
-                <dnn:Label ID="plPublishTime" Suffix=":" ControlName="publishTime" runat="server" />
-               <div class="dateDiv"><dnn:DnnTimePicker ID="publishTime" runat="server" /></div>
+ 			    <div class="dateDiv"><dnn:DnnDateTimePicker ID="publishDate" runat="server" /></div>
             </div>
             <div class="dnnFormItem">
                 <dnn:Label ID="plExpireDate" Suffix=":" ControlName="expireDate" runat="server" />
- 			    <div class="dateDiv"><dnn:DnnDatePicker ID="expireDate" runat="server" /></div>
-            </div>
-             <div class="dnnFormItem">
-                <dnn:Label ID="plExpireTime" Suffix=":" ControlName="expireTime" runat="server" />
-               <div class="dateDiv"><dnn:DnnTimePicker ID="expireTime" runat="server" /></div>
+ 			    <div class="dateDiv"><dnn:DnnDateTimePicker ID="expireDate" runat="server" /></div>
             </div>
         </fieldset>
     </div>

AnnouncementsEdit.ascx.cs

@@ -44,8 +44,7 @@
 using DotNetNuke.Web.Client;
 using DotNetNuke.Web.Client.ClientResourceManagement;
 using DotNetNuke.Web.Mvp;
-using DotNetNuke.Web.UI.WebControls;
-
+using DotNetNuke.Web.UI.WebControls.Internal;
 using WebFormsMvp;
 
 #endregion
@@ -68,6 +67,13 @@ public partial class AnnouncementsEdit : ModuleView<AnnouncementsEditModel>, IAn
         public event EventHandler<EditItemEventArgs> DeleteAnnouncement;
         public event EventHandler<EditItemEventArgs> UpdateAnnouncement;
 
+        protected UI.UserControls.LabelControl plTitle;
+        protected DotNetNuke.Web.UI.WebControls.DnnFilePickerUploader urlImage;
+        protected UI.UserControls.TextEditor teDescription;
+        protected UI.UserControls.UrlControl ctlURL;
+        protected UI.UserControls.ModuleAuditControl ctlAudit;
+        protected UI.UserControls.URLTrackingControl ctlTracking;
+
         override protected void OnInit(EventArgs e)
         {
             base.OnInit(e);
@@ -157,8 +163,8 @@ private void CmdUpdateClick(object sender, EventArgs e)
                     announcement.ImageSource = urlImage.FilePath;
                     announcement.Description = teDescription.Text;
                     announcement.URL = ctlURL.Url;
-                    announcement.PublishDate = GetDateTimeValue(publishDate, publishTime, DateTime.UtcNow);
-                    announcement.ExpireDate = GetDateTimeValue(expireDate, expireTime);
+                    announcement.PublishDate = GetDateTimeValue(publishDate, DateTime.UtcNow);
+                    announcement.ExpireDate = GetDateTimeValue(expireDate);
                     announcement.LastModifiedByUserID = ModuleContext.PortalSettings.UserId;
                     announcement.LastModifiedOnDate = DateTime.UtcNow;
                     if (!string.IsNullOrWhiteSpace(txtViewOrder.Text))
@@ -201,14 +207,12 @@ private void BindForm()
                     {
                         var portalDateTime = TimeZoneInfo.ConvertTimeFromUtc(Model.AnnouncementInfo.PublishDate.Value, ModuleContext.PortalSettings.TimeZone);
                         publishDate.SelectedDate = portalDateTime;
-                        publishTime.SelectedDate = portalDateTime;
                     }
                     if ((!Null.IsNull(Model.AnnouncementInfo.ExpireDate)) &&
                         (Model.AnnouncementInfo.ExpireDate != (DateTime)SqlDateTime.Null))
                     {
                         var portalDateTime = TimeZoneInfo.ConvertTimeFromUtc(Model.AnnouncementInfo.ExpireDate.Value, ModuleContext.PortalSettings.TimeZone);
                         expireDate.SelectedDate = portalDateTime;
-                        expireTime.SelectedDate = portalDateTime;
                     }
 
                     var user = UserController.Instance.GetCurrentUserInfo();
@@ -276,7 +280,7 @@ private string ReturnURL
             }
         }
 
-        private DateTime? GetDateTimeValue(DnnDatePicker dnnDatePicker, DnnTimePicker dnnTimePicker)
+        private DateTime? GetDateTimeValue(DnnDatePicker dnnDatePicker)
         {
             DateTime? resultValue = null;
 
@@ -285,11 +289,6 @@ private string ReturnURL
                 resultValue = dnnDatePicker.SelectedDate;
             }
 
-            if ((dnnTimePicker.SelectedTime != null) && (resultValue.HasValue))
-            {
-                resultValue = resultValue.Value.Add((TimeSpan)dnnTimePicker.SelectedTime);
-            }
-
             if (resultValue.HasValue)
             {
                 return TimeZoneInfo.ConvertTimeToUtc(resultValue.Value, ModuleContext.PortalSettings.TimeZone);
@@ -298,9 +297,9 @@ private string ReturnURL
             return null;
         }
 
-        private DateTime? GetDateTimeValue(DnnDatePicker dnnDatePicker, DnnTimePicker dnnTimePicker, DateTime defaultValue)
+        private DateTime? GetDateTimeValue(DnnDateTimePicker dnnDatePicker, DateTime defaultValue)
         {
-            DateTime? resultValue = GetDateTimeValue(dnnDatePicker, dnnTimePicker);
+            DateTime? resultValue = GetDateTimeValue(dnnDatePicker);
 
             if (!resultValue.HasValue)
             {