Add components for dropdown items (jenkinsci#8827)

* Init * Update taglib * Add docs * Add additional docs * Update header.jelly * Remove translations * Linting * Update utils.js * Add clazz * Update templates.js * Address comments * Fix failing tests due to JS change * Update templates.js * Fix properties not being set correctly * XML escape clazz, URL and ID --------- Co-authored-by: Mark Waite <[email protected]>
krisstern · Mar 14, 2024 · 730c59f · 730c59f
1 parent 471bf22
commit 730c59f
Show file tree

Hide file tree

Showing 49 changed files with 345 additions and 266 deletions.
diff --git a/core/src/main/resources/hudson/PluginManager/available.jelly b/core/src/main/resources/hudson/PluginManager/available.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
   List of available new plugins
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form" xmlns:dd="/lib/layout/dropdowns">
   <l:layout title="${%Available plugins} - ${%Plugins}" permission="${app.SYSTEM_READ}">
     <st:include page="sidepanel.jelly"/>
     <!-- no need for additional breadcrumb here as the side panel offers enough functionality to browse between different pages -->
@@ -53,12 +53,14 @@ THE SOFTWARE.
                                 icon="symbol-chevron-down"
                                 tooltip="${null}"
                                 clazz="jenkins-button--primary">
-                <button form="form" type="submit" class="jenkins-dropdown__item">
-                  <div class="jenkins-dropdown__item__icon">
-                    <l:icon src="symbol-download" />
-                  </div>
-                  ${%Install after restart}
-                </button>
+                <dd:custom>
+                  <button form="form" type="submit" class="jenkins-dropdown__item">
+                    <div class="jenkins-dropdown__item__icon">
+                      <l:icon src="symbol-download" />
+                    </div>
+                    ${%Install after restart}
+                  </button>
+                </dd:custom>
               </l:overflowButton>
             </div>
           </l:isAdmin>

diff --git a/core/src/main/resources/hudson/logging/LogRecorder/index.jelly b/core/src/main/resources/hudson/logging/LogRecorder/index.jelly
@@ -26,7 +26,8 @@ THE SOFTWARE.
   Log view
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:dd="/lib/layout/dropdowns">
 <l:layout title="Log" permission="${app.SYSTEM_READ}" type="one-column">
   <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
   <l:main-panel>
@@ -46,19 +47,21 @@ THE SOFTWARE.
         </a>
       </l:isAdmin>
       <l:overflowButton>
-        <span class="jenkins-dropdown__heading">${%Atom feed}</span>
+        <dd:header text="${%Atom feed}" />
         <st:include it="${it.parent}" page="feeds.jelly" />
         <l:isAdmin>
-          <div class="jenkins-dropdown__separator"></div>
-          <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
-                              href="doDelete"
-                              message="${%delete.logrecorder(it.displayName)}"
-                              post="true">
-            <div class="jenkins-dropdown__item__icon">
-              <l:icon src="symbol-trash" />
-            </div>
-            ${%Delete log recorder}
-          </l:confirmationLink>
+          <dd:separator />
+          <dd:custom>
+            <l:confirmationLink class="jenkins-dropdown__item jenkins-!-destructive-color"
+                                href="doDelete"
+                                message="${%delete.logrecorder(it.displayName)}"
+                                post="true">
+              <div class="jenkins-dropdown__item__icon">
+                <l:icon src="symbol-trash" />
+              </div>
+              ${%Delete log recorder}
+            </l:confirmationLink>
+          </dd:custom>
         </l:isAdmin>
       </l:overflowButton>
     </l:app-bar>

diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly
@@ -24,23 +24,14 @@ THE SOFTWARE.
 
 <!-- list of feed links -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-    <a class="jenkins-dropdown__item" href="rss">
-        <div class="jenkins-dropdown__item__icon">
-            <l:icon src="symbol-rss" />
-        </div>
-        ${%All}
-    </a>
-    <a class="jenkins-dropdown__item" href="rss?level=WARNING">
-        <div class="jenkins-dropdown__item__icon">
-            <l:icon src="symbol-rss" />
-        </div>
-        ${%WARNING}
-    </a>
-    <a class="jenkins-dropdown__item" href="rss?level=SEVERE">
-        <div class="jenkins-dropdown__item__icon">
-            <l:icon src="symbol-rss" />
-        </div>
-        ${%SEVERE}
-    </a>
+<j:jelly xmlns:j="jelly:core" xmlns:dd="/lib/layout/dropdowns">
+    <dd:item icon="symbol-rss"
+             text="${%All}"
+             href="rss" />
+    <dd:item icon="symbol-rss"
+             text="${%WARNING}"
+             href="rss?level=WARNING" />
+    <dd:item icon="symbol-rss"
+             text="${%SEVERE}"
+             href="rss?level=SEVERE" />
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/rssBar.jelly b/core/src/main/resources/lib/hudson/rssBar.jelly
@@ -23,24 +23,17 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
-         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:dd="/lib/layout/dropdowns" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
   <div id="rss-bar" class="jenkins-buttons-row jenkins-buttons-row--invert">
-    <button class="jenkins-button jenkins-button--tertiary" id="button-icon-legend">
-      ${%Legend}
-    </button>
-    <a href="rssAll" class="jenkins-button jenkins-button--tertiary">
-      <l:icon src="symbol-rss" />
-      <span>Atom feed ${%forAll}</span>
-    </a>
-    <a href="rssFailed" class="jenkins-button jenkins-button--tertiary">
-      <l:icon src="symbol-rss" />
-      <span>Atom feed ${%forFailures}</span>
-    </a>
-    <a href="rssLatest" class="jenkins-button jenkins-button--tertiary">
-      <l:icon src="symbol-rss" />
-      <span>Atom feed ${%justLatestBuilds}</span>
-    </a>
+    <l:overflowButton clazz="jenkins-button--tertiary">
+      <dd:item icon="symbol-information-circle" id="button-icon-legend" text="${%Legend}" />
+      <dd:separator />
+      <dd:submenu icon="symbol-rss" text="${%Atom feed}">
+        <dd:item icon="symbol-rss" text="${%All}" href="rssAll" />
+        <dd:item icon="symbol-rss" text="${%Failures}" href="rssFailed" />
+        <dd:item icon="symbol-rss" text="${%LatestBuilds}" href="rssLatest" />
+      </dd:submenu>
+    </l:overflowButton>
   </div>
 
   <template id="template-icon-legend" data-title="${%Icon legend}">

diff --git a/core/src/main/resources/lib/hudson/rssBar.properties b/core/src/main/resources/lib/hudson/rssBar.properties
@@ -22,6 +22,6 @@
 # THE SOFTWARE.
 
 Legend=Icon legend
-forAll=for all
-forFailures=for failures
-justLatestBuilds=for just latest builds
+All=All
+Failures=Failures
+LatestBuilds=Latest builds
diff --git a/core/src/main/resources/lib/hudson/rssBar_bg.properties b/core/src/main/resources/lib/hudson/rssBar_bg.properties
@@ -22,9 +22,3 @@
 
 Legend=\
  Легенда
-for\ all=\
- За всички
-for\ failures=\
- За неуспешните
-for\ just\ latest\ builds=\
- Само за последните
diff --git a/core/src/main/resources/lib/hudson/rssBar_ca.properties b/core/src/main/resources/lib/hudson/rssBar_ca.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Llegenda
-for\ all=per a tot
-for\ failures=per a les fallades
-for\ just\ latest\ builds=només per als darrers muntatges
diff --git a/core/src/main/resources/lib/hudson/rssBar_cs.properties b/core/src/main/resources/lib/hudson/rssBar_cs.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Vysvětlivky
-for\ all=pro vše
-for\ failures=pro neúspěšné
-for\ just\ latest\ builds=pro poslední buildy
diff --git a/core/src/main/resources/lib/hudson/rssBar_da.properties b/core/src/main/resources/lib/hudson/rssBar_da.properties
@@ -20,7 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-for\ just\ latest\ builds=kun for seneste byggerier
-for\ failures=for fejl
-for\ all=for alle
 Legend=Beskrivelse
diff --git a/core/src/main/resources/lib/hudson/rssBar_de.properties b/core/src/main/resources/lib/hudson/rssBar_de.properties
@@ -21,7 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legende
-for\ all=Alle Builds
-for\ failures=Nur Fehlschläge
-for\ just\ latest\ builds=Nur jeweils letzter Build
-Icon\ legend=Legende
diff --git a/core/src/main/resources/lib/hudson/rssBar_el.properties b/core/src/main/resources/lib/hudson/rssBar_el.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Υπόμνημα
-for\ all=για όλα
-for\ failures=για τις αποτυχίες
-for\ just\ latest\ builds=μονο για τις πρόσφατες διεργασίες
diff --git a/core/src/main/resources/lib/hudson/rssBar_es.properties b/core/src/main/resources/lib/hudson/rssBar_es.properties
@@ -22,7 +22,3 @@
 # THE SOFTWARE.
 
 Legend=Guía de iconos
-for\ all=para todos
-for\ failures=para fallas
-for\ just\ latest\ builds=para los más recientes
-
diff --git a/core/src/main/resources/lib/hudson/rssBar_es_AR.properties b/core/src/main/resources/lib/hudson/rssBar_es_AR.properties
@@ -1,6 +1,3 @@
 # This file is under the MIT License by authors
 
 Legend=Leyenda
-for\ all=para todos
-for\ failures=para las fallas
-for\ just\ latest\ builds=sólo para los últimos trabajos
diff --git a/core/src/main/resources/lib/hudson/rssBar_et.properties b/core/src/main/resources/lib/hudson/rssBar_et.properties
diff --git a/core/src/main/resources/lib/hudson/rssBar_fi.properties b/core/src/main/resources/lib/hudson/rssBar_fi.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Selite
-for\ all=kaikista
-for\ failures=epäonnistuneista
-for\ just\ latest\ builds=vain viimeisimmistä
diff --git a/core/src/main/resources/lib/hudson/rssBar_fr.properties b/core/src/main/resources/lib/hudson/rssBar_fr.properties
@@ -21,7 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Légende
-for\ all=pour tout
-for\ failures=de tous les échecs
-for\ just\ latest\ builds=juste pour les dernières compilations
-
diff --git a/core/src/main/resources/lib/hudson/rssBar_he.properties b/core/src/main/resources/lib/hudson/rssBar_he.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=תיאור
-for\ all=עבור כולם
-for\ failures=עבור כשלונות
-for\ just\ latest\ builds=רק עבור הבניות האחרונות
diff --git a/core/src/main/resources/lib/hudson/rssBar_hu.properties b/core/src/main/resources/lib/hudson/rssBar_hu.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Jelmagyarázat
-for\ all=mindegyikre
-for\ failures=sikertelenekre
-for\ just\ latest\ builds=csak a legutóbbi építésekre
diff --git a/core/src/main/resources/lib/hudson/rssBar_it.properties b/core/src/main/resources/lib/hudson/rssBar_it.properties
@@ -21,7 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-for\ all=per tutte le compilazioni
-for\ failures=per le compilazioni non riuscite
-for\ just\ latest\ builds=solo per le ultime compilazioni
 Legend=Legenda
diff --git a/core/src/main/resources/lib/hudson/rssBar_ja.properties b/core/src/main/resources/lib/hudson/rssBar_ja.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=凡例
-for\ all=全ビルド
-for\ failures=失敗ビルド
-for\ just\ latest\ builds=最新ビルドのみ
diff --git a/core/src/main/resources/lib/hudson/rssBar_ko.properties b/core/src/main/resources/lib/hudson/rssBar_ko.properties
diff --git a/core/src/main/resources/lib/hudson/rssBar_lt.properties b/core/src/main/resources/lib/hudson/rssBar_lt.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Aprašymas
-for\ all=visiems
-for\ failures=nepavykusios užduotims
-for\ just\ latest\ builds=tik paskutinėms užduotims
diff --git a/core/src/main/resources/lib/hudson/rssBar_lv.properties b/core/src/main/resources/lib/hudson/rssBar_lv.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Leģenda
-for\ all=visiem
-for\ failures=kļūmēm
-for\ just\ latest\ builds=pēdējiem būvējumiem
diff --git a/core/src/main/resources/lib/hudson/rssBar_nb_NO.properties b/core/src/main/resources/lib/hudson/rssBar_nb_NO.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Tegnforklaring
-for\ all=for alle bygg
-for\ failures=for feilede bygg
-for\ just\ latest\ builds=for kun de siste byggene
diff --git a/core/src/main/resources/lib/hudson/rssBar_nl.properties b/core/src/main/resources/lib/hudson/rssBar_nl.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legenda
-for\ all=van alles
-for\ failures=van gefaalde
-for\ just\ latest\ builds=enkel de laatste uitvoerpogingen
diff --git a/core/src/main/resources/lib/hudson/rssBar_pl.properties b/core/src/main/resources/lib/hudson/rssBar_pl.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legenda
-for\ all=dla wszystkich
-for\ failures=tylko niepowodzenia
-for\ just\ latest\ builds=tylko dla najnowszych
diff --git a/core/src/main/resources/lib/hudson/rssBar_pt_BR.properties b/core/src/main/resources/lib/hudson/rssBar_pt_BR.properties
diff --git a/core/src/main/resources/lib/hudson/rssBar_pt_PT.properties b/core/src/main/resources/lib/hudson/rssBar_pt_PT.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legenda
-for\ all=para todos
-for\ failures=só para falhas
-for\ just\ latest\ builds=só para últimas builds
diff --git a/core/src/main/resources/lib/hudson/rssBar_ro.properties b/core/src/main/resources/lib/hudson/rssBar_ro.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legendă
-for\ all=pentru toate
-for\ failures=pentru eşecuri
-for\ just\ latest\ builds=doar pentru ultimele build-uri
diff --git a/core/src/main/resources/lib/hudson/rssBar_ru.properties b/core/src/main/resources/lib/hudson/rssBar_ru.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Помощь
-for\ all=для всех сборок
-for\ failures=для неудачных сборок
-for\ just\ latest\ builds=Для последних сборок
diff --git a/core/src/main/resources/lib/hudson/rssBar_sk.properties b/core/src/main/resources/lib/hudson/rssBar_sk.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legenda
-for\ all=pre všetko
-for\ failures=pre neúspechy
-for\ just\ latest\ builds=pre posledné zostavenia
diff --git a/core/src/main/resources/lib/hudson/rssBar_sl.properties b/core/src/main/resources/lib/hudson/rssBar_sl.properties
@@ -21,6 +21,3 @@
 # THE SOFTWARE.
 
 Legend=Legenda
-for\ all=Za vse
-for\ failures=Za neuspehe
-for\ just\ latest\ builds=Samo za zadnje različice
diff --git a/core/src/main/resources/lib/hudson/rssBar_sr.properties b/core/src/main/resources/lib/hudson/rssBar_sr.properties
@@ -1,6 +1,3 @@
 # This file is under the MIT License by authors
 
 Legend=Легенда
-for\ all=за све
-for\ failures=за неуспешне
-for\ just\ latest\ builds=само за најновије изградње