Skip to content

Commit

Permalink
Merge pull request #2 from bdukes/integrate-jquery-ui
Browse files Browse the repository at this point in the history
Remove jQuery UI from scripts, ask through DNN API

Fixes #1
Fixes #6
  • Loading branch information
bdukes committed Oct 13, 2014
2 parents 44c21b3 + 0318f9e commit d433e74
Show file tree
Hide file tree
Showing 71 changed files with 12,994 additions and 154,561 deletions.
2 changes: 1 addition & 1 deletion Source/AnalyzeResponses.ascx.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="AnalyzeResponses.ascx.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/ClientService.asmx.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ClientService.asmx.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/ControlKey.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ControlKey.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Controls/GlobalNavigation.ascx.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="GlobalNavigation.ascx.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/DnnLocalizer.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="DnnLocalizer.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
8 changes: 5 additions & 3 deletions Source/EditSurvey.ascx.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="EditSurvey.ascx.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand All @@ -16,6 +16,8 @@ namespace Engage.Dnn.Survey
using System.Web.Script.Serialization;
using System.Web.UI;

using DotNetNuke.Framework;

using Engage.Survey.Entities;

using Microsoft.Security.Application;
Expand Down Expand Up @@ -74,7 +76,7 @@ protected string DefaultNotificationToEmailAddresses
/// Gets a value indicating whether to send thank you emails by default.
/// </summary>
/// <value>
/// <c>true</c> if thank you emails are sent by default; otherwise, <c>false</c>.
/// <c>true</c> if thank you emails are sent by default; otherwise, <c>false</c>.
/// </value>
protected bool DefaultSendThankYou
{
Expand Down Expand Up @@ -180,7 +182,7 @@ private Survey GetSurvey()
/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
private void Page_Load(object sender, EventArgs e)
{
this.AddJQueryReference();
jQuery.RequestUIRegistration();
this.Page.ClientScript.RegisterClientScriptResource(typeof(EditSurvey), "Engage.Dnn.Survey.JavaScript.survey-all.js");
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/IAnswer.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="IAnswer.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/IQuestion.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="IQuestion.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/ISection.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ISection.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/ISurvey.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ISurvey.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/ISurveyElement.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ISurveyElement.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
8 changes: 4 additions & 4 deletions Source/Engage.Survey/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="AssemblyInfo.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand All @@ -20,7 +20,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Engage.Survey")]
[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -42,5 +42,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.4.3.*")]
[assembly: AssemblyFileVersion("3.4.3.0")]
[assembly: AssemblyVersion("3.5.0.*")]
[assembly: AssemblyFileVersion("3.5.0.0")]
2 changes: 1 addition & 1 deletion Source/Engage.Survey/UI/ILocalizer.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ILocalizer.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/UI/SurveyControl.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="SurveyControl.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/UI/SurveyControlDesigner.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="SurveyControlDesigner.ascx.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/UserResponse.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="UserResponse.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/ControlType.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ControlType.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/ElementFormatOption.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ElementFormatOption.cs" company="Engage Software">
// Engage: Survey - http://www.engagesoftware.com
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/EngageValidationProvider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="EngageValidationProvider.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/FinalMessageOption.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="FinalMessageOption.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/Key.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="Key.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/TextBoxLengthValidator.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="TextBoxLengthValidator.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/TitleOption.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="TitleOption.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/Utility.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="Utility.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
2 changes: 1 addition & 1 deletion Source/Engage.Survey/Util/ValidationProviderBase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// <copyright file="ValidationProviderBase.cs" company="Engage Software">
// Engage: Survey
// Copyright (c) 2004-2013
// Copyright (c) 2004-2014
// by Engage Software ( http://www.engagesoftware.com )
// </copyright>
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
Expand Down
145 changes: 0 additions & 145 deletions Source/EngageSurvey.5.dnn

This file was deleted.

Loading

0 comments on commit d433e74

Please sign in to comment.