Skip to content
GitLab
Menu
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
ff5bc3b4
Commit
ff5bc3b4
authored
Oct 10, 2017
by
Karl Hasselbring
Browse files
Merge with previous style works
parents
79a5343e
6f991b86
Changes
9
Hide whitespace changes
Inline
Side-by-side
resources/assets/less/metager/result-page.less
View file @
ff5bc3b4
...
...
@@ -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 {
...
...
@@ -208,10 +207,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 {
...
...
@@ -316,13 +312,9 @@ a {
.result {
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;
...
...
@@ -391,7 +383,7 @@ a {
}
img {
margin: 5px;
margin-left: 0;
margin-left: 0
px
;
margin-right: 15px;
height: auto;
width: auto;
...
...
@@ -400,11 +392,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;
...
...
@@ -493,15 +493,6 @@ a {
}
}
#quicktips iframe {
width: 100%;
height: 800px;
background-color: transparent;
border: 0px none transparent;
padding: 0px;
overflow: hidden;
}
.js-only {
display: none;
}
...
...
@@ -632,14 +623,14 @@ 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;
}
}
/*
* <div id="quicktips">
* <div class="quicktip" type="TYPE">
...
...
@@ -656,8 +647,7 @@ a {
#quicktips {
display: flex;
flex-direction: column;
// border: 2px solid #ccc;
flex-direction: column; // border: 2px solid #ccc;
.quicktip {
margin: 10px 0px;
padding-left: 10px;
...
...
@@ -675,18 +665,21 @@ a {
font-size: 15px;
font-weight: bold;
}
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
6
px;
font-weight: bold;
}
p {
display: none;
font-size: 1
2
px;
font-size: 1
4
px;
}
}
.gefVon {
...
...
resources/lang/de/ad.php
View file @
ff5bc3b4
<?php
return
[
'werbung'
=>
'Werbung'
,
'von'
=>
'Werbung von'
,
];
resources/lang/en/ad.php
View file @
ff5bc3b4
<?php
return
[
'von'
=>
'Advertisement by'
,
];
resources/lang/es/ad.php
View file @
ff5bc3b4
<?php
return
[
"von"
=>
"Reclamo de:"
];
\ No newline at end of file
resources/views/layouts/ad.blade.php
View file @
ff5bc3b4
@
if
(
isset
(
$ad
)
&&
!
$apiAuthorized
)
<
div
class
=
"result ad row"
>
<
div
class
=
"number col-sm-1"
></
div
>
<
div
class
=
"resultInformation col-sm-10"
>
<
p
class
=
"title"
>
<
a
class
=
"title"
href
=
"{{
$ad->link
}}"
target
=
"{{
$metager->getNewtab
() }}"
data
-
hoster
=
"{{
$ad->gefVon
}}"
data
-
count
=
"0"
>
...
...
@@ -12,7 +11,7 @@
{{
$ad
->
anzeigeLink
}}
</
a
>
<
span
class
=
"hoster"
>
{
!!
trans
(
'ad.von'
)
!!
}
{
!!
$ad
->
gefVon
!!
}
<
span
class
=
"ad-label"
>
{
!!
trans
(
'ad.werbung'
)
!!
}
</
span
>
{
!!
trans
(
'ad.von'
)
!!
}
{
!!
$ad
->
gefVon
!!
}
</
span
>
</
p
>
<
p
class
=
"description"
>
...
...
resources/views/layouts/researchandtabs.blade.php
View file @
ff5bc3b4
...
...
@@ -17,7 +17,7 @@
<
a
href
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
") }}"
><
h1
>
M
<
span
class
=
"hidden-xs"
>
eta
</
span
>
G
<
span
class
=
"hidden-xs"
>
er
</
span
></
h1
></
a
>
</
div
>
<
div
class
=
"col-xs-9 dense-col"
>
<
form
method
=
"{{ Request::method() }}"
accept
-
charset
=
"UTF-8"
class
=
"form"
id
=
"submitForm"
>
<
form
method
=
"{{ Request::method() }}"
accept
-
charset
=
"UTF-8"
class
=
"form
search-bar-input
"
id
=
"submitForm"
>
<
div
class
=
"searchbar"
>
<
input
autocomplete
=
"off"
class
=
"form-control"
form
=
"submitForm"
id
=
"eingabeTop"
name
=
"eingabe"
placeholder
=
"Suchbegriffe erweitern/verändern, oder völlig neue Suche:"
tabindex
=
"1"
type
=
"text"
value
=
"{{
$eingabe
}}"
required
/>
<
button
type
=
'submit'
form
=
"submitForm"
id
=
'search'
><
i
class
=
"fa fa-search"
aria
-
hidden
=
"true"
></
i
></
button
>
...
...
@@ -32,168 +32,12 @@
</
div
>
</
div
>
</
nav
>
<
ul
id
=
"foki"
class
=
" resultpage-foki nav nav-tabs"
role
=
"tablist"
>
@
if
(
$metager
->
getFokus
()
===
"web"
)
<
li
id
=
"webTabSelector"
role
=
"presentation"
data
-
loaded
=
"1"
class
=
"active tab-selector"
>
<
a
aria
-
controls
=
"web"
data
-
href
=
"#web"
href
=
"#web"
>
<
i
class
=
"fa fa-globe"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.web'
)
}}
</
span
>
</
a
>
</
li
>
@
else
<
li
data
-
loaded
=
"0"
id
=
"webTabSelector"
class
=
"tab-selector"
role
=
"presentation"
>
<
a
aria
-
controls
=
"web"
data
-
href
=
"{!!
$metager->generateSearchLink
('web') !!}"
href
=
"{!!
$metager->generateSearchLink
('web', false) !!}"
>
<
i
class
=
"fa fa-globe"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.web'
)
}}
</
span
>
</
a
>
</
li
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"nachrichten"
)
<
li
id
=
"nachrichtenTabSelector"
role
=
"presentation"
data
-
loaded
=
"1"
class
=
"active tab-selector"
>
<
a
aria
-
controls
=
"nachrichten"
data
-
href
=
"#nachrichten"
href
=
"#nachrichten"
>
<
i
class
=
"fa fa-bullhorn"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.nachrichten'
)
}}
</
span
>
</
a
>
</
li
>
@
else
<
li
data
-
loaded
=
"0"
id
=
"nachrichtenTabSelector"
class
=
"tab-selector"
role
=
"presentation"
>
<
a
aria
-
controls
=
"nachrichten"
data
-
href
=
"{!!
$metager->generateSearchLink
('nachrichten') !!}"
href
=
"{!!
$metager->generateSearchLink
('nachrichten', false) !!}"
>
<
i
class
=
"fa fa-bullhorn"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.nachrichten'
)
}}
</
span
>
</
a
>
</
li
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"wissenschaft"
)
<
li
id
=
"wissenschaftTabSelector"
role
=
"presentation"
data
-
loaded
=
"1"
class
=
"active tab-selector"
>
<
a
aria
-
controls
=
"wissenschaft"
data
-
href
=
"#wissenschaft"
href
=
"#wissenschaft"
>
<
i
class
=
"fa fa-file-text"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.wissenschaft'
)
}}
</
span
>
</
a
>
</
li
>
@
else
<
li
data
-
loaded
=
"0"
id
=
"wissenschaftTabSelector"
class
=
"tab-selector"
role
=
"presentation"
>
<
a
aria
-
controls
=
"wissenschaft"
data
-
href
=
"{!!
$metager->generateSearchLink
('wissenschaft') !!}"
href
=
"{!!
$metager->generateSearchLink
('wissenschaft', false) !!}"
>
<
i
class
=
"fa fa-file-text"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.wissenschaft'
)
}}
</
span
>
</
a
>
</
li
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"produktsuche"
)
<
li
id
=
"produktsucheTabSelector"
role
=
"presentation"
data
-
loaded
=
"1"
class
=
"active tab-selector"
>
<
a
aria
-
controls
=
"produktsuche"
data
-
href
=
"#produktsuche"
href
=
"#produktsuche"
>
<
i
class
=
"fa fa-shopping-cart"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.produkte'
)
}}
</
span
>
</
a
>
</
li
>
@
else
<
li
data
-
loaded
=
"0"
id
=
"produktsucheTabSelector"
class
=
"tab-selector"
role
=
"presentation"
>
<
a
aria
-
controls
=
"produktsuche"
data
-
href
=
"{!!
$metager->generateSearchLink
('produktsuche') !!}"
href
=
"{!!
$metager->generateSearchLink
('produktsuche', false) !!}"
>
<
i
class
=
"fa fa-shopping-cart"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.produkte'
)
}}
</
span
>
</
a
>
</
li
>
@
endif
{{
--
Fix
for
older
Versions
--
}}
@
if
(
$metager
->
getFokus
()
===
"angepasst"
)
<
li
id
=
"angepasstTabSelector"
role
=
"presentation"
data
-
loaded
=
"1"
class
=
"active tab-selector"
>
<
a
aria
-
controls
=
"angepasst"
data
-
href
=
"#angepasst"
href
=
"#angepasst"
>
<
i
class
=
"fa fa-cog"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{{
trans
(
'index.foki.angepasst'
)
}}
</
span
>
</
a
>
</
li
>
@
endif
<
li
id
=
"mapsTabSelector"
role
=
"presentation"
class
=
"tab-selector"
>
<
a
href
=
"https://maps.metager.de/map/{{
$metager->getQ
() }}/-6.781309835595698/44.85855550132342/33.9779675081543/58.25372144666716"
target
=
"_blank"
>
<
i
class
=
"fa fa-map-marker"
aria
-
hidden
=
"true"
></
i
>
<
span
class
=
"hidden-xs"
>
{
!!
trans
(
'index.foki.maps'
)
!!
}
</
span
>
</
a
>
</
li
>
</
ul
>
</
header
>
<
main
id
=
"main-content-tabs"
class
=
"tab-content row"
>
@
if
(
$metager
->
getFokus
()
===
"web"
)
<
div
role
=
"tabpanel"
class
=
"tab-pane active"
id
=
"web"
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
</
div
>
@
else
<
div
role
=
"tabpanel"
class
=
"tab-pane"
id
=
"web"
>
<
div
class
=
"loader"
>
<
img
src
=
"/img/ajax-loader.gif"
alt
=
""
/>
</
div
>
</
div
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"bilder"
)
<
div
role
=
"tabpanel"
class
=
"tab-pane active"
id
=
"bilder"
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
</
div
>
@
else
<
div
role
=
"tabpanel"
class
=
"tab-pane"
id
=
"bilder"
>
<
div
class
=
"loader"
>
<
img
src
=
"/img/ajax-loader.gif"
alt
=
""
/>
</
div
>
</
div
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"nachrichten"
)
<
div
role
=
"tabpanel"
class
=
"tab-pane active"
id
=
"nachrichten"
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
</
div
>
@
else
<
div
role
=
"tabpanel"
class
=
"tab-pane"
id
=
"nachrichten"
>
<
div
class
=
"loader"
>
<
img
src
=
"/img/ajax-loader.gif"
alt
=
""
/>
</
div
>
<
main
id
=
"main-content-tabs"
class
=
"row"
>
<
div
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"wissenschaft"
)
<
div
role
=
"tabpanel"
class
=
"tab-pane active"
id
=
"wissenschaft"
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
</
div
>
@
else
<
div
role
=
"tabpanel"
class
=
"tab-pane"
id
=
"wissenschaft"
>
<
div
class
=
"loader"
>
<
img
src
=
"/img/ajax-loader.gif"
alt
=
""
/>
</
div
>
</
div
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"produktsuche"
)
<
div
role
=
"tabpanel"
class
=
"tab-pane active"
id
=
"produktsuche"
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
</
div
>
@
else
<
div
role
=
"tabpanel"
class
=
"tab-pane"
id
=
"produktsuche"
>
<
div
class
=
"loader"
>
<
img
src
=
"/img/ajax-loader.gif"
alt
=
""
/>
</
div
>
</
div
>
@
endif
@
if
(
$metager
->
getFokus
()
===
"angepasst"
)
<
div
role
=
"tabpanel"
class
=
"tab-pane active"
id
=
"angepasst"
>
<
div
class
=
"row"
>
@
yield
(
'results'
)
</
div
>
</
div
>
@
endif
</
div
>
</
main
>
</
div
>
resources/views/layouts/result.blade.php
View file @
ff5bc3b4
<div
class=
"result row"
data-count=
"{{ $result->number }}"
>
<div
class=
"number col-sm-1 hidden-xs"
style=
"color:{{ $result->color }}"
>
{{ $result->number }})
</div>
<div
class=
"resultInformation col-xs-12 col-sm-11"
>
<div
class=
"col-xs-10 col-sm-11"
style=
"padding:0; "
>
<p
class=
"title"
>
...
...
resources/views/metager3.blade.php
View file @
ff5bc3b4
...
...
@@ -36,7 +36,6 @@
@
endif
@
if
(
$metager
->
getMaps
())
<
div
class
=
"result row"
id
=
"map"
>
<
div
class
=
"number col-sm-1 hidden-xs"
></
div
>
<
div
class
=
"resultInformation col-xs-12 col-sm-11"
>
<
iframe
class
=
""
src
=
"https://maps.metager.de/metager/{{
$metager->getQ
() }}"
scrolling
=
"no"
tabindex
=
"-1"
style
=
"width: 100%; height:0; border:0;"
></
iframe
>
</
div
>
...
...
resources/views/metager3results.blade.php
View file @
ff5bc3b4
...
...
@@ -28,7 +28,6 @@
@
endif
@
if
(
$metager
->
getMaps
())
<
div
class
=
"result row"
id
=
"map"
>
<
div
class
=
"number col-sm-1 hidden-xs"
></
div
>
<
div
class
=
"resultInformation col-xs-12 col-sm-11"
>
<
iframe
class
=
""
src
=
"https://maps.metager.de/metager/{{
$metager->getQ
() }}"
style
=
"width: 100%; height:0; border:0;"
></
iframe
>
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment