Skip to content

GitLab

Commit cbb8ec2f authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '678' into 'MetaGer-Redesign' 

678

See merge request !1169
parents 46e5f096 2d51098e
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 193 deletions
resources/assets/less/metager/beitritt.less
View file @ cbb8ec2f
/* Style für die Druckversion des Beitrittsformulars */
@media print {
header {
display: none !important;
}
footer {
display: none !important;
}
h1 {
margin-top: 0 !important;
padding-top: 0 !important;
}
hr {
display: none !important;
}
input[type=text],
input[type=email] {
margin: 0px !important;
padding: 0px !important;
height: initial !important;
border: 0;
}
/* Skalierung für Firefox, absolut für die anderen Browser */
input[type=radio] {
transform: scale(0.5);
-moz-transform: scale(0.5);
-ms-transform: scale(0.5);
-webkit-transform: scale(0.5);
-o-transform: scale(0.5);
width: 20px !important;
height: 20px !important;
margin-top: 0px !important;
padding-top: 0px !important;
}
input::-webkit-input-placeholder {
/* WebKit browsers */
color: transparent !important;
}
input:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: transparent !important;
}
input::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: transparent !important;
}
input:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: transparent !important;
}
.container {
width: auto !important;
margin: 0px;
padding: 0px;
}
.wrapper {
padding-top: 0 !important;
}
* {
font-size: 12px!important;
}
.beitritt-form-group {
margin: 0px !important;
padding: 0px !important;
margin-bottom: 0px !important;
}
.sign {
margin-top: 10px;
}
.donation-amount-input {
padding-top: 5px;
}
.pagebreak {
page-break-before: always;
}
#spendenaufruf {
display: none !important;
}
.beitritt-formular-info * {
font-size: 7pt !important;
#donation-form {
.beitritt-inputs {
display: flex;
flex-wrap: wrap;
>div {
width: 50%;
padding: 10px;
}
@media print {
padding: 0px;
flex-direction: column;
flex-wrap: nowrap;
}
}
label {
font-weight: normal;
}
.signature {
border-top: 1px dashed black;
width: 50%;
margin-top: 50px;
}
@media print {
* {
font-size: 14px !important;
}
header {
display: none !important;
}
footer {
display: none !important;
}
h1 {
margin-top: 0 !important;
padding-top: 0 !important;
font-size: 18px !important;
}
hr {
display: none !important;
}
label {
text-decoration: underline;
}
.help-block {
text-decoration: none;
}
input[type=text],
input[type=email] {
margin: 0px !important;
padding: 0px !important;
height: initial !important;
border: 0;
}
/* Passt die Größe der Radio-Buttons an
* Skalierung für Firefox, absolut für die anderen Browser
*/
input[type=radio] {
transform: scale(0.5);
width: 20px !important;
height: 20px !important;
margin-top: 0px !important;
padding-top: 0px !important;
}
/* Blendet die Placeholder aus */
input::-webkit-input-placeholder {
/* WebKit browsers */
color: transparent !important;
}
input:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: transparent !important;
}
input::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: transparent !important;
}
input:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: transparent !important;
}
.container {
width: auto !important;
margin: 0px;
padding: 0px;
}
.wrapper {
padding-top: 0 !important;
}
* {
font-size: 12px!important;
}
.beitritt-form-group {
margin: 0px !important;
padding: 0px !important;
margin-bottom: 0px !important;
}
.sign {
margin-top: 10px;
}
.donation-amount-input {
padding-top: 5px;
}
.pagebreak {
page-break-before: always;
}
#spendenaufruf {
display: none !important;
}
.beitritt-formular-info {
margin-top: 50px;
* {
font-size: 7pt !important;
}
}
}
}
\ No newline at end of file
resources/assets/less/metager/general.less
View file @ cbb8ec2f
......@@ -170,11 +170,14 @@ summary {
font-weight: bold;
}
@media print {
.noprint {
.noprint {
@media print {
display: none!important;
}
}
.newpage {
page-break-after: always;
}
nav {
h1 {
......
resources/assets/less/metager/sidebar.less
View file @ cbb8ec2f
......@@ -160,6 +160,7 @@ label#openSidebar {
&:hover {
color: rgb(255, 128, 0);
}
.noprint;
}
@media (max-width: @screen-xs-max) {
......
resources/assets/less/metager/specific.less
View file @ cbb8ec2f
......@@ -93,7 +93,7 @@ textarea#message {
font-size: 20px;
}
.bitcoins {
.donation-others {
text-align: center;
padding: 30px;
}
......@@ -124,12 +124,13 @@ a.content.hidden-xs {
color: @a-content-hidden-xs-color;
}
a.navbar-brand {
.navbar-brand {
line-height: 100%!important;
padding: 0;
position: absolute;
z-index: 5;
left: 10px;
.noprint;
}
.dotlist li {
......@@ -219,12 +220,6 @@ main {
font-weight: bold;
}
.signature {
border-top: 1px dashed black;
width: 50%;
margin-top: 16px;
}
.fake-result {
*:hover {
overflow: visible !important;
......
resources/lang/de/beitritt.php
View file @ cbb8ec2f
......@@ -21,7 +21,7 @@ return [
'beitritt.12' => 'Ja',
'beitritt.13' => 'Nein',
'beitritt.14' => 'Ort, Datum:',
'abbuchung.1' => 'Unterschrift nach Ausdrucken des Formulars',
'unterschrift' => 'Unterschrift nach Ausdrucken des Formulars',
'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:',
......
resources/views/spende/beitritt.blade.php
View file @ cbb8ec2f
......@@ -6,118 +6,87 @@
@section('content')
<link type="text/css" rel="stylesheet" href="{{ elixir('/css/beitritt.css') }}" />
<h1>{{ trans('beitritt.heading.1') }}</h1>
<form>
<div class="col-sm-6">
<div class="form-group beitritt-form-group">
<label for="name" class="non-bold">{{ trans('beitritt.beitritt.1') }}</label>
<form id="donation-form">
<h1>{{ trans('beitritt.heading.1') }}</h1>
<div class="beitritt-inputs">
<div>
<label for="name">{{ 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>
<div>
<label for="firma">{{ trans('beitritt.beitritt.2') }}</label>
<input type="text" class="form-control beitritt-input" name="firma" placeholder="{{trans('beitritt.placeholder.2')}}">
</div>
</div>
<div class="col-sm-6">
<div class="form-group beitritt-form-group">
<label for="funktion" class="non-bold">{{ trans('beitritt.beitritt.3') }}</label>
<div>
<label for="funktion">{{ trans('beitritt.beitritt.3') }}</label>
<input type="text" class="form-control beitritt-input" name="funktion" placeholder="{{trans('beitritt.placeholder.3')}}">
</div>
</div>
<div class="col-sm-6">
<div class="form-group beitritt-form-group">
<label for="adresse" class="non-bold">{{ trans('beitritt.beitritt.4') }}</label>
<div>
<label for="adresse">{{ 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="col-sm-6">
<div class="form-group beitritt-form-group">
<label for="email" class="non-bold">{{ trans('beitritt.beitritt.5') }}</label>
<div>
<label for="email">{{ trans('beitritt.beitritt.5') }}</label>
<input type="email" class="form-control beitritt-input" name="email" placeholder="">
</div>
</div>
<div class="col-sm-6">
<div class="form-group beitritt-form-group">
<label for="homepage" class="non-bold">{{ trans('beitritt.beitritt.6') }}</label>
<div>
<label for="homepage">{{ trans('beitritt.beitritt.6') }}</label>
<input type="text" class="form-control beitritt-input" name="homepage" placeholder="http://">
</div>
</div>
<div class="col-sm-6">
<div class="form-group beitritt-form-group">
<label for="telefon" class="non-bold">{{ trans('beitritt.beitritt.7') }}</label>
<div>
<label for="telefon">{{ 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" required>
</div>
<div class="pull-left" style="padding-left: 10px">
<p class="help-block"> {{ trans('beitritt.beitritt.9') }}</p>
</div>
</div>
<div>
<p>{{ trans('beitritt.beitritt.8') }}</p>
<input type="text" class="form-control" name="betrag" required>
<p> {{ trans('beitritt.beitritt.9') }}</p>
</div>
<label class="non-bold">
{{ trans('beitritt.beitritt.10') }}
</label>
<label class="non-bold">
{{ trans('beitritt.beitritt.11') }}
</label>
<div class="row">
<div class="pull-left">
<div class="radio">
<label>
<input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
</label>
</div>
</div>
<div class="pull-left" style="padding-left: 10px">
<div class="radio">
<label>
<input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
</label>
</div>
</div>
<div>
<p>{{ trans('beitritt.beitritt.10') }}</p>
<p>{{ trans('beitritt.beitritt.11') }}</p>
</div>
<div class="form-group beitritt-form-group">
<label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
<input type="text" class="form-control beitritt-input" id="ort" placeholder="">
<div>
<input type="radio" name="veröffentlichung" checked> {{ trans('beitritt.beitritt.12') }}
<input type="radio" name="veröffentlichung"> {{ trans('beitritt.beitritt.13') }}
</div>
<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>
<label for="ort">{{ trans('beitritt.beitritt.14') }}</label>
<input type="text" class="form-control beitritt-input" id="ort" placeholder="">
</div>
<p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</div>
<div class="row">
<div class="col-sm-4 form-group beitritt-form-group">
<label for="bankverbindung" class="non-bold">{{ trans('beitritt.abbuchung.5') }}</label>
<div class="newpage"></div>
<h1>{{ trans('beitritt.abbuchung.2') }}</h1>
<p>{{ trans('beitritt.abbuchung.3') }}</p>
<div class="beitritt-inputs">
<div>
<label for="kontoname">{{ trans('beitritt.abbuchung.4') }}</label>
<input type="text" class="form-control" name="kontoname" placeholder="">
</div>
<div>
<label for="bankverbindung">{{ 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>
<div>
<label for="iban">{{ 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>
<div>
<label for="bic">{{ 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 beitritt-input" id="ort2" placeholder="">
<div>
<div>
<label for="ort2">{{ trans('beitritt.abbuchung.8') }}</label>
<input type="text" class="form-control beitritt-input" id="ort2" placeholder="">
</div>
<p class="signature">{{ trans('beitritt.unterschrift') }}</p>
</div>
<br>
<p class="signature">{{ trans('beitritt.abbuchung.1') }}</p>
</form>
<hr>
<div class="beitritt-formular-info">
<p>{{ trans('beitritt.anweisung.1') }}</p>
<ul class="dotlist">
......
resources/views/spende/spende.blade.php
View file @ cbb8ec2f
......@@ -16,40 +16,39 @@
<form id="donate" role="form" method="POST">
<input type="hidden" name="dt" value="{{ md5(date('Y') . date('m') . date('d')) }}">
<div class="form-group donation-form-group">
<label for="Name">{!! trans('spende.lastschrift.3') !!}</label>
<input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" value="{{ old('Name') }}" />
<label for="Name">{!! trans('spende.lastschrift.3') !!}</label>
<input type="text" class="form-control" id="Name" required="" name="Name" placeholder="{!! trans('spende.lastschrift.3.placeholder') !!}" value="{{ old('Name') }}" />
</div>
<div class="form-group donation-form-group">
<label for="email">{!! trans('spende.lastschrift.4') !!}</label>
<label for="email">{!! trans('spende.lastschrift.4') !!}</label>
<input type="email" class="form-control" id="email" name="email" placeholder="Email" value="{{ old('email') }}">
</div>
<div class="form-group donation-form-group">
<label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
<label for="iban">{!! trans('spende.lastschrift.6') !!}</label>
<input type="text" class="form-control" id="iban" required="" name="Kontonummer" placeholder="IBAN" value="{{ old('Kontonummer') }}">
</div>
<div class="form-group donation-form-group">
<label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
<label for="bic">{!! trans('spende.lastschrift.7') !!}</label>
<input type="text" class="form-control" id="bic" required="" name="Bankleitzahl" placeholder="BIC" value="{{ old('Bankleitzahl') }}">
</div>
<div class="form-group donation-form-group">
<label for="value">{!! trans('spende.lastschrift.8.value')!!} </label>
<label for="value">{!! trans('spende.lastschrift.8.value')!!} </label>
<input type="number" class="form-control" id="value" required="" name="Betrag" placeholder="{!! trans('spende.lastschrift.8.value.placeholder') !!}" value="{{ old('Bankleitzahl') }}">
</div>
<div class="form-group donation-form-group">
<label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
<label for="msg"><u>{!! trans('spende.bankinfo.3')!!}</u></label>
<textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">{{ old('Nachricht') }}</textarea>
<label for="msg">{!! trans('spende.lastschrift.8.message')!!}</label>
<label for="msg"><u>{!! trans('spende.bankinfo.3')!!}</u></label>
<textarea class="form-control" id="msg" name="Nachricht" placeholder="{!! trans('spende.lastschrift.8.message.placeholder') !!}">{{ old('Nachricht') }}</textarea>
</div>
<button type="submit" form="donate" class="btn btn-default">{!! trans('spende.lastschrift.9') !!}</button>
</form>
</div>
<div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
<div class="col-lg-6 col-md-12 col-sm-12 donation-others">
<h3>{!! trans('spende.bankinfo.1') !!}</h3>
<p>{!! trans('spende.bankinfo.2') !!}</p>
</div>
<hr>
<div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
<h3>{!! trans('spende.paypal.1') !!}</h3>
<div class="col-lg-6 col-md-12 col-sm-12 donation-others">
<h3>{!! trans('spende.paypal.1') !!}</h3>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input name="cmd" value="_xclick" type="hidden">
<input name="business" value="wsb@suma-ev.de" type="hidden">
......@@ -64,18 +63,16 @@
<input name="tax" value="0" type="hidden">
<input name="lc" value="DE" type="hidden">
<input name="bn" value="PP-DonationsBF" type="hidden">
<input src="/img/paypalspenden.gif" name="submit" width="120px" alt="{!! trans('spende.paypal.2') !!}" type="image">
<input src="/img/paypalspenden.gif" name="submit" width="120px" alt="{!! trans('spende.paypal.2') !!}" type="image">
</form>
</div>
<div class="col-lg-6 col-md-12 col-sm-12 others bitcoins">
<h3>{!! trans('spende.bitcoins.1') !!}</h3>
{!! trans('spende.bitcoins.2') !!}<br/>
<div class="col-lg-6 col-md-12 col-sm-12 donation-others">
<h3>{!! trans('spende.bitcoins.1') !!}</h3>
{!! trans('spende.bitcoins.2') !!}<br/>
<a href="bitcoin:174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V">174SDRNZqM2WNobHhCDqD1VXbnZYFXNf8V</a>
</div>
<div class="clearfix"></div>
<hr>
</div>
<p>{!! trans('spende.lastschrift.10') !!}</p>
<hr>
<div class="clearfix"></div>
@endsection
Markdown is supported
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