Commit fb711876 authored by Dominik Hebeler's avatar Dominik Hebeler

Der Bug könnte behoben sein

Ergebnisse wurden beim Weitersuchen in den falschen Result Hash geschrieben.
parent 986ca5dd
......@@ -51,6 +51,7 @@ class Searcher implements ShouldQueue
$this->counter = 0; // Counts the number of answered jobs
$time = microtime(true);
while(true){
Log:info("Durchlauf");
// Update the expire
Redis::expire($this->name, 5);
Redis::expire($this->name . ".stats", 5);
......@@ -111,7 +112,7 @@ class Searcher implements ShouldQueue
* When a search engine needs more time to produce search results than the timeout of the MetaGer process, we won't even bother of spawning
* more and more Searchers because they would just block free worker processes from serving the important engines which will give results in time.
**/
if($this->counter === 3){
if($this->counter === 3 || getenv("QUEUE_DRIVER") === "sync"){
# If the MetaGer process waits longer for the results than this Fetcher will probably need to fetch
# Or if this engine is in the array of important engines which we will always try to serve
Redis::set($this->name, "running");
......
......@@ -558,6 +558,10 @@ class MetaGer
if ($this->requestIsCached($request)) {
$engines = $this->getCachedEngines($request);
# We need to edit some Options of the Cached Search Engines
foreach($engines as $engine){
$engine->setResultHash($this->getHashCode());
}
} else {
$engines = $this->actuallyCreateSearchEngines($enabledSearchengines, $siteSearchFailed);
}
......@@ -1349,6 +1353,7 @@ class MetaGer
public function getHashCode()
{
$string = url()->full();
Log::info($string . "\n" . md5($string));
return md5($string);
}
......
......@@ -207,6 +207,10 @@ abstract class Searchengine
$this->enabled = true;
}
public function setResultHash($hash){
$this->resultHash = $hash;
}
public function closeFp()
{
fclose($this->fp);
......@@ -233,9 +237,11 @@ abstract class Searchengine
$body = "";
if ($this->canCache && $this->cacheDuration > 0 && Cache::has($this->hash)) {
Log::info("Aus dem Cache: " . $this->hash);
$body = Cache::get($this->hash);
} elseif (Redis::hexists('search.' . $this->resultHash, $this->name)) {
$body = Redis::hget('search.' . $this->resultHash, $this->name);
Log::info("Schon vorhanden: " . $this->resultHash . "\n" . $body);
Redis::hdel('search.' . $this->resultHash, $this->name);
if ($this->canCache && $this->cacheDuration > 0) {
Cache::put($this->hash, $body, $this->cacheDuration);
......
@media print {
.container {
width: auto !important;
margin: 0px;
padding: 0px;
}
hr {
display: none !important;
}
#spendenaufruf {
display: none !important;
}
header {
display: none !important;
}
footer {
display: none !important;
}
.wrapper {
padding-top: 0 !important;
}
* {
font-size: 12px!important;
}
input[type=text],
input[type=email] {
margin: 0px !important;
padding: 0px !important;
height: initial !important;
border: 0;
}
.beitritt-form-group {
margin: 0px !important;
padding: 0px !important;
margin-bottom: 0px !important;
}
.sign {
margin-top: 10px;
}
.donation-amount-input {
padding-top: 5px;
}
h1 {
margin-top: 0 !important;
padding-top: 0 !important;
}
/* 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;
}
.pagebreak {
page-break-before: always;
}
}
/*# sourceMappingURL=beitritt.css.map */
{"version":3,"sources":["beitritt.less","beitritt.css"],"names":[],"mappings":"AAAA;EACI;IACI,uBAAA;IACA,YAAA;IACA,aAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;;IACI,uBAAA;IACA,wBAAA;IACA,2BAAA;IACA,UAAA;GCEL;EDAC;IACI,uBAAA;IACA,wBAAA;IACA,8BAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,yBAAA;IACA,0BAAA;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,0BAAA;GCEL;CACF","file":"beitritt.css","sourcesContent":["@media print {\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n hr {\n display: none !important;\n }\n #spendenaufruf {\n display: none !important;\n }\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!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 .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 h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\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 .pagebreak {\n page-break-before: always;\n }\n}","@media print {\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n hr {\n display: none !important;\n }\n #spendenaufruf {\n display: none !important;\n }\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!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 .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 h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\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 .pagebreak {\n page-break-before: always;\n }\n}\n"]}
\ No newline at end of file
{"version":3,"sources":["beitritt.less","beitritt.css"],"names":[],"mappings":"AAAA;EACI;IACI,uBAAA;IACA,YAAA;IACA,aAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;;IACI,uBAAA;IACA,wBAAA;IACA,2BAAA;IACA,UAAA;GCEL;EDAC;IACI,uBAAA;IACA,wBAAA;IACA,8BAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,yBAAA;IACA,0BAAA;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,0BAAA;GCEL;CACF","file":"beitritt.css","sourcesContent":["@media print {\r\n .container {\r\n width: auto !important;\r\n margin: 0px;\r\n padding: 0px;\r\n }\r\n hr {\r\n display: none !important;\r\n }\r\n #spendenaufruf {\r\n display: none !important;\r\n }\r\n header {\r\n display: none !important;\r\n }\r\n footer {\r\n display: none !important;\r\n }\r\n .wrapper {\r\n padding-top: 0 !important;\r\n }\r\n * {\r\n font-size: 12px!important;\r\n }\r\n input[type=text], input[type=email] {\r\n margin: 0px !important;\r\n padding: 0px !important;\r\n height: initial !important;\r\n border: 0;\r\n }\r\n .beitritt-form-group {\r\n margin: 0px !important;\r\n padding: 0px !important;\r\n margin-bottom: 0px !important;\r\n }\r\n .sign {\r\n margin-top: 10px;\r\n }\r\n .donation-amount-input {\r\n padding-top: 5px;\r\n }\r\n h1 {\r\n margin-top: 0 !important;\r\n padding-top: 0 !important;\r\n }\r\n /* Skalierung für Firefox, absolut für die anderen Browser */\r\n input[type=radio] {\r\n transform: scale(0.5);\r\n -moz-transform: scale(0.5);\r\n -ms-transform: scale(0.5);\r\n -webkit-transform: scale(0.5);\r\n -o-transform: scale(0.5);\r\n width: 20px !important;\r\n height: 20px !important;\r\n margin-top: 0px !important;\r\n padding-top: 0px !important;\r\n }\r\n input::-webkit-input-placeholder {\r\n /* WebKit browsers */\r\n color: transparent !important;\r\n }\r\n input:-moz-placeholder {\r\n /* Mozilla Firefox 4 to 18 */\r\n color: transparent !important;\r\n }\r\n input::-moz-placeholder {\r\n /* Mozilla Firefox 19+ */\r\n color: transparent !important;\r\n }\r\n input:-ms-input-placeholder {\r\n /* Internet Explorer 10+ */\r\n color: transparent !important;\r\n }\r\n .pagebreak {\r\n page-break-before: always;\r\n }\r\n}","@media print {\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n hr {\n display: none !important;\n }\n #spendenaufruf {\n display: none !important;\n }\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!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 .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 h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\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 .pagebreak {\n page-break-before: always;\n }\n}\n"]}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
$(document).ready(function() {
$(".hint").tooltip();
$(".language-text-area").each(function() {
auto_grow(this);
});
$(".language-text-area").keyup(function() {
auto_grow(this);
});
});
function auto_grow(element) {
element.style.height = "5px";
element.style.height = (element.scrollHeight + 10) + "px";
}
\ No newline at end of file
$(document).ready(function() {
switch (getLanguage()) {
case "de":
$(".encrypt-btn").html("Verschlüsseln und senden");
break;
case "en":
$(".encrypt-btn").html("encrypt and send");
break;
case "es":
// $(".encrypt-btn").html(""); TODO
break;
}
$(".contact").submit(function() {
return encrypt(this);
});
});
//based on https://github.com/encrypt-to/secure.contactform.php
/* The MIT License (MIT)
Copyright (c) 2013 Jan Wiegelmann
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
function encrypt() {
if (window.crypto && window.crypto.getRandomValues) {
var message = document.getElementById("message");
if (message.value.indexOf("-----BEGIN PGP MESSAGE-----") !== -1 && message.value.indexOf("-----END PGP MESSAGE-----") !== -1) {
// encryption done
} else {
var pub_key = openpgp.key.readArmored(document.getElementById("pubkey").innerHTML).keys[0];
var plaintext = message.value;
var ciphertext = openpgp.encryptMessage([pub_key], plaintext);
message.value = ciphertext;
return true;
}
} else {
switch (getLanguage()) {
case "de":
alert("Fehler: Ihr Browser wird nicht unterstützt. Bitte installieren Sie einen aktuellen Browser wie z.B. Mozilla Firefox.");
break;
case "en":
alert("Error: Your browser is not supported. Please install an up to date browser like Mozilla Firefox.");
break;
case "es":
// alert(""); TODO
break;
}
return false;
}
}
function getLanguage() {
var metaData = document.getElementsByTagName('meta');
for (var m in metaData) {
if (metaData[m]["httpEquiv"] == "language") {
return metaData[m]["content"];
}
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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.
$(document).ready(function() {
// Wenn LocalStorage verfügbar ist, geben wir die Möglichkeit die Einstellungen dort zu speichern
tickOptions();
if (localStorage) {
$("#save").removeClass("hidden");
$("#save").click(function() {
localStorage.setItem("pers", true);
$("input[type=checkbox]:checked, input[type=hidden]").each(function(el) {
localStorage.setItem($(this).attr("name"), $(this).val());
});
$("select").each(function(el) {
localStorage.setItem($(this).attr("name"), $(this).val());
});
document.location.href = $("#save").attr("data-href");
});
}
$(".checker").click(function() {
var selector = "." + $(this).attr("data-type");
if ($(selector + " input:checked").length) {
$(selector + " input").prop("checked", false);
} else {
$(selector + " input").prop("checked", true);
}
});
$("#unten").click(function() {
$("#settings-form").append("<input type=\"hidden\" name=\"usage\" value=\"once\">");
switch (getLanguage()) {
case "de":
alert("Auf der folgenden Startseite sind Ihre Einstellungen nun einmalig gespeichert. Nach Ihrer ersten Suche sind diese wieder verloren. Wenn Sie diese speichern möchten, können Sie sich allerdings ein Lesezeichen für die generierte Startseite einrichten.");
break;
case "en":
alert("On the following startpage your settings are saved one-time. They will be lost after your first search. Though if you want to save them, you can create a bookmark for the generated startpage.");
break;
case "es":
// alert(""); TODO
break;
}
});
$("#plugin").click(function() {
$("form").attr('action', $("#save").attr("data-href") + '#plugin-modal');
switch (getLanguage()) {
case "de":
alert("Ihr Browserplugin mit den persönlichen Sucheinstellungen wurde generiert. Folgen Sie bitte der Anleitung auf der folgenden Seite um es zu installieren. Beachten Sie: Zuvor sollten Sie ein eventuell bereits installiertes MetaGer-Plugin entfernen.");
break;
case "en":
alert("Your browser plugin with personal settings was generated. Please follow the instructions on the following page to install it. Notice that beforehand you might have to delete a former MetaGer plugin.");
break;
case "es":
// alert(""); TODO
break;
}
});
$("#settings-focus").val("angepasst");
});
function tickOptions() {
if (localStorage && localStorage.getItem("pers")) {
for (var i = 0; i < localStorage.length; i++) {
var key = localStorage.key(i);
var value = localStorage.getItem(key);
if (key.startsWith("param_")) {
if ($("input[name=" + key + "]").length) {
$("input[name=" + key + "]").attr("checked", "");
} else {
$("select[name=" + key + "] > option[value=" + value + "]").attr("selected", true);
}
}
}
} else {
$("div.web input").attr("checked", true);
}
}
function getLanguage() {
var metaData = document.getElementsByTagName('meta');
for (var m in metaData) {
if (metaData[m]["httpEquiv"] == "language") {
return metaData[m]["content"];
}
}
}
\ No newline at end of file
function copyCode() {
$("#codesnippet").select();
try {
var successful = document.execCommand('copy');
if (successful) {
$('#copyButton').removeClass('btn-default');
$('#copyButton').addClass('btn-success');
} else {
$('#copyButton').removeClass('btn-default');
$('#copyButton').addClass('btn-danger');
}
} catch (err) {
$('#copyButton').removeClass('btn-default');
$('#copyButton').addClass('btn-danger');
}
}
window.onload = function() {
$('#copyButton').bind('click', copyCode);
};
\ No newline at end of file
{
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-f8cfabc6d9.js",
"js/scriptStartPage.js": "js/scriptStartPage-be605a6afa.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
"css/themes/default.css": "css/themes/default-005a752e4d.css",
"js/lib.js": "js/lib-62ec3bb556.js",
"js/quicktips.js": "js/quicktips-6fceaafa1a.js"
}
\ No newline at end of file
{"version":3,"sources":["beitritt.less","beitritt.css"],"names":[],"mappings":"AAAA;EACI;IACI,uBAAA;IACA,YAAA;IACA,aAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;;IACI,uBAAA;IACA,wBAAA;IACA,2BAAA;IACA,UAAA;GCEL;EDAC;IACI,uBAAA;IACA,wBAAA;IACA,8BAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,yBAAA;IACA,0BAAA;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,0BAAA;GCEL;CACF","file":"beitritt.css","sourcesContent":["@media print {\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n hr {\n display: none !important;\n }\n #spendenaufruf {\n display: none !important;\n }\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!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 .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 h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\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 .pagebreak {\n page-break-before: always;\n }\n}","@media print {\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n hr {\n display: none !important;\n }\n #spendenaufruf {\n display: none !important;\n }\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!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 .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 h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\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 .pagebreak {\n page-break-before: always;\n }\n}\n"]}
\ No newline at end of file
{"version":3,"sources":["beitritt.less","beitritt.css"],"names":[],"mappings":"AAAA;EACI;IACI,uBAAA;IACA,YAAA;IACA,aAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,yBAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;IACI,0BAAA;GCCL;EDCC;;IACI,uBAAA;IACA,wBAAA;IACA,2BAAA;IACA,UAAA;GCEL;EDAC;IACI,uBAAA;IACA,wBAAA;IACA,8BAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,iBAAA;GCEL;EDAC;IACI,yBAAA;IACA,0BAAA;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,0BAAA;GCEL;CACF","file":"beitritt.css","sourcesContent":["@media print {\r\n .container {\r\n width: auto !important;\r\n margin: 0px;\r\n padding: 0px;\r\n }\r\n hr {\r\n display: none !important;\r\n }\r\n #spendenaufruf {\r\n display: none !important;\r\n }\r\n header {\r\n display: none !important;\r\n }\r\n footer {\r\n display: none !important;\r\n }\r\n .wrapper {\r\n padding-top: 0 !important;\r\n }\r\n * {\r\n font-size: 12px!important;\r\n }\r\n input[type=text], input[type=email] {\r\n margin: 0px !important;\r\n padding: 0px !important;\r\n height: initial !important;\r\n border: 0;\r\n }\r\n .beitritt-form-group {\r\n margin: 0px !important;\r\n padding: 0px !important;\r\n margin-bottom: 0px !important;\r\n }\r\n .sign {\r\n margin-top: 10px;\r\n }\r\n .donation-amount-input {\r\n padding-top: 5px;\r\n }\r\n h1 {\r\n margin-top: 0 !important;\r\n padding-top: 0 !important;\r\n }\r\n /* Skalierung für Firefox, absolut für die anderen Browser */\r\n input[type=radio] {\r\n transform: scale(0.5);\r\n -moz-transform: scale(0.5);\r\n -ms-transform: scale(0.5);\r\n -webkit-transform: scale(0.5);\r\n -o-transform: scale(0.5);\r\n width: 20px !important;\r\n height: 20px !important;\r\n margin-top: 0px !important;\r\n padding-top: 0px !important;\r\n }\r\n input::-webkit-input-placeholder {\r\n /* WebKit browsers */\r\n color: transparent !important;\r\n }\r\n input:-moz-placeholder {\r\n /* Mozilla Firefox 4 to 18 */\r\n color: transparent !important;\r\n }\r\n input::-moz-placeholder {\r\n /* Mozilla Firefox 19+ */\r\n color: transparent !important;\r\n }\r\n input:-ms-input-placeholder {\r\n /* Internet Explorer 10+ */\r\n color: transparent !important;\r\n }\r\n .pagebreak {\r\n page-break-before: always;\r\n }\r\n}","@media print {\n .container {\n width: auto !important;\n margin: 0px;\n padding: 0px;\n }\n hr {\n display: none !important;\n }\n #spendenaufruf {\n display: none !important;\n }\n header {\n display: none !important;\n }\n footer {\n display: none !important;\n }\n .wrapper {\n padding-top: 0 !important;\n }\n * {\n font-size: 12px!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 .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 h1 {\n margin-top: 0 !important;\n padding-top: 0 !important;\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 .pagebreak {\n page-break-before: always;\n }\n}\n"]}
\ No newline at end of file
......@@ -1118,7 +1118,6 @@ img {
background-color: #fafafa;
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
display: inline-block;
max-width: 100%;
......@@ -2539,7 +2538,6 @@ output {
border: 1px solid #ccc;
border-radius: 4px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control:focus {
......@@ -3433,7 +3431,6 @@ input[type="button"].btn-block {
}
.fade {
opacity: 0;
-webkit-transition: opacity 0.15s linear;
transition: opacity 0.15s linear;
}
.fade.in {
......@@ -3455,11 +3452,8 @@ tbody.collapse.in {
position: relative;
height: 0;
overflow: hidden;
-webkit-transition-property: height, visibility;
transition-property: height, visibility;
-webkit-transition-duration: 0.35s;
transition-duration: 0.35s;
-webkit-transition-timing-function: ease;
transition-timing-function: ease;
}
.caret {
......@@ -4960,7 +4954,6 @@ a.badge:focus {
background-color: #fafafa;
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: border 0.2s ease-in-out;
transition: border 0.2s ease-in-out;
}
.thumbnail > img,
......@@ -5086,12 +5079,10 @@ a.thumbnail.active {
text-align: center;
background-color: #337ab7;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-transition: width 0.6s ease;
transition: width 0.6s ease;
}
.progress-striped .progress-bar,
.progress-bar-striped {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-size: 40px 40px;
}
......@@ -5104,28 +5095,24 @@ a.thumbnail.active {
background-color: #5cb85c;
}
.progress-striped .progress-bar-success {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.progress-bar-info {
background-color: #FB0;
}
.progress-striped .progress-bar-info {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.progress-bar-warning {
background-color: #f0ad4e;
}
.progress-striped .progress-bar-warning {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.progress-bar-danger {
background-color: #d9534f;
}
.progress-striped .progress-bar-danger {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.media {
......@@ -5814,7 +5801,6 @@ button.close {
.modal.fade .modal-dialog {
-webkit-transform: translate(0, -25%);
transform: translate(0, -25%);
-webkit-transition: -webkit-transform 0.3s ease-out;
transition: -webkit-transform 0.3s ease-out;
transition: transform 0.3s ease-out;
transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out;
......@@ -6168,7 +6154,6 @@ button.close {
.carousel-inner > .item {
display: none;
position: relative;
-webkit-transition: 0.6s ease-in-out left;
transition: 0.6s ease-in-out left;
}
.carousel-inner > .item > img,
......@@ -6177,7 +6162,6 @@ button.close {
}
@media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item {
-webkit-transition: -webkit-transform 0.6s ease-in-out;
transition: -webkit-transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out;
transition: transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out;
......@@ -6251,7 +6235,6 @@ button.close {
background-color: rgba(0, 0, 0, 0);
}
.carousel-control.left {
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
......@@ -6259,7 +6242,6 @@ button.close {
.carousel-control.right {
left: auto;
right: 0;
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
......@@ -6827,7 +6809,6 @@ ul.metager-dropdown-menu {
background-clip: padding-box;
max-height: 0px;
overflow: hidden;
-webkit-transition: max-height 1s ease;
transition: max-height 1s ease;
}
ul.metager-dropdown-menu > li > a {
......@@ -6886,7 +6867,6 @@ ul.metager-dropdown-menu:hover,
width: 100%;
max-height: 40px;
overflow: hidden;
-webkit-transition: max-height 1s ease;
transition: max-height 1s ease;
}
#metager-static-nav-list:target {
......
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -49,8 +49,8 @@ function setActionListeners () {
$('#addFocusBtn').click(function () {
showFocusCreateDialog('')
})
$('.save-focus-btn').click(saveFocus);
$('.delete-focus-btn').click(deleteFocus);
$('#save-focus-btn').click(saveFocus);
$('#delete-focus-btn').click(deleteFocus);
$('#focus-name').keyup(function (event) {
if (event.keyCode == 13) {
$('#save-focus-btn').click()
......
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