Skip to content

Commit

Permalink
Replace setting-input with jenkins-input
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik committed Oct 7, 2021
1 parent 458b29c commit 2cd5ffe
Show file tree
Hide file tree
Showing 16 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ THE SOFTWARE.
<f:block>
<!-- @size is for other browsers, @style is for IE -->
${%File}:
<input type="file" name="name" class="setting-input" style="width:80%" size='40'/>
<input type="file" name="name" class="jenkins-input" style="width:80%" size='40'/>
</f:block>
<f:block>
<f:submit value="${%Upload}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ THE SOFTWARE.
<l:main-panel>
<f:form method="post" action="newLogRecorder">
<f:entry title="${%Name}">
<input type="text" name="name" class="setting-input" id="box" autofocus="autofocus" />
<input type="text" name="name" class="jenkins-input" id="box" autofocus="autofocus" />
</f:entry>

<f:block>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ THE SOFTWARE.
<!-- if there's only one JDK configured, always use that. -->
<f:entry title="JDK"
description="${%JDK to be used for this project}">
<select class="setting-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
<select class="jenkins-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
<j:getStatic var="DEFAULT_NAME" className="hudson.model.JDK" field="DEFAULT_NAME"/>
<option>${DEFAULT_NAME}</option>
<j:forEach var="inst" items="${jdks}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ THE SOFTWARE.
<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">
<f:entry title="${%View name}"
description="${%The name of a global view that will be shown.}">
<select class="setting-input" name="proxiedViewName">
<select class="jenkins-input" name="proxiedViewName">
<j:forEach var="inst" items="${app.views}">
<f:option selected="${inst.viewName==it.proxiedViewName}" value="${inst.viewName}">${inst.viewName}</f:option>
</j:forEach>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/tasks/Maven/config.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ THE SOFTWARE.
<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:if test="${!empty(descriptor.installations)}">
<f:entry title="${%Maven Version}">
<select class="setting-input" name="maven.name">
<select class="jenkins-input" name="maven.name">
<option value="(Default)">(${%Default})</option>
<j:forEach var="inst" items="${descriptor.installations}">
<f:option selected="${inst.name==instance.maven.name}" value="${inst.name}">${inst.name}</f:option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<f:repeatable var="location" name="locations" items="${instance.locations}">
<table width="100%">
<f:entry title="${%Name}">
<select class="setting-input" name="locations.key">
<select class="jenkins-input" name="locations.key">
<j:forEach var="toolDescriptor" items="${descriptor.toolDescriptors}">
<j:forEach var="toolInstallation" items="${toolDescriptor.installations}">
<f:option selected="${descriptor.getKey(toolInstallation)==location.key}" value="${descriptor.getKey(toolInstallation)}">(${toolDescriptor.displayName}) ${toolInstallation.name}</f:option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ THE SOFTWARE.
<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">
<f:entry title="${%Status Filter}" help="/help/view-config/statusFilter.html">
<select name="statusFilter" class="setting-input">
<select name="statusFilter" class="jenkins-input">
<f:option value="1" selected="${it.statusFilter==true}">${%Enabled jobs only}</f:option>
<f:option value="2" selected="${it.statusFilter==false}">${%Disabled jobs only}</f:option>
</select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ THE SOFTWARE.
</div>
</f:block>
<f:entry title="${%File to check}">
<input type="file" name="name" class="setting-input" />
<input type="file" name="name" class="jenkins-input" />
</f:entry>
<f:block>
<f:submit value="${%Check}" />
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/combobox.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ THE SOFTWARE.
<f:possibleReadOnlyField>
<m:input xmlns:m="jelly:hudson.util.jelly.MorphTagLibrary"
autocomplete="off"
class="combobox2 setting-input ${attrs.clazz}${attrs.checkUrl!=null ? ' validated' : ''}"
class="combobox2 jenkins-input ${attrs.clazz}${attrs.checkUrl!=null ? ' validated' : ''}"
name="${name}"
value="${value}"
ATTRIBUTES="${attrs}" EXCEPT="field items clazz" />
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/enum.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ THE SOFTWARE.
<j:set target="${attrs}" property="field" value="${entry.field}" />
</j:if>

