diff --git a/lib/zin/wg/globalsearch/v1.php b/lib/zin/wg/globalsearch/v1.php index cecfd631ca..6367ac67da 100644 --- a/lib/zin/wg/globalsearch/v1.php +++ b/lib/zin/wg/globalsearch/v1.php @@ -17,7 +17,12 @@ class globalSearch extends wg $input = inputGroup ( - input(setID('globalSearchInput')), + set($this->getRestProps()), + input + ( + setID('globalSearchInput'), + set::placeholder($lang->index->pleaseInput), + ), btn ( set::icon('search'), diff --git a/module/index/css/index.ui.css b/module/index/css/index.ui.css index d716d2a0f9..63229be1e5 100644 --- a/module/index/css/index.ui.css +++ b/module/index/css/index.ui.css @@ -26,11 +26,11 @@ #appsBar {position: fixed; left: var(--zt-menu-width, 96px); bottom: 0; right: 0; height: var(--zt-apps-bar-height, 40px); background: var(--zt-apps-bar-bg, var(--color-canvas)); box-shadow: 0 -2px 12px rgba(0,0,0,.02); transition: left .2s;} .hide-menu #appsBar {left: var(--zt-menu-fold-width, 40px);} -#appTabs {position: absolute; left: 4px; right: 280px; top: 0; bottom: 0; user-select: none;} +#appTabs {position: absolute; left: 4px; right: 360px; top: 0; bottom: 0; user-select: none;} #appTabs > li > a {border-radius: var(--radius-md); opacity: .7;} #appTabs > li + li::before {display: block; content: ' '; position: absolute; left: 0; top: 8px; bottom: 8px; width: 1px; background: var(--color-inverse); opacity: .12;} #appTabs > li > a.active {opacity: 1; color: var(--color-primary-500)} -#appsToolbar {position: absolute; right: 4px; width: 280px; top: 0; bottom: 0; display: flex; justify-content: flex-end;} +#appsToolbar {position: absolute; right: 4px; width: 360px; top: 0; bottom: 0; display: flex; justify-content: flex-end;} #appsToolbar > .btn {color: inherit} #appsToolbar > .btn-zentao > .icon {color: var(--color-primary-400)} diff --git a/module/index/ui/index.html.php b/module/index/ui/index.html.php index 8e51b8aee7..b8abaff111 100644 --- a/module/index/ui/index.html.php +++ b/module/index/ui/index.html.php @@ -72,6 +72,11 @@ div ) ); +div +( + setID('apps'), +); + div ( setID('appsBar'), @@ -83,6 +88,16 @@ div toolbar ( setID('appsToolbar'), + globalSearch + ( + set::commonSearchUrl(''), + set::searchItems + ( + array( + // array('key' => '', 'text' => '', 'url' => ''), + ) + ), + ), item ( set::class('ghost btn-zentao'), @@ -92,12 +107,7 @@ div set::hint($version), set::text($versionName) ) - ) -); - -div -( - setID('apps'), + ), ); render('pagebase');