Skip to content

Commit

Permalink
Merge pull request #42431 from nextcloud/42094-manual-backport
Browse files Browse the repository at this point in the history
[stable28] Rename "global search" to "unified search"
  • Loading branch information
emoral435 committed Dec 22, 2023
2 parents fecb3ea + 525c2b8 commit f7080c5
Show file tree
Hide file tree
Showing 38 changed files with 1,420 additions and 1,423 deletions.
169 changes: 0 additions & 169 deletions core/src/components/GlobalSearch/SearchResult.vue

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<template>
<NcModal v-if="isModalOpen"
id="global-search"
id="unified-search"
:name="t('core', 'Custom date range')"
:show.sync="isModalOpen"
:size="'small'"
:clear-view-delay="0"
:title="t('core', 'Custom date range')"
@close="closeModal">
<!-- Custom date range -->
<div class="global-search-custom-date-modal">
<div class="unified-search-custom-date-modal">
<h1>{{ t('core', 'Custom date range') }}</h1>
<div class="global-search-custom-date-modal__pickers">
<NcDateTimePicker :id="'globalsearch-custom-date-range-start'"
<div class="unified-search-custom-date-modal__pickers">
<NcDateTimePicker :id="'unifiedsearch-custom-date-range-start'"
v-model="dateFilter.startFrom"
:label="t('core', 'Pick start date')"
type="date" />
<NcDateTimePicker :id="'globalsearch-custom-date-range-end'"
<NcDateTimePicker :id="'unifiedsearch-custom-date-range-end'"
v-model="dateFilter.endAt"
:label="t('core', 'Pick end date')"
type="date" />
</div>
<div class="global-search-custom-date-modal__footer">
<div class="unified-search-custom-date-modal__footer">
<NcButton @click="applyCustomRange">
{{ t('core', 'Search in date range') }}
<template #icon>
Expand Down Expand Up @@ -80,7 +80,7 @@ export default {
</script>

<style lang="scss" scoped>
.global-search-custom-date-modal {
.unified-search-custom-date-modal {
padding: 10px 20px 10px 20px;
h1 {
Expand Down

0 comments on commit f7080c5

Please sign in to comment.