Skip to content

Commit

Permalink
MID-4775 task details layout fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Sep 10, 2018
1 parent 635583f commit 64ae3df
Show file tree
Hide file tree
Showing 7 changed files with 195 additions and 179 deletions.
78 changes: 40 additions & 38 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.html
View file
Expand Up @@ -23,44 +23,46 @@
<div class="col-md-6">
<div class="box box-success">
<div class="box-body no-padding">
<table class="table table-striped">
<tr wicket:id="nameContainer">
<td><wicket:message key="pageTaskEdit.name"/></td>
<td><input type="text" class="form-control input-sm" wicket:id="name"/></td>
</tr>
<tr wicket:id="descriptionContainer">
<td><wicket:message key="pageTaskEdit.description"/></td>
<td><textarea class="form-control input-sm" rows="5" wicket:id="description"/></td>
</tr>
<tr>
<td><wicket:message key="pageTaskEdit.oid"/></td>
<td><span wicket:id="oid"/></td>
</tr>
<tr wicket:id="identifierContainer">
<td><wicket:message key="pageTaskEdit.identifier"/></td>
<td><span wicket:id="identifier"/></td>
</tr>
<tr wicket:id="categoryContainer">
<td><wicket:message key="pageTaskEdit.category"/></td>
<td><span wicket:id="category"/></td>
</tr>
<tr wicket:id="parentContainer">
<td><wicket:message key="pageTaskEdit.parent"/></td>
<td><span wicket:id="parent"/></td>
</tr>
<tr wicket:id="ownerContainer">
<td><wicket:message key="pageTaskEdit.owner"/></td>
<td><span wicket:id="owner"/></td>
</tr>
<tr wicket:id="handlerUriContainer">
<td><wicket:message key="pageTaskEdit.handlerUri"/></td>
<td><span wicket:id="handlerUri"/></td>
</tr>
<tr wicket:id="executionContainer">
<td><wicket:message key="pageTaskEdit.execution"/></td>
<td><span wicket:id="execution"/> <span wicket:id="node"/></td>
</tr>
</table>
<div class="table-responsive">
<table class="table table-striped">
<tr wicket:id="nameContainer">
<td><wicket:message key="pageTaskEdit.name"/></td>
<td><input type="text" class="form-control input-sm" wicket:id="name"/></td>
</tr>
<tr wicket:id="descriptionContainer">
<td><wicket:message key="pageTaskEdit.description"/></td>
<td><textarea class="form-control input-sm" rows="5" wicket:id="description"/></td>
</tr>
<tr>
<td><wicket:message key="pageTaskEdit.oid"/></td>
<td><span wicket:id="oid"/></td>
</tr>
<tr wicket:id="identifierContainer">
<td><wicket:message key="pageTaskEdit.identifier"/></td>
<td><span wicket:id="identifier"/></td>
</tr>
<tr wicket:id="categoryContainer">
<td><wicket:message key="pageTaskEdit.category"/></td>
<td><span wicket:id="category"/></td>
</tr>
<tr wicket:id="parentContainer">
<td><wicket:message key="pageTaskEdit.parent"/></td>
<td><span wicket:id="parent"/></td>
</tr>
<tr wicket:id="ownerContainer">
<td><wicket:message key="pageTaskEdit.owner"/></td>
<td><span wicket:id="owner"/></td>
</tr>
<tr wicket:id="handlerUriContainer">
<td><wicket:message key="pageTaskEdit.handlerUri"/></td>
<td><span wicket:id="handlerUri"/></td>
</tr>
<tr wicket:id="executionContainer">
<td><wicket:message key="pageTaskEdit.execution"/></td>
<td><span wicket:id="execution"/> <span wicket:id="node"/></td>
</tr>
</table>
</div>
</div>
</div>
</div>
Expand Down
170 changes: 87 additions & 83 deletions ...gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSchedulingTabPanel.html
View file
Expand Up @@ -22,94 +22,98 @@

