Skip to content

Commit

Permalink
Merge pull request #377 from dcook-net/carousel-images
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianbanks committed Jun 6, 2019
2 parents 82d84e6 + af95766 commit d796d1d
Show file tree
Hide file tree
Showing 13 changed files with 90 additions and 14 deletions.
5 changes: 5 additions & 0 deletions DDDEastAnglia/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ public ActionResult CodeOfConduct()
{
return View();
}

// public ActionResult Environmental()
// {
// return View();
// }

public ActionResult Accommodation()
{
Expand Down
1 change: 1 addition & 0 deletions DDDEastAnglia/Controllers/NavigationBarController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public ActionResult RenderMenu()
CreateLink("Accommodation", "Home", "Accommodation", conference.CanRegister),
CreateLink("Sponsors", "Home", "Sponsors"),
CreateLink("Team", "Home", "Team"),
// CreateLink("Environmental Policy", "Home", "Environmental"),
CreateLink("Contact", "Home", "Contact"),
CreateLink("Admin", "AdminHome", "Index", () => User.IsInRole("Administrator"), new { area = "Admin" }),
};
Expand Down
2 changes: 2 additions & 0 deletions DDDEastAnglia/DDDEastAnglia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
<Content Include="emails\SessionFeedbackForm.png" />
<Content Include="emails\SpeakerEmail.html" />
<Content Include="Images\carousel\8.jpg" />
<Content Include="Images\carousel\9.jpg" />
<Content Include="Images\googleplaystore.gif" />
<Content Include="Images\hotels\doubletree-hilton.jpg" />
<Content Include="Images\hotels\hotel-ibis-cambridge-central-station.jpg" />
Expand Down Expand Up @@ -633,6 +634,7 @@
<Content Include="Scripts\Markdown.Editor.js" />
<Content Include="Scripts\modernizr-2.5.3.js" />
<Content Include="Scripts\modernizr-2.6.2.js" />
<Content Include="Views\Home\Environmental.cshtml" />
<Content Include="Views\Home\Preview.cshtml">
<SubType>Code</SubType>
</Content>
Expand Down
Binary file modified DDDEastAnglia/Images/carousel/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified DDDEastAnglia/Images/carousel/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified DDDEastAnglia/Images/carousel/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified DDDEastAnglia/Images/carousel/5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified DDDEastAnglia/Images/carousel/6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified DDDEastAnglia/Images/carousel/7.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified DDDEastAnglia/Images/carousel/8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added DDDEastAnglia/Images/carousel/9.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 61 additions & 0 deletions DDDEastAnglia/Views/Home/Environmental.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
@{
ViewBag.Title = "Environmental Policy";
}

<div class="row-fluid">
<div class="span12">
<h1>Environmental Policy - Our mission</h1>
</div>
</div>

<p>Our founding principle has always been 'For the community by the community'.</p>
<p>
Recently @Html.DDDEastAnglia() has recognised that this needs to extend beyond just ensuring you have a great conference,
and as of 2019 we are taking steps to be a more environmentally conscious, sustainable conference.
We know we are a little late to the party, but we hope to set an example for those yet to catch up.
</p>

<h3>What we are doing now</h3>

<p>To kick things off, we are stopping the use of any single use plastics.
The disposable coffee cups and plastic water bottles you have seen in previous years are out, and we are committed to sourcing
more sustainable, reusable alternatives.</p>

<p>We are also committing to reviewing and improving our environmental impact for future conferences.</p>

<h3>What we've been doing for a while</h3>

<p>No one likes waste, so since 2017 we have been donating any left over food and drink
to a local homeless shelter <a href="http://www.jimmyscambridge.org.uk">Jimmy's Night Shelter</a>,
supporting the local community while reducing what simply gets thrown away.</p>


<h3>Why?</h3>

<p>We all need to band together and do our bit.
Environmentle issues such as <a href="https://www.plasticpollutioncoalition.org/">plastic waste</a> and climate change
are problems that are not going away without our help.

</p>

<h3>What you can do to help</h3>

<p>
Travel miles to and from the venue are where you can make the biggest contribution to
helping reduce the impact of the conference.

So we would like to encourage you to opt for more sustainable travel arrangements, such as lift shares,
coach or cycling.

