Skip to content

Commit

Permalink
Merge pull request rundeck#3553 from rundeck/ui-alpha-merge
Browse files Browse the repository at this point in the history 
Ui alpha merge
  • Loading branch information
@gschueler
gschueler authored Jun 21, 2018
2 parents 50c8e29 + bc840d1 commit 587aa36
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 72 deletions.
19 changes: 19 additions & 0 deletions rundeckapp/grails-app/assets/scss/custom/modals.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,22 @@ body.modal-open{
// margin-left: auto;
// }
}

// TODO: This is really really hacky. The modal's content gets loaded from a template that's used in not-modals.
#execDiv{
// this is a modal for running jobs from the jobs page
#execDivContent{
padding: 0 15px;
margin-top: -30px;
.panel-footer{
margin: 0 -15px;
.form-group{
margin-right:20px!important;
margin-left: 0!important;
#execFormRunButton{
margin-bottom:0!important;
}
}
}
}
}
20 changes: 19 additions & 1 deletion rundeckapp/grails-app/assets/stylesheets/app.scss.css
View file

Large diffs are not rendered by default.

98 changes: 41 additions & 57 deletions rundeckapp/grails-app/views/execution/_wfstateSummaryDisplay.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<g:render template="nodeCurrentStateSimpleKO"/>
</script>

<div data-bind="if: !stateLoaded()" style="margin-top:1em">
<div data-bind="if: !stateLoaded()">
<div class="row">
<div class="col-sm-12">
<div class="card">
Expand All @@ -27,7 +27,7 @@
<div class="well well-lg" data-bind="visible: errorMessage()" style="display: none">
<span class="text-warning" data-bind="text: errorMessage()">
</span>
<div style="margin-top:1em;">
<div>
<a class="btn btn-default btn-sm" href="#output" data-bind="click: showTab.curry('tab_link_output') "><g:message code="button.action.view.log.output" /></a>
</div>
</div>
Expand All @@ -54,63 +54,47 @@
<tmpl:wfstateSummaryScore />
</div>

<div class="row row-space" data-bind="if: !completed()">
<div class="col-sm-12" >
<div class="row" data-bind="if: !completed()">

<table class="table table-bordered">

<tr>
<th colspan="3" class="text-primary table-footer text-small">
<g:message code="node.summary" />
</th>
</tr>
<tr>
<th style="width: 33%" class="text-primary text-center h5 text-header">
<g:message code="waiting" />
<g:render template="/common/helpTooltipIconKO"
model="[messageCode:'workflowState.summary.nodes.waiting.description']"/>
</th>
<th style="width: 33%" class="text-primary text-center h5 text-header">
<g:message code="running" />
<g:render template="/common/helpTooltipIconKO"
model="[messageCode: 'workflowState.summary.nodes.running.description']"/>
</th>
<th style="width: 33%" class="text-primary text-center h5 text-header">
<g:message code="done" />
<g:render template="/common/helpTooltipIconKO"
model="[messageCode: 'workflowState.summary.nodes.complete.description']"/>
</th>
</tr>
<tr>
<td>
<div class="text-center">
<span class="h3 text-primary" data-bind="text: waitingNodes().length"></span>
</div>
</td>
<td>

<div class="text-center">
<span class=" h3"
data-bind="css: {'text-info': runningNodes().length > 0 , 'text-primary': runningNodes().length < 1 } ">
<span class=" " data-bind="text: runningNodes().length"></span>
</span>
</div>


</td>
<td >

