Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
f141d4ec
Commit
f141d4ec
authored
Oct 11, 2017
by
Dominik Hebeler
Browse files
Merge branch 'MetaGer-Redesign' into 'development'
# Conflicts: # resources/assets/less/metager/result-page.less
parents
e63a7f42
c0e37f35
Changes
20
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
public/css/theme.css.php
View file @
f141d4ec
...
...
@@ -15,9 +15,10 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
-webkit-box-shadow: 0px 0px 2px 2px
<?=
$colorRGBA
?>
;
-moz-box-shadow: 0px 0px 2px 2px
<?=
$colorRGBA
?>
;
box-shadow: 0px 0px 2px 2px
<?=
$colorRGBA
?>
;
border-color:
<?=
$colorRGBA
?>
;
border-color:
<?=
$colorRGBA
?>
;
}
#mglogo > a {
background-image: linear-gradient(
<?=
$color
?>
0%,
<?=
$color
?>
250%);
background-color: transparent;
...
...
@@ -46,11 +47,6 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
}
.navbar.navbar-resultpage {
border-bottom: 2px solid
<?=
$color
?>
;
box-shadow: none;
}
.lSPrev > i, .lSNext > i {
color:
<?=
$color
?>
;
}
\ No newline at end of file
resources/assets/js/scriptResultPage.js
View file @
f141d4ec
...
...
@@ -82,6 +82,15 @@ function getDocumentReadyForUse (fokus, custom = false) {
productWidget
();
$
(
'
iframe:not(.resized)
'
).
iFrameResize
();
$
(
'
iframe
'
).
addClass
(
'
resized
'
);
addListeners
();
}
function
addListeners
()
{
$
(
'
#reset
'
).
attr
(
'
type
'
,
'
button
'
).
click
(
resetSearchbar
);
}
function
resetSearchbar
()
{
$
(
'
#eingabeTop
'
).
val
(
''
);
}
function
pluginInfo
()
{
...
...
@@ -570,7 +579,7 @@ function loadQuicktips (search, locale, sprueche) {
}
const
QUICKTIP_SERVER
=
'
https://quicktips.metager3.de
'
;
//const QUICKTIP_SERVER = 'http://localhost:63825'
;
//
const QUICKTIP_SERVER = 'http://localhost:63825'
/**
* Requests quicktips from the quicktip server and passes them to the loadedHandler
...
...
@@ -588,7 +597,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) {
$
.
get
(
getString
,
function
(
data
,
status
)
{
if
(
status
===
'
success
'
)
{
var
quicktips
=
$
(
data
).
children
(
'
feed
'
).
children
(
'
entry
'
).
map
(
function
()
{
console
.
log
(
this
);
return
quicktip
=
{
type
:
$
(
this
).
children
(
'
mg
\\
:type
'
).
text
(),
title
:
$
(
this
).
children
(
'
title
'
).
text
(),
...
...
@@ -605,7 +613,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) {
}).
toArray
()
};
}).
toArray
();
console
.
log
(
quicktips
);
loadedHandler
(
quicktips
);
}
else
{
console
.
error
(
'
Loading quicktips failed with status
'
+
status
);
...
...
resources/assets/less/metager/metager.less
View file @
f141d4ec
...
...
@@ -4,4 +4,5 @@
@import "./quicktips.less";
@import "./start-page.less";
@import "./settings.less";
@import "./variables.less";
\ No newline at end of file
@import "./variables.less";
@import "./sidebar.less";
\ No newline at end of file
resources/assets/less/metager/result-page.less
View file @
f141d4ec
...
...
@@ -35,7 +35,7 @@
@lsprev-or-lsnext-i-background-color: @result-page-color-black;
body {
background-image: inherit;
background-color:
@body-background-color
;
background-color:
white
;
}
footer {
...
...
@@ -48,7 +48,6 @@ footer {
#map,
#map div {
display: flex;
margin: 0;
}
.nav-tabs>li>a {
...
...
@@ -94,6 +93,8 @@ footer {
.navbar-resultpage {
background-color: @navbar-resultpage-background-color;
position: absolute;
border-bottom: 2px solid #ff8000;
padding-bottom: 10px;
&>ul>li {
padding-left: 0;
padding-right: 0;
...
...
@@ -208,10 +209,7 @@ nav .input-group {
.content-wrapper {
padding: 0px;
padding-top: 52px;
background-color: @content-wrapper-background-color;
-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.3);
background-color: white;
}
#helpButton {
...
...
@@ -299,16 +297,59 @@ a {
border: 1px dotted black;
}
#logo-searchbar-container {
display: flex;
}
.mg-logo {
color: #ff8000;
font-family: Liberation Sans, sans-serif;
padding: 5px 30px 0px 0px;
}
#header-searchbar {
flex-grow: 1;
}
.searchbar {
margin-top: 5px;
display: flex;
align-items: center;
border-left: #bbb solid 1px;
.search-input {
order: 2;
border: none;
box-shadow: none !important;
border: white solid 1px;
font-size: 16px;
&:focus {
border: #bbb dotted 1px;
background-color: #eee;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
}
.search-reset {
order: 1;
border: none;
background-color: transparent;
color: #444;
}
.search-submit {
order: 3;
color: #bbb;
font-size: 20px;
}
}
.result {
margin-bottom: 10px;
margin-top: 20px;
margin-bottom: 40px;
width: 100%;
&>.number {
font-size: 15px;
line-height: 1;
text-align: right;
}
&>.resultInformation {
border-radius: 5px;
padding-left: 0px;
&>.save {
position: absolute;
top: 0;
...
...
@@ -324,7 +365,7 @@ a {
.title {
color: @result-title-color;
text-decoration: none;
font-size: 1
4
px;
font-size: 1
8
px;
font-weight: bold;
margin-bottom: 0;
white-space: nowrap;
...
...
@@ -334,7 +375,7 @@ a {
text-overflow: ellipsis;
}
.link {
font-size: 1
3
px;
font-size: 1
6
px;
margin: 0;
line-height: 1.5;
&>div {
...
...
@@ -365,7 +406,7 @@ a {
.description {
margin-bottom: 3px;
color: @result-description-color;
font-size: 1
4
px;
font-size: 1
6
px;
line-height: 1.3;
clear: both;
.date {
...
...
@@ -377,7 +418,7 @@ a {
}
img {
margin: 5px;
margin-left: 0;
margin-left: 0
px
;
margin-right: 15px;
height: auto;
width: auto;
...
...
@@ -386,11 +427,19 @@ a {
border: solid 1px @result-description-img-border-color;
}
}
&.ad .description {
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
&.ad {
.ad-label {
border: green solid 1px;
padding: 1px;
color: green;
border-radius: 4px;
}
.description {
max-width: 115ch;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.hoster {
font-size: 13px;
...
...
@@ -479,15 +528,6 @@ a {
}
}
#quicktips iframe {
width: 100%;
height: 800px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
overflow: hidden;
}
.js-only {
display: none;
}
...
...
@@ -618,10 +658,11 @@ a {
}
}
@media(max-width: @screen-xs-max) {
.resultContainer {
padding-left: 0;
padding-right: 0;
.resultContainer {
margin: 0px;
padding: 0px;
@media(max-width: @screen-xs-max) {
padding-right: 0px;
}
}
...
...
@@ -669,7 +710,7 @@ a {
}
.quicktip-summary {
h1 {
font-size: 1
6
px;
font-size: 1
8
px;
font-weight: bold;
display: flex;
justify-content: space-between;
...
...
@@ -679,22 +720,25 @@ a {
font-size: 20px;
}
}
p {
font-size: 16px;
}
}
.quicktip-detail {
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
h2 {
margin: 10px 0px;
font-size: 1
4
px;
font-size: 1
7
px;
font-weight: bold;
}
p {
display: none;
font-size: 1
2
px;
font-size: 1
5
px;
}
}
.gefVon {
font-size: 1
4
px;
font-size: 1
5
px;
}
&[type=spruch] {
border-left: 3px solid #070;
...
...
resources/assets/less/metager/sidebar.less
0 → 100644
View file @
f141d4ec
.sideBar {
position: fixed;
display: block;
right: -140px;
top: 0;
width: 200px;
height: 100%;
background-color: #FFF;
overflow: hidden;
overflow-y: auto;
transition: 0.3s;
z-index: 999;
border-left: 1px solid LightGray;
&>label {
position: fixed;
font-size: 36px;
top: 0px;
right: 20px;
&:after {
content: "≡";
}
}
&>ul {
padding-top: 20%;
padding-left: 0%;
}
& a {
font-size: 12px;
line-height: 20px;
text-decoration: none;
text-indent: 12px;
width: 160px;
&:visited {
color: blue;
}
}
}
.sideBar *:not(label) {
display: none;
}
input#nav0:checked~.sideBar {
right: 0px;
& * {
display: inline-block;
}
}
input#nav0:checked~.sideBar label:after {
content: "×";
}
\ No newline at end of file
resources/assets/less/metager/static-pages.less
View file @
f141d4ec
...
...
@@ -89,7 +89,6 @@ nav {
ul.metager-dropdown-menu {
list-style-type: none;
padding-left: 0;
position: absolute;
top: 100%;
left: auto;
z-index: 1000;
...
...
@@ -163,7 +162,7 @@ ul.metager-dropdown-menu {
}
}
.
metager-
dropdown
:hover {
#
metager-
static-nav-list > li
:hover {
background-color: @metager-navbar-toggle-hover-background-color;
&>.metager-dropdown-menu {
animation-name: dropdown-animation;
...
...
@@ -193,6 +192,10 @@ ul.metager-dropdown-menu {
background-color: @toggle-nav-hide-or-metager-navbar-toggle-background-color;
}
#metager-static-nav-list>li {
padding-top: 10%;
}
@media (max-width: 979px) {
#metager-static-nav-list {
width: 100%;
...
...
@@ -203,6 +206,7 @@ ul.metager-dropdown-menu {
max-height: 1000px;
}
#metager-static-nav-list>li {
padding-top: 5px;
display: initial;
}
ul.metager-dropdown-menu {
...
...
@@ -219,11 +223,6 @@ ul.metager-dropdown-menu {
}
}
@media (min-width: 980px) {
.metager-navbar-toggle {
display: none;
}
}
#color-chooser {
padding: 0;
...
...
resources/assets/less/metager/variables.less
View file @
f141d4ec
...
...
@@ -46,4 +46,14 @@
@base-aufruf-winter-border-color: #953535;
@base-aufruf-winter-btn-color: white;
@base-aufruf-winter-btn-hover-background-color: #bd0d0d;
@base-new-feature-badge-background-color: #f80;
\ No newline at end of file
@base-new-feature-badge-background-color: #f80;
// Bootstrap Ersatz
/*
@screen-sm-min: 768px;
@screen-md-min: 992px;
@screen-lg-min: 1200px;
@screen-xs-max: (@screen-sm-min - 1);
@screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1);
@grid-gutter-width: 30px;
*/
\ No newline at end of file
resources/lang/de/ad.php
View file @
f141d4ec
<?php
return
[
'werbung'
=>
'Werbung'
,
'von'
=>
'Werbung von'
,
];
resources/lang/de/resultPage.php
View file @
f141d4ec
...
...
@@ -4,4 +4,5 @@ return [
'opensearch'
=>
'MetaGer: Sicher suchen & finden, Privatsphäre schützen'
,
'startseite'
=>
'MetaGer-Startseite'
,
'impressum'
=>
'Impressum'
,
'search-placeholder'
=>
'Suchbegriff(e) eingeben'
,
];
resources/lang/en/ad.php
View file @
f141d4ec
<?php
return
[
'von'
=>
'Advertisement by'
,
];
resources/lang/es/ad.php
View file @
f141d4ec
<?php
return
[
"von"
=>
"Reclamo de:"
];
\ No newline at end of file
resources/views/index_old.blade.php
0 → 100644
View file @
f141d4ec
@
extends
(
'layouts.indexPage'
)
@
section
(
'title'
,
$title
)
@
section
(
'content'
)
<
div
class
=
"modal fade"
id
=
"plugin-modal"
tab
-
index
=
"-1"
role
=
"dialog"
>
<
div
class
=
"modal-dialog "
>
<
div
class
=
"content modal-content"
>
<
div
class
=
"modal-header"
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"modal"
aria
-
label
=
"Close"
>
<
span
aria
-
hidden
=
"true"
>&
times
;
</
span
>
</
button
>
<
h4
>
@
if
(
$browser
===
'Firefox'
||
$browser
===
'Mozilla'
)
{{
trans
(
'index.plugin.head.1'
)
}}
@
elseif
(
$browser
===
'Chrome'
)
{{
trans
(
'index.plugin.head.2'
)
}}
@
elseif
(
$browser
===
'Opera'
)
{{
trans
(
'index.plugin.head.3'
)
}}
@
elseif
(
$browser
===
'IE'
)
{{
trans
(
'index.plugin.head.4'
)
}}
@
elseif
(
$browser
===
'Edge'
)
{{
trans
(
'index.plugin.head.5'
)
}}
@
elseif
(
$browser
===
'Safari'
)
{{
trans
(
'index.plugin.head.6'
)
}}
@
elseif
(
$browser
===
'Vivaldi'
)
{{
trans
(
'index.plugin.head.6'
)
}}
@
else
$
(
".seperator"
)
.
addClass
(
"hidden"
);
@
endif
</
h4
>
<
p
class
=
"text-muted"
>
{{
trans
(
'index.plugin.head.info'
)
}}
</
p
>
</
div
>
<
div
class
=
"modal-body"
>
@
if
(
$browser
===
'Firefox'
||
$browser
===
'Mozilla'
)
<
ol
>
<
li
>
{{
trans
(
'index.plugin.firefox.1'
)
}}
<
img
src
=
"/img/Firefox.png"
width
=
"100%"
/></
li
>
<
li
>
{{
trans
(
'index.plugin.firefox.2'
)
}}
<
img
src
=
"/img/Firefox_Standard.png"
width
=
"100%"
/></
li
>
</
ol
>
<
hr
/>
<
h4
>
{
!!
trans
(
'index.plugin.firefox.3'
,
[
'browser'
=>
$browser
])
!!
}
</
h4
>
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.firefox.4'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.firefox.5'
)
!!
}
</
li
>
</
ol
>
@
elseif
(
$browser
===
'Chrome'
)
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.chrome.1'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.chrome.2'
)
!!
}
</
li
>
<
li
>
{{
trans
(
'index.plugin.chrome.3'
)
}}
</
li
>
</
ol
>
<
hr
/>
<
h4
>
{
!!
trans
(
'index.plugin.chrome.4'
,
[
'browser'
=>
$browser
])
!!
}
</
h4
>
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.chrome.5'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.chrome.6'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.chrome.7'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.chrome.8'
)
!!
}
</
li
>
</
ol
>
@
elseif
(
$browser
===
'Opera'
)
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.opera.1'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.opera.2'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.opera.3'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.opera.4'
)
!!
}
</
li
>
<
li
><
small
>
{
!!
trans
(
'index.plugin.opera.5'
)
!!
}
</
small
>
</
ol
>
<
hr
/>
<
h4
>
{
!!
trans
(
'index.plugin.opera.6'
,
[
'browser'
=>
$browser
])
!!
}
</
h4
>
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.opera.7'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.opera.8'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.opera.9'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.opera.10'
)
!!
}
</
li
>
</
ol
>
@
elseif
(
$browser
===
'IE'
)
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.IE.1'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.IE.4'
)
!!
}
(
<
i
class
=
"fa fa-cog"
aria
-
hidden
=
"true"
></
i
>
)
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.IE.5'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.IE.6'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.IE.7'
)
!!
}
</
li
>
</
ol
>
<
hr
/>
<
h4
>
{
!!
trans
(
'index.plugin.IE.8'
,
[
'browser'
=>
$browser
])
!!
}
</
h4
>
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.IE.9'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.IE.10'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.IE.11'
)
!!
}
</
li
>
</
ol
>
@
elseif
(
$browser
===
'Edge'
)
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.edge.1'
)
!!
}
<
i
class
=
"fa fa-ellipsis-h"
aria
-
hidden
=
"true"
></
i
>
{
!!
trans
(
'index.plugin.edge.2'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.3'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.4'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.5'
)
!!
}
</
li
>
</
ol
>
<
hr
/>
<
h4
>
{
!!
trans
(
'index.plugin.edge.6'
,
[
'browser'
=>
$browser
])
!!
}
</
h4
>
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.edge.7'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.8'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.9'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.10'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.edge.11'
)
!!
}
</
li
>
</
ol
>
@
elseif
(
$browser
===
'Safari'
)
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.safari.1'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.safari.2'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.safari.3'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.safari.4'
)
!!
}
</
li
>
</
ol
>
@
elseif
(
$browser
===
'Vivaldi'
)
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.1'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.2'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.3'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.4'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.5'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.6'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.7'
)
!!
}
</
li
>
</
ol
>
<
hr
/>
<
h4
>
{
!!
trans
(
'index.plugin.vivaldi.8'
,
[
'browser'
=>
$browser
])
!!
}
</
h4
>
<
ol
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.9'
)
!!
}
</
li
>
<
li
>
{
!!
trans
(
'index.plugin.vivaldi.10'
)
!!
}
</
li
>
</
ol
>
@
endif
<
hr
>
<
p
>@
lang
(
'index.plugin.faq.1'
)
<
a
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
faq
#mg-plugin") }}">@lang('index.plugin.faq.2')</a></p>
</
div
>
</
div
>
</
div
>
</
div
>
<
div
id
=
"create-focus-modal"
class
=
"modal fade"
tab
-
index
=
"-1"
role
=
"dialog"
>
<
div
class
=
"modal-dialog modal-lg"
>
<
div
class
=
"content modal-content"
>
<
div
class
=
"modal-header"
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"modal"
aria
-
label
=
"Close"
>
<
span
aria
-
hidden
=
"true"
>&
times
;
</
span
>
</
button
>
<
h4
>
@
lang
(
"index.focus-creator.head"
)
</
h4
>
<
p
class
=
"text-muted"
>@
lang
(
"index.focus-creator.description"
)
</
p
>
</
div
>
<
div
class
=
"modal-body"
>
<
div
class
=
"clearfix"
>
<
div
class
=
"pull-left"
>
<
label
for
=
"focus-name"
>@
lang
(
'index.focus-creator.focusname'
)
</
label
>
<
input
id
=
"focus-name"
type
=
"text"
name
=
"focus-name"
placeholder
=
"@lang('index.focus-creator.name-placeholder')"
>
<
input
id
=
"original-id"
type
=
"hidden"
name
=
"original-id"
value
=
""
>
</
div
>
<
div
class
=
"settings-modal-buttons pull-right"
>
<
button
class
=
"delete-focus-btn btn btn-danger"
>
@
lang
(
'index.focus-creator.delete'
)
</
button
>
<
button
class
=
"save-focus-btn btn btn-primary"
>
@
lang
(
'index.focus-creator.save'
)
</
button
>
</
div
>
</
div
>
{{
--
<
h2
>
{
!!
trans
(
'settings.suchmaschinen.1'
)
!!
}
<
small
><
button
type
=
"button"
class
=
"btn btn-link allUnchecker hide"
>
{
!!
trans
(
'settings.suchmaschinen.2'
)
!!
}
</
button
></
small
></
h2
>
--
}}
@
foreach
(
$foki
as
$fokus
=>
$sumas
)
<
div
class
=
"headingGroup {{
$fokus
}}"
>
<
h3
class
=
"focus-category"
>