<div class="box box-info">
<div class="box-body no-padding">
<table class="table table-striped">
<tr wicket:id="lastStartedContainer">
<td><wicket:message key="pageTaskEdit.lastStarted"/></td>
<td><span wicket:id="lastStarted" /> <span class="small" wicket:id="lastStartedAgo" /></td>
</tr>
<tr wicket:id="lastFinishedContainer">
<td><wicket:message key="pageTaskEdit.lastFinished"/></td>
<td><span wicket:id="lastFinished" /> <span class="small" wicket:id="lastFinishedAgo" /></td>
</tr>
<tr wicket:id="nextRunContainer">
<td><wicket:message key="pageTaskEdit.nextRun"/></td>
<td><span wicket:id="nextRun" /> <span class="small" wicket:id="nextRunIn" /></td>
</tr>
<tr wicket:id="nextRetryContainer">
<td><wicket:message key="pageTaskEdit.nextRetry"/></td>
<td><span wicket:id="nextRetry" /> <span class="small" wicket:id="nextRetryIn" /></td>
</tr>
</table>
<div class="table-responsive">
<table class="table table-striped">
<tr wicket:id="lastStartedContainer">
<td><wicket:message key="pageTaskEdit.lastStarted"/></td>
<td><span wicket:id="lastStarted" /> <span class="small" wicket:id="lastStartedAgo" /></td>
</tr>
<tr wicket:id="lastFinishedContainer">
<td><wicket:message key="pageTaskEdit.lastFinished"/></td>
<td><span wicket:id="lastFinished" /> <span class="small" wicket:id="lastFinishedAgo" /></td>
</tr>
<tr wicket:id="nextRunContainer">
<td><wicket:message key="pageTaskEdit.nextRun"/></td>
<td><span wicket:id="nextRun" /> <span class="small" wicket:id="nextRunIn" /></td>
</tr>
<tr wicket:id="nextRetryContainer">
<td><wicket:message key="pageTaskEdit.nextRetry"/></td>
<td><span wicket:id="nextRetry" /> <span class="small" wicket:id="nextRetryIn" /></td>
</tr>
</table>
</div>
</div>
</div>

<div class="box box-default">
<div class="box-body no-padding">
<table class="table table-striped" wicket:id="schedulingTable">
<tr wicket:id="recurringContainer">
<td><wicket:message key="pageTaskEdit.recurring"/></td>
<td>
<input type="checkbox" class="input-sm" wicket:id="recurringCheck"/>
<span wicket:id="suspendReqRecurring" class="text-warning"><wicket:message key="pageTaskEdit.suspendReq"/></span>
</td>
</tr>
<tr wicket:id="boundContainer">
<td>
<wicket:message key="pageTaskEdit.bound"/>
<i wicket:id="boundHelp" wicket:message="title:pageTaskEdit.boundHelp"/>
</td>
<td>
<input type="checkbox" class="input-sm" wicket:id="boundCheck"/>
<span wicket:id="suspendReqBound" class="text-warning"><wicket:message key="pageTaskEdit.suspendReq"/></span>
</td>
</tr>
<tr wicket:id="intervalContainer">
<td><wicket:message key="pageTaskEdit.scheduleInterval"/></td>
<td><input type="text" class="form-control input-sm" wicket:id="interval"/></td>
</tr>
<tr wicket:id="cronContainer">
<td>
<wicket:message key="pageTaskEdit.cronSpec"/>
<i wicket:id="cronHelp" wicket:message="title:pageTaskEdit.cronHelp"/>
</td>
<td>
<input type="text" class="form-control input-sm" wicket:id="cron"/>
<span class="help-block">
<wicket:message key="pageTaskEdit.cronHelpLink" />
<a href="http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/tutorial-lesson-06"
target="_blank"><wicket:message key="pageTaskEdit.cronHelpLinkTutorial" /></a>
</span>
</td>
</tr>
<tr wicket:id="notStartBeforeContainer">
<td><wicket:message key="pageTaskEdit.notStartBefore"/></td>
<td><span wicket:id="notStartBeforeField" /></td>
</tr>
<tr wicket:id="notStartAfterContainer">
<td><wicket:message key="pageTaskEdit.notStartAfter"/></td>
<td><span wicket:id="notStartAfterField" /></td>
</tr>
<tr wicket:id="misfireActionContainer">
<td><wicket:message key="pageTaskEdit.misfire"/></td>
<td><select class="form-control input-sm" wicket:id="misfireAction"/></td>
</tr>
<tr wicket:id="threadStopContainer">
<td><wicket:message key="pageTaskEdit.threadStop"/></td>
<td><select class="form-control input-sm" wicket:id="threadStop"/></td>
</tr>
<tr wicket:id="executionGroupContainer">
<td><wicket:message key="pageTaskEdit.executionGroup"/></td>
<td><input class="form-control input-sm" wicket:id="executionGroup"/></td>
</tr>
<tr wicket:id="groupTaskLimitContainer">
<td><wicket:message key="pageTaskEdit.groupTaskLimit"/></td>
<td><input class="form-control input-sm" wicket:id="groupTaskLimit"/></td>
</tr>
<tr wicket:id="allowedNodesContainer">
<td><wicket:message key="pageTaskEdit.allowedNodes"/></td>
<td><label wicket:id="allowedNodes" style="font-weight:normal"></label></td>
</tr>
</table>
<div class="table-responsive">
<table class="table table-striped" wicket:id="schedulingTable">
<tr wicket:id="recurringContainer">
<td><wicket:message key="pageTaskEdit.recurring"/></td>
<td>
<input type="checkbox" class="input-sm" wicket:id="recurringCheck"/>
<span wicket:id="suspendReqRecurring" class="text-warning"><wicket:message key="pageTaskEdit.suspendReq"/></span>
</td>
</tr>
<tr wicket:id="boundContainer">
<td>
<wicket:message key="pageTaskEdit.bound"/>
<i wicket:id="boundHelp" wicket:message="title:pageTaskEdit.boundHelp"/>
</td>
<td>
<input type="checkbox" class="input-sm" wicket:id="boundCheck"/>
<span wicket:id="suspendReqBound" class="text-warning"><wicket:message key="pageTaskEdit.suspendReq"/></span>
</td>
</tr>
<tr wicket:id="intervalContainer">
<td><wicket:message key="pageTaskEdit.scheduleInterval"/></td>
<td><input type="text" class="form-control input-sm" wicket:id="interval"/></td>
</tr>
<tr wicket:id="cronContainer">
<td>
<wicket:message key="pageTaskEdit.cronSpec"/>
<i wicket:id="cronHelp" wicket:message="title:pageTaskEdit.cronHelp"/>
</td>
<td>
<input type="text" class="form-control input-sm" wicket:id="cron"/>
<span class="help-block">
<wicket:message key="pageTaskEdit.cronHelpLink" />
<a href="http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/tutorial-lesson-06"
target="_blank"><wicket:message key="pageTaskEdit.cronHelpLinkTutorial" /></a>
</span>
</td>
</tr>
<tr wicket:id="notStartBeforeContainer">
<td><wicket:message key="pageTaskEdit.notStartBefore"/></td>
<td><span wicket:id="notStartBeforeField" /></td>
</tr>
<tr wicket:id="notStartAfterContainer">
<td><wicket:message key="pageTaskEdit.notStartAfter"/></td>
<td><span wicket:id="notStartAfterField" /></td>
</tr>
<tr wicket:id="misfireActionContainer">
<td><wicket:message key="pageTaskEdit.misfire"/></td>
<td><select class="form-control input-sm" wicket:id="misfireAction"/></td>
</tr>
<tr wicket:id="threadStopContainer">
<td><wicket:message key="pageTaskEdit.threadStop"/></td>
<td><select class="form-control input-sm" wicket:id="threadStop"/></td>
</tr>
<tr wicket:id="executionGroupContainer">
<td><wicket:message key="pageTaskEdit.executionGroup"/></td>
<td><input class="form-control input-sm" wicket:id="executionGroup"/></td>
</tr>
<tr wicket:id="groupTaskLimitContainer">
<td><wicket:message key="pageTaskEdit.groupTaskLimit"/></td>
<td><input class="form-control input-sm" wicket:id="groupTaskLimit"/></td>
</tr>
<tr wicket:id="allowedNodesContainer">
<td><wicket:message key="pageTaskEdit.allowedNodes"/></td>
<td><label wicket:id="allowedNodes" style="font-weight:normal"></label></td>
</tr>
</table>
</div>
</div>
</div>

