Permalink
Browse files

[HACK][JENKINS-33622] Get 2.x UI to show on config page.

  • Loading branch information...
mjdetullio committed Jul 12, 2016
1 parent c4aa3bc commit 2ae71549c53d15a39707082d2cd284f3a4923b0a
@@ -61,6 +61,7 @@
import hudson.util.FormValidation;
import hudson.util.Function1;
import hudson.util.HttpResponses;
import hudson.util.VersionNumber;
import hudson.views.DefaultViewsTabBar;
import hudson.views.ViewsTabBar;
import java.io.File;
@@ -124,6 +125,8 @@

private static final Logger LOGGER = Logger.getLogger(AbstractFolder.class.getName());

private static final VersionNumber VERSION_TWO = new VersionNumber("2.0");

private static long loadingTick;
private static final AtomicInteger jobTotal = new AtomicInteger();
private static final AtomicInteger jobEncountered = new AtomicInteger();
@@ -785,4 +788,8 @@ public void doDoRename(StaplerRequest req, StaplerResponse rsp) throws IOExcepti
return null;
}

public static boolean useLegacyUi() {
return Jenkins.getVersion().isOlderThan(VERSION_TWO);
}

}
@@ -23,72 +23,30 @@ THE SOFTWARE.
-->
<?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" xmlns:i="jelly:fmt">
<l:layout title="${it.displayName} Config" norefresh="true" permission="${it.EXTENDED_READ}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<div class="behavior-loading">${%LOADING}</div>
<f:form method="post" action="configSubmit" name="config">
<j:set var="descriptor" value="${it.descriptor}" />
<j:set var="instance" value="${it}" />

<f:entry title="${%Name}" field="name">
<f:textbox />
</f:entry>

<f:entry title="${%Display Name}" field="displayNameOrNull">
<f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
</f:entry>

<f:entry title="${%Description}" field="description">
<f:textarea codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription" />
</f:entry>

<st:include page="configure-details" optional="true"/>

<j:if test="${it.views.size()>1}">
<f:entry title="${%Default View}" field="defaultView">
<select class="setting-input" name="primaryView">
<j:forEach var="v" items="${it.views}">
<j:choose>
<j:when test="${it.primaryView==v}">
<option value="${v.viewName}" selected="selected">${v.viewName}</option>
</j:when>
<j:otherwise>
<option value="${v.viewName}">${v.viewName}</option>
</j:otherwise>
</j:choose>
</j:forEach>
</select>
</f:entry>
</j:if>

<f:dropdownDescriptorSelector title="${%Views Tab Bar}" field="viewsTabBar"/>

<!-- TODO tried to hide unless ${it.icon.descriptor.all().size() > 1} using f:invisibleEntry but this did not seem to work: -->
<f:dropdownDescriptorSelector title="${%Icon}" field="icon"/>

<f:section title="${%Health metrics}">
<f:advanced title="${%Health metrics}" align="left">
<f:block>
<f:hetero-list descriptors="${descriptor.getHealthMetricDescriptors()}"
items="${it.healthMetrics}" name="healthMetrics"
addCaption="${%Add metric}" deleteCaption="${%Remove}"
oneEach="true" hasHeader="true" honorOrder="true"/>
</f:block>
</f:advanced>
</f:section>

<!-- folder property configurations -->
<f:descriptorList descriptors="${descriptor.getPropertyDescriptors()}" instances="${it.properties}" forceRowSet="true" />

