diff --git a/src/main/resources/lib/local/descriptorList.jelly b/src/main/resources/lib/local/descriptorList.jelly deleted file mode 100644 index 33a1cc7..0000000 --- a/src/main/resources/lib/local/descriptorList.jelly +++ /dev/null @@ -1,90 +0,0 @@ - - - - - Generate config pages from a list of Descriptors into a section. - - - Human readable title of the section to be rendered in HTML. - - - hudson.model.Descriptor collection whose configuration page is rendered. - - - Map<Descriptor,Describable> that defines current instances of those descriptors. - These are used to fill initial values. Other classes that define the get(Descriptor) - method works fine, too, such as DescribableList. - - - Either @field or @instances are required (or @field may be inherited from the ancestor <entry> element). - If field is specified, instances are assumed to be instance[field]. - - When this attribute is specified, JSON structure is properly set up so that the databinding - can set the field (or pass this collection as a constructor parameter of the same name. - - This is more modern way of doing databinding, and thus preferred approach. - - - the type for which descriptors will be configured. - default to ${it.class} - - - If specified, instead of a sequence of <f:optionalBlock>s, draw a sequence of <rowSet>s. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/lib/local/entry.jelly b/src/main/resources/lib/local/entry.jelly deleted file mode 100644 index 310ce6e..0000000 --- a/src/main/resources/lib/local/entry.jelly +++ /dev/null @@ -1,88 +0,0 @@ - - - - - An entry of the <f:form>, which is one logical row (that consists of - several <TR> tags. - - One entry normally host one control. - - - Name of the entry. Think of this like a label for the control. - - - Used for the databinding. TBD. When this attribute - is specified, @help is inferred, and nested input controls don't need - the @field nor @name. - - - If it's not obvious to the user as to what the control expects, - specify some description text (which currently gets rendered as - small text under the control, but that may change.) - - This text shouldn't get too long, and in recent Hudson, this feature - is somewhat de-emphasized, in favor of the inline foldable help page - specified via @help. - - - URL to the HTML page. When this attribute is specified, the entry gets - a (?) icon on the right, and if the user clicks it, the contents of the - given URL is rendered as a box below the entry. - - The URL should return an HTML document wrapped in a <div> tag. - The URL is interpreted to be rooted at the context path of Hudson, - so it's normally something like "/plugin/foobar/help/abc.html". - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/lib/local/expandableTextbox.jelly b/src/main/resources/lib/local/expandableTextbox.jelly deleted file mode 100644 index 4153fbc..0000000 --- a/src/main/resources/lib/local/expandableTextbox.jelly +++ /dev/null @@ -1,83 +0,0 @@ - - - - - single-line textbox that can be expanded into a multi-line textarea. - - This control is useful for a field that expects multiple whitespaec-separated tokens - (such as URLs, glob patterns, etc.) When the user only enters a few tokens, - they can keep it as a single line to save space, but to enter a large number of values, - this can be turned into textarea for better visibility. - - If the initial value is already multi-line text, the control starts with - textarea. - - On the server side, your program is responsible for treating ' ', \t, \r, and \n for - separators. (StringTokenizer would do this.) - - - Used for databinding. TBD. - - - This becomes @name of the <input> tag. - If @field is specified, this value is inferred from it. - - - The initial value of the field. This becomes the @value of the <input> tag. - If @field is specified, the current property from the "instance" object - will be set as the initial value automatically, - which is the recommended approach. - - - - - - - - - - - - - - - -
- - - - ${customizedFields.add(name)} - - - -
- - - diff --git a/src/main/resources/lib/local/optionalBlock.jelly b/src/main/resources/lib/local/optionalBlock.jelly deleted file mode 100644 index bea2b93..0000000 --- a/src/main/resources/lib/local/optionalBlock.jelly +++ /dev/null @@ -1,92 +0,0 @@ - - - - - Foldable block that can be expanded to show more controls by checking the checkbox. - - - Name of the checkbox. Can be used by the server to determine - if the block is collapsed or expanded at the time of submission. - - Note that when the block is collapsed, none of its child controls will send - the values to the server (unlike <f:advanced>) - - - Human readable text that follows the checkbox. - - If this field is null, the checkbox degrades to a <f:rowSet>, which provides - a grouping at JSON level but on the UI there's no checkbox (and you always see - the body of it.) - - - Used for databinding. TBD. Either this or @name/@title combo is required. - - - initial checkbox status. true/false. - - - If present, the (?) icon will be rendered on the right to show inline help. - See @help for <f:entry>. - - - if present, the foldable section expands when the checkbox is unchecked. - - - if present, the foldable section will not be grouped into a separate JSON object upon submission - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/lib/local/taglib b/src/main/resources/lib/local/taglib deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/org/jenkinsci/plugins/registry/notification/DockerHubTrigger/config.groovy b/src/main/resources/org/jenkinsci/plugins/registry/notification/DockerHubTrigger/config.groovy index 6839870..ef3f149 100644 --- a/src/main/resources/org/jenkinsci/plugins/registry/notification/DockerHubTrigger/config.groovy +++ b/src/main/resources/org/jenkinsci/plugins/registry/notification/DockerHubTrigger/config.groovy @@ -29,21 +29,13 @@ import org.jenkinsci.plugins.registry.notification.opt.impl.TriggerForAllUsedInJ def st = namespace("jelly:stapler") def f = namespace(lib.FormTagLib) -def l = namespace("/lib/local") def defaultOption = [:] defaultOption[TriggerForAllUsedInJob.DescriptorImpl.instance] = new TriggerForAllUsedInJob() DockerHubTrigger trigger = instance; -if (context.getVariableWithDefaultValue("divBasedFormLayout", false) == true) { - f.descriptorList(title: null, - field: "options", - descriptors: TriggerOptionDescriptor.all(), - instances: trigger != null ? trigger.optionsList : defaultOption) -} else { - l.descriptorList(title: null, - field: "options", - descriptors: TriggerOptionDescriptor.all(), - instances: trigger != null ? trigger.optionsList : defaultOption) -} +f.descriptorList(title: null, + field: "options", + descriptors: TriggerOptionDescriptor.all(), + instances: trigger != null ? trigger.optionsList : defaultOption) diff --git a/src/main/resources/org/jenkinsci/plugins/registry/notification/opt/impl/TriggerOnSpecifiedImageNames/config.groovy b/src/main/resources/org/jenkinsci/plugins/registry/notification/opt/impl/TriggerOnSpecifiedImageNames/config.groovy index efd4f5c..8249d3c 100644 --- a/src/main/resources/org/jenkinsci/plugins/registry/notification/opt/impl/TriggerOnSpecifiedImageNames/config.groovy +++ b/src/main/resources/org/jenkinsci/plugins/registry/notification/opt/impl/TriggerOnSpecifiedImageNames/config.groovy @@ -25,14 +25,7 @@ package org.jenkinsci.plugins.registry.notification.opt.impl.TriggerOnSpecifiedI def st = namespace("jelly:stapler") def f = namespace(lib.FormTagLib) -def l = namespace("/lib/local") -if (context.getVariableWithDefaultValue("divBasedFormLayout", false) == true) { - f.entry(title:_("Repositories"), field: "repoNames") { - f.expandableTextbox(value: instance?.repoNames?.join("\n")) - } -} else { - l.entry(title:_("Repositories"), field: "repoNames") { - l.expandableTextbox(value: instance?.repoNames?.join("\n")) - } +f.entry(title:_("Repositories"), field: "repoNames") { + f.expandableTextbox(value: instance?.repoNames?.join("\n")) }