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

Merge branch 'development' into 519-fehler-im-container

parents a9ba100c c8bfcbe2
......@@ -14,3 +14,5 @@ Homestead.yaml
/public/js/scriptStartPage.js
/public/js/scriptResultPage.js
/public/css/beitritt.css
/public/css/themes/default.css
**.map
......@@ -335,22 +335,29 @@ class MailController extends Controller
return redirect(url('synoptic', ['exclude' => $exclude]));
}
$zip = new ZipArchive();
if ($zip->open("langfiles.zip", ZipArchive::OVERWRITE)!==TRUE) {
} else if ($zip->open("langfiles.zip", ZipArchive::CREATE)!==TRUE) {
exit("Cannot open".$filename);
}
if(file_exists("langfiles.zip"))
unlink("langfiles.zip");
$zip = new ZipArchive();
if ($zip->open("langfiles.zip", ZipArchive::CREATE) !== TRUE) {
exit("Cannot open ".$filename);
}
try{
#Erstelle Ausgabedateien
foreach($data as $lang => $entries) {
$output = json_encode($entries, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
$output = preg_replace("/\{/si", "[", $output);
$output = preg_replace("/\}/si", "]", $output);
$output = preg_replace("/\": ([\"\[])/si", "\"\t=>\t$1", $output);
$output = "<?php\n\nreturn $output;\n";
$zip->addEmptyDir($lang);
$zip->addFromString($lang."/".$filename, $output);
foreach($data as $lang => $entries) {
$output = json_encode($entries, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
$output = preg_replace("/\{/si", "[", $output);
$output = preg_replace("/\}/si", "]", $output);
$output = preg_replace("/\": ([\"\[])/si", "\"\t=>\t$1", $output);
$output = "<?php\n\nreturn $output;\n";
$zip->addEmptyDir($lang);
$zip->addFromString($lang."/".$filename, $output);
}
} catch(ErrorException $e) {
exit("Failed to write ".$filename);
}
$zip->close();
......
@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;
}
}
/*# sourceMappingURL=beitritt.css.map */
{"version":3,"sources":["beitritt.less","beitritt.css"],"names":[],"mappings":"AAAA;EACI;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;IACA,0BAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;;IACI,uBAAA;IACA,wBAAA;IACA,2BAAA;IACA,UAAA;GCEL;EACD,6DAA6D;EDA3D;IACI,sBAAA;IACA,2BAAA;IACA,0BAAA;IACA,8BAAA;IACA,yBAAA;IACA,uBAAA;IACA,wBAAA;IACA,2BAAA;IACA,4BAAA;GCEL;EDAC;ICEA,qBAAqB;IDAjB,8BAAA;GCEL;EDAC;ICEA,6BAA6B;IDAzB,8BAAA;GCEL;EDAC;ICEA,yBAAyB;IDArB,8BAAA;GCEL;EDAC;ICEA,2BAA2B;IDAvB,8BAAA;GCEL;EDAC;IACI,uBAAA;IACA,YAAA;IACA,aAAA;GCEL;EDAC;IACI,0BAAA;GCEL;EDAC;IACI,0BAAA;GCEL;EDAC;IACI,uBAAA;IACA,wBAAA;IACA,8BAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,0BAAA;GCEL;EDAC;IACI,yBAAA;GCEL;CACF","file":"beitritt.css","sourcesContent":["@media print {\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\n }\n hr {\n display: none !important;\n }\n input[type=text], input[type=email] {\n margin: 0px !important;\n padding: 0px !important;\n height: initial !important;\n border: 0;\n }\n /* Skalierung für Firefox, absolut für die anderen Browser */\n input[type=radio] {\n transform: scale(0.5);\n -moz-transform: scale(0.5);\n -ms-transform: scale(0.5);\n -webkit-transform: scale(0.5);\n -o-transform: scale(0.5);\n width: 20px !important;\n height: 20px !important;\n margin-top: 0px !important;\n padding-top: 0px !important;\n }\n input::-webkit-input-placeholder {\n /* WebKit browsers */\n color: transparent !important;\n }\n input:-moz-placeholder {\n /* Mozilla Firefox 4 to 18 */\n color: transparent !important;\n }\n input::-moz-placeholder {\n /* Mozilla Firefox 19+ */\n color: transparent !important;\n }\n input:-ms-input-placeholder {\n /* Internet Explorer 10+ */\n color: transparent !important;\n }\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!important;\n }\n .beitritt-form-group {\n margin: 0px !important;\n padding: 0px !important;\n margin-bottom: 0px !important;\n }\n .sign {\n margin-top: 10px;\n }\n .donation-amount-input {\n padding-top: 5px;\n }\n .pagebreak {\n page-break-before: always;\n }\n #spendenaufruf {\n display: none !important;\n }\n}","@media print {\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\n }\n hr {\n display: none !important;\n }\n input[type=text],\n input[type=email] {\n margin: 0px !important;\n padding: 0px !important;\n height: initial !important;\n border: 0;\n }\n /* Skalierung für Firefox, absolut für die anderen Browser */\n input[type=radio] {\n transform: scale(0.5);\n -moz-transform: scale(0.5);\n -ms-transform: scale(0.5);\n -webkit-transform: scale(0.5);\n -o-transform: scale(0.5);\n width: 20px !important;\n height: 20px !important;\n margin-top: 0px !important;\n padding-top: 0px !important;\n }\n input::-webkit-input-placeholder {\n /* WebKit browsers */\n color: transparent !important;\n }\n input:-moz-placeholder {\n /* Mozilla Firefox 4 to 18 */\n color: transparent !important;\n }\n input::-moz-placeholder {\n /* Mozilla Firefox 19+ */\n color: transparent !important;\n }\n input:-ms-input-placeholder {\n /* Internet Explorer 10+ */\n color: transparent !important;\n }\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!important;\n }\n .beitritt-form-group {\n margin: 0px !important;\n padding: 0px !important;\n margin-bottom: 0px !important;\n }\n .sign {\n margin-top: 10px;\n }\n .donation-amount-input {\n padding-top: 5px;\n }\n .pagebreak {\n page-break-before: always;\n }\n #spendenaufruf {\n display: none !important;\n }\n}\n"]}
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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