<j:if test="${h.hasPermission(it,it.CONFIGURE)}">
<f:bottomButtonBar>
<f:submit value="${%Save}" />
<f:apply/>
</f:bottomButtonBar>
</j:if>
</f:form>
<st:adjunct includes="lib.form.confirm" />
</l:main-panel>
</l:layout>
<j:choose>
<!-- TODO Remove logic and bring configure2 back in when base is upgraded to 2.x. -->
<j:when test="${it.useLegacyUi()}">
<l:layout norefresh="true" permission="${it.EXTENDED_READ}" title="${it.displayName} Config">
<st:include page="sidepanel.jelly"/>
<l:main-panel>
<st:include page="configure2.jelly"/>
</l:main-panel>
</l:layout>
</j:when>
<j:otherwise>
<l:layout norefresh="true" type="one-column" permission="${it.EXTENDED_READ}" title="${it.displayName} Config">
<l:js src="jsbundles/config-scrollspy.js"/>
<l:css src="jsbundles/config-scrollspy.css"/>
<l:main-panel>
<div class="container">
<div class="row">
<div class="col-md-offset-2 col-md-20">
<st:include page="configure2.jelly"/>
</div>
</div>
</div>
</l:main-panel>
</l:layout>
</j:otherwise>
</j:choose>
</j:jelly>
@@ -0,0 +1,102 @@
<!--
The MIT License
Copyright 2013 CloudBees.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
<div class="behavior-loading">${%LOADING}</div>
<f:form method="post" action="configSubmit" name="config" tableClass="config-table scrollspy">
<j:set var="descriptor" value="${it.descriptor}"/>
<j:set var="instance" value="${it}"/>

<f:entry title="${%Name}" field="name">
<!--
TODO Remove block-control class
Having this forces application of the 2.x UI but it is glitchy if no f:optionalBlock or f:radioBlock
elements are in the form (such is the case for the standard Folder implementation).
The save/apply buttons are out of place until the DOM is modified by expanding config elements or by
resizing the browser window.
-->
<f:textbox clazz="block-control"/>
</f:entry>

<f:entry title="${%Display Name}" field="displayNameOrNull">
<f:textbox
checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
</f:entry>

<f:entry title="${%Description}" field="description">
<f:textarea codemirror-mode="${app.markupFormatter.codeMirrorMode}"
codemirror-config="${app.markupFormatter.codeMirrorConfig}"
previewEndpoint="/markupFormatter/previewDescription"/>
</f:entry>

<st:include page="configure-details" optional="true"/>

<j:if test="${it.views.size()>1}">
<f:entry title="${%Default View}" field="defaultView">
<select class="setting-input" name="primaryView">
<j:forEach var="v" items="${it.views}">
<j:choose>
<j:when test="${it.primaryView==v}">
<option value="${v.viewName}" selected="selected">${v.viewName}</option>
</j:when>
<j:otherwise>
<option value="${v.viewName}">${v.viewName}</option>
</j:otherwise>
</j:choose>
</j:forEach>
</select>
</f:entry>
</j:if>

<f:dropdownDescriptorSelector title="${%Views Tab Bar}" field="viewsTabBar"/>

<!-- TODO tried to hide unless ${it.icon.descriptor.all().size() > 1} using f:invisibleEntry but this did not seem to work: -->
<f:dropdownDescriptorSelector title="${%Icon}" field="icon"/>

<f:section title="${%Health metrics}">
<f:advanced title="${%Health metrics}" align="left">
<f:block>
<f:hetero-list descriptors="${descriptor.getHealthMetricDescriptors()}"
items="${it.healthMetrics}" name="healthMetrics"
addCaption="${%Add metric}" deleteCaption="${%Remove}"
oneEach="true" hasHeader="true" honorOrder="true"/>
</f:block>
</f:advanced>
</f:section>

<!-- folder property configurations -->
<f:descriptorList descriptors="${descriptor.getPropertyDescriptors()}" instances="${it.properties}"
forceRowSet="true"/>

<j:if test="${h.hasPermission(it,it.CONFIGURE)}">
<f:bottomButtonBar>
<f:submit value="${%Save}"/>
<f:apply/>
</f:bottomButtonBar>
</j:if>
</f:form>
<st:adjunct includes="lib.form.confirm"/>
</j:jelly>

0 comments on commit 2ae7154

Please sign in to comment.