Skip to content
Permalink
Browse files
Those 5 commits revert the unnecessary fixes to JENKINS-9426.
It actually contains one hunk that is necessary, but I'll merge it from
the 1.408 branch.
  • Loading branch information
kohsuke committed Apr 18, 2011
2 parents ebcc791 + ffcf4c5 commit 0ecb07bd36f334e906c0e0a71da38fd62f9ce5d4
@@ -53,7 +53,7 @@ THE SOFTWARE.
</j:otherwise>
</j:choose>
<p>
<j:out value="${%text(rootURL,it.url)}" />
${%text(rootURL,it.url)}
</p>
</l:main-panel>
</l:layout>
@@ -32,15 +32,15 @@ THE SOFTWARE.
<!-- Only show the create new jobs link to those users that have permission to use it. -->
<j:getStatic var="permission" className="hudson.model.Item" field="CREATE"/>
<j:when test="${h.hasPermission(permission)}">
<j:out value="${%newJob}" />
${%newJob}
</j:when>
<j:otherwise>
<!-- Offer anonymous users the chance to login, then they can create jobs. -->
<j:if test="${h.isAnonymous()}">
<j:out value="${%login(rootURL, app.securityRealm.loginUrl, request.requestURI)}" />
${%login(rootURL, app.securityRealm.loginUrl, request.requestURI)}
<!-- Also offer them the opportunity to sign-up for an account, if this facility is available. -->
<j:if test="${app.securityRealm.allowsSignup()}">
<j:out value="${%signup}" />
${%signup}
</j:if>
</j:if>
</j:otherwise>
@@ -24,5 +24,5 @@ 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">
<!-- upstreamUrl added in 1.284, so handle missing value -->
<span><j:out value='${it.upstreamUrl!=null ? "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" : it.shortDescription}' /></span>
<span>${it.upstreamUrl!=null ? "%started_by_project(it.upstreamProject,it.upstreamBuild.toString(),it.upstreamUrl,rootURL)" : it.shortDescription}</span>
</j:jelly>
@@ -23,5 +23,5 @@ 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">
<span><j:out value="${%started_by_user(it.userName,rootURL)}" /></span>
<span>${%started_by_user(it.userName,rootURL)}</span>
</j:jelly>
@@ -21,6 +21,7 @@ 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:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout norefresh="true">
@@ -31,7 +32,7 @@ THE SOFTWARE.
${%Jenkins CLI}
</h1>
<p>
<j:out value="${%blurb(rootURL)}" />
${%blurb(rootURL)}
</p>
<pre style="color: white; background-color:black; padding:1em; font-weight: bold">java -jar <a
style="color: white"
@@ -37,7 +37,7 @@ THE SOFTWARE.
<f:form method="post" action="doFingerprintCheck" enctype="multipart/form-data">
<f:block>
<div style="margin-bottom: 1em;">
<j:out value="${%description}"/> (<a href="${%fingerprint.link}">${%more details}</a>)
${%description} (<a href="${%fingerprint.link}">${%more details}</a>)
</div>
</f:block>
<f:entry title="${%File to check}">
@@ -20,11 +20,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Check\ File\ Fingerprint=\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u30c1\u30a7\u30c3\u30af
File\ to\ check=\u30c1\u30a7\u30c3\u30af\u3059\u308b\u30d5\u30a1\u30a4\u30eb
Check=\u30c1\u30a7\u30c3\u30af
Check\ File\ Fingerprint=\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u30C1\u30A7\u30C3\u30AF
File\ to\ check=\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u30D5\u30A1\u30A4\u30EB
Check=\u30C1\u30A7\u30C3\u30AF
description=\
jar\u30d5\u30a1\u30a4\u30eb\u3092\u53d6\u5f97\u3057\u305f\u306e\u306b\u3001\u3069\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304b\u5206\u304b\u3089\u306a\u3044\u306e\u3067\u3059\u304b? <br /> \
Jenkins\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3067\u30d5\u30a1\u30a4\u30eb\u6307\u7d0b\u3092\u30c1\u30a7\u30c3\u30af\u3059\u308c\u3070\u5206\u304b\u308a\u307e\u3059\u3002
more\ details=\u8a73\u7d30
jar\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u5F97\u3057\u305F\u306E\u306B\u3001\u3069\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u304B\u5206\u304B\u3089\u306A\u3044\u306E\u3067\u3059\u304B? <br /> \
Jenkins\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3067\u30D5\u30A1\u30A4\u30EB\u6307\u7D0B\u3092\u30C1\u30A7\u30C3\u30AF\u3059\u308C\u3070\u3001\u5206\u304B\u308A\u307E\u3059\u3002
more\ details=\u8A73\u7D30
fingerprint.link=http://wiki.jenkins-ci.org/display/JA/Fingerprint
@@ -61,6 +61,6 @@ THE SOFTWARE.
</div>
<img src="${prefix?:'loadStatistics'}/graph?type=${type}&amp;width=500&amp;height=300" alt="[${%Load statistics graph}]" />
<div style="margin-top: 2em;">
<j:core value="${%blurb}" />
${%blurb}
</div>
</j:jelly>
@@ -31,7 +31,7 @@ THE SOFTWARE.
<st:include page="sidepanel.jelly" />
<l:main-panel>
<t:buildCaption>
<j:out value="${%Console Output}"/>
${%Console Output}
</t:buildCaption>
<l:rightspace>
<a href="consoleText">
@@ -43,7 +43,7 @@ THE SOFTWARE.
<j:set var="offset" value="${empty(consoleFull) ? it.logFile.length()-threshold*1024 : 0}" />
<j:choose>
<j:when test="${offset > 0}">
<j:out value='${%skipSome(offset/1024,"consoleFull")}' />
${%skipSome(offset/1024,"consoleFull")}
</j:when>
<j:otherwise>
<j:set var="offset" value="${0}" />
@@ -22,7 +22,7 @@ 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">
<style type="text/css">
#noJobDiv {
@@ -21,13 +21,14 @@ 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:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<l:layout permission="${app.ADMINISTER}" title="${%Users}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>${%Users}</h1>
<p><j:out value="${%blurb}" /></p>
<p>${%blurb}</p>

<table class="sortable pane bigtable" id="people">
<tr>
@@ -21,6 +21,7 @@ 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:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<l:layout norefresh="true">
@@ -30,7 +31,7 @@ THE SOFTWARE.
<l:main-panel>
<h1>${%Success}</h1>
<div>
<j:out value="${%description}" />
${%description}
</div>
</l:main-panel>
</l:layout>
@@ -34,7 +34,7 @@ THE SOFTWARE.
<h1>${%Script Console}</h1>

<p>
<j:out value="${%description}" />
${%description}
</p>
<!-- this is where the example goes -->
<d:invokeBody />

0 comments on commit 0ecb07b

Please sign in to comment.