Skip to content

Commit

Permalink
Merge branch 'ESS2014-RegPrep'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikobeer
nikobeer committed Jun 26, 2014
2 parents 3276e40 + 8f20b4c commit 046c520
Show file tree
Hide file tree
Showing 36 changed files with 7,251 additions and 1,213 deletions.
25 changes: 15 additions & 10 deletions 2014/formTemplates/form_bad.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<title>Anmeldung fehlgeschlagen</title>
<link rel="stylesheet" href="stylesheets/app.css" />
<script src="javascripts/vendor/custom.modernizr.js"></script>
<link rel="stylesheet" href="../../stylesheets/app.css" />
<script src="../../javascripts/vendor/custom.modernizr.js"></script>
<style type="text/css">
.icon{height: 40px; margin-right:5px;}
c</style>
</head>
<body>

Expand All @@ -18,21 +21,23 @@

<ul class="title-area">
<li class="name">
<h1 class="hide-for-small"><a href="index.html">Edirom-Summer-School 2013</a></h1>
<h1 class="show-for-small"><a href="index.html">ESS 2013</a></h1>
<h1 class="hide-for-small"><a href="../index.html"><img src="img/ESS2014_icon.png" class="icon"/>Edirom-Summer-School 2014</a></h1>
<h1 class="show-for-small"><a href="../index.html">ESS 2014</a></h1>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
</ul>

<section class="top-bar-section">
<ul class="right">
<li><a href="programm.html">Programm</a></li>
<li><a href="programm.html">Programm 2014</a></li>
<li class="divider"></li>
<li><a href="veranstaltungsort.html">Veranstaltungsort</a></li>
<li class="divider"></li>
<li><a href="partner.html">Partner</a></li>
<li class="divider"></li>
<li><a href="registrierung.html">Registrierung</a></li>
<li class="divider"></li>
<li><a href="programm2013.html">ESS 2013</a></li>
</ul>
</section>
</nav>
Expand All @@ -49,7 +54,7 @@ <h1 class="show-for-small"><a href="index.html">ESS 2013</a></h1>

<div class="large-6 large-centered columns" role="content">
<h2>Anmeldung fehlgeschlagen</h2>
<p>Ups, leider ist bei der Anmeldung etwas schiefgegangen. Sollte der Fehler erneut auftreten, informieren Sie uns bitte mit einer E-Mail an <img src="img/email-stadler.png" alt="stadler at edirom punkt de"/>.</p>
<p>Entschuldigung! Leider ist bei der Anmeldung etwas schiefgegangen. Sollte der Fehler erneut auftreten, informieren Sie uns bitte mit einer E-Mail an <a href="mailto:[email protected]">ess@edirom.de</a>.</p>

<!-- End Main Content -->

Expand All @@ -66,7 +71,7 @@ <h2>Anmeldung fehlgeschlagen</h2>
<hr />
<div class="row">
<div class="small-12 columns text-center">
<p><a href="impressum.html">Impressum</a></p>
<p><a href="../impressum.html">Impressum</a></p>
</div>
</div>
</div>
Expand All @@ -75,12 +80,12 @@ <h2>Anmeldung fehlgeschlagen</h2>

