Skip to content

Commit

Permalink
Fixing issues #12, #13 and #14 regarding global e-mail templates and …
Browse files Browse the repository at this point in the history 
…sessions
  • Loading branch information
Eivind committed Sep 20, 2016
1 parent d238103 commit a8608ba
Show file tree
Hide file tree
Showing 21 changed files with 248 additions and 119 deletions.
8 changes: 8 additions & 0 deletions src/BVNetwork.Attend.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,13 @@
<Compile Include="Views\Blocks\Static\AvailableSeatsControl.ascx.designer.cs">
<DependentUpon>AvailableSeatsControl.ascx</DependentUpon>
</Compile>
<Compile Include="Views\Blocks\Static\EmailTemplateBlockPreviewControl.ascx.cs">
<DependentUpon>EmailTemplateBlockPreviewControl.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Views\Blocks\Static\EmailTemplateBlockPreviewControl.ascx.designer.cs">
<DependentUpon>EmailTemplateBlockPreviewControl.ascx</DependentUpon>
</Compile>
<Compile Include="Views\Blocks\Static\EmailTemplateBlockControl.ascx.cs">
<DependentUpon>EmailTemplateBlockControl.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
Expand Down Expand Up @@ -608,6 +615,7 @@
<Content Include="Views\Blocks\SessionBlockListViewControl.ascx" />
<Content Include="Views\Blocks\ParticipantBlockListViewSmallControl.ascx" />
<Content Include="Views\Blocks\Static\AvailableSeatsControl.ascx" />
<Content Include="Views\Blocks\Static\EmailTemplateBlockPreviewControl.ascx" />
<Content Include="Views\Blocks\Static\EmailTemplateBlockControl.ascx" />
<Content Include="Views\Blocks\Static\EventDetailsBlockControl.ascx" />
<Content Include="Views\Blocks\ParticipantBlockPreviewControl.ascx" />
Expand Down
2 changes: 1 addition & 1 deletion src/BVNetwork.Attend.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>BVNetwork.Attend</id>
<version>5.4.0</version>
<version>5.5.0</version>
<title>Attend</title>
<authors>The EPiCode Community</authors>
<owners>BV Network AS</owners>
Expand Down
4 changes: 2 additions & 2 deletions src/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("5.4.0.*")]
[assembly: AssemblyFileVersion("5.4.0.*")]
[assembly: AssemblyVersion("5.5.0.*")]
[assembly: AssemblyFileVersion("5.5.0.*")]
65 changes: 18 additions & 47 deletions src/Views/Blocks/EMailTemplatePreview.aspx
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,31 @@
<%@ Page Language="C#" Inherits="BVNetwork.Attend.Views.Blocks.EMailTemplatePreview" EnableViewState="false" %>
<%@ Page Language="C#" Inherits="BVNetwork.Attend.Views.Blocks.EMailTemplatePreview" EnableViewState="false" MasterPageFile="~/modules/BVNetwork.Attend/Views/MasterPages/Attend.Master" %>

<%@ Import Namespace="BVNetwork.Attend.Business.API" %>
<%@ Import Namespace="BVNetwork.Attend.Models.Blocks" %>
<%@ Register Namespace="EPiServer.Web.WebControls" TagPrefix="EPiServer" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">


<html xmlns="http://www.w3.org/1999/xhtml" style="margin: 0; padding: 0;">
<head id="Head1" runat="server">
<title>
<EPiServer:Translate runat="server" text="/attend/edit/eventblockpreview" />
</title>
<link rel="Stylesheet" type="text/css" href="/Modules/BVNetwork.Attend/Static/AttendStyle.css" />
<link rel="Stylesheet" type="text/css" href="/Modules/BVNetwork.Attend/Static/css/bootstrap.css" />
<script type="text/javascript" src="/Modules/BVNetwork.Attend/Static/js/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="/Modules/BVNetwork.Attend/Static/js/bootstrap.min.js"></script>
</head>
<body>
<form id="Form1" runat="server" style="background-color: #fff; margin-top: -22px;">
<div class="">
<EPiServer:FullRefreshPropertiesMetaData runat="server" />

