Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
a7b17a62
Commit
a7b17a62
authored
Oct 11, 2017
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development' into 'MetaGer-Redesign'
Development See merge request
!1067
parents
8bc9937a
010e7a91
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
12 deletions
+37
-12
.gitignore
.gitignore
+2
-0
.settings/.gitignore
.settings/.gitignore
+2
-0
app/Http/Controllers/StartpageController.php
app/Http/Controllers/StartpageController.php
+9
-9
app/Models/Result.php
app/Models/Result.php
+1
-1
resources/assets/js/scriptResultPage.js
resources/assets/js/scriptResultPage.js
+2
-1
resources/assets/less/metager/result-page.less
resources/assets/less/metager/result-page.less
+21
-1
No files found.
.gitignore
View file @
a7b17a62
...
...
@@ -20,3 +20,5 @@ langfiles.zip
/public/js/utility.js
**/*.map
/.buildpath
/.project
.settings/.gitignore
0 → 100644
View file @
a7b17a62
/org.eclipse.core.resources.prefs
/org.eclipse.wst.validation.prefs
app/Http/Controllers/StartpageController.php
View file @
a7b17a62
...
...
@@ -6,6 +6,7 @@ use App;
use
Illuminate\Http\Request
;
use
Jenssegers\Agent\Agent
;
use
Response
;
use
LaravelLocalization
;
class
StartpageController
extends
Controller
{
...
...
@@ -15,20 +16,14 @@ class StartpageController extends Controller
* @param int $id
* @return Response
*/
/* public function loadStartPage($locale = "de")
{
\App::setLocale($locale);
return view('index', [
'title' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
'homeIcon']);
} */
public
function
loadStartPage
(
Request
$request
)
{
$focusPages
=
[];
$theme
=
"default"
;
foreach
(
$request
->
all
()
as
$key
=>
$value
)
{
if
(
$value
===
'on'
&&
$key
!=
'param_sprueche'
&&
$key
!=
'param_newtab'
&&
$key
!==
'param_maps'
&&
$key
!==
'param_autocomplete'
)
{
if
(
$value
===
'on'
&&
$key
!=
'param_sprueche'
&&
$key
!=
'param_newtab'
&&
$key
!==
'param_maps'
&&
$key
!==
'param_autocomplete'
&&
$key
!==
'param_lang'
)
{
$focusPages
[]
=
str_replace
(
'param_'
,
''
,
$key
);
}
if
(
$key
===
'param_theme'
)
{
...
...
@@ -36,6 +31,11 @@ class StartpageController extends Controller
}
}
$lang
=
LaravelLocalization
::
getCurrentLocale
();
if
(
$lang
===
'de'
)
{
$lang
=
'all'
;
}
return
view
(
'index'
)
->
with
(
'title'
,
trans
(
'titles.index'
))
->
with
(
'homeIcon'
)
...
...
@@ -46,7 +46,7 @@ class StartpageController extends Controller
->
with
(
'autocomplete'
,
$request
->
input
(
'param_autocomplete'
,
'on'
))
->
with
(
'foki'
,
$this
->
loadFoki
())
->
with
(
'focus'
,
$request
->
input
(
'focus'
,
'web'
))
->
with
(
'lang'
,
$request
->
input
(
'param_lang'
,
'all'
))
->
with
(
'lang'
,
$request
->
input
(
'param_lang'
,
$lang
))
->
with
(
'resultCount'
,
$request
->
input
(
'param_resultCount'
,
'20'
))
->
with
(
'time'
,
$request
->
input
(
'param_time'
,
'1500'
))
->
with
(
'sprueche'
,
$request
->
input
(
'param_sprueche'
,
'on'
))
...
...
app/Models/Result.php
View file @
a7b17a62
...
...
@@ -264,7 +264,7 @@ class Result
* dass von jedem Host maximal 3 Links angezeigt werden.
* Diese Überprüfung führen wir unter bestimmten Bedingungen nicht durch.
*/
if
(
$metager
->
getSite
()
===
""
&&
if
(
(
$metager
->
getSite
()
===
""
||
$metager
->
getSite
()
===
null
)
&&
strpos
(
$this
->
strippedHost
,
"ncbi.nlm.nih.gov"
)
===
false
&&
strpos
(
$this
->
strippedHost
,
"twitter.com"
)
===
false
&&
strpos
(
$this
->
strippedHost
,
"www.ladenpreis.net"
)
===
false
&&
...
...
resources/assets/js/scriptResultPage.js
View file @
a7b17a62
...
...
@@ -21,7 +21,7 @@ $(document).ready(function () {
});
/*
function readLocaleFromUrl(defaultLocale) {
function readLocaleFromUrl
(defaultLocale) {
return location.pathname.substr(1, location.pathname.indexOf('/meta', 0) - 1) || 'de'
}
*/
...
...
@@ -658,6 +658,7 @@ function createQuicktips (quicktips, sprueche) {
}
else
{
headlineElem
.
text
(
quicktip
.
title
);
}
headlineElem
.
append
(
'
<i class="quicktip-extender fa fa-chevron-circle-down" aria-hidden="true"></i>
'
);
summaryElem
.
append
(
headlineElem
)
.
append
(
'
<p>
'
+
quicktip
.
summary
+
'
</p>
'
);
...
...
resources/assets/less/metager/result-page.less
View file @
a7b17a62
...
...
@@ -681,9 +681,22 @@ a {
* </...>
*/
@keyframes quicktip-extender-turn {
from {
transform: rotate(0deg);
}
to {
transform: rotate(180deg);
}
}
#quicktips {
display: flex;
flex-direction: column; // border: 2px solid #ccc;
flex-direction: column;
details[open=""] .quicktip-extender {
animation-name: quicktip-extender-turn;
animation-fill-mode: forwards;
}
.quicktip {
margin: 10px 0px;
padding-left: 10px;
...
...
@@ -699,6 +712,13 @@ a {
h1 {
font-size: 18px;
font-weight: bold;
display: flex;
justify-content: space-between;
.quicktip-extender {
margin-left: 10px;
color: #777;
font-size: 20px;
}
}
p {
font-size: 16px;
...
...
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