forked from jenkinsci/jenkins
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new-search-bar-component' into search-overhaul
- Loading branch information
Showing
16 changed files
with
390 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
core/src/main/resources/hudson/PluginManager/sidepanel.groovy
This file was deleted.
Oops, something went wrong.
117 changes: 117 additions & 0 deletions
117
core/src/main/resources/hudson/PluginManager/sidepanel.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <!-- | ||
| The MIT License | ||
| Copyright (c) 2022, Jenkins contributors | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| --> | ||
|
|
||
| <!-- | ||
| Sidepanel component for Plugins Manager | ||
| --> | ||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"> | ||
| <st:documentation> | ||
| <st:attribute name="page"> | ||
| Adds the highlighted class to the current page item in the list | ||
| </st:attribute> | ||
| </st:documentation> | ||
|
|
||
| <div id="tasks" class="app-plugin-manager__sidebar"> | ||
| <div class="jenkins-app-bar"> | ||
| <div class="jenkins-app-bar__content"> | ||
| <h1>${%Plugins}</h1> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="task"> | ||
| <span class="task-link-wrapper"> | ||
| <a href="./" class="task-link ${page == 'updates' ? 'task-link--active' : ''}"> | ||
| <div class="task-icon-link"> | ||
| <l:icon src="symbol-download" /> | ||
| </div> | ||
| <span class="task-icon-text"> | ||
| ${%Updates} | ||
| </span> | ||
| <j:if test="${app.updateCenter.updates.size() != 0}"> | ||
| <span class="task-icon-badge"> | ||
| ${app.updateCenter.updates.size()} | ||
| </span> | ||
| </j:if> | ||
| </a> | ||
| </span> | ||
| </div> | ||
|
|
||
| <div class="task"> | ||
| <span class="task-link-wrapper"> | ||
| <a href="./available" class="task-link ${page == 'available' ? 'task-link--active' : ''}"> | ||
| <div class="task-icon-link"> | ||
| <l:icon src="symbol-shopping-bag" /> | ||
| </div> | ||
| <span class="task-icon-text"> | ||
| ${%Available plugins} | ||
| </span> | ||
| </a> | ||
| </span> | ||
| </div> | ||
|
|
||
| <div class="task"> | ||
| <span class="task-link-wrapper"> | ||
| <a href="./installed" class="task-link ${page == 'installed' ? 'task-link--active' : ''}"> | ||
| <div class="task-icon-link"> | ||
| <l:icon src="symbol-plugins" /> | ||
| </div> | ||
| <span class="task-icon-text"> | ||
| ${%Installed plugins} | ||
| </span> | ||
| </a> | ||
| </span> | ||
| </div> | ||
|
|
||
| <div class="task"> | ||
| <span class="task-link-wrapper"> | ||
| <a href="./advanced" class="task-link ${page == 'advanced' ? 'task-link--active' : ''}"> | ||
| <div class="task-icon-link"> | ||
| <l:icon src="symbol-settings" /> | ||
| </div> | ||
| <span class="task-icon-text"> | ||
| ${%Advanced settings} | ||
| </span> | ||
| </a> | ||
| </span> | ||
| </div> | ||
|
|
||
| <j:if test="${!app.updateCenter.jobs.isEmpty()}"> | ||
| <hr /> | ||
|
|
||
| <div class="task"> | ||
| <span class="task-link-wrapper"> | ||
| <a href="../updateCenter" class="task-link"> | ||
| <div class="task-icon-link"> | ||
| <l:icon src="symbol-list" /> | ||
| </div> | ||
| <span class="task-icon-text"> | ||
| ${%Update Center} | ||
| </span> | ||
| </a> | ||
| </span> | ||
| </div> | ||
| </j:if> | ||
| </div> | ||
| </j:jelly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <!-- | ||
| The MIT License | ||
| Copyright (c) 2022 Jan Faracik | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| --> | ||
|
|
||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout"> | ||
| <st:documentation> | ||
| <st:attribute name="value" /> | ||
| <st:attribute name="placeholder" /> | ||
| <st:attribute name="id" /> | ||
| <st:attribute name="autofocus" /> | ||
| <st:attribute name="clazz" /> | ||
| </st:documentation> | ||
|
|
||
| <div class="jenkins-search ${attrs.clazz}"> | ||
| <div class="jenkins-search__icon"> | ||
| <l:icon src="symbol-search" /> | ||
| </div> | ||
| <input value="${attrs.value}" | ||
| id="${attrs.id}" | ||
| class="jenkins-search__input" | ||
| placeholder="${attrs.placeholder ?: '%Search'}" | ||
| type="search" | ||
| autofocus="${attrs.autofocus}" | ||
| autocomplete="off" | ||
| autocorrect="off" | ||
| autocapitalize="off" | ||
| spellcheck="false" /> | ||
| <div class="jenkins-search__shortcut" tooltip="Press / on your keyboard to focus"> | ||
| <l:icon src="symbol-search-shortcut" /> | ||
| </div> | ||
| </div> | ||
| </j:jelly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.