<div class="darkarea">
<div class="container">
<div class="left">
<img src="/Modules/BVNetwork.Attend/static/attend_blue.png" />
</div>
<div class="left">
<h1>
<EPiServer:Translate runat="server" text="/attend/edit/attend" />
<br />
<%=CurrentData.Name %></h1>
</div>

<asp:Content runat="server" ContentPlaceHolderID="MainContent">
<div class="container">
<h2>
<episerver:translate runat="server" text="/attend/edit/emailtemplates" />
</h2>

<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="well">
<episerver:property id="propertyControl" cssclass="row preview" runat="server">
<rendersettings enableeditfeaturesforchildren="true" />
</episerver:property>
</div>
</div>
</div>


<div class="container">
<h2>
<EPiServer:Translate runat="server" text="/attend/edit/emailtemplates" />
</h2>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="well">
</div>
</asp:Content>


<EPiServer:Property ID="propertyControl" CssClass="row preview" runat="server">
<rendersettings enableeditfeaturesforchildren="true" />
</EPiServer:Property>
</div>
</div>
</div>
</div>
</form>
</body>
</html>

<asp:Content runat="server" ContentPlaceHolderID="HeaderArea">
<%=CurrentData.Name %>
</asp:Content>
7 changes: 2 additions & 5 deletions src/Views/Blocks/EMailTemplatePreview.aspx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public partial class EMailTemplatePreview : PreviewPage, IRenderTemplate<EmailTe

protected void Page_Init(object sender, EventArgs e)
{
BVNetwork.Attend.Business.Localization.FixEditModeCulture.TryToFix();

}

protected void Page_Load(object sender, EventArgs e)
Expand All @@ -32,19 +34,14 @@ protected void Page_Load(object sender, EventArgs e)

private void SetupPreviewPropertyControl(Property propertyControl, IEnumerable<IContent> contents)
{
// Define a content area
var contentArea = new ContentArea();

// Add the blocks to preview
foreach (var content in contents)
{
contentArea.Items.Add(new ContentAreaItem { ContentLink = content.ContentLink });
}

// Create a temporary property for the content area
var previewProperty = new PropertyContentArea { Value = contentArea, Name = "PreviewPropertyData", IsLanguageSpecific = true };

// Render the temporary property using the Property control in the web form
propertyControl.InnerProperty = previewProperty;
}

Expand Down
93 changes: 50 additions & 43 deletions src/Views/Blocks/ParticipantBlockPreviewControl.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,47 @@
<%@ Register Namespace="EPiServer.Web.WebControls" TagPrefix="EPiServer" %>
<%@ Register Namespace="EPiServer.XForms.WebControls" TagPrefix="XForms" %>

<script type="text/javascript">
$(function () {
// for bootstrap 3 use 'shown.bs.tab', for bootstrap 2 use 'shown' in the next line
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
// save the latest tab; use cookies if you like 'em better:
localStorage.setItem('lastTab', $(this).attr('href'));
});
// go to the latest tab, if it exists:
var lastTab = localStorage.getItem('lastTab');
if (lastTab) {
$('[href="' + lastTab + '"]').tab('show');
}
<script type="text/javascript">
$(function () {
// for bootstrap 3 use 'shown.bs.tab', for bootstrap 2 use 'shown' in the next line
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
// save the latest tab; use cookies if you like 'em better:
localStorage.setItem('lastTab', $(this).attr('href'));
});
</script>
<br/>
<a target="_top" class="btn btn-default pull-right" href='<%=EventUrl %>'>
<EPiServer:Translate runat="server" text="/attend/edit/returntoevent" />
</a>

<EPiServer:Translate runat="server" text="/attend/edit/participantat" />
<EPiServer:property runat="server" propertyname="pageName" pagelinkproperty="EventPage"></EPiServer:property><br />
// go to the latest tab, if it exists:
var lastTab = localStorage.getItem('lastTab');
if (lastTab) {
$('[href="' + lastTab + '"]').tab('show');
}
});
</script>
<br />
<a target="_top" class="btn btn-default pull-right" href='<%=EventUrl %>'>
<episerver:translate runat="server" text="/attend/edit/returntoevent" />
</a>