<select class="setting-input" name="${attrs.field}">
<select class="jenkins-input" name="${attrs.field}">
<j:forEach var="it" items="${descriptor.getPropertyType(instance,attrs.field).getEnumConstants()}">
<f:option value="${it.name()}" selected="${instance[attrs.field]!=null ? it==instance[attrs.field] : it.name()==attrs.default}">
<d:invokeBody />
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/expandableTextbox.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ THE SOFTWARE.
<div class="expanding-input">
<div class="expanding-input__input">
<j:set var="name" value="${attrs.name ?: '_.'+attrs.field}" />
<input class="setting-input" type="text"
<input class="jenkins-input" type="text"
name="${name}" value="${value}"
id="textarea.${name}" />
<j:if test="${customizedFields != null and attrs.field != null and (value ?: '') != ''}">
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/resources/lib/form/password.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ THE SOFTWARE.
<st:adjunct includes="lib.form.password.password"/>
<div class="hidden-password">
<m:input xmlns:m="jelly:hudson.util.jelly.MorphTagLibrary"
class="complex-password-field hidden-password-field setting-input ${attrs.checkUrl!=null?'validated ':''}${attrs.clazz}"
class="complex-password-field hidden-password-field jenkins-input ${attrs.checkUrl!=null?'validated ':''}${attrs.clazz}"
name="${attrs.name ?: '_.'+attrs.field}"
value="${value}"
type="hidden"
Expand Down Expand Up @@ -117,7 +117,7 @@ THE SOFTWARE.
</j:when>
<j:otherwise>
<m:input xmlns:m="jelly:hudson.util.jelly.MorphTagLibrary"
class="complex-password-field setting-input ${attrs.checkUrl!=null?'validated ':''}${attrs.clazz}"
class="complex-password-field jenkins-input ${attrs.checkUrl!=null?'validated ':''}${attrs.clazz}"
name="${attrs.name ?: '_.'+attrs.field}"
value="${value}"
type="text"
Expand All @@ -130,7 +130,7 @@ THE SOFTWARE.
</j:when>
<j:otherwise>
<m:input xmlns:m="jelly:hudson.util.jelly.MorphTagLibrary"
class="setting-input ${attrs.checkUrl!=null?'validated ':''}${attrs.clazz}"
class="jenkins-input ${attrs.checkUrl!=null?'validated ':''}${attrs.clazz}"
name="${attrs.name ?: '_.'+attrs.field}"
value="${h.getPasswordValue(resolvedValue)}"
type="password"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/readOnlyTextbox.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ THE SOFTWARE.
</st:attribute>
</st:documentation>
<f:prepareDatabinding />
<input class="setting-input ${attrs.checkUrl!=null?'validated':''} ${attrs.clazz}"
<input class="jenkins-input ${attrs.checkUrl!=null?'validated':''} ${attrs.clazz}"
name="${attrs.name ?: '_.'+attrs.field}"
value="${attrs.value ?: instance[attrs.field] ?: attrs.default}"
id="${attrs.id}"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/richtextarea.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ THE SOFTWARE.
<st:attribute name="style"/>
</st:documentation>
<textarea name="${attrs.name}" id="${attrs.id}" style="${attrs.style}"
class="setting-input rich-editor"
class="jenkins-input rich-editor"
rows="${h.determineRows(attrs.value)}">
<st:out value="${attrs.value}" />
</textarea>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/textarea.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ THE SOFTWARE.
<f:possibleReadOnlyField>
<textarea id="${attrs.id}" style="${attrs.style}"
name ="${name}"
class="setting-input ${attrs.checkUrl!=null?'validated':''} ${attrs['codemirror-mode']!=null?'codemirror':''} ${attrs.class}"
class="jenkins-input ${attrs.checkUrl!=null?'validated':''} ${attrs['codemirror-mode']!=null?'codemirror':''} ${attrs.class}"
checkUrl="${attrs.checkUrl}" checkDependsOn="${attrs.checkDependsOn}" checkMethod="${attrs.checkMethod}"
rows="${h.determineRows(value)}"
readonly="${attrs.readonly}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ THE SOFTWARE.
<f:textarea name="d" value="dvalue" />
</f:entry>
<f:entry title="e" field="e">
<select class="setting-input" name="_.e">
<select class="jenkins-input" name="_.e">
<f:option value="e1">e1</f:option>
<f:option value="e2" selected="true">e2</f:option>
</select>
Expand Down

0 comments on commit 2cd5ffe

Please sign in to comment.