mirror of https://github.com/Lissy93/dashy.git
🌐 Adds note for web search
This commit is contained in:
parent
438693c8db
commit
30bb4fdf5f
|
@ -6,7 +6,8 @@
|
||||||
"search": {
|
"search": {
|
||||||
"search-label": "Search",
|
"search-label": "Search",
|
||||||
"search-placeholder": "Start typing to filter",
|
"search-placeholder": "Start typing to filter",
|
||||||
"clear-search-tooltip": "Clear Search"
|
"clear-search-tooltip": "Clear Search",
|
||||||
|
"enter-to-search-web": "Press enter to search the web"
|
||||||
},
|
},
|
||||||
"login": {
|
"login": {
|
||||||
"title": "Dashy",
|
"title": "Dashy",
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<form @submit.prevent="searchSubmitted">
|
<form @submit.prevent="searchSubmitted">
|
||||||
<label for="filter-tiles">{{ $t('search.search-label') }}</label>
|
<label for="filter-tiles">{{ $t('search.search-label') }}</label>
|
||||||
|
<div class="search-wrap">
|
||||||
<input
|
<input
|
||||||
id="filter-tiles"
|
id="filter-tiles"
|
||||||
v-model="input"
|
v-model="input"
|
||||||
|
@ -8,6 +9,10 @@
|
||||||
:placeholder="$t('search.search-placeholder')"
|
:placeholder="$t('search.search-placeholder')"
|
||||||
v-on:input="userIsTypingSomething"
|
v-on:input="userIsTypingSomething"
|
||||||
@keydown.esc="clearFilterInput" />
|
@keydown.esc="clearFilterInput" />
|
||||||
|
<p v-if="webSearchEnabled && input.length > 0" class="web-search-note">
|
||||||
|
{{ $t('search.enter-to-search-web') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
<i v-if="input.length > 0"
|
<i v-if="input.length > 0"
|
||||||
class="clear-search"
|
class="clear-search"
|
||||||
:title="$t('search.clear-search-tooltip')"
|
:title="$t('search.clear-search-tooltip')"
|
||||||
|
@ -35,6 +40,15 @@ export default {
|
||||||
getCustomKeyShortcuts,
|
getCustomKeyShortcuts,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
computed: {
|
||||||
|
webSearchEnabled() {
|
||||||
|
const { appConfig } = this.config;
|
||||||
|
if (appConfig && appConfig.webSearch) {
|
||||||
|
return !appConfig.webSearch.disableWebSearch;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
window.addEventListener('keydown', (event) => {
|
window.addEventListener('keydown', (event) => {
|
||||||
const currentElem = document.activeElement.id;
|
const currentElem = document.activeElement.id;
|
||||||
|
@ -97,7 +111,7 @@ export default {
|
||||||
// Get search preferences from appConfig
|
// Get search preferences from appConfig
|
||||||
const { appConfig } = this.config;
|
const { appConfig } = this.config;
|
||||||
const searchPrefs = appConfig.webSearch || {};
|
const searchPrefs = appConfig.webSearch || {};
|
||||||
if (!searchPrefs.disableWebSearch) { // Only proceed if user hasn't disabled web search
|
if (this.webSearchEnabled) { // Only proceed if user hasn't disabled web search
|
||||||
const openingMethod = searchPrefs.openingMethod || defaultSearchOpeningMethod;
|
const openingMethod = searchPrefs.openingMethod || defaultSearchOpeningMethod;
|
||||||
// Get search engine, and make URL
|
// Get search engine, and make URL
|
||||||
const searchEngine = searchPrefs.searchEngine || defaultSearchEngine;
|
const searchEngine = searchPrefs.searchEngine || defaultSearchEngine;
|
||||||
|
@ -131,6 +145,17 @@ export default {
|
||||||
border-radius: 0 0 var(--curve-factor-navbar) 0;
|
border-radius: 0 0 var(--curve-factor-navbar) 0;
|
||||||
padding: 0 0.2rem 0.2rem 0;
|
padding: 0 0.2rem 0.2rem 0;
|
||||||
background: var(--search-container-background);
|
background: var(--search-container-background);
|
||||||
|
.search-wrap {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
p.web-search-note {
|
||||||
|
margin: 0 0.5rem;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--minimal-view-search-color);
|
||||||
|
opacity: var(--dimming-factor);
|
||||||
|
}
|
||||||
|
}
|
||||||
label {
|
label {
|
||||||
display: inline;
|
display: inline;
|
||||||
color: var(--search-label-color);
|
color: var(--search-label-color);
|
||||||
|
@ -157,7 +182,7 @@ export default {
|
||||||
.clear-search {
|
.clear-search {
|
||||||
//position: absolute;
|
//position: absolute;
|
||||||
color: var(--settings-text-color);
|
color: var(--settings-text-color);
|
||||||
padding: 0 0.4rem;
|
padding: 0 0.3rem 0.1rem 0.3rem;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
opacity: var(--dimming-factor);
|
opacity: var(--dimming-factor);
|
||||||
|
@ -167,7 +192,7 @@ export default {
|
||||||
top: 1rem;
|
top: 1rem;
|
||||||
border: 1px solid var(--settings-text-color);
|
border: 1px solid var(--settings-text-color);
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
margin: 0.5rem;
|
margin: 0.25rem;
|
||||||
&:hover {
|
&:hover {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
background: var(--background-darker);
|
background: var(--background-darker);
|
||||||
|
|
Loading…
Reference in New Issue