<h2>
<episerver:translate runat="server" text="/attend/edit/participantat" />
<episerver:property runat="server" propertyname="pageName" pagelinkproperty="EventPage"></episerver:property>
</h2>



<div style="font-weight: bold;">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#edit" aria-controls="edit" role="tab" data-toggle="tab">
<EPiServer:Translate runat="server" text="/attend/edit/editparticipantdetails" />
<episerver:translate runat="server" text="/attend/edit/editparticipantdetails" />
</a></li>
<li role="presentation"><a href="#form" aria-controls="form" role="tab" data-toggle="tab">
<EPiServer:Translate runat="server" text="/attend/edit/editregistrationform" />
<episerver:translate runat="server" text="/attend/edit/editregistrationform" />
</a></li>
<li role="presentation"><a href="#sessions" aria-controls="sessions" role="tab" data-toggle="tab">
<EPiServer:Translate runat="server" text="/attend/edit/editsessions" />
<episerver:translate runat="server" text="/attend/edit/editsessions" />
</a></li>

<li role="presentation"><a href="#log" aria-controls="log" role="tab" data-toggle="tab">
<EPiServer:Translate runat="server" text="/attend/edit/log" />
<episerver:translate runat="server" text="/attend/edit/log" />
</a></li>

</ul>
Expand All @@ -60,50 +59,55 @@

<div class="">
<h2>
<EPiServer:Translate runat="server" text="/attend/edit/editparticipantdetails" />
<episerver:translate runat="server" text="/attend/edit/editparticipantdetails" />
</h2>
<table class="table table-responsive table-hover table-striped">
<tr>
<td>
<EPiServer:Translate runat="server" text="/attend/edit/email" />
<episerver:translate runat="server" text="/attend/edit/email" />
</td>
<td>
<EPiServer:property runat="server" propertyname="Email" id="PropertyEmail"></EPiServer:property></td>
<episerver:property runat="server" propertyname="Email" id="PropertyEmail"></episerver:property>
</td>
</tr>
<tr>
<td>
<EPiServer:Translate runat="server" text="/attend/edit/code" />
<episerver:translate runat="server" text="/attend/edit/code" />
</td>
<td>
<EPiServer:property runat="server" propertyname="Code" id="Code"></EPiServer:property></td>
<episerver:property runat="server" propertyname="Code" id="Code"></episerver:property>
</td>
</tr>
<tr>
<td>
<EPiServer:Translate runat="server" text="/attend/edit/status" />
<episerver:translate runat="server" text="/attend/edit/status" />
</td>
<td>
<%=CurrentData.AttendStatus %></td>
<%=CurrentData.AttendStatus %></td>
</tr>
<tr>
<td>
<EPiServer:Translate runat="server" text="/attend/edit/username" />
<episerver:translate runat="server" text="/attend/edit/username" />
</td>
<td>
<EPiServer:property runat="server" propertyname="Username" id="Property3"></EPiServer:property></td>
<episerver:property runat="server" propertyname="Username" id="Property3"></episerver:property>
</td>
</tr>
<tr>
<td>
<EPiServer:Translate runat="server" text="/attend/edit/datesubmitted" />
<episerver:translate runat="server" text="/attend/edit/datesubmitted" />
</td>
<td>
<EPiServer:property runat="server" propertyname="DateSubmitted" id="Property4"></EPiServer:property></td>
<episerver:property runat="server" propertyname="DateSubmitted" id="Property4"></episerver:property>
</td>
</tr>
<tr>
<td>
<EPiServer:Translate runat="server" text="/attend/edit/price" />
<episerver:translate runat="server" text="/attend/edit/price" />
</td>
<td>
<EPiServer:property runat="server" propertyname="Price" id="Property5"></EPiServer:property></td>
<episerver:property runat="server" propertyname="Price" id="Property5"></episerver:property>
</td>
</tr>

</table>
Expand All @@ -116,38 +120,41 @@