Expand Down
16 changes: 9 additions & 7 deletions ...c/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/DefaultHandlerPanel.html
View file
Expand Up @@ -21,13 +21,15 @@
<wicket:panel>
<div class="box box-success">
<div class="box-body no-padding">
<table class="table table-striped">
<tr wicket:id="objectRefContainer">
<td><wicket:message key="pageTaskEdit.objectRef"/></td>
<td><span wicket:id="objectRef"/></td>
</tr>
<wicket:child/>
</table>
<div class="table-responsive">
<table class="table table-striped">
<tr wicket:id="objectRefContainer">
<td><wicket:message key="pageTaskEdit.objectRef"/></td>
<td><span wicket:id="objectRef"/></td>
</tr>
<wicket:child/>
</table>
</div>
</div>
</div>
</wicket:panel>
Expand Down
24 changes: 13 additions & 11 deletions ...ain/java/com/evolveum/midpoint/web/page/admin/server/handlers/QueryBasedHandlerPanel.html
View file
Expand Up @@ -21,17 +21,19 @@
<wicket:panel>
<div class="box box-success">
<div class="box-body no-padding">
<table class="table table-striped">
<tr wicket:id="objectTypeContainer">
<td><wicket:message key="QueryBasedHandlerPanel.objectType"/></td>
<td><span wicket:id="objectType"/></td>
</tr>
<tr wicket:id="objectQueryContainer">
<td><wicket:message key="QueryBasedHandlerPanel.query"/></td>
<td><textarea wicket:id="objectQuery" class="form-control input-sm" rows="12"></textarea></td>
</tr>
<wicket:child/>
</table>
<div class="table-responsive">
<table class="table table-striped">
<tr wicket:id="objectTypeContainer">
<td><wicket:message key="QueryBasedHandlerPanel.objectType"/></td>
<td><span wicket:id="objectType"/></td>
</tr>
<tr wicket:id="objectQueryContainer">
<td><wicket:message key="QueryBasedHandlerPanel.query"/></td>
<td><textarea wicket:id="objectQuery" class="form-control input-sm" rows="12"></textarea></td>
</tr>
<wicket:child/>
</table>
</div>
</div>
</div>
</wicket:panel>
Expand Down

0 comments on commit 64ae3df

Please sign in to comment.