Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
3b56d73c
Commit
3b56d73c
authored
Jul 05, 2017
by
Dominik Hebeler
Browse files
Revert "Merge branch '530-js-only-class' into 'development'"
This reverts merge request
!957
parent
055edeb5
Changes
11
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
3b56d73c
...
...
@@ -16,6 +16,4 @@ langfiles.zip
/public/js/scriptResultPage.js
/public/css/beitritt.css
/public/css/themes/default.css
/public/css/utility.css
/public/js/utility.js
**/*.map
gulpfile.js
View file @
3b56d73c
...
...
@@ -22,24 +22,13 @@ elixir(function (mix) {
| scriptStartPage.js
| settings.js
*/
// lib
mix
.
scripts
([
'
lib/jquery.js
'
,
'
lib/jquery-ui.min.js
'
,
'
lib/bootstrap.js
'
,
'
lib/lightslider.js
'
,
'
lib/masonry.js
'
,
'
lib/imagesloaded.js
'
,
'
lib/openpgp.min.js
'
,
'
lib/iframeResizer.min.js
'
,
'
lib/md5.js
'
],
'
public/js/lib.js
'
);
// quicktips
mix
.
scripts
([
'
lib/jquery.js
'
,
'
lib/iframeResizer.contentWindow.min.js
'
],
'
public/js/quicktips.js
'
);
// start page
mix
.
scripts
([
'
lib/jquery.js
'
,
'
lib/jquery-ui.min.js
'
,
'
lib/bootstrap.js
'
,
'
lib/lightslider.js
'
,
'
lib/masonry.js
'
,
'
lib/imagesloaded.js
'
,
'
lib/openpgp.min.js
'
,
'
lib/iframeResizer.min.js
'
,
'
lib/md5.js
'
],
'
public/js/lib.js
'
)
mix
.
scripts
([
'
lib/jquery.js
'
,
'
lib/iframeResizer.contentWindow.min.js
'
],
'
public/js/quicktips.js
'
)
mix
.
scripts
([
'
scriptStartPage.js
'
,
'
results.js
'
],
'
public/js/scriptStartPage.js
'
);
// result page
mix
.
scripts
([
'
scriptResultPage.js
'
,
'
results.js
'
],
'
public/js/scriptResultPage.js
'
);
mix
.
scripts
([
'
scriptSubpages.js
'
],
'
public/js/scriptSubpages.js
'
);
// versioning
mix
.
version
([
'
css/themes/default.css
'
,
'
js/lib.js
'
,
'
js/quicktips.js
'
]);
// utility
mix
.
scripts
([
'
utility.js
'
],
'
public/js/utility.js
'
);
mix
.
less
(
'
utility.less
'
,
'
public/css/utility.css
'
);
mix
.
version
([
'
js/utility.js
'
,
'
css/utility.css
'
]);
// beitritt
mix
.
less
(
'
metager/beitritt.less
'
,
'
public/css/beitritt.css
'
);
mix
.
version
([
'
css/beitritt.css
'
]);
// general versioning
mix
.
version
([
'
js/widgets.js
'
,
'
js/editLanguage.js
'
,
'
js/kontakt.js
'
,
'
js/scriptResultPage.js
'
,
'
js/scriptStartPage.js
'
,
'
js/settings.js
'
]);
mix
.
less
(
'
metager/beitritt.less
'
,
'
public/css/beitritt.css
'
)
mix
.
version
([
'
css/beitritt.css
'
])
mix
.
version
([
'
js/widgets.js
'
,
'
js/editLanguage.js
'
,
'
js/kontakt.js
'
,
'
js/scriptResultPage.js
'
,
'
js/scriptStartPage.js
'
,
'
js/settings.js
'
])
})
resources/assets/js/scriptResultPage.js
View file @
3b56d73c
$
(
document
).
ready
(
function
()
{
activateJSOnlyContent
();
createCustomFocuses
();
var
focus
=
$
(
'
#foki > li.active > a
'
).
attr
(
'
aria-controls
'
);
var
custom
=
$
(
'
#foki > li.active
'
).
hasClass
(
'
custom-focus-tab-selector
'
);
...
...
@@ -10,6 +11,11 @@ $(document).ready(function () {
}
});
function
activateJSOnlyContent
()
{
$
(
'
#searchplugin
'
).
removeClass
(
'
hide
'
);
$
(
'
.options
'
).
removeClass
(
'
hide
'
);
}
function
tabs
()
{
$
(
'
#foki > li.tab-selector > a
'
).
each
(
function
()
{
if
(
$
(
this
).
attr
(
'
target
'
)
!=
'
_blank
'
)
{
...
...
@@ -36,6 +42,7 @@ function tabs () {
}
function
getDocumentReadyForUse
(
fokus
,
custom
=
false
)
{
activateJSOnlyContent
();
clickLog
();
popovers
();
if
(
fokus
===
'
bilder
'
)
imageLoader
();
...
...
resources/assets/js/scriptStartPage.js
View file @
3b56d73c
...
...
@@ -5,6 +5,7 @@ $(document).ready(function () {
if
(
location
.
href
.
indexOf
(
'
#plugin-modal
'
)
>
-
1
)
{
$
(
'
#plugin-modal
'
).
modal
(
'
show
'
);
}
$
(
'
#addFocusBtn
'
).
removeClass
(
'
hide
'
);
$
(
'
button
'
).
popover
();
loadLocalStorage
();
...
...
resources/assets/js/utility.js
deleted
100644 → 0
View file @
055edeb5
$
(
document
).
ready
(
function
()
{
$
(
'
.js-only
'
).
removeClass
(
'
js-only
'
);
});
resources/assets/less/utility.less
deleted
100644 → 0
View file @
055edeb5
.js-only {
display: none !important;
}
\ No newline at end of file
resources/views/index.blade.php
View file @
3b56d73c
...
...
@@ -252,7 +252,7 @@
</
div
>
@
endif
<
div
id
=
"addFocusBtnDiv"
>
<
button
id
=
"addFocusBtn"
class
=
"btn btn-default
js-only
"
>
<
button
id
=
"addFocusBtn"
class
=
"btn btn-default
hide
"
>
<
i
class
=
"fa fa-plus"
aria
-
hidden
=
"true"
></
i
>
</
button
>
</
div
>
...
...
@@ -265,7 +265,7 @@
<
fieldset
>
<
form
id
=
"searchForm"
@
if
(
Request
::
has
(
'request'
)
&&
Request
::
input
(
'request'
)
===
"POST"
)
method
=
"POST"
@
elseif
(
Request
::
has
(
'request'
)
&&
Request
::
input
(
'request'
)
===
"GET"
)
method
=
"GET"
@
else
method
=
"GET"
@
endif
action
=
"{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
/
meta
/
meta
.
ger3
") }}"
accept
-
charset
=
"UTF-8"
>
<
div
class
=
"input-group"
>
<
div
class
=
"input-group-addon
js-only
"
>
<
div
class
=
"input-group-addon"
>
<
button
type
=
"button"
data
-
toggle
=
"popover"
data
-
html
=
"true"
data
-
container
=
"body"
title
=
"{{ trans('index.design') }}"
data
-
content
=
'<ul id="color-chooser" class="list-inline list-unstyled">
<li ><a id="standard" data-rgba="255,194,107,1" href="#"></a></li>
<li ><a id="standardHard" data-rgba="255,128,0,1" href="#"></a></li>
...
...
@@ -305,11 +305,11 @@
</
form
>
</
fieldset
>
<
ul
class
=
"list-inline searchform-bonus"
>
<
li
id
=
"plug"
@
unless
(
$browser
===
'Firefox'
||
$browser
===
'Mozilla'
||
$browser
===
'Chrome'
||
$browser
===
'Opera'
||
$browser
===
'IE'
||
$browser
===
'Edge'
||
$browser
===
'Safari'
||
$browser
===
'Vivaldi'
)
<
li
id
=
"plug"
class
=
"js-only"
>
<
a
href
=
"#"
data
-
toggle
=
"modal"
data
-
target
=
"#plugin-modal"
class
=
"btn btn-default mutelink"
title
=
"{{ trans('index.plugintitle') }}"
><
i
class
=
"fa fa-plug"
aria
-
hidden
=
"true"
></
i
>
{{
trans
(
'index.plugin'
)
}}
</
a
>
</
li
>
@
endunless
class
=
"hidden"
@
endunless
>
<
a
href
=
"#"
data
-
toggle
=
"modal"
data
-
target
=
"#plugin-modal"
class
=
"btn btn-default mutelink"
title
=
"{{ trans('index.plugintitle') }}"
><
i
class
=
"fa fa-plug"
aria
-
hidden
=
"true"
></
i
>
{{
trans
(
'index.plugin'
)
}}
</
a
></
li
>
@
if
(
LaravelLocalization
::
getCurrentLocale
()
==
"de"
)
<
li
>
<
a
href
=
"https://suma-ev.de/presse/Werbefreie-Suche-mit-MetaGer.html"
target
=
"_blank"
class
=
"btn btn-default mutelink"
>
...
...
@@ -319,7 +319,6 @@
@
endif
</
ul
>
<
script
src
=
"{{ elixir('js/scriptStartPage.js') }}"
></
script
>
<
script
type
=
"text/javascript"
src
=
"{{ elixir('js/utility.js') }}"
></
script
>
@
endsection
@
section
(
'optionalContent'
)
...
...
resources/views/layouts/researchandtabs.blade.php
View file @
3b56d73c
@
if
(
strpos
(
rtrim
(
Request
::
header
(
'REFERER'
),
'/'
),
LaravelLocalization
::
getLocalizedURL
(
LaravelLocalization
::
getCurrentLocale
(),
"/"
)
)
===
0
&&
(
$browser
===
'Firefox'
||
$browser
===
'Mozilla'
||
$browser
===
'Chrome'
||
$browser
===
'IE'
||
$browser
===
'Edge'
)
)
<
div
id
=
"searchplugin"
class
=
"alert alert-warning alert-dismissible
js-only
"
role
=
"alert"
style
=
""
>
<
div
id
=
"searchplugin"
class
=
"alert alert-warning alert-dismissible
hide
"
role
=
"alert"
style
=
""
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"alert"
aria
-
label
=
"Close"
><
span
aria
-
hidden
=
"true"
>&
times
;
</
span
></
button
>
{
!!
trans
(
'researchandtabs.plugin.1'
,
[
'browser'
=>
$browser
])
!!
}
<
br
/>
...
...
resources/views/layouts/result.blade.php
View file @
3b56d73c
...
...
@@ -16,7 +16,7 @@
{{ $result->anzeigeLink }}
</a>
</div>
<div
class=
"options
js-only
"
>
<div
class=
"options
hide
"
>
<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)
<i
class=
"fa fa-caret-down"
aria-hidden=
"true"
></i>
...
...
resources/views/layouts/resultPage.blade.php
View file @
3b56d73c
...
...
@@ -16,7 +16,6 @@
<link
type=
"text/css"
rel=
"stylesheet"
href=
"/css/lightslider.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"/font-awesome/css/font-awesome.min.css"
/>
<link
id=
"theme"
type=
"text/css"
rel=
"stylesheet"
href=
"/css/theme.css.php"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"{{ elixir('css/utility.css') }}"
/>
</head>
<body
id=
"resultBody"
>
@if( !isset($suspendheader) )
...
...
@@ -50,6 +49,5 @@
<img
src=
"{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}"
class=
"hidden"
/>
<script
type=
"text/javascript"
src=
"{{ elixir('js/lib.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ elixir('js/scriptResultPage.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ elixir('js/utility.js') }}"
></script>
</body>
</html>
resources/views/layouts/staticPages.blade.php
View file @
3b56d73c
...
...
@@ -18,7 +18,6 @@
<link
type=
"text/css"
rel=
"stylesheet"
href=
"/font-awesome/css/font-awesome.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"{{ elixir('css/themes/default.css') }}"
/>
<link
id=
"theme"
type=
"text/css"
rel=
"stylesheet"
href=
"/css/theme.css.php"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"{{ elixir('css/utility.css') }}"
/>
@if (isset($css))
@if(is_array($css))
@foreach($css as $el)
...
...
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