<div class="well">
<h2>
<EPiServer:Translate runat="server" text="/attend/edit/editregistrationform" />
<episerver:translate runat="server" text="/attend/edit/editregistrationform" />
</h2>
<XForms:XFormControl runat="server" id="DetailsXFormControl" />
<xforms:xformcontrol runat="server" id="DetailsXFormControl" />
<br />
<asp:LinkButton runat="server" OnClick="UpdateParticipant_Click" Text="<%$ Resources: EPiServer, attend.edit.saveformdata %>" CssClass="btn btn-primary primary" />
&nbsp;
<asp:LinkButton runat="server" OnClick="SendMail_Click" Text="<%$ Resources: EPiServer, attend.edit.saveandsendmail %>" CssClass="btn btn-primary " />
<br />
<asp:Literal runat="server" ID="StatusLiteral"></asp:Literal>
</div>
</div>

<div role="tabpanel" class="tab-pane" id="sessions">

<div class="well">
<h2>
<EPiServer:Translate runat="server" text="/attend/edit/editsessions"></EPiServer:Translate></h2>
<episerver:translate runat="server" text="/attend/edit/editsessions"></episerver:translate>
</h2>
<asp:PlaceHolder runat="server" ID="SessionList"></asp:PlaceHolder>
<br />
<br />
<asp:LinkButton runat="server" OnClick="UpdateSessions_Click" CssClass="btn btn-primary" Text="<%$ Resources: EPiServer, attend.edit.savesessionsdata %>"></asp:LinkButton>
</div>
</div>



<div role="tabpanel" class="tab-pane" id="log">
<h2>
<EPiServer:Translate runat="server" text="/attend/edit/log" />
<episerver:translate runat="server" text="/attend/edit/log" />
</h2>
<%=GetLogText %>

<a target="_top" class="btn btn-default" href='<%=EventUrl %>'>
<EPiServer:Translate runat="server" text="/attend/edit/returntoevent" />
<episerver:translate runat="server" text="/attend/edit/returntoevent" />
</a>

</div>
Expand Down
13 changes: 10 additions & 3 deletions src/Views/Blocks/ParticipantBlockPreviewControl.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,16 @@ protected void Page_Init(object sender, EventArgs e)

protected void UpdateParticipant_Click(object sender, EventArgs e)
{
ParticipantBlock current = (CurrentBlock.CreateWritableClone() as ParticipantBlock);
current.XForm = DetailsXFormControl.Data.Data.OuterXml;
Locate.ContentRepository().Save(current as IContent, EPiServer.DataAccess.SaveAction.Publish);
try
{
ParticipantBlock current = (CurrentBlock.CreateWritableClone() as ParticipantBlock);
current.XForm = DetailsXFormControl.Data.Data.OuterXml;
Locate.ContentRepository().Save(current as IContent, EPiServer.DataAccess.SaveAction.Publish);
StatusLiteral.Text = "OK";
}
catch (Exception ex) {
StatusLiteral.Text = ex.Message;
}
}

protected void UpdateSessions_Click(object sender, EventArgs e)
Expand Down
9 changes: 9 additions & 0 deletions src/Views/Blocks/ParticipantBlockPreviewControl.ascx.designer.cs
View file

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

4 changes: 3 additions & 1 deletion src/Views/Blocks/ScheduledEmailBlockPreview.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
<EPiServer:Translate runat="server" text="/attend/edit/selectglobaltemplate" />
<EPiServer:Property runat="server" PropertyName="EmailTemplateContentReference" id="EmailTemplateContentReference" />
<asp:PlaceHolder runat="server" ID="ConfirmMailTemplateBlockPreviewPlaceHolder">
<EPiServer:Property runat="server" ID="MailTemplateBlockPreview"></EPiServer:Property>
<EPiServer:Property runat="server" ID="MailTemplateBlockPreview">
<rendersettings tag="MailPreview" />
</EPiServer:Property>
<asp:LinkButton runat="server" ID="ConvertLocalConfirmBlock" Text="<%$ Resources: EPiServer, attend.edit.convertlocal %>" CssClass="btn btn-primary" OnClick="ConvertLocalConfirmBlock_OnClick"></asp:LinkButton>
&nbsp;
<asp:LinkButton runat="server" ID="EditConfirmMailTemplate" Text="<%$ Resources: EPiServer, attend.edit.editmailtemplate %>" CssClass="btn btn-primary" OnClick="EditConfirmMailTemplate_OnClick"></asp:LinkButton>
Expand Down
Loading

0 comments on commit a8608ba

Please sign in to comment.