We also ask that you consider off-setting your journey by calculating your carbon output,
and paying a small contribution to neutralise your trip.
</p>

<h3>Policy Summary</h3>

<p>Irradicate single use plastics</p>
<p>Strive towards zero food and drink waste</p>
<p>Committed to locally sourced produce, to reduce millage and carbon footprint</p>
<p>We will seek to buy recycled and recyclable paper products.</p>
<p>We will strongly encourage our speakers and attendies to use more sustainable travel options</p>
<p>We will continually improve and reduce environmental impacts.</p>
35 changes: 21 additions & 14 deletions DDDEastAnglia/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -29,52 +29,59 @@
<li data-target="#photos" data-slide-to="5"></li>
<li data-target="#photos" data-slide-to="6"></li>
<li data-target="#photos" data-slide-to="7"></li>
<li data-target="#photos" data-slide-to="8"></li>
</ol>
<!-- Carousel items -->
<div class="carousel-inner">
<div class="active item">
<img src="@Url.Content("~/Images/carousel/1.jpg")" alt="DDD East Anglia logo" />
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/2.jpg")" alt="Liam Westley presenting" />
<img src="@Url.Content("~/Images/carousel/2.jpg")" alt="Closing Session 2018" />
<div class="carousel-caption">
<p>Liam Westley presenting his 'An Actor's Life For Me' talk at DDDEA 2014.</p>
<p>A packed closing session at DDD East Anglia 2018.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/3.jpg")" alt="Attendees mingling" />
<img src="@Url.Content("~/Images/carousel/4.jpg")" alt="Don Wibier presenting" />
<div class="carousel-caption">
<p>Attendees mingle during one of the refreshment breaks at DDDEA 2014.</p>
<p>Don Wibier talks 'Dependency Injection in ASP.NET Core 2. Why and How?' at DDD East Anglia 2018.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/4.jpg")" alt="Mark Rendle presenting" />
<img src="@Url.Content("~/Images/carousel/6.jpg")" alt="Emily Sas presenting" />
<div class="carousel-caption">
<p>Mark Rendle presenting his 'The vNext Big Thing' talk at DDDEA 2014.</p>
<p>Emily Sas giving a lightnight talk on 'Pair Programming - the Marmite of Engineering' at DDD East Anglia 2018.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/5.jpg")" alt="Iris Classon presenting to an audience" />
<img src="@Url.Content("~/Images/carousel/8.jpg")" alt="Hands-on Docker Workshop" />
<div class="carousel-caption">
<p>Iris Classon presenting her lunchtime 'Grok' talk at DDDEA 2014.</p>
<p>Paula Muldoon & Paul McGrath deliver their 'Docker for the complete beginner' workshop at DDD East Anglia 2018.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/6.jpg")" alt="Ben Hall presenting" />
<img src="@Url.Content("~/Images/carousel/9.jpg")" alt="Chris O'Dell" />
<div class="carousel-caption">
<p>Ben Hall presenting his 'What Developers Need To Know About Visual Design' talk at DDDEA 2014.</p>
<p>Chris O'Dell presenting 'You build it, you run it!' at DDD East Anglia 2017.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/7.jpg")" alt="Barbara Fusinska presenting" />
<img src="@Url.Content("~/Images/carousel/3.jpg")" alt="Attendees mingling" />
<div class="carousel-caption">
<p>Attendees mingle during one of the refreshment breaks at DDD East Anglia 2014.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/5.jpg")" alt="Iris Classon presenting to an audience" />
<div class="carousel-caption">
<p>Barbara Fusinska presenting her 'Architecture - why so serious?' talk at DDDEA 2014.</p>
<p>Iris Classon presenting her lunchtime 'Grok' talk at DDD East Anglia 2014.</p>
</div>
</div>
<div class="item">
<img src="@Url.Content("~/Images/carousel/8.jpg")" alt="Several people on a stage" />
<img src="@Url.Content("~/Images/carousel/7.jpg")" alt="Barbara Fusinska presenting" />
<div class="carousel-caption">
<p>Attendees of DDDEA 2014 receiving prizes during the end of day wrap-up.</p>
<p>Barbara Fusinska presenting her 'Architecture - why so serious?' talk at DDD East Anglia 2014.</p>
</div>
</div>
</div>
Expand Down

0 comments on commit d796d1d

Please sign in to comment.