<div class="text-center">
<span class=" h3"
data-bind="css: {'text-info': completedNodes().length > 0 , 'text-primary': completedNodes().length < 1 } ">
<span data-bind="text: completedNodes().length"></span>
</span>
</div>
</td>
</tr>
</table>
<div class="col-sm-12">
<div class="card">
<div class="card-content">
<div class="row">
<div class="col-xs-12 col-sm-4">
<strong>
<g:message code="waiting" />
<span class="text-primary" data-bind="text: waitingNodes().length"></span>
</strong>
<g:render template="/common/helpTooltipIconKO"
model="[messageCode:'workflowState.summary.nodes.waiting.description']"/>
</div>
<div class="col-xs-12 col-sm-4">
<strong>
<g:message code="running" />
<span
data-bind="css: {'text-info': runningNodes().length > 0 , 'text-primary': runningNodes().length < 1 } ">
<span class=" " data-bind="text: runningNodes().length"></span>
</span>
</strong>
<g:render template="/common/helpTooltipIconKO"
model="[messageCode: 'workflowState.summary.nodes.running.description']"/>
</div>
<div class="col-xs-12 col-sm-4">
<strong>
<g:message code="done" />
<span
data-bind="css: {'text-info': completedNodes().length > 0 , 'text-primary': completedNodes().length < 1 } ">
<span data-bind="text: completedNodes().length"></span>
</span>
</strong>
<g:render template="/common/helpTooltipIconKO"
model="[messageCode: 'workflowState.summary.nodes.complete.description']"/>

</div>
</div>
</div>
</div>
</div>
</div>

</div>
</div>
3 changes: 1 addition & 2 deletions rundeckapp/grails-app/views/execution/show.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,8 @@

<g:if test="${execution.scheduledExecution}">
%{--progress bar--}%
<div class="row row-space" data-bind="if: !completed()">
<div class="row" data-bind="if: !completed()">
<div class="col-sm-12">
<h4>Running</h4>
<section class="runstatus " data-bind="if: !completed() && jobAverageDuration()>0">
<g:set var="progressBind" value="${', css: { \'progress-bar-info\': jobPercentageFixed() < 105 , \'progress-bar-warning\': jobPercentageFixed() > 104 }'}"/>
<g:render template="/common/progressBar"
Expand Down
21 changes: 11 additions & 10 deletions rundeckapp/grails-app/views/framework/_allnodesKO.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,17 @@
filterval: nodename,
linkicon: 'glyphicon glyphicon-circle-arrow-right',
"></node-filter-link>

<span class="nodedesc"></span>
<span class="text-primary ">
<!-- ko if: attributes['ui:badges'] -->
<!-- ko foreach: $root.nodeSet().glyphiconBadges(attributes)-->
<i data-bind="css: $root.nodeSet().glyphiconCss($data)"></i>
<!-- /ko -->
<!-- /ko -->
<span data-bind="text: attributes.description"></span>
</span>
<div>
<span class="nodedesc"></span>
<span class="text-primary ">
<!-- ko if: attributes['ui:badges'] -->
<!-- ko foreach: $root.nodeSet().glyphiconBadges(attributes)-->
<i data-bind="css: $root.nodeSet().glyphiconCss($data)"></i>
<!-- /ko -->
<!-- /ko -->
<span data-bind="text: attributes.description"></span>
</span>
</div>
</td>

<!--ko foreach: $root.filterColumns -->
Expand Down
2 changes: 1 addition & 1 deletion rundeckapp/grails-app/views/framework/nodes.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@

<!-- ko foreach: nodeSummary().filters -->
<li>
<a href="#" class=" nodefilterlink btn btn-default" data-bind="attr: { 'data-node-filter-name': name(), 'data-node-filter': filter(), 'title': filter(), 'href': $root.nodeSummary().linkForFilterName($data)}">
<a href="#" class=" nodefilterlink btn btn-default btn-xs" data-bind="attr: { 'data-node-filter-name': name(), 'data-node-filter': filter(), 'title': filter(), 'href': $root.nodeSummary().linkForFilterName($data)}">
<span data-bind="text: name"></span>
</a>
<div class="btn-group">
Expand Down
2 changes: 1 addition & 1 deletion rundeckapp/grails-app/views/menu/jobs.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@
sortEnabled : true,
rkey : rkey,
clusterModeEnabled: clusterModeEnabled
]}"/>
]}"/>
<div id="error" class="alert alert-danger" style="display:none;"></div>
</div>
</div>
Expand Down

0 comments on commit 587aa36

Please sign in to comment.