diff --git a/public/js/scriptJoinPage.js b/public/js/scriptJoinPage.js
new file mode 100644
index 0000000000000000000000000000000000000000..80aed71c643d3dd055beb3803fcc3db268766a57
--- /dev/null
+++ b/public/js/scriptJoinPage.js
@@ -0,0 +1,16 @@
+function checkFormBeforePrinting () {
+ var requiredElements = document.querySelectorAll("[required]");
+ var passed = true;
+ for (i = 0; i < requiredElements.length; i++) {
+ if(requiredElements[i].value == "") {
+ passed = false;
+ requiredElements[i].style.backgroundColor = "#ff9999";
+ }
+ else {
+ requiredElements[i].style.backgroundColor = "#ffffff";
+ }
+ }
+ if(passed) {
+ window.print();
+ }
+}
\ No newline at end of file
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index 51dd987b7239c31163dd158a81cdccf2c487b053..c91ba95e299faa654553d997e6dfd9d35a8cbcb5 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -581,6 +581,8 @@ textarea#message {
text-align: left;
}
+.beitritt-input {}
+
.modal-content {
border-radius: 0;
-webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
@@ -668,8 +670,13 @@ label.select-label {
.noprint {
display: none!important;
}
+
+ .beitritt-formular-info * {
+ font-size: 7pt !important;
+ }
}
+
.donation-form-group label {
font-weight: bold;
}
@@ -740,4 +747,10 @@ main fieldset {
.panel-title {
font-weight: bold;
+}
+
+.signature {
+ border-top: 1px dashed black;
+ width: 50%;
+ margin-top: 16px;
}
\ No newline at end of file
diff --git a/resources/lang/de/beitritt.php b/resources/lang/de/beitritt.php
index 329fd8a4326ed8916eae221031c58d3739cddd3e..d3d4acae7b206bb8bd759af56f98eadd28903090 100644
--- a/resources/lang/de/beitritt.php
+++ b/resources/lang/de/beitritt.php
@@ -25,11 +25,10 @@ return [
'abbuchung.2' => 'Abbuchungsermächtigung',
'abbuchung.3' => 'Hiermit ermächtige ich den "SUMA-EV - Verein für freien Wissenszugang" den o.g. Mitgliedsbeitrag von meinem Konto abzubuchen.',
'abbuchung.4' => 'Name des Kontoinhabers:',
- 'abbuchung.5' => 'Bankverbindung, Name der Bank:',
- 'abbuchung.6' => 'IBAN (oder Konto-Nummer)',
- 'abbuchung.7' => 'BIC (oder Bankleitzahl)',
+ 'abbuchung.5' => 'Name der Bank:',
+ 'abbuchung.6' => 'IBAN (oder Konto-Nummer):',
+ 'abbuchung.7' => 'BIC (oder BLZ):',
'abbuchung.8' => 'Ort, Datum:',
- 'abbuchung.9' => 'Unterschrift nach Ausdrucken des Formulars',
'anweisung.1' => 'Bitte drucken Sie das Formular nach Ausfüllen aus und unterschreiben an beiden ......... Linien; dann können Sie es',
'anweisung.2' => 'faxen an 0511 34 00 10 23 (und schicken uns eine kurze EMail dazu, dass Sie das Beitrittsformular gefaxt haben, denn Faxgeräte sind manchmal inkompatibel) oder',
'anweisung.3' => 'per Post senden an: SUMA-EV, Röselerstr. 3, 30159 Hannover oder',
diff --git a/resources/lang/en/beitritt.php b/resources/lang/en/beitritt.php
index c1a92501dd1a7622813f65ca655f3c0ce38e657d..3a61d399bb64f9c76b52aad12bd318eb68028532 100644
--- a/resources/lang/en/beitritt.php
+++ b/resources/lang/en/beitritt.php
@@ -29,7 +29,6 @@ return [
"abbuchung.6" => "IBAN:",
"abbuchung.7" => "BIC:",
"abbuchung.8" => "Place, Date:",
- "abbuchung.9" => "Signature after printing the form ",
"anweisung.1" => "Please print the form after completing and signing at both ......... lines, then you can: ",
"anweisung.2" => "- fax it to 0049-(0)511-34 00 10 23 or\r\n\r\n",
"anweisung.3" => "- send it by mail to: SUMA-EV, Roeselerstr. 3, D-30159 Hanover, Germany or",
diff --git a/resources/views/spende/beitritt.blade.php b/resources/views/spende/beitritt.blade.php
index d8f04610f500fc58e40d5af17d8a6f46b9072b4c..9dc555ed786d7e704aa32319de9aa0fd03e9008b 100644
--- a/resources/views/spende/beitritt.blade.php
+++ b/resources/views/spende/beitritt.blade.php
@@ -8,39 +8,53 @@
<link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" />
<h1>{{ trans('beitritt.heading.1') }}</h1>
<form>
- <div class="form-group beitritt-form-group">
- <label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
- <input type="text" class="form-control" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
- </div>
- <div class="form-group beitritt-form-group">
- <label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label>
- <input type="text" class="form-control" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
+ <input type="text" class="form-control beitritt-input" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label>
+ <input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
+ </div>
</div>
- <div class="form-group beitritt-form-group">
- <label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
- <input type="text" class="form-control" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
+ <input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
+ </div>
</div>
- <div class="form-group beitritt-form-group">
- <label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
- <input type="text" class="form-control" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
+ <input type="text" class="form-control beitritt-input" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required>
+ </div>
</div>
- <div class="form-group beitritt-form-group">
- <label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
- <input type="email" class="form-control" name="email" placeholder="">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
+ <input type="email" class="form-control beitritt-input" name="email" placeholder="">
+ </div>
</div>
- <div class="form-group beitritt-form-group">
- <label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
- <input type="text" class="form-control" name="homepage" placeholder="http://">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
+ <input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
+ </div>
</div>
- <div class="form-group beitritt-form-group">
- <label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
- <input type="text" class="form-control" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ <div class="col-sm-6">
+ <div class="form-group beitritt-form-group">
+ <label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
+ <input type="text" class="form-control beitritt-input" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}">
+ </div>
</div>
<div class="form-group beitritt-form-group">
<label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label>
<div class="row">
<div class="pull-left donation-amount-input">
- <input type="text" class="form-control" name="betrag">
+ <input type="text" class="form-control" name="betrag" required>
</div>
<div class="pull-left" style="padding-left: 10px">
<p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
@@ -71,45 +85,49 @@
</div>
<div class="form-group beitritt-form-group">
<label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
- <input type="text" class="form-control" id="ort" placeholder="">
+ <input type="text" class="form-control beitritt-input" id="ort" placeholder="">
</div>
- <br />
- <p class="sign">---------------------------------------------------------</p>
- <p>{{ trans('beitritt.abbuchung.1') }}</p>
+ <br>
+ <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
<h3>{{ trans('beitritt.abbuchung.2') }}</h3>
<p>{{ trans('beitritt.abbuchung.3') }}</p>
<div class="form-group beitritt-form-group">
<label for="kontoname" class="non-bold">{{ trans('beitritt.abbuchung.4') }}</label>
<input type="text" class="form-control" name="kontoname" placeholder="">
</div>
- <div class="form-group beitritt-form-group">
- <label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
- <input type="text" class="form-control" name="bankverbindung" placeholder="">
- </div>
- <div class="form-group beitritt-form-group">
- <label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label>
- <input type="text" class="form-control" name="iban" placeholder="">
- </div>
- <div class="form-group beitritt-form-group">
- <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
- <input type="text" class="form-control" name="bic" placeholder="">
+ <div class="row">
+ <div class="col-sm-4 form-group beitritt-form-group">
+ <label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
+ <input type="text" class="form-control" name="bankverbindung" placeholder="">
+ </div>
+ <div class="col-sm-5 form-group beitritt-form-group">
+ <label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label>
+ <input type="text" class="form-control" name="iban" maxlength="22" placeholder="">
+ </div>
+ <div class="col-sm-3 form-group beitritt-form-group">
+ <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
+ <input type="text" class="form-control" name="bic" placeholder="">
+ </div>
</div>
+ <br>
<div class="form-group beitritt-form-group">
<label for="ort2" class="non-bold">{{ trans('beitritt.abbuchung.8') }}</label>
- <input type="text" class="form-control" id="ort2" placeholder="">
+ <input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
</div>
- <br />
- <p class="sign">---------------------------------------------------------</p>
- <p>{{ trans('beitritt.abbuchung.9') }}</p>
+ <br>
+ <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
</form>
<hr>
-<p class="pagebreak">{{ trans('beitritt.anweisung.1') }}</p>
- <ul class="dotlist">
- <li>{{ trans('beitritt.anweisung.2') }}</li>
- <li>{{ trans('beitritt.anweisung.3') }}</li>
- <li>{{ trans('beitritt.anweisung.4') }}</li>
- </ul>
- <p>{{ trans('beitritt.anweisung.5') }}</p>
- <p>{{ trans('beitritt.anweisung.6') }}</p>
+ <div class="beitritt-formular-info">
+ <p>{{ trans('beitritt.anweisung.1') }}</p>
+ <ul class="dotlist">
+ <li>{{ trans('beitritt.anweisung.2') }}</li>
+ <li>{{ trans('beitritt.anweisung.3') }}</li>
+ <li>{{ trans('beitritt.anweisung.4') }}</li>
+ </ul>
+ <p>{{ trans('beitritt.anweisung.5') }}</p>
+ <p>{{ trans('beitritt.anweisung.6') }}</p>
+ </div>
<button type="button" class="btn btn-lg btn-primary noprint" onclick="window.print();">{{ trans('beitritt.anweisung.7') }}</button>
+ <!-- <script src="{{ elixir('js/scriptJoinPage.js') }}"></script> -->
@endsection