[JENKINS-43786] Overhaul of Manage Jenkins page #2857
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,7 +39,7 @@ SystemInfoLink.DisplayName=System Information | |
| SystemInfoLink.Description=Displays various environmental information to assist trouble-shooting. | ||
|
|
||
| SystemLogLink.DisplayName=System Log | ||
| SystemLogLink.Description=System log captures output from <code>java.util.logging</code> output related to Jenkins. | ||
|
Contributor
Author
There was a problem hiding this comment. Unrelated but |
||
|
|
||
| StatisticsLink.DisplayName=Load Statistics | ||
| StatisticsLink.Description=Check your resource utilization and see if you need more computers for your builds. | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,16 +27,16 @@ 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 title="${%Manage Jenkins}" xmlns:local="local" permission="${app.ADMINISTER}" css="/bootstrap/css/bootstrap.min.css"> | ||
|
|
||
| <d:taglib uri="local"> | ||
| <!-- table to show a map --> | ||
| <d:tag name="feature"> | ||
| <j:set var="iconUrl" value="${icon.startsWith('/') ? resURL+icon : imagesURL+'/48x48/'+icon}"/> | ||
| ${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(href,iconUrl,title,post,requiresConfirmation) : null} | ||
|
Member
There was a problem hiding this comment. This line was removed without replacement.
Member
There was a problem hiding this comment. Indeed it looks like |
||
| <!-- TODO summary.jelly should be modified to accept requiresConfirmation so the icon link can be included --> | ||
| <j:set var="_href" value="${href}"/> | ||
| <t:summary icon="${icon}" href="${requiresConfirmation || post ? null : href}" iconOnly="true"> | ||
|
|
||
| <div class="link"> | ||
| <j:choose> | ||
| <j:when test="${requiresConfirmation}"> | ||
|
|
@@ -57,6 +57,7 @@ THE SOFTWARE. | |
| <j:if test="${taskTags==null}"> | ||
| <st:include page="sidepanel.jelly" /> | ||
| </j:if> | ||
|
|
||
| <l:main-panel> | ||
| <h1>${%Manage Jenkins}</h1> | ||
|
|
||
|
|
@@ -68,12 +69,76 @@ THE SOFTWARE. | |
|
|
||
| <st:include page="downgrade.jelly" /> | ||
|
|
||
| <style type="text/css"> | ||
|
Contributor
Author
There was a problem hiding this comment. The final definition will be placed on the proper CSS file. |
||
| .manage-option { | ||
| border: 1px solid transparent; | ||
| margin-bottom: 4px; | ||
| } | ||
| .manage-option:hover { | ||
| border: 1px solid #ccc; | ||
| border-radius: 3px; | ||
| background-color: #fafafa; | ||
| } | ||
| .manage-option dl { | ||
| padding: 0; | ||
| margin: 0 0 0 62px; | ||
| min-height: 48px; | ||
| } | ||
| .manage-option dl dt { | ||
| font-size: 16px; | ||
| line-height: 24px; | ||
| } | ||
| .manage-option dl dd { | ||
| margin-left: 0; | ||
| line-height: 20px; | ||
| color: #333; | ||
| font-size: 14px; | ||
| } | ||
|
|
||
| .manage-option a, .manage-option a:visited { | ||
| display: block; | ||
| padding: 8px; | ||
| margin: 0; | ||
| text-decoration: none; | ||
| color: #000; | ||
| outline: 0; | ||
| } | ||
| .manage-option .icon { | ||
| display: block; | ||
| float: left; | ||
| position: relative; | ||
| width: 48px; | ||
| height: 48px; | ||
| } | ||
|
|
||
| </style> | ||
|
|
||
| <j:forEach var="m" items="${it.managementLinks}"> | ||
| <l:hasPermission permission="${m.requiredPermission}"> | ||
| <j:set var="icon" value="${m.iconClassName != null ? m.iconClassName : m.iconFileName}" /> | ||
| <j:if test="${icon!=null}"> | ||
| <div class="manage-option"> | ||
| <a href="${m.urlName}" title=""> | ||
| <j:set var="iconUrl" value="${icon.startsWith('/') ? resURL+icon : imagesURL + '/48x48/' + icon}" /> | ||
| <img class="icon" src="${iconUrl}" /> | ||
| <dl> | ||
| <dt>${m.displayName}</dt> | ||
| <dd><j:out value="${m.description}"/></dd> | ||
| <dd><st:include it="${m}" page="info.jelly" optional="true"/></dd> | ||
| </dl> | ||
| </a> | ||
| </div> | ||
| </j:if> | ||
| </l:hasPermission> | ||
| </j:forEach> | ||
|
|
||
|
|
||
| <table style="padding-left: 2em; display: none;" id="management-links"> | ||
|
Contributor
Author
There was a problem hiding this comment. It will be removed. It is still here for testing purposes.
Contributor
Author
There was a problem hiding this comment. Given this block of code will be removed, this functional test needs to reviewed. |
||
| <j:forEach var="m" items="${it.managementLinks}"> | ||
| <l:hasPermission permission="${m.requiredPermission}"> | ||
| <j:set var="icon" value="${m.iconClassName != null ? m.iconClassName : m.iconFileName}"/> | ||
| <j:if test="${icon!=null}"> | ||
| <local:feature icon="${icon}" href="${m.urlName}" title="${m.displayName}" requiresConfirmation="${m.requiresConfirmation}" post="${m.requiresPOST}"> | ||
|
Contributor
Author
There was a problem hiding this comment. @daniel-beck Do you know any case where
Contributor
Author
There was a problem hiding this comment. @oleg-nenashev And you? Could you help me?
Member
There was a problem hiding this comment. @recena AFAIK it cannot be used elsewhere outside this file
Contributor
Author
There was a problem hiding this comment. @oleg-nenashev What I really wanted was to know how exercising this taglib. Some use-case.
Member
There was a problem hiding this comment. @recena Reusability for less repetition, see https://github.com/recena/jenkins/blob/6d119ef16946312d8c4ca319babb2e2b292b9b79/core/src/main/resources/jenkins/model/Jenkins/manage.jelly. The October 2012 changes converted those to
Contributor
Author
There was a problem hiding this comment. @daniel-beck I appreciate your feedback. Can I understand we could make a cleanup?
Member
There was a problem hiding this comment. Assuming by cleanup you mean inlining the tag, yes. |
||
| <j:out value="${m.description}"/> | ||
| <st:include it="${m}" page="info.jelly" optional="true"/> | ||
| </local:feature> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are not typos.
iff is shorthand for if and only if, see e.g. http://www.dictionary.com/browse/iff
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad English. Thanks for noticing it.