Commit 84d82c63 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '470-glyphicons-durch-fontawesome-ersetzen-und-mehr-einsetzen' into 'development'

Resolve "Glyphicons durch Fontawesome ersetzen und mehr einsetzen"

Closes #470

See merge request !822
parents b1c69fd1 f26e0504
......@@ -5,3 +5,4 @@
Homestead.json
Homestead.yaml
.env
.orig
This diff is collapsed.
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.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -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");
......
This diff is collapsed.
{
"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-69aecd193d.js",
"js/scriptResultPage.js": "js/scriptResultPage-357d27fe23.js",
"js/scriptStartPage.js": "js/scriptStartPage-8f01e5974d.js",
"js/settings.js": "js/settings-6ff0eab621.js",
"js/widgets.js": "js/widgets-866379dd63.js"
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -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");
......
......@@ -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");
}
}
......@@ -287,10 +287,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>
*/
......@@ -318,14 +318,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");
......@@ -335,18 +336,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
......
// 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);
}
}
// 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; }
}
// 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;
}
// Fixed Width Icons
// -------------------------
.@{fa-css-prefix}-fw {
width: (18em / 14);
text-align: center;
}
/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
@import "variables.less";
@import "mixins.less";
@import "path.less";
@import "core.less";
@import "larger.less";
@import "fixed-width.less";
@import "list.less";
@import "bordered-pulled.less";
@import "animated.less";
@import "rotated-flipped.less";
@import "stacked.less";
@import "icons.less";
@import "screen-reader.less";
This diff is collapsed.
// Icon Sizes
// -------------------------
/* makes the font 33% larger relative to the icon container */
.@{fa-css-prefix}-lg {
font-size: (4em / 3);
line-height: (3em / 4);
vertical-align: -15%;
}
.@{fa-css-prefix}-2x { font-size: 2em; }
.@{fa-css-prefix}-3x { font-size: 3em; }
.@{fa-css-prefix}-4x { font-size: 4em; }
.@{fa-css-prefix}-5x { font-size: 5em; }
// List Icons
// -------------------------
.@{fa-css-prefix}-ul {
padding-left: 0;
margin-left: @fa-li-width;
list-style-type: none;
> li { position: relative; }
}
.@{fa-css-prefix}-li {
position: absolute;
left: -@fa-li-width;
width: @fa-li-width;
top: (2em / 14);
text-align: center;
&.@{fa-css-prefix}-lg {
left: (-@fa-li-width + (4em / 14));
}
}
// Mixins
// --------------------------
.fa-icon() {
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;
}
.fa-icon-rotate(@degrees, @rotation) {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
-webkit-transform: rotate(@degrees);
-ms-transform: rotate(@degrees);
transform: rotate(@degrees);
}
.fa-icon-flip(@horiz, @vert, @rotation) {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
-webkit-transform: scale(@horiz, @vert);
-ms-transform: scale(@horiz, @vert);
transform: scale(@horiz, @vert);
}
// Only display content to screen readers. A la Bootstrap 4.
//
// See: http://a11yproject.com/posts/how-to-hide-content/
.sr-only() {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0,0,0,0);
border: 0;
}
// Use in conjunction with .sr-only to only display content when it's focused.
//
// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
//
// Credit: HTML5 Boilerplate
.sr-only-focusable() {
&:active,
&:focus {
position: static;
width: auto;
height: auto;
margin: 0;
overflow: visible;
clip: auto;
}
}
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;
}
// Rotated & Flipped Icons
// -------------------------
.@{fa-css-prefix}-rotate-90 { .fa-icon-rotate(90deg, 1); }
.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); }
.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); }
.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .@{fa-css-prefix}-rotate-90,
:root .@{fa-css-prefix}-rotate-180,
:root .@{fa-css-prefix}-rotate-270,
:root .@{fa-css-prefix}-flip-horizontal,
:root .@{fa-css-prefix}-flip-vertical {
filter: none;
}
// Screen Readers
// -------------------------
.sr-only { .sr-only(); }
.sr-only-focusable { .sr-only-focusable(); }
// Stacked Icons
// -------------------------
.@{fa-css-prefix}-stack {
position: relative;
display: inline-block;
width: 2em;
height: 2em;
line-height: 2em;
vertical-align: middle;
}
.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
position: absolute;
left: 0;
width: 100%;
text-align: center;
}
.@{fa-css-prefix}-stack-1x { line-height: inherit; }
.@{fa-css-prefix}-stack-2x { font-size: 2em; }
.@{fa-css-prefix}-inverse { color: @fa-inverse; }
This diff is collapsed.
......@@ -3,4 +3,5 @@
@import "./result-page.less";
@import "./quicktips.less";
@import "./start-page.less";
@import "./settings.less";
\ No newline at end of file
@import "./settings.less";
@import "../fontawesome/font-awesome.less";
\ No newline at end of file
......@@ -578,7 +578,7 @@ Mixed
color: #FF4000;
}
.settings-checkbox .settings-glyphicon {
.settings-checkbox .settings-icon {
margin-left: 5px;
font-size: 12px;
}
......@@ -595,7 +595,7 @@ footer ul.list-inline {
width: 100%;
}
span.glyphicon {
i.fa {
background-color: transparent;
}
......
......@@ -68,7 +68,7 @@ return [
"tor.2" => "MetaGer erreichen Sie im Tor-Browser dann unter: http://b7cxf4dkdsko6ah2.onion .",
"proxy.title" => "Anonymisierender MetaGer-Proxyserver",
"proxy.1" => "Um ihn zu verwenden, müssen Sie auf der MetaGer-Ergebnisseite nur auf den Link \"anonym öffnen\" rechts neben dem Ergebnislink klicken. Dann wird Ihre Anfrage an die Zielwebseite über unseren anonymisierenden Proxy-Server geleitet und Ihre persönlichen Daten bleiben weiterhin völlig geschützt. Wichtig: wenn Sie ab dieser Stelle den Links auf den Seiten folgen, bleiben Sie durch den Proxy geschützt. Sie können aber oben im Adressfeld keine neue Adresse ansteuern. In diesem Fall verlieren Sie den Schutz. Ob Sie noch geschützt sind, sehen Sie ebenfalls im Adressfeld. Es zeigt: https://proxy.suma-ev.de/?url=hier steht die eigentlich Adresse.",
"infobutton.title" => "Was bedeutet das <span class=\"glyphicon glyphicon-info-sign info-details-available\" aria-hidden=\"true\"></span>, das ich an manchen Stellen sehe ?",
"infobutton.title" => "Was bedeutet das <i class=\"fa fa-info-sign info-details-available\" aria-hidden=\"true\"></i>, das ich an manchen Stellen sehe ?",
"infobutton.1" => "Hier können Sie mit einem Klick weitere Informationen ausklappen, zum Beispiel detaillierte Wetterdaten.",
"maps.title" => "MetaGer Maps",
"maps.1" => "Metager bietet eine Kartenfunktion. Sobald Sie nach einem Begriff gesucht haben, sehen Sie oben rechts einen neuen Suchfokus \"maps.MetaGer.de\". Beim Klick darauf gelangen Sie zur Karte (momentan nur deutschlandweit). Sie können die Funktion unter \"Anpassen\" auch dauerhaft anschalten. Sollten Sie speichern, so erhalten Sie ab diesem Moment einen Kartenausschnitt in der Ergebnisliste.",
......
......@@ -13,7 +13,7 @@ return [
'conveyor' => 'Einkaufen bei MetaGer-Fördershops',
'partnertitle' => 'MetaGer unterstützen, ohne Mehrkosten für Sie',
'mapstitle' => 'Der MetaGer Kartenservice',
'mapstitle' => 'Der MetaGer Kartenservice',
'plugin' => 'MetaGer-Plugin hinzufügen',
'plugintitle' => 'MetaGer zu Ihrem Browser hinzufügen',
......@@ -50,14 +50,14 @@ return [
'plugin.firefox.1' => 'Klicken Sie in Ihrem Browser oben rechts im Suchfeld auf die Lupe mit dem kleinen "+" und dann auf "MetaGer hinzufügen" (siehe Bild)',
'plugin.firefox.2' => 'Klicken Sie nun mit der rechten Maustaste auf das neue MetaGer Logo in der Liste und auf "als Standard Suchmaschine verwenden" (siehe Bild)',
'plugin.firefox.3' => 'MetaGer als Startseite im :browser einrichten',
'plugin.firefox.4' => 'Klicken Sie oben rechts im Browser auf <span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span><span class="sr-only">die drei horizontalen Striche</span> (Menü) und öffnen Sie die "Einstellungen"',
'plugin.firefox.4' => 'Klicken Sie oben rechts im Browser auf <i class="fa fa-bars" aria-hidden="true"></i><span class="sr-only">die drei horizontalen Striche</span> (Menü) und öffnen Sie die "Einstellungen"',
'plugin.firefox.5' => 'Tragen Sie im Feld "Startseite" "https://metager.de" ein.',
'plugin.chrome.1' => 'Klicken Sie in Ihrem Chrome oben rechts auf <span class="glyphicon glyphicon-option-vertical"></span> und im folgenden Menü auf "Einstellungen", um die Einstellungen Ihres Chromes zu öffnen.',
'plugin.chrome.1' => 'Klicken Sie in Ihrem Chrome oben rechts auf <i class="fa fa-ellipsis-v"></i> und im folgenden Menü auf "Einstellungen", um die Einstellungen Ihres Chromes zu öffnen.',
'plugin.chrome.2' => 'Im Bereich "Suchen" klicken Sie auf Suchmaschinen verwalten...',
'plugin.chrome.3' => 'In der nun angezeigten Liste, finden Sie den Eintrag "MetaGer". Fahren Sie mit der Maus über den Eintrag und klicken auf "Als Standard festlegen"',
'plugin.chrome.4' => 'MetaGer als Startseite im :browser einrichten',
'plugin.chrome.5' => 'Klicken Sie oben rechts im Browser auf <span class="glyphicon glyphicon-option-vertical"></span> und öffnen Sie die "Einstellungen"',
'plugin.chrome.5' => 'Klicken Sie oben rechts im Browser auf <i class="fa fa-ellipsis-v"></i> und öffnen Sie die "Einstellungen"',
'plugin.chrome.6' => 'Im Bereich "Beim Start" wählen Sie "Bestimmte Seite oder Seiten öffnen und klicken anschließend auf "Seiten festlegen"',
'plugin.chrome.7' => 'Tragen Sie "https://metager.de" als URL bei "Neue Seite hinzufügen ein"',
'plugin.chrome.8' => 'Hinweis: Alle hier sichtbaren Webseiten werden nun beim Start des Browsers geöffnet. Sie können Einträge entfernen, indem Sie mit der Maus drüber fahren und rechts auf das "x" klicken.',
......@@ -80,7 +80,7 @@ return [
'plugin.IE.6' => 'Klicken Sie im Bereich Add-On-Typen auf "Suchanbieter" und danach im rechten Bereich auf "MetaGer"',
'plugin.IE.7' => 'Wählen Sie unten den Knopf "Als Standard"',
'plugin.IE.8' => 'MetaGer als Startseite im :browser einrichten',
'plugin.IE.9' => 'Klicken Sie oben rechts im Browser auf <span class="glyphicon glyphicon-cog"></span> und öffnen Sie die "Internetoptionen"',
'plugin.IE.9' => 'Klicken Sie oben rechts im Browser auf <i class="fa fa-cog"></i> und öffnen Sie die "Internetoptionen"',
'plugin.IE.10' => 'Falls MetaGer die einzige Startseite sein soll, markieren Sie im Textfeld den kompletten Text und ersetzen Ihn durch "https://metager.de"',
'plugin.IE.11' => 'Klicken Sie auf "OK"',
......@@ -90,7 +90,7 @@ return [
'plugin.edge.4' => 'Scrollen Sie erneut nach unten bis zum Punkt "In Adressleiste suchen mit" und klicken Sie auf "Ändern"',
'plugin.edge.5' => 'Wählen Sie "MetaGer: Sicher suchen & finden..." und klicken Sie auf "Als Standard"',
'plugin.edge.6' => 'MetaGer als Startseite im :browser einrichten',
'plugin.edge.7' => 'Klicken Sie oben rechts im Browser auf <span class="glyphicon glyphicon-option-horizontal"></span> und öffnen Sie die "Einstellungen"',
'plugin.edge.7' => 'Klicken Sie oben rechts im Browser auf <i class="fa fa-ellipsis-h"></i> und öffnen Sie die "Einstellungen"',
'plugin.edge.8' => 'Wählen Sie im Bereich "Öffnen mit" den Punkt "Bestimmte Seite(n)" aus',
'plugin.edge.9' => 'Im Dropdown-Menü darunter wählen Sie "Benutzerdefiniert" aus',
'plugin.edge.10' => 'Im Bereich darunter tragen Sie "https://metager.de" in das Feld "Webadresse eingeben" ein und klicken auf das "+" Symbol',
......
......@@ -66,7 +66,7 @@ return [
"tor.2" => "MetaGer Tor address: http://b7cxf4dkdsko6ah2.onion/tor/",
"proxy.title" => "MetaGer proxy server",
"proxy.1" => "Looking at the MetaGer result page, you will find a link \"open anonymously\" marked by a small lock at the right of every single result. Use this link to hide behind the MetaGer proxy server. The provided protection is limited to the website you reached from our result page. Protection persists while you see https://proxy.suma-ev.de/?url=...in your webbrowser‘s address field.",
"infobutton.title" => "I see a <span class=\"glyphicon glyphicon-info-sign info-details-available\" aria-hidden=\"true\"></span> in some spots. What is it?",
"infobutton.title" => "I see a <i class=\"fa fa-info-circle info-details-available\" aria-hidden=\"true\"></i> in some spots. What is it?",
"infobutton.1" => "You gain more information on the specific theme by clicking it (e.g. weather data or something).",
"maps.title" => "MetaGer maps",
"maps.1" => "MetaGer provides a map function: On a result page you see a new focus on the upper right, called \"maps.MetaGer.de\". You receive a map according to your search by click (only Germany for the moment). Use the \"customize\" page for toggling maps function \"show/hide\", you will get a durably embedded small map on the result page, then.",
......
......@@ -7,7 +7,7 @@ return [
"foki.wissenschaft" => "Science",
"foki.produkte" => "Shopping",
"foki.angepasst" => "Customized",
"foki.maps" => "maps.metager.de <span class=\"badge new-feature\">new</span>",
"foki.maps" => "maps.metager.de <span class=\"badge new-feature\">new</span>",
"design" => "select personal theme",
"conveyor" => "Purchase at affiliate shops",
"partnertitle" => "Support MetaGer without any costs to you",
......@@ -41,13 +41,13 @@ return [
"plugin.firefox.1" => "Click on the magnifying glass with the small green \"+\" and then on \"Add MetaGer..\" (picture 1)",
"plugin.firefox.2" => "Now right click on the new MetaGer Logo in the List and select \"Make MetaGer the default search engine\" (picture2)",
"plugin.firefox.3" => "Use MetaGer as start page in :browser",
"plugin.firefox.4" => "Click top right in your browser on <span class=\"glyphicon glyphicon-menu-hamburger\" aria-hidden=\"true\"></span><span class=\"sr-only\">the three small horizontal lines</span> (menu) and open \"Preferences\"",
"plugin.firefox.4" => "Click top right in your browser on <i class=\"fa fa-menu\" aria-hidden=\"true\"></i><span class=\"sr-only\">the three small horizontal lines</span> (menu) and open \"Preferences\"",
"plugin.firefox.5" => "Type in field \"Home Page\" => \"https://metager.de/en/\"",
"plugin.chrome.1" => "Click in your Chrome browser on <span class=\"glyphicon glyphicon-option-vertical\"></span> and in the next menu on \"Preferences\" to open the settings of your Chrome browser",
"plugin.chrome.1" => "Click in your Chrome browser on <i class=\"fa fa-ellipsis-v\"></i> and in the next menu on \"Preferences\" to open the settings of your Chrome browser",
"plugin.chrome.2" => "Click in field \"Search\" on manage search engines",
"plugin.chrome.3" => "Now you will find an entry \"MetaGer\". Move your mouse over that entry and click on \"Standard\",",
"plugin.chrome.4" => "Set up MetaGer as start page in your browser",
"plugin.chrome.5" => "Click in your browser on<span class=\"glyphicon glyphicon-option-vertical\"></span> and open \"Preferences\"",
"plugin.chrome.5" => "Click in your browser on<i class=\"fa fa-ellipsis-v\"></i> and open \"Preferences\"",
"plugin.chrome.6" => "In the field \"Start\" choose \"Open specific Page/s\" and then click on \"Choose Page/s\"",
"plugin.chrome.7" => "Type in https://metager.de/en/\" as URL at \"Add new page\"",
"plugin.chrome.8" => "Hint: Every Webpage in this field will be opened when you start your browser. You can delete entries by moving the mouse on it and click \"x\"",
......@@ -67,7 +67,7 @@ return [
"plugin.IE.6" => "Click in field \"Add-Ons\" on \"search provider\" and the on the right on \"MetaGer\"",
"plugin.IE.7" => "Coose button \"Standard\"",
"plugin.IE.8" => "Set up MetaGer as start page in your browser",
"plugin.IE.9" => "Click at top right in your browser on <span class=\"glyphicon glyphicon-cog\"></span> and open \"Internet Options\"",
"plugin.IE.9" => "Click at top right in your browser on <i class=\"fa fa-cog\"></i> and open \"Internet Options\"",
"plugin.IE.10" => "If MetaGer should be your only startpage mark the existing text within the text field, and replace it by \"https://metager.de/en/\"",
"plugin.IE.11" => "Click on OK",
"plugin.edge.1" => "Click in your browser top right on Extras (",
......@@ -76,7 +76,7 @@ return [
"plugin.edge.4" => "Scroll again down to topic \"within addresses\" and click on \"Change\"",
"plugin.edge.5" => "Choose \"MetaGer ...\" and click on \"Standard\"",
"plugin.edge.6" => "Set up MetaGer as start page in :browser",
"plugin.edge.7" => "Click at top right in your browser on <span class=\"glyphicon glyphicon-option-horizontal\"></span> and open \"Preferences\"",
"plugin.edge.7" => "Click at top right in your browser on <i class=\"fa fa-ellipsis-h\"></i> and open \"Preferences\"",
"plugin.edge.8" => "Choose in the field \"Open\" the topic \"Specific pages\"",
"plugin.edge.9" => "Choose \"User defined\" within drop down menu",
"plugin.edge.10" => "Type \"https://metager.de/en/\" in field \"Webaddress\" and click on \"+\"",
......
This diff is collapsed.
......@@ -35,11 +35,11 @@ return [
"plugin.firefox.3" => "Instalar MetaGer como página de inico en el :browser",
"plugin.firefox.4" => "Hacer click arriba a la derecha en los tres barras horizontales en su navegador (Menú) y abre \"Preferencias\"",
"plugin.firefox.5" => "Introducir en el campo \"Pagina de inicio\" \"https:\\/\\/metager.de\"",
"plugin.chrome.1" => "Haga click en su Chrome arriba a la derecha <span class=\"glyphicon glyphicon-option-vertical\"><\\/span> y en el subsecuente menú en \"Preferencias\", para abrir las preferencias de su Chrome.",
"plugin.chrome.1" => "Haga click en su Chrome arriba a la derecha <i class=\"fa fa-ellipsis-v\"><\\/i> y en el subsecuente menú en \"Preferencias\", para abrir las preferencias de su Chrome.",
"plugin.chrome.2" => "In la área de la búsqueda hacer click en administrar motores de búsqueda ...",
"plugin.chrome.3" => "En la lista que se ve ahora, busca la entrada \"MetaGer\". Cloquease con el ratón sobre la entrada \"Establecer como predeterminado\"",
"plugin.chrome.4" => "Definir MetaGer como pagina de inicio en el :browser ",
"plugin.chrome.5" => "Hacer click arriba a la derecha en su navegador en <span class=\"glyphicon glyphicon-option-vertical\"><\\/span> y abre \"Configuración\"",
"plugin.chrome.5" => "Hacer click arriba a la derecha en su navegador en <i class=\"fa fa-ellipsis-v\"><\\/i> y abre \"Configuración\"",
"plugin.chrome.6" => "En la sección \"Al abrir el navegador ... \" seleccionar \"Abrir una página especifica\" y haga click en \"Establecer páginas\" ",
"plugin.chrome.7" => "Introduzca \"https:\\/\\/metager.de\" como URL en el campo \"Añadir una nueva página\" ",
"plugin.chrome.8" => "Nota: Todos los sitios web visibles aquí se abren ahora cuando inicia el navegador. Usted puede borrarlos, poniéndose con el ratón encima y hacer click en la \"x\" al lado derecha.",
......@@ -59,7 +59,7 @@ return [
"plugin.IE.6" => "Busca Tipos de Extensiones y haga click en \"Máquinas de búsqueda\" y después al lado derecho click en \"MetaGer\"",
"plugin.IE.7" => "Escoge el botón \"Definir como predeterminado\"",
"plugin.IE.8" => "Definir MetaGer como página de inicio en :browser ",
"plugin.IE.9" => "Haga click arriba derecha en <span class=\"glyphicon glyphicon-cog\"></span> y abre \"Opciones de internet\"",
"plugin.IE.9" => "Haga click arriba derecha en <i class=\"fa fa-cog\"></i> y abre \"Opciones de internet\"",
"plugin.IE.10" => "Si quiere definir MetaGer como única página de inicio, marca todo el texto en el campo del texto y reemplázalo por \"https://metager.de\"",
"plugin.IE.11" => "Haga click en \"Aceptar\"",
"plugin.edge.1" => "Haga click en su navegador arriba derecha en Extras (",
......@@ -68,7 +68,7 @@ return [
"plugin.edge.4" => "Haga scroll de nuevo hacia abajo llegando al \"Buscar en la barra de direcciones con\" y haga click en \"Cambiar\"",
"plugin.edge.5" => "Selecciona \"MetaGer: Sicher suchen & finden...\" y clickea en \"Definir com predeterminado\"",
"plugin.edge.6" => "Hacer MetaGer la página de inicio en :browser",
"plugin.edge.7" => "Haga click arriba derecha en el navegador en <span class=\"glyphicon glyphicon-option-horizontal\"></span> y abre \"Configuraciones\"",
"plugin.edge.7" => "Haga click arriba derecha en el navegador en <i class=\"fa fa-ellipsis-h\"></i> y abre \"Configuraciones\"",
"plugin.edge.8" => "Selecciona en la sección \"Abrir con\" el ítem \"Página específica\"",
"plugin.edge.9" => "En el menú de cascada selecciona \"Definido por el usuario\"",
"plugin.edge.10" => "En la área abajo ponga \"https://metager.de\" en el campo \"Introducir URL\" y haga click en el símbolo \"+\"",
......
......@@ -94,7 +94,7 @@
<div style="margin-top: 315px; margin-bottom: 10px;">
<div class="popover fade bottom in" role="tooltip" style="top: auto; left: auto; display: block; position: relative">
<div class="arrow" style="left: 50%;"></div>
<h3 class="popover-title"><span class="glyphicon glyphicon-cog"></span> Optionen</h3>
<h3 class="popover-title"><i class="fa fa-cog" aria-hidden="true"></i> Optionen</h3>
<div class="popover-content">
<ul class="options-list list-unstyled small">
<li>
......
This diff is collapsed.
......@@ -17,9 +17,9 @@
</a>
</div>
<div class="options">
<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="auto bottom" data-container="body" data-html="true" data-title="<span class='glyphicon glyphicon-cog'></span> Optionen">
<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="auto bottom" data-container="body" data-html="true" data-title="<i class='fa fa-cog' aria-hidden='true'></i> Optionen">
@if(strlen($metager->getSite()) === 0)
<span class="glyphicon glyphicon-triangle-bottom"></span>
<i class="fa fa-caret-down" aria-hidden="true"></i>
@endif
</a>
<div class="content hidden">
......
......@@ -36,7 +36,7 @@
<div>{!! $mq['summary'] !!}</div>
</div>
<div class="media-right">