Skip to content
Snippets Groups Projects
Commit 19aa6fbe authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '556-beitrittsformular-etwas-kurzen' into 'development' 

Resolve "Beitrittsformular etwas kürzen"

Closes #556

See merge request !989
parents 624074e3 bbc800e3
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
Hide whitespace changes
Inline Side-by-side
public/js/scriptJoinPage.js 0 → 100644
+ 16
− 0
View file @ 19aa6fbe
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
resources/assets/less/metager/static-pages.less
+ 13
− 0
View file @ 19aa6fbe
...@@ -581,6 +581,8 @@ textarea#message { ...@@ -581,6 +581,8 @@ textarea#message {
text-align: left; text-align: left;
} }
.beitritt-input {}
.modal-content { .modal-content {
border-radius: 0; border-radius: 0;
-webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color; -webkit-box-shadow: 1px 1px 3px 1px @modal-content-box-shadow-color;
...@@ -668,8 +670,13 @@ label.select-label { ...@@ -668,8 +670,13 @@ label.select-label {
.noprint { .noprint {
display: none!important; display: none!important;
} }
.beitritt-formular-info * {
font-size: 7pt !important;
}
} }
.donation-form-group label { .donation-form-group label {
font-weight: bold; font-weight: bold;
} }
...@@ -740,4 +747,10 @@ main fieldset { ...@@ -740,4 +747,10 @@ main fieldset {
.panel-title { .panel-title {
font-weight: bold; font-weight: bold;
}
.signature {
border-top: 1px dashed black;
width: 50%;
margin-top: 16px;
} }
\ No newline at end of file
resources/lang/de/beitritt.php
+ 3
− 4
View file @ 19aa6fbe
...@@ -25,11 +25,10 @@ return [ ...@@ -25,11 +25,10 @@ return [
'abbuchung.2' => 'Abbuchungsermächtigung', '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.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.4' => 'Name des Kontoinhabers:',
'abbuchung.5' => 'Bankverbindung, Name der Bank:', 'abbuchung.5' => 'Name der Bank:',
'abbuchung.6' => 'IBAN (oder Konto-Nummer)', 'abbuchung.6' => 'IBAN (oder Konto-Nummer):',
'abbuchung.7' => 'BIC (oder Bankleitzahl)', 'abbuchung.7' => 'BIC (oder BLZ):',
'abbuchung.8' => 'Ort, Datum:', '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.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.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', 'anweisung.3' => 'per Post senden an: SUMA-EV, Röselerstr. 3, 30159 Hannover oder',
......
resources/lang/en/beitritt.php
+ 0
− 1
View file @ 19aa6fbe
...@@ -29,7 +29,6 @@ return [ ...@@ -29,7 +29,6 @@ return [
"abbuchung.6" => "IBAN:", "abbuchung.6" => "IBAN:",
"abbuchung.7" => "BIC:", "abbuchung.7" => "BIC:",
"abbuchung.8" => "Place, Date:", "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.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.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", "anweisung.3" => "- send it by mail to: SUMA-EV, Roeselerstr. 3, D-30159 Hanover, Germany or",
......
resources/views/spende/beitritt.blade.php
+ 68
− 50
View file @ 19aa6fbe
...@@ -8,39 +8,53 @@ ...@@ -8,39 +8,53 @@
<link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" />
<h1>{{ trans('beitritt.heading.1') }}</h1> <h1>{{ trans('beitritt.heading.1') }}</h1>
<form> <form>
<div class="form-group beitritt-form-group"> <div class="col-sm-6">
<label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label> <div class="form-group beitritt-form-group">
<input type="text" class="form-control" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required> <label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
</div> <input type="text" class="form-control beitritt-input" name="name" placeholder="{{trans('beitritt.placeholder.1')}}" required>
<div class="form-group beitritt-form-group"> </div>
<label for="firma" class="non-bold">{{ trans('beitritt.beitritt.2') }}</label> </div>
<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="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>
<div class="form-group beitritt-form-group"> <div class="col-sm-6">
<label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label> <div class="form-group beitritt-form-group">
<input type="text" class="form-control" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}"> <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>
<div class="form-group beitritt-form-group"> <div class="col-sm-6">
<label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label> <div class="form-group beitritt-form-group">
<input type="text" class="form-control" name="adresse" placeholder="{{trans('beitritt.placeholder.4')}}" required> <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>
<div class="form-group beitritt-form-group"> <div class="col-sm-6">
<label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label> <div class="form-group beitritt-form-group">
<input type="email" class="form-control" name="email" placeholder=""> <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>
<div class="form-group beitritt-form-group"> <div class="col-sm-6">
<label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label> <div class="form-group beitritt-form-group">
<input type="text" class="form-control" name="homepage" placeholder="http://"> <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>
<div class="form-group beitritt-form-group"> <div class="col-sm-6">
<label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label> <div class="form-group beitritt-form-group">
<input type="text" class="form-control" name="telefon" placeholder="{{trans('beitritt.placeholder.7')}}"> <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>
<div class="form-group beitritt-form-group"> <div class="form-group beitritt-form-group">
<label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label> <label class="non-bold" for="betrag">{{ trans('beitritt.beitritt.8') }}</label>
<div class="row"> <div class="row">
<div class="pull-left donation-amount-input"> <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>
<div class="pull-left" style="padding-left: 10px"> <div class="pull-left" style="padding-left: 10px">
<p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p> <p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
...@@ -71,45 +85,49 @@ ...@@ -71,45 +85,49 @@
</div> </div>
<div class="form-group beitritt-form-group"> <div class="form-group beitritt-form-group">
<label for="ort">{{ trans('beitritt.beitritt.14') }}</label> <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> </div>
<br /> <br>
<p class="sign">---------------------------------------------------------</p> <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
<p>{{ trans('beitritt.abbuchung.1') }}</p>
<h3>{{ trans('beitritt.abbuchung.2') }}</h3> <h3>{{ trans('beitritt.abbuchung.2') }}</h3>
<p>{{ trans('beitritt.abbuchung.3') }}</p> <p>{{ trans('beitritt.abbuchung.3') }}</p>
<div class="form-group beitritt-form-group"> <div class="form-group beitritt-form-group">
<label for="kontoname" class="non-bold">{{ trans('beitritt.abbuchung.4') }}</label> <label for="kontoname" class="non-bold">{{ trans('beitritt.abbuchung.4') }}</label>
<input type="text" class="form-control" name="kontoname" placeholder=""> <input type="text" class="form-control" name="kontoname" placeholder="">
</div> </div>
<div class="form-group beitritt-form-group"> <div class="row">
<label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label> <div class="col-sm-4 form-group beitritt-form-group">
<input type="text" class="form-control" name="bankverbindung" placeholder=""> <label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
</div> <input type="text" class="form-control" name="bankverbindung" placeholder="">
<div class="form-group beitritt-form-group"> </div>
<label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label> <div class="col-sm-5 form-group beitritt-form-group">
<input type="text" class="form-control" name="iban" placeholder=""> <label for="iban" class="non-bold">{{ trans('beitritt.abbuchung.6') }}</label>
</div> <input type="text" class="form-control" name="iban" maxlength="22" placeholder="">
<div class="form-group beitritt-form-group"> </div>
<label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label> <div class="col-sm-3 form-group beitritt-form-group">
<input type="text" class="form-control" name="bic" placeholder=""> <label for="bic" class="non-bold">{{ trans('beitritt.abbuchung.7') }}</label>
<input type="text" class="form-control" name="bic" placeholder="">
</div>
</div> </div>
<br>
<div class="form-group beitritt-form-group"> <div class="form-group beitritt-form-group">
<label for="ort2" class="non-bold">{{ trans('beitritt.abbuchung.8') }}</label> <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> </div>
<br /> <br>
<p class="sign">---------------------------------------------------------</p> <p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
<p>{{ trans('beitritt.abbuchung.9') }}</p>
</form> </form>
<hr> <hr>
<p class="pagebreak">{{ trans('beitritt.anweisung.1') }}</p> <div class="beitritt-formular-info">
<ul class="dotlist"> <p>{{ trans('beitritt.anweisung.1') }}</p>
<li>{{ trans('beitritt.anweisung.2') }}</li> <ul class="dotlist">
<li>{{ trans('beitritt.anweisung.3') }}</li> <li>{{ trans('beitritt.anweisung.2') }}</li>
<li>{{ trans('beitritt.anweisung.4') }}</li> <li>{{ trans('beitritt.anweisung.3') }}</li>
</ul> <li>{{ trans('beitritt.anweisung.4') }}</li>
<p>{{ trans('beitritt.anweisung.5') }}</p> </ul>
<p>{{ trans('beitritt.anweisung.6') }}</p> <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> <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 @endsection
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment