-
+
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
index 41e4d5b9689f..dfeb5024042c 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
@@ -21,5 +21,7 @@
# THE SOFTWARE.
title=Account
-Full\ name=Full Name
+Full\ name=Full name
+Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID
Description=Description
+Description.Description=Enter a short description about yourself so that visitors know who you are
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
index 57f5af6d2097..3ea825131863 100644
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
+++ b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
@@ -5,9 +5,6 @@
-
- ${%description}
-
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
deleted file mode 100644
index 9ebb3cd824ca..000000000000
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
+++ /dev/null
@@ -1 +0,0 @@
-description=Controls what visualization tool handles build console links. Providers higher in the list take precedence over providers lower in the list. All providers configured here take precedence over those configured globally by administrators.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
deleted file mode 100644
index d0a8ed3d0459..000000000000
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
+++ /dev/null
@@ -1 +0,0 @@
-description=Styr vilket visualiseringsverktyg som hanterar konsollänkar för byggen. Leverantörer högre upp i listan har företräde framför leverantörer längre ned i listan. Alla leverantörer som konfigurerats här har företräde framför de som har konfigurerats globalt av administratörer.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/console/Messages.properties b/core/src/main/resources/jenkins/console/Messages.properties
index 20a460d49709..2c3f7cc14769 100644
--- a/core/src/main/resources/jenkins/console/Messages.properties
+++ b/core/src/main/resources/jenkins/console/Messages.properties
@@ -1,2 +1,3 @@
consoleUrlProviderDisplayName=Console URL Provider
+consoleUrlProviderDisplayName.Description=Select which view you want to use for build console links. Tools listed higher will be prioritized over those listed lower. The tools you choose here will be used rather than those set by administrators.
defaultProviderDisplayName=Default
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/section.jelly b/core/src/main/resources/lib/form/section.jelly
index 706920ad6ecc..1e7e7ebbb2d5 100644
--- a/core/src/main/resources/lib/form/section.jelly
+++ b/core/src/main/resources/lib/form/section.jelly
@@ -32,6 +32,9 @@ THE SOFTWARE.
If null is given, the entire tag becomes no-op.
]]>
+
+ Optional attribute to set a description for the section
+
Optional attribute to set an icon for the section, this is only visible when using section-to-sidebar-items.js
@@ -50,6 +53,11 @@ THE SOFTWARE.
${attrs.title}
+
+
+ ${attrs.description}
+
+
diff --git a/war/src/main/scss/components/_section.scss b/war/src/main/scss/components/_section.scss
index 9a53a7238339..4e0768d8f6e0 100644
--- a/war/src/main/scss/components/_section.scss
+++ b/war/src/main/scss/components/_section.scss
@@ -34,6 +34,13 @@
font-weight: 500;
}
+.jenkins-section__description {
+ // Tweaked margin so that it appears visually centred when placed next to `.jenkins-section__title`
+ margin: -0.5rem 0 1rem;
+ color: var(--text-color-secondary);
+ line-height: 1.66;
+}
+
.jenkins-section__items {
display: grid;
grid-template-columns: 1fr;
diff --git a/war/src/main/webapp/help/user/description.html b/war/src/main/webapp/help/user/description.html
deleted file mode 100644
index 8d4d4ee62729..000000000000
--- a/war/src/main/webapp/help/user/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- This description is placed on the user top page so that visitors can know who
- you are. You can use any HTML tags (or markup in the configured language)
- here. Consider putting some links to other pages related to you.
-
diff --git a/war/src/main/webapp/help/user/description_bg.html b/war/src/main/webapp/help/user/description_bg.html
deleted file mode 100644
index 81894e55816e..000000000000
--- a/war/src/main/webapp/help/user/description_bg.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Това описание стои отгоре на вашата страница като потребител, така че другите
- потребители да знаят кой сте. Може да използвате HTML или друг език с
- маркиране, стига да е настроен. Добре е да поставите връзки към други
- страници, които ви описват.
-
diff --git a/war/src/main/webapp/help/user/description_de.html b/war/src/main/webapp/help/user/description_de.html
deleted file mode 100644
index 4ddca12dfbf9..000000000000
--- a/war/src/main/webapp/help/user/description_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Diese Beschreibung wird in der Benutzeransicht angezeigt. Andere Benutzer
- können dadurch mehr über Sie erfahren. Sie können in der Beschreibung
- beliebige HTML-Auszeichnungen verwenden, also beispielsweise auch Links auf
- andere Webangebote, die mit Ihnen in Zusammenhang stehen.
-
diff --git a/war/src/main/webapp/help/user/description_fr.html b/war/src/main/webapp/help/user/description_fr.html
deleted file mode 100644
index 7744e9764cea..000000000000
--- a/war/src/main/webapp/help/user/description_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Cette description est placée sur la page principale de l'utilisateur, afin que
- les visiteurs puissent vous connaitre. Vous pouvez utiliser des tags HTML.
- N'hésitez pas à ajouter des liens vers d'autres pages vous concernant.
-
diff --git a/war/src/main/webapp/help/user/description_it.html b/war/src/main/webapp/help/user/description_it.html
deleted file mode 100644
index 009e9203ac3d..000000000000
--- a/war/src/main/webapp/help/user/description_it.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Questa descrizione è collocata nella pagina principale utente in modo che i
- visitatori possano conoscere la propria identità. In questo campo è possibile
- utilizzare tutti i tag HTML (o i marcatori nel linguaggio configurato). Si
- prenda in considerazione l'aggiunta di alcuni collegamenti ad altre pagine
- correlate a sé stessi.
-
diff --git a/war/src/main/webapp/help/user/description_ja.html b/war/src/main/webapp/help/user/description_ja.html
deleted file mode 100644
index c2a1c9a21f53..000000000000
--- a/war/src/main/webapp/help/user/description_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- この説明はあなたが誰なのか知ることができるように、ユーザーのトップページに表示されます。
- ここではどんなHTMLタグでも使用できます。あなたに関する他のページにリンクすることを考えてみてください。
-
diff --git a/war/src/main/webapp/help/user/description_nl.html b/war/src/main/webapp/help/user/description_nl.html
deleted file mode 100644
index 458d60b66613..000000000000
--- a/war/src/main/webapp/help/user/description_nl.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Deze beschrijving zal worden toegevoegd aan de specifiek pagina van een
- gebruiker. Op deze manier zullen andere gebruikers van Jenkins, eenvoudig, te
- weten kunnen komen wie U bent. HTML kan gebruikt worden in dit veld. Het kan
- interessant zijn om in deze beschrijving, referentie toe te voegen naar ander
- pagina's over uzelf of uw activiteiten.
-
diff --git a/war/src/main/webapp/help/user/description_pt_BR.html b/war/src/main/webapp/help/user/description_pt_BR.html
deleted file mode 100644
index 15e9a0c45428..000000000000
--- a/war/src/main/webapp/help/user/description_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Esta descrição é colocada no topo da página do
- usuário tal que os visitantes possam saber quem você é.
- Você pode usar qualquer marcação HTML aqui. Considere colocar
- alguns links para outras páginas relacionadas a você.
-
diff --git a/war/src/main/webapp/help/user/description_ru.html b/war/src/main/webapp/help/user/description_ru.html
deleted file mode 100644
index 08e6008fde69..000000000000
--- a/war/src/main/webapp/help/user/description_ru.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Это описание будет помещено в шапку страницы пользователя, так чтобы
- посетители могли определить кто вы. Вы можете использовать HTML. Возможно,
- размещение ссылок с подробной информацией о вас будет уместным.
-
diff --git a/war/src/main/webapp/help/user/description_tr.html b/war/src/main/webapp/help/user/description_tr.html
deleted file mode 100644
index ca5cf685ca82..000000000000
--- a/war/src/main/webapp/help/user/description_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Bu açıklama alanı, kullanıcı sayfasının en
- üstünde yer alacaktır. Ziyaretçilerin sizi
- tanımaları için bu alanı bilgilendirme amaçlı
- kullanabilirsiniz. HTML tag'leri kullanılabilir. Sizinle ilgili
- olabilecek başka sayfaların linklerini de koyabilirsiniz.
-
diff --git a/war/src/main/webapp/help/user/description_zh_TW.html b/war/src/main/webapp/help/user/description_zh_TW.html
deleted file mode 100644
index 4ff51596f575..000000000000
--- a/war/src/main/webapp/help/user/description_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- 這個說明會放在使用者首頁上，讓訪客知道您是誰。 您可以使用任何 HTML
- 標籤。說不定您可以放一些有關自己的連結。
-
diff --git a/war/src/main/webapp/help/user/fullName.html b/war/src/main/webapp/help/user/fullName.html
deleted file mode 100644
index 453efdda5e5e..000000000000
--- a/war/src/main/webapp/help/user/fullName.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Specify your name in a more human-friendly format, so that people can see your
- real name as opposed to your ID. For example, "Jane Doe" is usually easier for
- people to understand than IDs like "jd513".
-
diff --git a/war/src/main/webapp/help/user/fullName_bg.html b/war/src/main/webapp/help/user/fullName_bg.html
deleted file mode 100644
index 6c27c38ad910..000000000000
--- a/war/src/main/webapp/help/user/fullName_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Указване на име вместо идентификатор, с което хората да ви разпознават
- по-лесно. „Иван Петров“ е по-разбираемо от „ip2873“.
-
diff --git a/war/src/main/webapp/help/user/fullName_de.html b/war/src/main/webapp/help/user/fullName_de.html
deleted file mode 100644
index e7f1a6d4fe59..000000000000
--- a/war/src/main/webapp/help/user/fullName_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Geben Sie Ihren vollständigen Namen an, damit andere Benutzer Ihren echten
- Namen anstelle Ihres Benutzerkontos sehen können. Beispiel: "Jasmin
- Mustermann" ist für die meisten Benutzer verständlicher als das Benutzerkonto
- "jm531".
-
diff --git a/war/src/main/webapp/help/user/fullName_fr.html b/war/src/main/webapp/help/user/fullName_fr.html
deleted file mode 100644
index e6438c57da48..000000000000
--- a/war/src/main/webapp/help/user/fullName_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Indiquez votre nom dans un format lisible pour un humain. Les visiteurs
- verront votre vrai nom à côté de votre identifiant. "Jean Dupont" est plus
- facile à retenir que "jd513"...
-
diff --git a/war/src/main/webapp/help/user/fullName_it.html b/war/src/main/webapp/help/user/fullName_it.html
deleted file mode 100644
index 9a81fd145602..000000000000
--- a/war/src/main/webapp/help/user/fullName_it.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Specificare il proprio nome in un formato più a misura d'uomo in modo che gli
- utenti possano visualizzare il proprio nome reale anziché il proprio ID. Ad
- esempio, "Mario Rossi" è solitamente più facile da comprendere per le persone
- anziché "mr513".
-
diff --git a/war/src/main/webapp/help/user/fullName_ja.html b/war/src/main/webapp/help/user/fullName_ja.html
deleted file mode 100644
index 451745435d07..000000000000
--- a/war/src/main/webapp/help/user/fullName_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- IDではなく本名が分かるように、より親しみのある形式であなたの名前を指定します。
- 例えば、"Jane Doe"は"jd513"のようなIDよりも分かりやすいでしょう。
-
diff --git a/war/src/main/webapp/help/user/fullName_nl.html b/war/src/main/webapp/help/user/fullName_nl.html
deleted file mode 100644
index 225051ab6181..000000000000
--- a/war/src/main/webapp/help/user/fullName_nl.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Vul uw volledige naam in. Deze naam zal gebruikt worden i.p.v. uw id waar
- mogelijk. Bv. "Els Desmet" is voor de meeste mensen duidelijker dan een id
- zoals "ed513".
-
diff --git a/war/src/main/webapp/help/user/fullName_pt_BR.html b/war/src/main/webapp/help/user/fullName_pt_BR.html
deleted file mode 100644
index 5a69cacb7065..000000000000
--- a/war/src/main/webapp/help/user/fullName_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Especifique seu nome em um formato mais amigável, tal que as pessoas
- possam ver seu verdadeiro nome ao invés de seu ID. Por exemplo,
- "João da Silva" é geralmente mais fácil para as pessoas
- entenderem do que "js513".
-
diff --git a/war/src/main/webapp/help/user/fullName_ru.html b/war/src/main/webapp/help/user/fullName_ru.html
deleted file mode 100644
index 6de0eb415bab..000000000000
--- a/war/src/main/webapp/help/user/fullName_ru.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- Укажите ваше имя в более дружелюбной форме, чтобы могли видеть ваше настоящее
- имя, а не просто идентификатор. Например, "Василий Пупкин" обычно приятнее
- видеть, чем "vas_pup_1".
-
diff --git a/war/src/main/webapp/help/user/fullName_tr.html b/war/src/main/webapp/help/user/fullName_tr.html
deleted file mode 100644
index 229a7dea2a09..000000000000
--- a/war/src/main/webapp/help/user/fullName_tr.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Kullanıcıların sizi kullanıcı adınızdan
- daha anlamlı bir isimle tanıyabilmesini isterseniz, tam
- adınızı bu kısıma yazabilirsiniz. Mesela, "Jane Doe",
- "jd513"ten daha anlamlıdır.
-
diff --git a/war/src/main/webapp/help/user/fullName_zh_TW.html b/war/src/main/webapp/help/user/fullName_zh_TW.html
deleted file mode 100644
index ddbbb5556df7..000000000000
--- a/war/src/main/webapp/help/user/fullName_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- 設定您能讓一般人看得懂的名字，讓別人知道您的姓名，而不光只有 ID。
- 舉例來說，大多數人應該都會覺得「張三」比 "mrchang3" 這個 ID 還要容易看懂。
-
From 00fcdb9825d0fa57cce6891aba810540b4fed9b7 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 3 Aug 2024 15:57:35 +0100
Subject: [PATCH 2/3] Update
core/src/main/resources/jenkins/console/Messages.properties
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
core/src/main/resources/jenkins/console/Messages.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/resources/jenkins/console/Messages.properties b/core/src/main/resources/jenkins/console/Messages.properties
index 2c3f7cc14769..72347e1df5b6 100644
--- a/core/src/main/resources/jenkins/console/Messages.properties
+++ b/core/src/main/resources/jenkins/console/Messages.properties
@@ -1,3 +1,3 @@
consoleUrlProviderDisplayName=Console URL Provider
-consoleUrlProviderDisplayName.Description=Select which view you want to use for build console links. Tools listed higher will be prioritized over those listed lower. The tools you choose here will be used rather than those set by administrators.
+consoleUrlProviderDisplayName.Description=Select which view you want to use for build console links. Views listed higher will be prioritized over those listed lower. The views you choose here will be used rather than those set by administrators.
defaultProviderDisplayName=Default
\ No newline at end of file
From e9c7735a70cc3a6a581d3571a79df5b9af41ed31 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Tue, 13 Aug 2024 22:08:50 +0100
Subject: [PATCH 3/3] Move getDescription, update Javadoc
---
core/src/main/java/hudson/model/Descriptor.java | 10 ----------
.../java/hudson/model/UserPropertyDescriptor.java | 12 ++++++++++++
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 5729db5eed42..b5eb07784d27 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -326,16 +326,6 @@ public String getDisplayName() {
return clazz.getSimpleName();
}
- /**
- * Optional description for the configurable object
- *
- * @since TODO
- */
- @Nullable
- public String getDescription() {
- return null;
- }
-
/**
* Uniquely identifies this {@link Descriptor} among all the other {@link Descriptor}s.
*
diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
index 66762bf3c716..b5a115404be3 100644
--- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
@@ -26,6 +26,7 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
import hudson.model.userproperty.UserPropertyCategory;
import java.util.Optional;
import org.jenkinsci.Symbol;
@@ -126,4 +127,15 @@ public boolean isEnabled() {
protected @CheckForNull String getUserPropertyCategoryAsString() {
return null;
}
+
+ /**
+ * Optional description for the configurable object
+ * Displays as plain text
+ *
+ * @since TODO
+ */
+ @Nullable
+ public String getDescription() {
+ return null;
+ }
}