Skip to content

GitLab

Commit 4e3063d8 authored by Karl's avatar Karl
Browse files

Merge with Development

parents e9c4c76c fc876032
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 4e3063d8
......@@ -5,3 +5,4 @@
Homestead.json
Homestead.yaml
.env
.orig
app/MetaGer.php
View file @ 4e3063d8
......@@ -882,7 +882,7 @@ class MetaGer
{
$this->request = $request;
# Sichert, dass der request in UTF-8 formatiert ist
if ($request->input('encoding', '') !== "utf8") {
if ($request->input('encoding', 'utf8') !== "utf8") {
# In früheren Versionen, als es den Encoding Parameter noch nicht gab, wurden die Daten in ISO-8859-1 übertragen
$input = $request->all();
foreach ($input as $key => $value) {
......
public/build/css/themes/default-d9e82261b9.css deleted 100644 → 0
View file @ e9c4c76c
This diff is collapsed.
public/build/css/themes/default.css.map
View file @ 4e3063d8
This diff is collapsed.
public/build/js/scriptResultPage-95d76cf16b.js → public/build/js/scriptResultPage-357d27fe23.js
View file @ 4e3063d8
......@@ -90,7 +90,7 @@ function popovers() {
$(this).popover("destroy");
$(this).popover({
//html : true,
//title : "<span class='glyphicon glyphicon-cog'></span> Optionen",
//title : "<i class="fa fa-cog" aria-hidden="true"></i> Optionen",
content: $(this).parent().find(".content").html()
});
});
......@@ -229,8 +229,8 @@ function productWidget() {
easing: 'cubic-bezier(0.25, 0, 0.25, 1)',
speed: 600,
pager: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
prevHtml: '<i class="fa fa-chevron-left" aria-hidden="true"></i></span><span class="sr-only">Previous</span>',
nextHtml: '<i class="fa fa-chevron-right" aria-hidden="true"></i><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
......@@ -273,8 +273,8 @@ function productWidget() {
pager: false,
enableTouch: false,
enableDrag: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
prevHtml: '<a class="fa fa-chevron-left" aria-hidden="true"></a><span class="sr-only">Previous</span>',
nextHtml: '<a class="fa fa-chevron-right" aria-hidden="true"></a><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
......@@ -332,14 +332,14 @@ function createCustomFocuses() {
* @if( $metager->getFokus() === "produktsuche" )
* <li id="produktsucheTabSelector" class="active tab-selector" role="presentation" data-loaded="1">
* <a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
* <span class='glyphicon glyphicon-shopping-cart'></span>
* <i class="fa fa-shopping-cart" aria-hidden="true"></i>
* <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
* </a>
* </li>
* @else
* <li id="produktsucheTabSelector" class="tab-selector" role="presentation" data-loaded="0">
* <a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche', false) !!}">
* <span class='glyphicon glyphicon-shopping-cart'></span>
* <i class="fa fa-shopping-cart" aria-hidden="true"></i>
* <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
* </a>
* </li>
......@@ -366,10 +366,11 @@ function addFocus(focus, active = false) {
var searchLink = generateSearchLinkForFocus(focus)
focusElementLink.setAttribute("data-href", searchLink);
focusElementLink.setAttribute("href", searchLink);
// create <span> glyphicon
var focusElementIcon = document.createElement("span");
focusElementIcon.classList.add("glyphicon");
focusElementIcon.classList.add("glyphicon-cog");
// create <a> icon
var focusElementIcon = document.createElement("a");
focusElementIcon.classList.add("fa");
focusElementIcon.classList.add("fa-cog");
focusElementIcon.setAttribute("aria-hidden", "true");
// create <span> focusname
var focusElementName = document.createElement("span");
focusElementName.classList.add("hidden-xs");
......
public/build/js/scriptStartPage-f0a2275fc2.js → public/build/js/scriptStartPage-a59b8ddf71.js
View file @ 4e3063d8
......@@ -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);
}
function setSettings() {
......@@ -79,7 +79,7 @@ function setSettings() {
$("fieldset.mobile input#bilder").attr("id", "angepasst");
$("fieldset.mobile label#bilder-label").attr("id", "anpassen-label");
$("fieldset.mobile label#anpassen-label").attr("for", "angepasst");
$("fieldset.mobile label#anpassen-label span.glyphicon").attr("class", "glyphicon glyphicon-cog");
$("fieldset.mobile label#anpassen-label a.fa").attr("class", "fa fa-cog");
$("fieldset.mobile label#anpassen-label span.content").html("angepasst");
}
}
......@@ -290,10 +290,10 @@ function alreadyInUse(name) {
*
* <input id="NAME" class="hide" type="radio" name="focus" value="NAME" form="searchForm" checked required>
* <label id="NAME-label" for="NAME">
* <span class="glyphicon glyphicon-star"></span>
* <i class="fa fa-star" aria-hidden="true"></i>
* <span class="content">NAME</span>
* <button class="btn btn-default">
* <span class="glyphicon glyphicon-pencil"></span>
* <i class="fa fa-pencil" aria-hidden="true"></i>
* </button>
* </label>
*/
......@@ -321,14 +321,15 @@ function addFocus(name) {
newFocusLabel.classList.add("focus-label");
newFocusLabel.classList.add("custom-focus-label");
newFocusLabel.htmlFor = id;
// create glyphicon
var newFocusGlyphicon = document.createElement("span");
newFocusGlyphicon.classList.add("glyphicon");
newFocusGlyphicon.classList.add("glyphicon-star");
// create <i> icon
var newFocusIcon = document.createElement("i");
newFocusIcon.classList.add("fa");
newFocusIcon.classList.add("fa-star");
newFocusIcon.setAttribute("aria-hidden", "true");
// create content
var newFocusContent = document.createElement("span");
newFocusGlyphicon.classList.add("content");
newFocusContent.textContent = name;
newFocusIcon.classList.add("content");
newFocusContent.textContent = " " + name;
// create edit button
var newFocusEditLink = document.createElement("a");
newFocusEditLink.classList.add("focus-edit");
......@@ -338,18 +339,19 @@ function addFocus(name) {
newFocusEditLink.onclick = function() {
showFocusEditDialog(id);
}
var newFocusEditLinkGlyphicon = document.createElement("span");
newFocusEditLinkGlyphicon.classList.add("glyphicon");
newFocusEditLinkGlyphicon.classList.add("glyphicon-pencil");
var newFocusEditLinkIcon = document.createElement("i");
newFocusEditLinkIcon.classList.add("fa");
newFocusEditLinkIcon.classList.add("fa-pencil");
newFocusEditLinkIcon.setAttribute("aria-hidden", "true");
// add new elements
var addFocusBtn = document.getElementById("addFocusBtn");
foki.insertBefore(wrapper, addFocusBtn);
wrapper.appendChild(newFocus);
wrapper.appendChild(newFocusLabel);
newFocusLabel.appendChild(newFocusGlyphicon);
newFocusLabel.appendChild(newFocusIcon);
newFocusLabel.appendChild(newFocusContent);
wrapper.appendChild(newFocusEditLink);
newFocusEditLink.appendChild(newFocusEditLinkGlyphicon);
newFocusEditLink.appendChild(newFocusEditLinkIcon);
}
/**
* Remove the focuses html-elements
......
public/build/rev-manifest.json
View file @ 4e3063d8
{
"js/editLanguage.js": "js/editLanguage-7a1cbfb2ba.js",
"js/kontakt.js": "js/kontakt-de49d68db3.js",
"js/scriptResultPage.js": "js/scriptResultPage-95d76cf16b.js",
"js/scriptStartPage.js": "js/scriptStartPage-f0a2275fc2.js",
"js/scriptResultPage.js": "js/scriptResultPage-357d27fe23.js",
"js/scriptStartPage.js": "js/scriptStartPage-a59b8ddf71.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
public/css/themes/default.css
View file @ 4e3063d8
This diff is collapsed.
public/css/themes/default.css.map
View file @ 4e3063d8
This diff is collapsed.
public/fonts/fontawesome-webfont.svg 0 → 100644
View file @ 4e3063d8
This diff is collapsed.
public/js/scriptResultPage.js
View file @ 4e3063d8
......@@ -90,7 +90,7 @@ function popovers() {
$(this).popover("destroy");
$(this).popover({
//html : true,
//title : "<span class='glyphicon glyphicon-cog'></span> Optionen",
//title : "<i class="fa fa-cog" aria-hidden="true"></i> Optionen",
content: $(this).parent().find(".content").html()
});
});
......@@ -229,8 +229,8 @@ function productWidget() {
easing: 'cubic-bezier(0.25, 0, 0.25, 1)',
speed: 600,
pager: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
prevHtml: '<i class="fa fa-chevron-left" aria-hidden="true"></i></span><span class="sr-only">Previous</span>',
nextHtml: '<i class="fa fa-chevron-right" aria-hidden="true"></i><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
......@@ -273,8 +273,8 @@ function productWidget() {
pager: false,
enableTouch: false,
enableDrag: false,
prevHtml: '<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span><span class="sr-only">Previous</span>',
nextHtml: '<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span><span class="sr-only">Next</span>',
prevHtml: '<a class="fa fa-chevron-left" aria-hidden="true"></a><span class="sr-only">Previous</span>',
nextHtml: '<a class="fa fa-chevron-right" aria-hidden="true"></a><span class="sr-only">Next</span>',
responsive: [{
breakpoint: 1400,
settings: {
......@@ -332,14 +332,14 @@ function createCustomFocuses() {
* @if( $metager->getFokus() === "produktsuche" )
* <li id="produktsucheTabSelector" class="active tab-selector" role="presentation" data-loaded="1">
* <a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
* <span class='glyphicon glyphicon-shopping-cart'></span>
* <i class="fa fa-shopping-cart" aria-hidden="true"></i>
* <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
* </a>
* </li>
* @else
* <li id="produktsucheTabSelector" class="tab-selector" role="presentation" data-loaded="0">
* <a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche', false) !!}">
* <span class='glyphicon glyphicon-shopping-cart'></span>
* <i class="fa fa-shopping-cart" aria-hidden="true"></i>
* <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
* </a>
* </li>
......@@ -366,10 +366,11 @@ function addFocus(focus, active = false) {
var searchLink = generateSearchLinkForFocus(focus)
focusElementLink.setAttribute("data-href", searchLink);
focusElementLink.setAttribute("href", searchLink);
// create <span> glyphicon
var focusElementIcon = document.createElement("span");
focusElementIcon.classList.add("glyphicon");
focusElementIcon.classList.add("glyphicon-cog");
// create <a> icon
var focusElementIcon = document.createElement("a");
focusElementIcon.classList.add("fa");
focusElementIcon.classList.add("fa-cog");
focusElementIcon.setAttribute("aria-hidden", "true");
// create <span> focusname
var focusElementName = document.createElement("span");
focusElementName.classList.add("hidden-xs");
......
public/js/scriptStartPage.js
View file @ 4e3063d8
......@@ -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);
}
function setSettings() {
......@@ -79,7 +79,7 @@ function setSettings() {
$("fieldset.mobile input#bilder").attr("id", "angepasst");
$("fieldset.mobile label#bilder-label").attr("id", "anpassen-label");
$("fieldset.mobile label#anpassen-label").attr("for", "angepasst");
$("fieldset.mobile label#anpassen-label span.glyphicon").attr("class", "glyphicon glyphicon-cog");
$("fieldset.mobile label#anpassen-label a.fa").attr("class", "fa fa-cog");
$("fieldset.mobile label#anpassen-label span.content").html("angepasst");
}
}
......@@ -290,10 +290,10 @@ function alreadyInUse(name) {
*
* <input id="NAME" class="hide" type="radio" name="focus" value="NAME" form="searchForm" checked required>
* <label id="NAME-label" for="NAME">
* <span class="glyphicon glyphicon-star"></span>
* <i class="fa fa-star" aria-hidden="true"></i>
* <span class="content">NAME</span>
* <button class="btn btn-default">
* <span class="glyphicon glyphicon-pencil"></span>
* <i class="fa fa-pencil" aria-hidden="true"></i>
* </button>
* </label>
*/
......@@ -321,14 +321,15 @@ function addFocus(name) {
newFocusLabel.classList.add("focus-label");
newFocusLabel.classList.add("custom-focus-label");
newFocusLabel.htmlFor = id;
// create glyphicon
var newFocusGlyphicon = document.createElement("span");
newFocusGlyphicon.classList.add("glyphicon");
newFocusGlyphicon.classList.add("glyphicon-star");
// create <i> icon
var newFocusIcon = document.createElement("i");
newFocusIcon.classList.add("fa");
newFocusIcon.classList.add("fa-star");
newFocusIcon.setAttribute("aria-hidden", "true");
// create content
var newFocusContent = document.createElement("span");
newFocusGlyphicon.classList.add("content");
newFocusContent.textContent = name;
newFocusIcon.classList.add("content");
newFocusContent.textContent = " " + name;
// create edit button
var newFocusEditLink = document.createElement("a");
newFocusEditLink.classList.add("focus-edit");
......@@ -338,18 +339,19 @@ function addFocus(name) {
newFocusEditLink.onclick = function() {
showFocusEditDialog(id);
}
var newFocusEditLinkGlyphicon = document.createElement("span");
newFocusEditLinkGlyphicon.classList.add("glyphicon");
newFocusEditLinkGlyphicon.classList.add("glyphicon-pencil");
var newFocusEditLinkIcon = document.createElement("i");
newFocusEditLinkIcon.classList.add("fa");
newFocusEditLinkIcon.classList.add("fa-pencil");
newFocusEditLinkIcon.setAttribute("aria-hidden", "true");
// add new elements
var addFocusBtn = document.getElementById("addFocusBtn");
foki.insertBefore(wrapper, addFocusBtn);
wrapper.appendChild(newFocus);
wrapper.appendChild(newFocusLabel);
newFocusLabel.appendChild(newFocusGlyphicon);
newFocusLabel.appendChild(newFocusIcon);
newFocusLabel.appendChild(newFocusContent);
wrapper.appendChild(newFocusEditLink);
newFocusEditLink.appendChild(newFocusEditLinkGlyphicon);
newFocusEditLink.appendChild(newFocusEditLinkIcon);
}
/**
* Remove the focuses html-elements
......
resources/assets/less/fontawesome/animated.less 0 → 100644
View file @ 4e3063d8
// Animated Icons
// --------------------------
.@{fa-css-prefix}-spin {
-webkit-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
}
.@{fa-css-prefix}-pulse {
-webkit-animation: fa-spin 1s infinite steps(8);
animation: fa-spin 1s infinite steps(8);
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
@keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
resources/assets/less/fontawesome/bordered-pulled.less 0 → 100644
View file @ 4e3063d8
// Bordered & Pulled
// -------------------------
.@{fa-css-prefix}-border {
padding: .2em .25em .15em;
border: solid .08em @fa-border-color;
border-radius: .1em;
}
.@{fa-css-prefix}-pull-left { float: left; }
.@{fa-css-prefix}-pull-right { float: right; }
.@{fa-css-prefix} {
&.@{fa-css-prefix}-pull-left { margin-right: .3em; }
&.@{fa-css-prefix}-pull-right { margin-left: .3em; }
}
/* Deprecated as of 4.4.0 */
.pull-right { float: right; }
.pull-left { float: left; }
.@{fa-css-prefix} {
&.pull-left { margin-right: .3em; }
&.pull-right { margin-left: .3em; }
}
resources/assets/less/fontawesome/core.less 0 → 100644
View file @ 4e3063d8
// Base Class Definition
// -------------------------
.@{fa-css-prefix} {
display: inline-block;
font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
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