<!-- Check for Zepto support, load jQuery if necessary -->
<script>
document.write('<script src=javascripts/vendor/'
document.write('<script src=../../javascripts/vendor/'
+ ('__proto__' in {} ? 'zepto' : 'jquery')
+ '.js><\/script>');
</script>
<script src="javascripts/foundation/foundation.js"></script>
<script src="javascripts/foundation/foundation.topbar.js"></script>
<script src="../../javascripts/foundation/foundation.js"></script>
<script src="../../javascripts/foundation/foundation.topbar.js"></script>
<script>
$(document).foundation();
</script>
Expand Down
37 changes: 21 additions & 16 deletions 2014/formTemplates/form_ok.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<title>Vielen Dank für Ihre Anmeldung</title>
<link rel="stylesheet" href="stylesheets/app.css" />
<script src="javascripts/vendor/custom.modernizr.js"></script>
<link rel="stylesheet" href="../../stylesheets/app.css" />
<script src="../../javascripts/vendor/custom.modernizr.js"></script>
<style type="text/css">
.icon{height: 40px; margin-right:5px;}
c</style>
</head>
<body>

Expand All @@ -18,22 +21,24 @@

<ul class="title-area">
<li class="name">
<h1 class="hide-for-small"><a href="index.html">Edirom-Summer-School 2013</a></h1>
<h1 class="show-for-small"><a href="index.html">ESS 2013</a></h1>
<h1 class="hide-for-small"><a href="../index.html"><img src="img/ESS2014_icon.png" class="icon"/>Edirom-Summer-School 2014</a></h1>
<h1 class="show-for-small"><a href="../index.html">ESS 2014</a></h1>
</li>
<li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
</ul>

<section class="top-bar-section">
<ul class="right">
<li><a href="programm.html">Programm</a></li>
<li class="divider"></li>
<li><a href="veranstaltungsort.html">Veranstaltungsort</a></li>
<li class="divider"></li>
<li><a href="partner.html">Partner</a></li>
<li class="divider"></li>
<li><a href="registrierung.html">Registrierung</a></li>
</ul>
<li><a href="programm.html">Programm 2014</a></li>
<li class="divider"></li>
<li><a href="veranstaltungsort.html">Veranstaltungsort</a></li>
<li class="divider"></li>
<li><a href="partner.html">Partner</a></li>
<li class="divider"></li>
<li><a href="registrierung.html">Registrierung</a></li>
<li class="divider"></li>
<li><a href="programm2013.html">ESS 2013</a></li>
</ul>
</section>
</nav>
</div>
Expand Down Expand Up @@ -66,7 +71,7 @@ <h2>Vielen Dank für Ihre Anmeldung</h2>
<hr />
<div class="row">
<div class="small-12 columns text-center">
<p><a href="impressum.html">Impressum</a></p>
<p><a href="../impressum.html">Impressum</a></p>
</div>
</div>
</div>
Expand All @@ -75,12 +80,12 @@ <h2>Vielen Dank für Ihre Anmeldung</h2>

<!-- Check for Zepto support, load jQuery if necessary -->
<script>
document.write('<script src=javascripts/vendor/'
document.write('<script src=../../javascripts/vendor/'
+ ('__proto__' in {} ? 'zepto' : 'jquery')
+ '.js><\/script>');
</script>
<script src="javascripts/foundation/foundation.js"></script>
<script src="javascripts/foundation/foundation.topbar.js"></script>
<script src="../../javascripts/foundation/foundation.js"></script>
<script src="../../javascripts/foundation/foundation.topbar.js"></script>
<script>
$(document).foundation();
</script>
Expand Down
2 changes: 1 addition & 1 deletion 2014/formmail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
// this value, you *must* set $CSVOPEN = "b".

/* Help: http://www.tectite.com/fmdoc/templatedir.php */
$TEMPLATEDIR = "/var/www/ess2013/formTemplates"; // directory for template files; empty string
$TEMPLATEDIR = "/var/www/ess2013/2014/formTemplates"; // directory for template files; empty string
// if you don't have any templates

/* Help: http://www.tectite.com/fmdoc/templateurl.php */
Expand Down
Binary file added 2014/img/DHDarmstadt.png
View file
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 2014/img/ESS2014_Programm.pdf
View file
Binary file not shown.
Binary file added 2014/img/ESS2014_Programm.png
View file
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 2014/img/ESS2014_simple.png
View file
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 2014/img/mri-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions 2014/partner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1 class="show-for-small"><a href="../index.html">ESS 2014</a></h1>

<section class="top-bar-section">
<ul class="right">
<li><a href="programm.html">Programm</a></li>
<li><a href="programm.html">Programm 2014</a></li>
<li class="divider"></li>
<!--<li><a href="dozentInnen.html">DozentInnen</a></li>
<li class="divider"></li>-->
Expand All @@ -42,7 +42,7 @@ <h1 class="show-for-small"><a href="../index.html">ESS 2014</a></h1>
<li class="divider"></li>
<li><a href="registrierung.html">Registrierung</a></li>
<li class="divider"></li>
<li><a href="../2013/programm.html">ESS 2013</a></li>
<li><a href="programm2013.html">ESS 2013</a></li>
</ul>
</section>
</nav>
Expand All @@ -63,10 +63,8 @@ <h2>Partner der diesjährigen Edirom-Summer-School</h2>
<li><a href="http://www.uni-paderborn.de" title="Universität Paderborn"><img src="../img/UPB_Logo.png" width="233" height="61" alt="UPB-Logo"/></a></li>
<li><a href="https://de.dariah.eu" title="Digital Research Infrastructure for the Arts and Humanities"><img src="../img/DARIAH_Logo.png" width="233" height="109" alt="DARIAH-Logo"/></a></li>
<li><a href="http://www.eadh.org"><img src="img/eadh-logo-horizontal-2.png" width="233" height="109" alt="DARIAH-Logo"/></a></li>
<!-- <li><a href="http://www.hab.de" title="Herzog August Bibliothek Wolfenbüttel"><img src="img/HAB_logo.png" width="233" height="79" alt="HAB-Logo"/></a></li> -->
<!-- <li><a href="http://textgrid.de" title="TextGrid: Digital edieren – forschen – archivieren"><img src="img/TextGrid-Logo-Deutsch.png" width="233" height="89" alt="TextGrid-Logo"/></a></li> -->
<!-- <li><a href="http://www.digitalhumanities.tu-darmstadt.de" title="Digital Humanities Darmstadt"><img src="img/DHDarmstadt.png" width="233" height="67" alt="DH-Darmstadt-Logo"/></a></li> -->
<!-- <li><a href="http://www.kb.dk/en/kb/nb/mta/dcm/" title="Danish Centre for Music Publication – The Royal Library"><img src="img/DCM_logo.png" width="233" height="41" alt="DCM-Logo"/></a></li> -->
<li><a href="http://www.digitalhumanities.tu-darmstadt.de" title="Digital Humanities Darmstadt"><img src="img/DHDarmstadt.png" width="233" height="67" alt="DH-Darmstadt-Logo"/></a></li>
<li><a href="http://www.max-reger-institut.de" title="Max-Reger-Institut/Elsa-Reger-Stiftung"><img src="img/mri-logo.png" alt="MRI Logo"/></a></li>
<!-- <li><a href="http://www.oxygenxml.com" title="Oxygen XML Editor"><img src="http://www.oxygenxml.com/img/resources/oxygen250x80.png" width="233" height="75" alt="Oxygen XML Editor" /></a></li> -->
</ul>
</div>
Expand All @@ -75,7 +73,7 @@ <h2>Partner der diesjährigen Edirom-Summer-School</h2>
<h2>DH Training Network</h2>
<p>Als Mitglied im DH Training Network freuen wir uns, Sie auf die folgenden Veranstaltungen unserer Partner hinweisen zu können:</p>
<ul class="no-bullet">
<li><a href="http://dhsi.org" title="Digital Humanities Summer Institute at the University of Victoria">DHSI</a>: 2.–6. Juni 2014</li>
<!-- <li><a href="http://dhsi.org" title="Digital Humanities Summer Institute at the University of Victoria">DHSI</a>: 2.–6. Juni 2014</li> -->
<li><a href="http://digital.humanities.ox.ac.uk/dhoxss/" title="Digital.Humanities@Oxford Summer School">DHOxSS2014</a>: 14.–18. Juli 2014</li>
<li><a href="http://www.culingtec.uni-leipzig.de/ESU_C_T/" title="'Culture &amp; Technology' – European Summer School in Digital Humanities">DH@Leipzig</a>: 22. Juli – 1. August 2014</li>
<li><a href="http://mith.umd.edu/dhwi/" title="Humanities Intensive Learning and Teaching">HILT</a>: 3.–8. August 2014</li>
Expand Down
Loading

0 comments on commit 046c520

Please sign in to comment.