Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
0a17d5ec
Commit
0a17d5ec
authored
5 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Plain Diff
Merge branch 'development' of
https://gitlab.metager3.de/open-source/MetaGer
into development
parents
31ac696a
53b950d8
No related branches found
No related tags found
1 merge request
!1459
Development
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/lang/de/index.php
+1
-0
1 addition, 0 deletions
resources/lang/de/index.php
resources/lang/en/index.php
+1
-0
1 addition, 0 deletions
resources/lang/en/index.php
resources/views/parts/searchbar.blade.php
+2
-2
2 additions, 2 deletions
resources/views/parts/searchbar.blade.php
with
4 additions
and
2 deletions
resources/lang/de/index.php
+
1
−
0
View file @
0a17d5ec
...
@@ -40,6 +40,7 @@ return [
...
@@ -40,6 +40,7 @@ return [
'key.placeholder'
=>
'Mitglieder-Key eingeben'
,
'key.placeholder'
=>
'Mitglieder-Key eingeben'
,
'key.tooltip'
=>
'Mitglieder-Key eingeben'
,
'key.tooltip'
=>
'Mitglieder-Key eingeben'
,
'placeholder'
=>
'MetaGer: Sicher suchen & finden, Privatsphäre schützen'
,
'placeholder'
=>
'MetaGer: Sicher suchen & finden, Privatsphäre schützen'
,
'searchbutton'
=>
'MetaGer-Suche'
,
'tooltips.add-focus'
=>
'Suche anpassen'
,
'tooltips.add-focus'
=>
'Suche anpassen'
,
'tooltips.edit-focus'
=>
'Aktuellen Fokus bearbeiten'
,
'tooltips.edit-focus'
=>
'Aktuellen Fokus bearbeiten'
,
...
...
This diff is collapsed.
Click to expand it.
resources/lang/en/index.php
+
1
−
0
View file @
0a17d5ec
...
@@ -41,6 +41,7 @@ return [
...
@@ -41,6 +41,7 @@ return [
'key.tooltip'
=>
'Enter member key'
,
'key.tooltip'
=>
'Enter member key'
,
"placeholder"
=>
"MetaGer: Privacy Protected Search & Find"
,
"placeholder"
=>
"MetaGer: Privacy Protected Search & Find"
,
'searchbutton'
=>
'MetaGer-Search'
,
'tooltips.add-focus'
=>
'Adjust search'
,
'tooltips.add-focus'
=>
'Adjust search'
,
'tooltips.edit-focus'
=>
'Change the actual focus'
,
'tooltips.edit-focus'
=>
'Change the actual focus'
,
...
...
This diff is collapsed.
Click to expand it.
resources/views/parts/searchbar.blade.php
+
2
−
2
View file @
0a17d5ec
...
@@ -9,12 +9,12 @@
...
@@ -9,12 +9,12 @@
</div>
</div>
<div
class=
"search-input"
>
<div
class=
"search-input"
>
<input
type=
"search"
name=
"eingabe"
value=
"@if(isset($eingabe)){{$eingabe}}@endif"
required=
""
@
if
(\
Request::is
('/'))
autofocus
@
endif
autocomplete=
"off"
class=
"form-control"
placeholder=
"{{ trans('index.placeholder') }}"
tabindex=
"0"
>
<input
type=
"search"
name=
"eingabe"
value=
"@if(isset($eingabe)){{$eingabe}}@endif"
required=
""
@
if
(\
Request::is
('/'))
autofocus
@
endif
autocomplete=
"off"
class=
"form-control"
placeholder=
"{{ trans('index.placeholder') }}"
tabindex=
"0"
>
<button
id=
"search-delete-btn"
type=
"button"
tabindex=
"-1"
>
<button
id=
"search-delete-btn"
name=
"delete-search-input"
type=
"button"
tabindex=
"-1"
>
×
×
</button>
</button>
</div>
</div>
<div
class=
"search-submit"
id=
"submit-inputgroup"
>
<div
class=
"search-submit"
id=
"submit-inputgroup"
>
<button
type=
"submit"
tabindex=
"-1"
>
<button
type=
"submit"
tabindex=
"-1"
name=
"submit-query"
title=
"@lang('index.searchbutton')"
aria-label=
"@lang('index.searchbutton')"
>
<i
class=
"fa fa-search"
aria-hidden=
"true"
></i>
<i
class=
"fa fa-search"
aria-hidden=
"true"
></i>
</button>
</button>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment