mirror of
https://github.com/documize/community.git
synced 2025-08-02 20:15:26 +02:00
Change Search & Profile views to use new UX/UI
This commit is contained in:
Harvey Kandola
parent
0ec0c65002
commit
8a654fcf3d
10 changed files with 113 additions and 103 deletions
|
|
@ -10,9 +10,8 @@
|
|||
// https://documize.com
|
||||
|
||||
import { inject as service } from '@ember/service';
|
||||
|
||||
import Controller from '@ember/controller';
|
||||
import { isPresent } from '@ember/utils';
|
||||
import Controller from '@ember/controller';
|
||||
|
||||
export default Controller.extend({
|
||||
userService: service('user'),
|
||||
|
|
|
|||
|
|
@ -1,18 +1,11 @@
|
|||
{{#layout/top-bar}}
|
||||
{{/layout/top-bar}}
|
||||
{{#layout/master-sidebar}}
|
||||
{{/layout/master-sidebar}}
|
||||
|
||||
{{#layout/middle-zone}}
|
||||
{{#layout/middle-zone-content}}
|
||||
{{user/user-profile model=model save=(action "save")}}
|
||||
{{/layout/middle-zone-content}}
|
||||
{{#layout/master-content}}
|
||||
{{layout/logo-heading
|
||||
title=session.user.fullname
|
||||
desc="Manage you profile and password"
|
||||
icon=constants.Icon.Person}}
|
||||
|
||||
{{#layout/middle-zone-sidebar}}
|
||||
<div id="sidebar" class="sidebar sidebar-center">
|
||||
<h1>{{session.user.fullname}}</h1>
|
||||
<div class="avatar-large my-3">{{session.user.initials}}</div>
|
||||
</div>
|
||||
{{/layout/middle-zone-sidebar}}
|
||||
{{/layout/middle-zone}}
|
||||
|
||||
{{#layout/bottom-bar}}
|
||||
{{/layout/bottom-bar}}
|
||||
{{user/user-profile model=model save=(action "save")}}
|
||||
{{/layout/master-content}}
|
||||
|
|
|
|||
|
|
@ -1,49 +1,77 @@
|
|||
{{#layout/top-bar}}
|
||||
{{/layout/top-bar}}
|
||||
{{#layout/master-sidebar selectedItem="search"}}
|
||||
{{ui/ui-spacer size=300}}
|
||||
|
||||
{{#layout/middle-zone}}
|
||||
{{#layout/middle-zone-content}}
|
||||
{{search/search-view filter=filter matchDoc=matchDoc matchContent=matchContent matchTag=matchTag matchFile=matchFile slog=slog}}
|
||||
{{/layout/middle-zone-content}}
|
||||
|
||||
{{#layout/middle-zone-sidebar scrollable=true}}
|
||||
<div id="sidebar" class="sidebar">
|
||||
<h1>Search</h1>
|
||||
<div class="view-search">
|
||||
{{#if (eq appMeta.storageProvider constants.StoreProvider.MySQL)}}
|
||||
<div class="syntax">
|
||||
<div class="example">apple banana</div>
|
||||
<div class="explain">Show results that contain at least one of the two words</div>
|
||||
<div class="example">+apple +banana</div>
|
||||
<div class="explain">Show results that contain both words</div>
|
||||
<div class="example">+apple macintosh</div>
|
||||
<div class="explain">Show results that contain the word "apple", but rank rows higher if they also contain "macintosh"</div>
|
||||
<div class="example">+apple -macintosh</div>
|
||||
<div class="explain">Show results that contain the word "apple" but not "macintosh"</div>
|
||||
<div class="example">+apple +(>turnover <strudel)</div>
|
||||
<div class="explain">Show results that contain the words "apple" and "turnover", or "apple" and "strudel" (in any order), but rank "apple turnover" higher than "apple strudel"</div>
|
||||
<div class="example">apple*</div>
|
||||
<div class="explain">Show results that contain words such as "apple", "apples", "applesauce", or "applet"</div>
|
||||
<div class="example">"some words"</div>
|
||||
<div class="explain">Show results that contain the exact phrase "some words" (for example, rows that contain "some words of wisdom" but not "some noise words")</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{#if (eq appMeta.storageProvider constants.StoreProvider.PostgreSQL)}}
|
||||
<div class="syntax">
|
||||
<div class="example">apple | banana</div>
|
||||
<div class="explain">Show results that contain at either word</div>
|
||||
<div class="example">apple & banana</div>
|
||||
<div class="explain">Show results that contain both words</div>
|
||||
<div class="example">apple !macintosh</div>
|
||||
<div class="explain">Show results that contain the word "apple" but not "macintosh"</div>
|
||||
<div class="example">google & (apple | microsoft) & !ibm</div>
|
||||
<div class="explain">Show results that have "google", either "apple" or "microsoft" but not "ibm"</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
<div class="section">
|
||||
<div class="title">Match Filter</div>
|
||||
<div class="list">
|
||||
<div class="item">
|
||||
{{input id="search-1" type="checkbox" checked=matchDoc}}
|
||||
<label for="search-1" class="name">Document name</label>
|
||||
</div>
|
||||
<div class="item">
|
||||
{{input id="search-2" type="checkbox" checked=matchContent}}
|
||||
<label for="search-2" class="name">Document content</label>
|
||||
</div>
|
||||
<div class="item">
|
||||
{{input id="search-3" type="checkbox" checked=matchTag}}
|
||||
<label for="search-3" class="name">Tag name</label>
|
||||
</div>
|
||||
<div class="item">
|
||||
{{input id="search-4" type="checkbox" checked=matchFile}}
|
||||
<label for="search-4" class="name">Attachment name</label>
|
||||
</div>
|
||||
</div>
|
||||
{{/layout/middle-zone-sidebar}}
|
||||
{{/layout/middle-zone}}
|
||||
</div>
|
||||
{{ui/ui-spacer size=200}}
|
||||
|
||||
{{#layout/bottom-bar}}
|
||||
{{/layout/bottom-bar}}
|
||||
<div class="section">
|
||||
<div class="title">query examples</div>
|
||||
<div class="view-search">
|
||||
{{#if (eq appMeta.storageProvider constants.StoreProvider.MySQL)}}
|
||||
<div class="syntax">
|
||||
<div class="example">apple banana</div>
|
||||
<div class="explain">Show results that contain at least one of the two words</div>
|
||||
<div class="example">+apple +banana</div>
|
||||
<div class="explain">Show results that contain both words</div>
|
||||
<div class="example">+apple macintosh</div>
|
||||
<div class="explain">Show results that contain the word "apple", but rank rows higher if they also contain "macintosh"</div>
|
||||
<div class="example">+apple -macintosh</div>
|
||||
<div class="explain">Show results that contain the word "apple" but not "macintosh"</div>
|
||||
<div class="example">+apple +(>turnover <strudel)</div>
|
||||
<div class="explain">Show results that contain the words "apple" and "turnover", or "apple" and "strudel" (in any order), but rank "apple turnover" higher than "apple strudel"</div>
|
||||
<div class="example">apple*</div>
|
||||
<div class="explain">Show results that contain words such as "apple", "apples", "applesauce", or "applet"</div>
|
||||
<div class="example">"some words"</div>
|
||||
<div class="explain">Show results that contain the exact phrase "some words" (for example, rows that contain "some words of wisdom" but not "some noise words")</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{#if (eq appMeta.storageProvider constants.StoreProvider.PostgreSQL)}}
|
||||
<div class="syntax">
|
||||
<div class="example">apple | banana</div>
|
||||
<div class="explain">Show results that contain at either word</div>
|
||||
<div class="example">apple & banana</div>
|
||||
<div class="explain">Show results that contain both words</div>
|
||||
<div class="example">apple !macintosh</div>
|
||||
<div class="explain">Show results that contain the word "apple" but not "macintosh"</div>
|
||||
<div class="example">google & (apple | microsoft) & !ibm</div>
|
||||
<div class="explain">Show results that have "google", either "apple" or "microsoft" but not "ibm"</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
{{/layout/master-sidebar}}
|
||||
|
||||
{{#layout/master-content}}
|
||||
{{layout/logo-heading
|
||||
title="Search"
|
||||
desc="Basic and advanced search queries"
|
||||
icon=constants.Icon.Search}}
|
||||
|
||||
{{search/search-view
|
||||
filter=filter
|
||||
matchDoc=matchDoc
|
||||
matchContent=matchContent
|
||||
matchTag=matchTag
|
||||
matchFile=matchFile
|
||||
slog=slog}}
|
||||
{{/layout/master-content}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue