From 102757732ef13532e0b19cb6e8318507048460b0 Mon Sep 17 00:00:00 2001 From: Dominik Pfennig Date: Fri, 12 May 2017 11:22:26 +0200 Subject: [PATCH] Revert "Wir benutzen kein Font-Awesome mehr" This reverts commit ba3f4179f2d38ff1d4a199f1dc4ab83f5ea78147 --- ...ffab.js => scriptResultPage-c6b34cc3ab.js} | 22 +- ...4c9eb.js => scriptStartPage-5e21fefbc8.js} | 282 +- public/build/rev-manifest.json | 4 +- public/css/themes/default.css | 2 +- public/font-awesome/HELP-US-OUT.txt | 7 + public/font-awesome/css/font-awesome.css | 2337 ++++++++++++++ public/font-awesome/css/font-awesome.min.css | 4 + public/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 134808 bytes .../fonts/fontawesome-webfont.eot | Bin 0 -> 165742 bytes .../fonts/fontawesome-webfont.svg | 2671 +++++++++++++++++ .../fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../fonts/fontawesome-webfont.woff | Bin 0 -> 98024 bytes .../fonts/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes public/font-awesome/less/animated.less | 34 + public/font-awesome/less/bordered-pulled.less | 25 + public/font-awesome/less/core.less | 12 + public/font-awesome/less/fixed-width.less | 6 + public/font-awesome/less/font-awesome.less | 18 + public/font-awesome/less/icons.less | 789 +++++ public/font-awesome/less/larger.less | 13 + public/font-awesome/less/list.less | 19 + public/font-awesome/less/mixins.less | 60 + public/font-awesome/less/path.less | 15 + public/font-awesome/less/rotated-flipped.less | 20 + public/font-awesome/less/screen-reader.less | 5 + public/font-awesome/less/stacked.less | 20 + public/font-awesome/less/variables.less | 800 +++++ public/font-awesome/scss/_animated.scss | 34 + .../font-awesome/scss/_bordered-pulled.scss | 25 + public/font-awesome/scss/_core.scss | 12 + public/font-awesome/scss/_fixed-width.scss | 6 + public/font-awesome/scss/_icons.scss | 789 +++++ public/font-awesome/scss/_larger.scss | 13 + public/font-awesome/scss/_list.scss | 19 + public/font-awesome/scss/_mixins.scss | 60 + public/font-awesome/scss/_path.scss | 15 + .../font-awesome/scss/_rotated-flipped.scss | 20 + public/font-awesome/scss/_screen-reader.scss | 5 + public/font-awesome/scss/_stacked.scss | 20 + public/font-awesome/scss/_variables.scss | 800 +++++ public/font-awesome/scss/font-awesome.scss | 18 + public/js/scriptResultPage.js | 22 +- public/js/scriptStartPage.js | 282 +- .../assets/less/metager/static-pages.less | 4 +- resources/lang/de/hilfe.php | 2 +- resources/lang/de/index.php | 10 +- resources/lang/en/hilfe.php | 2 +- resources/lang/en/index.php | 10 +- resources/lang/es/hilfe.php | 2 +- resources/lang/es/index.php | 10 +- resources/views/hilfe.blade.php | 2 +- resources/views/index.blade.php | 26 +- .../views/layouts/researchandtabs.blade.php | 26 +- resources/views/layouts/result.blade.php | 4 +- resources/views/layouts/resultPage.blade.php | 1 + resources/views/layouts/staticPages.blade.php | 5 +- resources/views/quicktip.blade.php | 2 +- resources/views/settings.blade.php | 2 +- resources/views/widget/sitesearch.blade.php | 2 +- resources/views/widget/websearch.blade.php | 2 +- resources/views/zitatsuche.blade.php | 2 +- 61 files changed, 9060 insertions(+), 359 deletions(-) rename public/build/js/{scriptResultPage-d3ca0bffab.js => scriptResultPage-c6b34cc3ab.js} (94%) rename public/build/js/{scriptStartPage-4c0c34c9eb.js => scriptStartPage-5e21fefbc8.js} (59%) create mode 100644 public/font-awesome/HELP-US-OUT.txt create mode 100644 public/font-awesome/css/font-awesome.css create mode 100644 public/font-awesome/css/font-awesome.min.css create mode 100644 public/font-awesome/fonts/FontAwesome.otf create mode 100644 public/font-awesome/fonts/fontawesome-webfont.eot create mode 100644 public/font-awesome/fonts/fontawesome-webfont.svg create mode 100644 public/font-awesome/fonts/fontawesome-webfont.ttf create mode 100644 public/font-awesome/fonts/fontawesome-webfont.woff create mode 100644 public/font-awesome/fonts/fontawesome-webfont.woff2 create mode 100644 public/font-awesome/less/animated.less create mode 100644 public/font-awesome/less/bordered-pulled.less create mode 100644 public/font-awesome/less/core.less create mode 100644 public/font-awesome/less/fixed-width.less create mode 100644 public/font-awesome/less/font-awesome.less create mode 100644 public/font-awesome/less/icons.less create mode 100644 public/font-awesome/less/larger.less create mode 100644 public/font-awesome/less/list.less create mode 100644 public/font-awesome/less/mixins.less create mode 100644 public/font-awesome/less/path.less create mode 100644 public/font-awesome/less/rotated-flipped.less create mode 100644 public/font-awesome/less/screen-reader.less create mode 100644 public/font-awesome/less/stacked.less create mode 100644 public/font-awesome/less/variables.less create mode 100644 public/font-awesome/scss/_animated.scss create mode 100644 public/font-awesome/scss/_bordered-pulled.scss create mode 100644 public/font-awesome/scss/_core.scss create mode 100644 public/font-awesome/scss/_fixed-width.scss create mode 100644 public/font-awesome/scss/_icons.scss create mode 100644 public/font-awesome/scss/_larger.scss create mode 100644 public/font-awesome/scss/_list.scss create mode 100644 public/font-awesome/scss/_mixins.scss create mode 100644 public/font-awesome/scss/_path.scss create mode 100644 public/font-awesome/scss/_rotated-flipped.scss create mode 100644 public/font-awesome/scss/_screen-reader.scss create mode 100644 public/font-awesome/scss/_stacked.scss create mode 100644 public/font-awesome/scss/_variables.scss create mode 100644 public/font-awesome/scss/font-awesome.scss diff --git a/public/build/js/scriptResultPage-d3ca0bffab.js b/public/build/js/scriptResultPage-c6b34cc3ab.js similarity index 94% rename from public/build/js/scriptResultPage-d3ca0bffab.js rename to public/build/js/scriptResultPage-c6b34cc3ab.js index 58f52d67..ed1b148f 100644 --- a/public/build/js/scriptResultPage-d3ca0bffab.js +++ b/public/build/js/scriptResultPage-c6b34cc3ab.js @@ -90,7 +90,7 @@ function popovers () { $(this).popover('destroy') $(this).popover({ // html : true, - // title : " Optionen", + // title : " Optionen", content: $(this).parent().find('.content').html() }) }) @@ -229,8 +229,9 @@ function productWidget () { easing: 'cubic-bezier(0.25, 0, 0.25, 1)', speed: 600, pager: false, - prevHtml: 'Previous', - nextHtml: 'Next', + prevHtml: 'Previous', + nextHtml: 'Next', + responsive: [{ breakpoint: 1400, settings: { item: 4, @@ -272,8 +273,8 @@ function productWidget () { pager: false, enableTouch: false, enableDrag: false, - prevHtml: 'Previous', - nextHtml: 'Next', + prevHtml: 'Previous', + nextHtml: 'Next', responsive: [{ breakpoint: 1400, settings: { @@ -331,14 +332,14 @@ function createCustomFocuses () { * @if( $metager->getFokus() === "produktsuche" ) * * @else * @@ -366,9 +367,10 @@ function addFocus (focus, active = false) { focusElementLink.setAttribute('data-href', searchLink) focusElementLink.setAttribute('href', searchLink) // create icon - var focusElementIcon = document.createElement('span') - focusElementIcon.classList.add('glyphicon') - focusElementIcon.classList.add('glyphicon-cog') + var focusElementIcon = document.createElement('i') + focusElementIcon.classList.add('fa') + focusElementIcon.classList.add('fa-cog') + focusElementIcon.setAttribute('aria-hidden', 'true') // create focusname var focusElementName = document.createElement('span') focusElementName.classList.add('hidden-xs') diff --git a/public/build/js/scriptStartPage-4c0c34c9eb.js b/public/build/js/scriptStartPage-5e21fefbc8.js similarity index 59% rename from public/build/js/scriptStartPage-4c0c34c9eb.js rename to public/build/js/scriptStartPage-5e21fefbc8.js index ca25ad1a..4e057dad 100644 --- a/public/build/js/scriptStartPage-4c0c34c9eb.js +++ b/public/build/js/scriptStartPage-5e21fefbc8.js @@ -74,13 +74,13 @@ function setSettings () { $('input[name=eingabe]').attr('autocomplete', value) } if ($('fieldset#foki.mobile').length) { - $('fieldset.mobile input#bilder').val('angepasst'); - $('fieldset.mobile input#bilder').prop('checked', true); - $('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 span.content').html('angepasst'); + $('fieldset.mobile input#bilder').val('angepasst') + $('fieldset.mobile input#bilder').prop('checked', true) + $('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 a.fa').attr('class', 'fa fa-cog') + $('fieldset.mobile label#anpassen-label span.content').html('angepasst') } } // Polyfill for form attribute @@ -89,11 +89,11 @@ function setSettings () { * polyfill for html5 form attr */ // detect if browser supports this - var sampleElement = $('[form]').get(0); - var isIE11 = !(window.ActiveXObject) && 'ActiveXObject' in window; + var sampleElement = $('[form]').get(0) + var isIE11 = !(window.ActiveXObject) && 'ActiveXObject' in window if (sampleElement && window.HTMLFormElement && sampleElement.form instanceof HTMLFormElement && !isIE11) { // browser supports it, no need to fix - return; + return } /** * Append a field to a form @@ -101,44 +101,44 @@ function setSettings () { */ $.fn.appendField = function (data) { // for form only - if (!this.is('form')) return; + if (!this.is('form')) return // wrap data if (!$.isArray(data) && data.name && data.value) { - data = [data]; + data = [data] } - var $form = this; + var $form = this // attach new params $.each(data, function (i, item) { - $('').attr('type', 'hidden').attr('name', item.name).val(item.value).appendTo($form); + $('').attr('type', 'hidden').attr('name', item.name).val(item.value).appendTo($form) }) - return $form; + return $form } /** * Find all input fields with form attribute point to jQuery object * */ $('form[id]').submit(function (e) { - var $form = $(this); + var $form = $(this) // serialize data - var data = $('[form=' + $form.attr('id') + ']').serializeArray(); + var data = $('[form=' + $form.attr('id') + ']').serializeArray() // append data to form - $form.appendField(data); + $form.appendField(data) }).each(function () { - var form = this; - $form = $(form); - $fields = $('[form=' + $form.attr('id') + ']'); + var form = this, + $form = $(form), + $fields = $('[form=' + $form.attr('id') + ']') $fields.filter('button, input').filter('[type=reset],[type=submit]').click(function () { - var type = this.type.toLowerCase(); + var type = this.type.toLowerCase() if (type === 'reset') { // reset form - form.reset(); + form.reset() // for elements outside form $fields.each(function () { - this.value = this.defaultValue; - this.checked = this.defaultChecked; + this.value = this.defaultValue + this.checked = this.defaultChecked }).filter('select').each(function () { $(this).find('option').each(function () { - this.selected = this.defaultSelected; + this.selected = this.defaultSelected }) }) } else if (type.match(/^submit|image$/i)) { @@ -151,27 +151,27 @@ function setSettings () { }) })(jQuery) // Opera 8.0+ -var isOpera = (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0; +var isOpera = (!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0 // Firefox 1.0+ -var isFirefox = typeof InstallTrigger !== 'undefined'; +var isFirefox = typeof InstallTrigger !== 'undefined' // At least Safari 3+: "[object HTMLElementConstructor]" -var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; +var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0 // Internet Explorer 6-11 -var isIE = /*@cc_on!@*/ false || !!document.documentMode; +var isIE = /*@cc_on!@*/ false || !!document.documentMode // Edge 20+ -var isEdge = !isIE && !!window.StyleMedia; +var isEdge = !isIE && !!window.StyleMedia // Chrome 1+ -var isChrome = !!window.chrome && !!window.chrome.webstore; +var isChrome = !!window.chrome && !!window.chrome.webstore // Blink engine detection -var isBlink = (isChrome || isOpera) && !!window.CSS; +var isBlink = (isChrome || isOpera) && !!window.CSS // Prüft, ob der URL-Parameter "usage" auf "once" gesetzt ist. function isUseOnce () { - var url = document.location.search; - var pos = url.indexOf('usage='); + var url = document.location.search + var pos = url.indexOf('usage=') if (pos >= 0 && url.substring(pos + 6, pos + 11) == 'once') { - return true; + return true } else { - return false; + return false } } /** @@ -180,8 +180,8 @@ function isUseOnce () { function loadInitialCustomFocuses () { for (var key in localStorage) { if (key.startsWith('focus_')) { - var focus = loadFocusById(key); - addFocus(focus.name); + var focus = loadFocusById(key) + addFocus(focus.name) } } } @@ -193,24 +193,24 @@ function showFocusCreateDialog (id) { if(id === undefined){ id = ''; } - document.getElementById('original-id').value = id; - $('#create-focus-modal').modal('show'); - var storedFocus = loadFocusById(id); - var focus = {}; + document.getElementById('original-id').value = id + $('#create-focus-modal').modal('show') + var storedFocus = loadFocusById(id) + var focus = {} // Try to load a focus for the given id - $('#focus-name').val(''); - uncheckAll(); + $('#focus-name').val('') + uncheckAll() if (storedFocus !== null) { try { - focus = JSON.parse(localStorage.getItem(id)); - $('#focus-name').val(focus.name); + focus = JSON.parse(localStorage.getItem(id)) + $('#focus-name').val(focus.name) for (var key in focus) { if (key.startsWith('engine_')) { - $('.focusCheckbox[name=' + key + ']').prop('checked', true); + $('.focusCheckbox[name=' + key + ']').prop('checked', true) } } } catch (ex) { - console.error(ex); + console.error(ex) } } } @@ -218,41 +218,41 @@ function showFocusCreateDialog (id) { * Shows the focus create dialog for a given id */ function showFocusEditDialog (id) { - showFocusCreateDialog(id); + showFocusCreateDialog(id) } /** * Save the current Focus * Listens for save button */ function saveFocus () { - var name = document.getElementById('focus-name').value; + var name = document.getElementById('focus-name').value if (isValidName(name) && atLeastOneChecked()) { - var oldId = document.getElementById('original-id').value; - var id = getIdFromName(name); - var overwrite = true; + var oldId = document.getElementById('original-id').value + var id = getIdFromName(name) + var overwrite = true if (alreadyInUse(name) && oldId !== id) { - overwrite = confirm('Name bereits genutzt\nüberschreiben?'); + overwrite = confirm('Name bereits genutzt\nüberschreiben?') if (overwrite) { - localStorage.removeItem(id); - removeFocusById(id); + localStorage.removeItem(id) + removeFocusById(id) } } if (overwrite) { - var focus = {}; + var focus = {} $('input[type=checkbox]:checked').each(function (el) { - focus[$(this).attr('name')] = $(this).val(); + focus[$(this).attr('name')] = $(this).val() }) - focus['name'] = name; + focus['name'] = name if (oldId !== '') { - localStorage.removeItem(oldId); - removeFocusById(oldId); + localStorage.removeItem(oldId) + removeFocusById(oldId) } - localStorage.setItem(id, JSON.stringify(focus)); - addFocus(name); - $('#create-focus-modal').modal('hide'); + localStorage.setItem(id, JSON.stringify(focus)) + addFocus(name) + $('#create-focus-modal').modal('hide') } } else { - alert('Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n* Mindestens 1 Suchmaschine auswählen'); + alert('Bitte gültigen Namen eingeben:\n* Keine Sonderzeichen\n* Mindestens 1 Buchstabe\n* Mindestens 1 Suchmaschine auswählen') } } /** @@ -260,13 +260,13 @@ function saveFocus () { * Listens for delete button */ function deleteFocus () { - var oldId = document.getElementById('original-id').value; + var oldId = document.getElementById('original-id').value if ($('#' + oldId).prop('checked')) { - setFocusToDefault(); + setFocusToDefault() } - localStorage.removeItem(oldId); - removeFocusById(oldId); - $('#create-focus-modal').modal('hide'); + localStorage.removeItem(oldId) + removeFocusById(oldId) + $('#create-focus-modal').modal('hide') } /** * Is the name valid (in terms of characters)? @@ -274,147 +274,149 @@ function deleteFocus () { function isValidName (name) { // no Characters other then a-z, A-Z, 0-9, ä, ö, ü, ß, -, _ allowed // at least 1 character - return /^[a-zA-Z0-9äöüß\-_ ]*$/.test(name); + return /^[a-zA-Z0-9äöüß\-_ ]*$/.test(name) } /** * Is at least one focus selected? */ function atLeastOneChecked () { - return $('input[type=checkbox]:checked').length > 0; + return $('input[type=checkbox]:checked').length > 0 } /** * Is there already a focus with this name? */ function alreadyInUse (name) { - return localStorage.hasOwnProperty(getIdFromName(name)); + return localStorage.hasOwnProperty(getIdFromName(name)) } /** * Adds a focus html-element to the focus selection * * * */ function addFocus (name) { var id = getIdFromName(name) - var foki = document.getElementById('foki'); + var foki = document.getElementById('foki') // create
to wrap all Elements - var wrapper = document.createElement('div'); - wrapper.classList.add('focus'); + var wrapper = document.createElement('div') + wrapper.classList.add('focus') // create - var newFocus = document.createElement('input'); - newFocus.id = id; - newFocus.classList.add('focus-radio'); - newFocus.classList.add('custom-focus'); - newFocus.classList.add('hide'); - newFocus.type = 'radio'; - newFocus.name = 'focus'; - newFocus.value = id; - newFocus.setAttribute('Form', 'searchForm'); - newFocus.checked = true; - newFocus.required = true; + var newFocus = document.createElement('input') + newFocus.id = id + newFocus.classList.add('focus-radio') + newFocus.classList.add('custom-focus') + newFocus.classList.add('hide') + newFocus.type = 'radio' + newFocus.name = 'focus' + newFocus.value = id + newFocus.setAttribute('Form', 'searchForm') + newFocus.checked = true + newFocus.required = true // create