diff --git a/core/src/main/java/hudson/console/ModelHyperlinkNote.java b/core/src/main/java/hudson/console/ModelHyperlinkNote.java index 51f413501634..fa5d57eedd4e 100644 --- a/core/src/main/java/hudson/console/ModelHyperlinkNote.java +++ b/core/src/main/java/hudson/console/ModelHyperlinkNote.java @@ -27,7 +27,7 @@ public ModelHyperlinkNote(String url, int length) { @Override protected String extraAttributes() { - return " class='model-link'"; + return " class='model-link model-link--float'"; } public static String encodeTo(@NonNull User u) { diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java index 793744afb1e7..70aad291b950 100644 --- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java +++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java @@ -153,7 +153,18 @@ public ContextMenu add(String url, String icon, String iconXml, String text, boo @Restricted(DoNotUse.class) // manage.jelly only public ContextMenu addHeader(String title) { final MenuItem item = new MenuItem().withDisplayName(title); - item.header = true; + item.type = MenuItemType.HEADER; + return add(item); + } + + /** + * Add a separator row (no icon, no URL, no text). + * + * @since TODO - Provide version + */ + public ContextMenu addSeparator() { + final MenuItem item = new MenuItem(); + item.type = MenuItemType.SEPARATOR; return add(item); } @@ -303,12 +314,12 @@ class MenuItem { /** - * True to display this item as a section header. - * @since 2.231 + * The type of menu item + * @since TODO */ @Exported @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "read by Stapler") - public boolean header; + public MenuItemType type = MenuItemType.ITEM; /** * If this is a submenu, definition of subitems. @@ -388,6 +399,12 @@ private String getResourceUrl() { } + enum MenuItemType { + ITEM, + HEADER, + SEPARATOR + } + /** * Allows an action to decide whether it will be visible in a context menu. * @since 1.538 diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.properties index 6465016a40c6..1deb78946fef 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=Started by upstream project {0} build number {1} -started_by_project_with_deleted_build=Started by upstream project {0} build number {1} +started_by_project=Started by upstream project {0} build number {1} +started_by_project_with_deleted_build=Started by upstream project {0} build number {1} caused_by=originally caused by: diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_bg.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_bg.properties index e628fd6eede0..fb6513a12ab9 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_bg.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_bg.properties @@ -22,10 +22,10 @@ started_by_project_with_deleted_build=\ \u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u043e \u0437\u0430\u0440\u0430\u0434\u0438 \u043f\u0440\u043e\u0435\u043a\u0442\u0430, \u043e\u0442 \u043a\u043e\u0439\u0442\u043e \u0442\u043e\u0437\u0438 \u0437\u0430\u0432\u0438\u0441\u0438:\ - {0}, \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u2116\u200a{1} + {0}, \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u2116\u200a{1} caused_by=\ \u043f\u044a\u0440\u0432\u043e\u043d\u0430\u0447\u0430\u043b\u043d\u043e \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u043e \u043f\u043e\u0440\u0430\u0434\u0438: started_by_project=\ \u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u043e \u0437\u0430\u0440\u0430\u0434\u0438 \u043f\u0440\u043e\u0435\u043a\u0442\u0430, \u043e\u0442 \u043a\u043e\u0439\u0442\u043e \u0442\u043e\u0437\u0438 \u0437\u0430\u0432\u0438\u0441\u0438:\ - {0}, \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435\ - \u2116\u200a{1} + {0}, \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435\ + \u2116\u200a{1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_cs.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_cs.properties index 6dadacc8d5b3..a774d761620e 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_cs.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_cs.properties @@ -1,4 +1,4 @@ # This file is under the MIT License by authors -started_by_project=Spu\u0161t\u011Bno nad\u0159azen\u00FDm projektem {0} build \u010D\u00EDslo {1} -started_by_project_with_deleted_build=Spu\u0161t\u011Bno nad\u0159azen\u00FDm projektem {0} build \u010D\u00EDslo {1} +started_by_project=Spu\u0161t\u011Bno nad\u0159azen\u00FDm projektem {0} build \u010D\u00EDslo {1} +started_by_project_with_deleted_build=Spu\u0161t\u011Bno nad\u0159azen\u00FDm projektem {0} build \u010D\u00EDslo {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_da.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_da.properties index d5d6abbe7ecf..c6817615ff64 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_da.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_da.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=Startet af upstream projekt {0} byg nummer {1} -started_by_project_with_deleted_build=Startet af upstream projekt {0} byg nummer {1} +started_by_project=Startet af upstream projekt {0} byg nummer {1} +started_by_project_with_deleted_build=Startet af upstream projekt {0} byg nummer {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_de.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_de.properties index e06ec4c0fa9a..1e8fe895152a 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_de.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_de.properties @@ -21,6 +21,6 @@ # THE SOFTWARE. caused_by=urspr\u00FCnglich ausgel\u00F6st durch: -started_by_project=Gestartet durch vorgelagertes Projekt {0}, Build {1} -started_by_project_with_deleted_build=Gestartet durch vorgelagertes Projekt {0}, Build {1} +started_by_project=Gestartet durch vorgelagertes Projekt {0}, Build {1} +started_by_project_with_deleted_build=Gestartet durch vorgelagertes Projekt {0}, Build {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_es.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_es.properties index 7dd9d5530e9e..119f06882497 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_es.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_es.properties @@ -21,5 +21,5 @@ # THE SOFTWARE. -started_by_project=Lanzado por la ejecuci\u00F3n n\u00FAmero {1} del proyecto padre\: {0} -started_by_project_with_deleted_build=Lanzado por la ejecuci\u00F3n n\u00FAmero {1} del proyecto padre\: {0} +started_by_project=Lanzado por la ejecuci\u00F3n n\u00FAmero {1} del proyecto padre\: {0} +started_by_project_with_deleted_build=Lanzado por la ejecuci\u00F3n n\u00FAmero {1} del proyecto padre\: {0} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fi.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fi.properties index 9cff3e9b6528..8c7a1c1dbc47 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fi.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fi.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=K\u00E4ynnist\u00E4j\u00E4 yl\u00E4virran projekti {0} k\u00E4\u00E4nn\u00F6snumero {1} -started_by_project_with_deleted_build=K\u00E4ynnist\u00E4j\u00E4 yl\u00E4virran projekti {0} k\u00E4\u00E4nn\u00F6snumero {1} +started_by_project=K\u00E4ynnist\u00E4j\u00E4 yl\u00E4virran projekti {0} k\u00E4\u00E4nn\u00F6snumero {1} +started_by_project_with_deleted_build=K\u00E4ynnist\u00E4j\u00E4 yl\u00E4virran projekti {0} k\u00E4\u00E4nn\u00F6snumero {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fr.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fr.properties index 7f46cd410c42..740edeb2da45 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fr.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_fr.properties @@ -21,6 +21,6 @@ # THE SOFTWARE. caused_by=Originellement lanc\u00E9 par: -started_by_project=Lanc\u00E9 par le projet amont {0} avec le num\u00E9ro de construction {1} -started_by_project_with_deleted_build=Lanc\u00E9 par le projet amont {0} avec le num\u00E9ro de construction {1} +started_by_project=Lanc\u00E9 par le projet amont {0} avec le num\u00E9ro de construction {1} +started_by_project_with_deleted_build=Lanc\u00E9 par le projet amont {0} avec le num\u00E9ro de construction {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_it.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_it.properties index da8d3d0d795b..b34f9c8b3a39 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_it.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_it.properties @@ -22,8 +22,8 @@ # THE SOFTWARE. caused_by=originariamente scatenata da: -started_by_project=Avviata dal progetto upstream {0}, compilazione numero {0}, compilazione numero {1} started_by_project_with_deleted_build=Avviata dal progetto upstream {0}, compilazione numero {1} + class="model-link model-link--float" href="{3}/{2}">{0}, compilazione numero {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ja.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ja.properties index 897136e18892..31abd832036b 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ja.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ja.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=\u4e0a\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306e#{1}\u304c\u5b9f\u884c -started_by_project_with_deleted_build=\u4e0a\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306e#{1}\u304c\u5b9f\u884c +started_by_project=\u4e0a\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306e#{1}\u304c\u5b9f\u884c +started_by_project_with_deleted_build=\u4e0a\u6d41\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306e#{1}\u304c\u5b9f\u884c caused_by=\u5143\u306e\u539f\u56e0: diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_lv.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_lv.properties index d6eb00c13ed0..0cc40b263090 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_lv.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_lv.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors caused_by=s\u0101kotn\u0113ji izrais\u012Bjis: -started_by_project=S\u0101kts no aug\u0161upstraumes projekta {0} b\u016Bv\u0113juma {1} -started_by_project_with_deleted_build=S\u0101kts no aug\u0161upstraumes projekta {0} b\u016Bv\u0113juma {1} +started_by_project=S\u0101kts no aug\u0161upstraumes projekta {0} b\u016Bv\u0113juma {1} +started_by_project_with_deleted_build=S\u0101kts no aug\u0161upstraumes projekta {0} b\u016Bv\u0113juma {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_nl.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_nl.properties index 8fffede35055..77a8f2b8784f 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_nl.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_nl.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors caused_by=oorspronkelijk veroorzaakt door: -started_by_project=Gestart door stroomopwaarts project {0}, bouwpoging {1} -started_by_project_with_deleted_build=Gestart door stroomopwaarts project {0}, bouwpoging {1} +started_by_project=Gestart door stroomopwaarts project {0}, bouwpoging {1} +started_by_project_with_deleted_build=Gestart door stroomopwaarts project {0}, bouwpoging {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pl.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pl.properties index ca975f6e8e65..7d6fa87a6d70 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pl.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pl.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=Wystartowany przez projekt nadrz\u0119dny {0} o numerze {1} -started_by_project_with_deleted_build=Wystartowany przez projekt nadrz\u0119dny {0} o numerze {1} +started_by_project=Wystartowany przez projekt nadrz\u0119dny {0} o numerze {1} +started_by_project_with_deleted_build=Wystartowany przez projekt nadrz\u0119dny {0} o numerze {1} caused_by=Pierwotnie spowodowany przez: diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties index bcd1781af945..02fb9c7e324f 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_pt_BR.properties @@ -22,5 +22,5 @@ # Started by upstream project {0} build number {1} caused_by=Criado por originalidade de: -started_by_project=Iniciado pelo build {1} do projeto {0} -started_by_project_with_deleted_build=Iniciado pelo build {1} do projeto {0} +started_by_project=Iniciado pelo build {1} do projeto {0} +started_by_project_with_deleted_build=Iniciado pelo build {1} do projeto {0} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ru.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ru.properties index d3ebf3a40bb1..4447b383be74 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ru.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_ru.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors caused_by=\u043F\u0435\u0440\u0432\u043E\u043D\u0430\u0447\u0430\u043B\u044C\u043D\u043E \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u0430: -started_by_project=\u0412\u044B\u0437\u0432\u0430\u043D \u0432\u043E\u0441\u0445\u043E\u0434\u044F\u0449\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u0441\u0431\u043E\u0440\u043A\u0430 \u043D\u043E\u043C\u0435\u0440 {1} -started_by_project_with_deleted_build=\u0412\u044B\u0437\u0432\u0430\u043D \u0432\u043E\u0441\u0445\u043E\u0434\u044F\u0449\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u0441\u0431\u043E\u0440\u043A\u0430 \u043D\u043E\u043C\u0435\u0440 {1} +started_by_project=\u0412\u044B\u0437\u0432\u0430\u043D \u0432\u043E\u0441\u0445\u043E\u0434\u044F\u0449\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u0441\u0431\u043E\u0440\u043A\u0430 \u043D\u043E\u043C\u0435\u0440 {1} +started_by_project_with_deleted_build=\u0412\u044B\u0437\u0432\u0430\u043D \u0432\u043E\u0441\u0445\u043E\u0434\u044F\u0449\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u0441\u0431\u043E\u0440\u043A\u0430 \u043D\u043E\u043C\u0435\u0440 {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sk.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sk.properties index 2027b4fb2660..6cbaae3dc1a5 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sk.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sk.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors caused_by=p\u00F4vodn\u00E1 pr\u00ED\u010Dina: -started_by_project=Na\u0161tartovan\u00E9 upstream projektom {0} \u010D\u00EDslo zostavenia {1} -started_by_project_with_deleted_build=Na\u0161tartovan\u00E9 upstream projektom {0} \u010D\u00EDslo zostavenia {1} +started_by_project=Na\u0161tartovan\u00E9 upstream projektom {0} \u010D\u00EDslo zostavenia {1} +started_by_project_with_deleted_build=Na\u0161tartovan\u00E9 upstream projektom {0} \u010D\u00EDslo zostavenia {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sr.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sr.properties index 327dc4258303..6db47bf0da33 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sr.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sr.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors -started_by_project=\u0417\u0430\u043F\u043E\u0447\u0435\u0442\u043E \u043E\u0434 \u0441\u0442\u0440\u0430\u043D\u0435 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 {0} \u0431\u0440\u043E\u0458 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435 {1} -started_by_project_with_deleted_build=\u0417\u0430\u043F\u043E\u0447\u0435\u0442\u043E \u043E\u0434 \u0441\u0442\u0440\u0430\u043D\u0435 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 {0} \u0431\u0440\u043E\u0458 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435 {1} +started_by_project=\u0417\u0430\u043F\u043E\u0447\u0435\u0442\u043E \u043E\u0434 \u0441\u0442\u0440\u0430\u043D\u0435 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 {0} \u0431\u0440\u043E\u0458 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435 {1} +started_by_project_with_deleted_build=\u0417\u0430\u043F\u043E\u0447\u0435\u0442\u043E \u043E\u0434 \u0441\u0442\u0440\u0430\u043D\u0435 \u043F\u0440\u043E\u0458\u0435\u043A\u0442\u0430 {0} \u0431\u0440\u043E\u0458 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0435 {1} caused_by=\u043F\u0440\u0432\u043E\u0431\u0438\u0442\u043D\u043E \u043F\u043E\u043A\u0440\u0435\u043D\u0443\u0442 \u0437\u0431\u043E\u0433: diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sv_SE.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sv_SE.properties index 19a14d946d67..69cb7058fa97 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sv_SE.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_sv_SE.properties @@ -1,5 +1,5 @@ # This file is under the MIT License by authors caused_by=ursprungligen p\u00E5 grund av: -started_by_project=Startad av projekt uppstr\u00F6ms {0} byggnummer {1} -started_by_project_with_deleted_build=Startad av projekt uppstr\u00F6ms {0} byggnummer {1} +started_by_project=Startad av projekt uppstr\u00F6ms {0} byggnummer {1} +started_by_project_with_deleted_build=Startad av projekt uppstr\u00F6ms {0} byggnummer {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_uk.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_uk.properties index a137decaa7b6..4c0f2cbed9ed 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_uk.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_uk.properties @@ -20,5 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u043A\u0435\u0440\u0456\u0432\u043D\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u043F\u043E\u0431\u0443\u0434\u043E\u0432\u0430 \u043D\u043E\u043C\u0435\u0440 {1} -started_by_project_with_deleted_build=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u043A\u0435\u0440\u0456\u0432\u043D\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u043F\u043E\u0431\u0443\u0434\u043E\u0432\u0430 \u043D\u043E\u043C\u0435\u0440 {1} +started_by_project=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u043A\u0435\u0440\u0456\u0432\u043D\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u043F\u043E\u0431\u0443\u0434\u043E\u0432\u0430 \u043D\u043E\u043C\u0435\u0440 {1} +started_by_project_with_deleted_build=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E \u043A\u0435\u0440\u0456\u0432\u043D\u0438\u043C \u043F\u0440\u043E\u0435\u043A\u0442\u043E\u043C {0}, \u043F\u043E\u0431\u0443\u0434\u043E\u0432\u0430 \u043D\u043E\u043C\u0435\u0440 {1} diff --git a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_zh_TW.properties b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_zh_TW.properties index c9e7e445a39a..2ed479cac029 100644 --- a/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_zh_TW.properties +++ b/core/src/main/resources/hudson/model/Cause/UpstreamCause/description_zh_TW.properties @@ -20,6 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -started_by_project=\u7531\u4e0a\u6e38\u5c08\u6848 {0} \u7684\u7b2c {1} \u6b21\u5efa\u7f6e\u6240\u89f8\u767c -started_by_project_with_deleted_build=\u7531\u4e0a\u6e38\u5c08\u6848 {0} \u7684\u7b2c {1} \u6b21\u5efa\u7f6e\u6240\u89f8\u767c +started_by_project=\u7531\u4e0a\u6e38\u5c08\u6848 {0} \u7684\u7b2c {1} \u6b21\u5efa\u7f6e\u6240\u89f8\u767c +started_by_project_with_deleted_build=\u7531\u4e0a\u6e38\u5c08\u6848 {0} \u7684\u7b2c {1} \u6b21\u5efa\u7f6e\u6240\u89f8\u767c caused_by=\u8d77\u56e0: diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly index 2d0506240aab..4ada9dbac120 100644 --- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly +++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly @@ -29,18 +29,18 @@ THE SOFTWARE.
- - - - - - - - - - - - + + + + + + + + + + + +
diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly index 51046f5886b8..cfecd8389b02 100644 --- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lfBuild.timestampString} - ${lfBuild.displayName} + ${lfBuild.displayName} ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly index 4ac61bffd584..7b951f4a1296 100644 --- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lsBuild.timestampString} - ${lsBuild.displayName} + ${lsBuild.displayName} ${%N/A} diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly index b690e2084ccc..5ed47248ad6d 100644 --- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly +++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly @@ -40,14 +40,14 @@ THE SOFTWARE.
- ${build.displayName} + ${build.displayName}
${%Took} ${build.durationString} - + ${h.getUserTimeZonePostfix()} diff --git a/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly b/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly index 773c3dadbacd..524dfff36573 100644 --- a/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly +++ b/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly @@ -1,6 +1,6 @@ -
+
diff --git a/war/src/main/js/util/page.js b/war/src/main/js/util/page.js index 4c45dddc5dd9..629064a0f50b 100644 --- a/war/src/main/js/util/page.js +++ b/war/src/main/js/util/page.js @@ -41,7 +41,7 @@ function onWinScroll(callback) { } function pageHeaderHeight() { - return elementHeight('#page-head'); + return elementHeight('#page-header') + breadcrumbBarHeight(); } function breadcrumbBarHeight() { diff --git a/war/src/main/less/base-styles-v2.less b/war/src/main/less/base-styles-v2.less index 7d291f46d170..925f839bd2b1 100644 --- a/war/src/main/less/base-styles-v2.less +++ b/war/src/main/less/base-styles-v2.less @@ -13,6 +13,7 @@ html { // The downside is that the page does not resize with the browser's font size, // only with the zoom level. font-size: 16px !important; + letter-spacing: -0.011em; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -38,6 +39,7 @@ html { @import './modules/app-bar'; @import './modules/badges'; +@import './modules/breadcrumbs'; @import './modules/buttons'; @import './modules/content-blocks'; @import './modules/icon-size'; diff --git a/war/src/main/less/base/layout-commons.less b/war/src/main/less/base/layout-commons.less index e2d1b84caa24..282512e1c382 100644 --- a/war/src/main/less/base/layout-commons.less +++ b/war/src/main/less/base/layout-commons.less @@ -4,12 +4,11 @@ html { position: relative; height: 100%; box-sizing: border-box; - min-height: none; } body { - height: 100%; margin: 0; + min-height: 100vh; display: flex; flex-direction: column; background-color: var(--background); @@ -23,7 +22,7 @@ body { /* --------------- header --------------- */ -#header .logo { +#page-header .logo { margin-left: 1.2rem; display: inline-flex; align-items: center; @@ -44,15 +43,10 @@ body { margin-left: 0.25rem; } -#breadcrumbBar, -#footer-container, -.top-sticker-inner { +#footer-container { background-color: var(--breadcrumbs-bg); } -.top-sticker-inner { - border-bottom: 1px solid --var(breadcrumbs-border); -} /* -------------------------------------- */ @@ -72,7 +66,6 @@ body { padding: 1rem 0 2.5rem 0; width: 300px; flex-shrink: 0; - border-right: 1px solid var(--panel-border-color); } #main-panel { diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less index 663ebf075f1e..918f91153bb6 100644 --- a/war/src/main/less/base/style.less +++ b/war/src/main/less/base/style.less @@ -544,16 +544,6 @@ div.behavior-loading { z-index: 999; } -.top-sticker-inner { - padding: 1em; -} - -.top-sticker-edge { - height: 16px; - background-image: url("../../images/top-sticker-bottom-edge.png"); - background-repeat: repeat-x; -} - .top-sticker.noedge > .top-sticker-edge { display: none; } @@ -1545,7 +1535,7 @@ body.no-decoration #main-panel { margin: 0 auto !important; } -body.no-decoration #page-head, +body.no-decoration #page-header, body.no-decoration #side-panel, body.no-decoration footer { display: none; diff --git a/war/src/main/less/modules/breadcrumbs.less b/war/src/main/less/modules/breadcrumbs.less new file mode 100644 index 000000000000..5a4fded18fdb --- /dev/null +++ b/war/src/main/less/modules/breadcrumbs.less @@ -0,0 +1,348 @@ +#breadcrumbBar { + position: sticky; + top: 0; + z-index: 999; +} + +.jenkins-breadcrumbs { + display: flex; + align-items: center; + padding: 0.5rem 0.7rem 0.5rem 0.75rem; + backdrop-filter: blur(15px); + + &::before { + content: ""; + position: absolute; + inset: 0; + background: var(--table-background); + opacity: 0.95; + } + + & > ul { + display: flex; + align-items: center; + list-style-type: none; + margin: 0; + padding: 0; + flex: 1; + flex-wrap: wrap; + + & > li { + & > a { + position: relative; + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0.2rem 0.4rem; + font-weight: 500; + font-size: 0.85rem; + border-radius: 6px; + color: var(--text-color); + z-index: 0; + text-decoration: none; + + &::before, + &::after { + content: ""; + position: absolute; + top: -1px; + left: -2px; + bottom: -1px; + right: -2px; + border-radius: 6px; + z-index: -1; + opacity: 0; + transition: var(--standard-transition) + } + + &::before { + background: var(--text-color); + } + + &::after { + box-shadow: 0 0 0 10px transparent; + } + + &:hover { + &::before { + opacity: 0.05 !important; + background: var(--text-color); + } + } + + &:focus, &:active { + &::before { + opacity: 0.1 !important; + background: var(--text-color); + } + + &::after { + opacity: 0.05 !important; + box-shadow: 0 0 0 5px var(--text-color); + } + } + } + } + + // '>' separator between two items + .children, + .separator { + position: relative; + width: 14px; + height: 14px; + margin: 6px; + + &::after { + content: ""; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + opacity: 0.5; + transition: var(--standard-transition); + background: var(--text-color); + mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='ionicon' viewBox='0 0 512 512'%3E%3Ctitle%3EChevron Forward%3C/title%3E%3Cpath fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='48' d='M184 112l144 144-144 144'/%3E%3C/svg%3E"); + } + } + + .children { + cursor: pointer; + + &:hover { + &::after { + opacity: 1; + transform: rotate(90deg); + } + } + + &:active { + &::after { + transform: translateY(2px) rotate(90deg); + opacity: 0.5; + } + } + + // Increase the hit target + &::before { + content: ""; + position: absolute; + top: -14px; + left: -5px; + bottom: -14px; + right: -5px; + background: transparent; + } + } + + .separator { + &:last-of-type { + display: none; + } + } + } +} + +.jenkins-menu-dropdown-chevron { + position: relative; + display: inline-block; + width: 14px; + height: 14px; + border: none; + outline: none; + cursor: pointer; + padding: 0; + margin-left: -14px; + pointer-events: none; + vertical-align: middle; + transition: var(--standard-transition); + background: transparent; + + &:hover { + &::after { + opacity: 1 !important; + } + } + + &:active { + &::after { + transform: translateY(2px); + opacity: 0.5 !important; + } + } + + // Increase the hit target + &::before { + content: ""; + position: absolute; + top: -7px; + bottom: -7px; + right: -20px; + width: 20px; + pointer-events: all; + } + + &::after { + content: ""; + position: absolute; + top: 0; + bottom: 0; + right: 0; + width: 14px; + opacity: 0; + transition: var(--standard-transition); + background: var(--text-color); + mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' class='ionicon' viewBox='0 0 512 512'%3E%3Ctitle%3EChevron Down%3C/title%3E%3Cpath fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='48' d='M112 184l144 144 144-144'/%3E%3C/svg%3E"); + mask-position: center; + mask-repeat: no-repeat; + } +} + +.model-link { + position: relative; + transition: var(--standard-transition) !important; + + &::before { + content: ""; + position: absolute; + top: -7px; + left: -10px; + bottom: -7px; + right: -10px; + } + + &:hover { + .jenkins-menu-dropdown-chevron { + margin-left: 1ch; + pointer-events: all; + + &::after { + opacity: 0.5; + } + } + + // For links with badges next to them, eg build monitor page, we need to shrink the margins of + // the badge so that it doesn't cause a table column resize, yet doesn't change in appearance + @media (hover: hover) { + & + a.model-link:not(.model-link--float) { + transform: translateX(10px); + margin-right: calc((14px + 1ch) * -1) !important; + } + } + } + + @media (hover: none) { + & + a.model-link { + transform: translateX(10px); + margin-right: calc((14px + 1ch) * -1) !important; + } + + .jenkins-menu-dropdown-chevron { + margin-left: 1ch; + + &::after { + opacity: 0.5; + } + } + } +} + +@media (hover: hover) { + .inside { + &:hover { + margin-right: calc((14px + 1ch) * -1) !important; + } + } +} + +.model-link--float { + z-index: 0; + + &::before, + &::after { + content: ""; + position: absolute; + top: -7px; + left: -10px; + bottom: -7px; + right: -10px; + opacity: 0; + border-radius: 6px; + transition: var(--standard-transition); + } + + &::before { + z-index: -2; + background: var(--background); + } + + &::after { + z-index: -1; + background: var(--text-color); + } + + @media (hover: hover) { + .jenkins-menu-dropdown-chevron { + position: absolute; + top: 1px; + right: 0; + margin-left: 0 !important; + } + } + + &:hover { + z-index: 10; + + @media (hover: hover) { + &::before, + &::after { + right: calc((2ch + 14px) * -1); + } + } + + &::before { + opacity: 1; + } + + &::after { + opacity: 0.15; + } + + .jenkins-menu-dropdown-chevron { + @media (hover: hover) { + right: calc((1ch + 14px) * -1); + } + + &::after { + opacity: 0.5; + } + } + } +} + +// TODO: Remove when YUI dropdowns are removed + +#breadcrumb-menu .header { + font-weight: bold; + font-size: 0.875rem; + pointer-events: none; +} + +#breadcrumb-menu .separator { + position: relative; + display: block !important; + color: transparent; + overflow: hidden; + width: 100%; + + &::after { + content: ""; + position: absolute; + top: 9px; + left: -50vw; + right: -50vw; + background: var(--text-color); + height: 2px; + opacity: 0.1; + } +} diff --git a/war/src/main/less/modules/page-header.less b/war/src/main/less/modules/page-header.less index 24e2ff030142..ccadec20547d 100644 --- a/war/src/main/less/modules/page-header.less +++ b/war/src/main/less/modules/page-header.less @@ -16,7 +16,7 @@ .page-header__brand { display: inline-block; - height: 100%; + height: 3.5rem; position: relative; flex: 1; // push controls to the end of the block } @@ -51,6 +51,7 @@ a.page-header__brand-link { } .page-header__hyperlinks a { + --text-color: var(--header-link-color); display: inline-flex; align-items: center; diff --git a/war/src/main/less/modules/side-panel-widgets.less b/war/src/main/less/modules/side-panel-widgets.less index 4dbff43c616d..091b23e9664a 100644 --- a/war/src/main/less/modules/side-panel-widgets.less +++ b/war/src/main/less/modules/side-panel-widgets.less @@ -148,6 +148,7 @@ .build-row-cell .pane.build-name .build-icon { position: absolute; + z-index: 1; } .build-row-cell .build-stop { diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index 77942f2c5d4c..5ed618f9d0bd 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1441,45 +1441,6 @@ function rowvgStartEachRow(recursive,f) { } }) - Behaviour.specify("#top-sticker", "-top-sticker", ++p, function(sticker) {// legacy - this[".top-sticker"](sticker); - }); - - /** - * @param {HTMLElement} sticker - */ - Behaviour.specify(".top-sticker", "-top-sticker-2", ++p, function(sticker) { - var DOM = YAHOO.util.Dom; - - var shadow = document.createElement("div"); - sticker.parentNode.insertBefore(shadow,sticker); - - var edge = document.createElement("div"); - edge.className = "top-sticker-edge"; - sticker.insertBefore(edge,sticker.firstElementChild); - - var initialBreadcrumbPosition = DOM.getRegion(shadow); - function adjustSticker() { - shadow.style.height = sticker.offsetHeight + "px"; - - var viewport = DOM.getClientRegion(); - var pos = DOM.getRegion(shadow); - - sticker.style.position = "fixed"; - if(pos.top <= initialBreadcrumbPosition.top) { - sticker.style.top = Math.max(0, pos.top-viewport.top) + "px" - } - sticker.style.left = Math.max(0,pos.left-viewport.left) + "px" - } - - // react to layout change - Element.observe(window,"scroll",adjustSticker); - Element.observe(window,"resize",adjustSticker); - // initial positioning - Element.observe(window,"load",adjustSticker); - adjustSticker(); - }); - /** * Function that provides compatibility to the checkboxes without title on an f:entry *