Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@RaphaelGauthier
RaphaelGauthier committed Dec 11, 2018
1 parent a0688a8 commit 1780faa
Show file tree
Hide file tree
Showing 17 changed files with 395 additions and 332 deletions.
6 changes: 3 additions & 3 deletions rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala
View file
Expand Up @@ -234,6 +234,7 @@ class ShowNodeDetailsFromNode(
bindNode(node, sm, withinPopup,displayCompliance, globalMode) ++ Script(
DisplayNode.jsInit(node.id, sm.node.softwareIds, "") &
JsRaw(s"""
$$('.portlet-header.page-title').html("<span>Node: ${sm.node.main.hostname}</span><span class='update-info'>last updated ${sm.node.inventoryDate.map(DateFormaterService.getFormatedDate(_)).getOrElse("Unknown")}</span>");
$$( "#${detailsId}" ).tabs({ active : ${tab} } );
$$('#nodeInventory .ui-tabs-vertical .ui-tabs-nav li a').on('click',function(){
var tab = $$(this).attr('href');
Expand Down Expand Up @@ -266,8 +267,7 @@ class ShowNodeDetailsFromNode(
*/
private def bindNode(node : NodeInfo, inventory: FullInventory, withinPopup : Boolean , displayCompliance: Boolean, globalMode : GlobalPolicyMode) : NodeSeq = {
val id = JsNodeId(node.id)
("#node_name " #> s"${inventory.node.main.hostname} (last updated ${ inventory.node.inventoryDate.map(DateFormaterService.getFormatedDate(_)).getOrElse("Unknown")})" &
"#node_groupTree" #>
( "#node_groupTree" #>
<div id={groupTreeId}>
<ul>{DisplayNodeGroupTree.buildTreeKeepingGroupWithNode(groupLib, node, None, None, Map(("info", _ => Noop)))}</ul>
</div> &
Expand All @@ -281,7 +281,7 @@ class ShowNodeDetailsFromNode(
"#node_parameters *+" #> complianceModeEditForm(node).complianceModeConfiguration &
"#extraHeader" #> DisplayNode.showExtraHeader(inventory) &
"#extraContent" #> DisplayNode.showExtraContent(Some(node), inventory) &
"#node_tabs [id]" #> s"details_${id}"
"#node_tabs [id]" #> s"details_${id}"
).apply(serverDetailsTemplate)
}

Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
View file
Expand Up @@ -413,7 +413,7 @@ object DisplayNode extends Loggable {
{ nodePolicyMode match {
case None => NodeSeq.Empty
case Some((mode,explanation)) =>
<b>Node policy mode :</b><span id="badge-apm"></span><br/> ++
<b>Node policy mode:</b><span id="badge-apm"></span><br/> ++
Script(OnLoad(JsRaw(s"""
$$('#badge-apm').append(createBadgeAgentPolicyMode('node',"${mode}","${explanation}"));
$$('.rudder-label').bsTooltip();
Expand Down
3 changes: 1 addition & 2 deletions ...src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala
View file
Expand Up @@ -770,8 +770,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable {
SHtml.ajaxSubmit("Save changes", submit _, ("class","btn btn-default"))
}&
"#sendMetricsSubmit *+" #> {
Script(Run("correctButtons();") & check())

Script(check())
}
)
case eb: EmptyBox =>
Expand Down
4 changes: 2 additions & 2 deletions ...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
View file
Expand Up @@ -427,12 +427,12 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
) match {
case Full(diff) =>
currentDirectiveSettingForm.set(Empty)
Replace(htmlId_policyConf, showDirectiveDetails) & JsRaw("""correctButtons(); createTooltip();""") & onRemoveSuccessCallBack()
Replace(htmlId_policyConf, showDirectiveDetails) & JsRaw("""createTooltip();""") & onRemoveSuccessCallBack()
case eb: EmptyBox =>
val msg = (eb ?~! s"Error when trying to delete directive '${directive.name}' (${directive.id})").messageChain
//redisplay this form with the new error
currentDirectiveSettingForm.set(Failure(msg))
Replace(htmlId_policyConf, showDirectiveDetails) & JsRaw("""correctButtons(); createTooltip();""")
Replace(htmlId_policyConf, showDirectiveDetails) & JsRaw("""createTooltip();""")
}
}, ("class" ,"dangerButton")
)
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/javascript/rudder/rudder.js
View file
Expand Up @@ -135,7 +135,7 @@ $(function() {

$(".portlet").addClass("ui-widget ui-widget-content ui-helper-clearfix arrondis")
.find(".portlet-header")
.addClass("ui-widget-header arrondishaut")
.addClass("ui-widget-header")
.end()
.find(".portlet-content");

Expand Down
95 changes: 31 additions & 64 deletions rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
View file
Expand Up @@ -4,55 +4,20 @@
<title>Rudder - Management</title>

<style type="text/css">
.deca input {
width: auto;
}
.inner-portlet{
float:left;
width:100%;
margin-bottom: 15px;
}
.page-title, .inner-portlet h3.page-title{
color:#333;
margin:15px 0 10px;
}
button.defaultButton {
margin-top: -1px;
margin-left: 15px;
padding: 2px;
width: 100px;
}
select.twoCol {
width:auto
}
select {
min-width:50px
}
.defaultButton span.ui-button-text {
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
</div>
<p>
Configure the networks from which nodes are allowed
to connect to the Rudder policy servers to get their updated
configuration policy.
</p>
<p>
You can add as many networks as you want, the expected
format is: <b>NetworkIP/mask</b>, for example
"42.42.0.0/16".
</p>
</div>
padding: 0;
}
#nodeOnAcceptDefaults ul > li.rudder-form label.input-group-addon{
min-width:185px;
text-align:left;
}
#nodeOnAcceptDefaults ul > li.rudder-form select.form-control{
width: auto !important;
width: auto !important;
min-width: 25%;
}
label{
font-size: 1.2em;
}
</style>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/angular/auditMode.js"></script>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/authorizedNetworks.js"></script>
Expand Down Expand Up @@ -81,34 +46,36 @@ <h3 class="page-title">Client-server communication</h3>
<div id="policyServerDetails"></div>
<div id="policyServerText"></div>
<form class="lift:form.ajax">
<label class="col-xs-12">Allowed networks</label>
<div id="allowNetworkFields" class="networkFieldsContainer">
<div class="network-group col-lg-4 col-sm-6 col-xs-12">
<div class="input-group">
<input name="network" class="networkField form-control input-sm"/>
<span class="input-group-btn">
<lift:authz role="administration_write">
<button class="deleteNetwork btn btn-danger btn-sm" type="submit" title="Remove this network"></button>
</lift:authz>
</span>
<div class="row">
<label class="col-xs-12">Allowed networks</label>
<div id="allowNetworkFields" class="networkFieldsContainer">
<div class="network-group col-lg-4 col-sm-6 col-xs-12">
<div class="input-group">
<input name="network" class="networkField form-control input-sm"/>
<span class="input-group-btn">
<lift:authz role="administration_write">
<button class="deleteNetwork btn btn-danger btn-sm" type="submit" title="Remove this network"></button>
</lift:authz>
</span>
</div>
<div id="errorNetworkField"></div>
<div class="warningNetworkField" style="display:none;">Invalid IP address.</div>
</div>
<div id="errorNetworkField"></div>
<div class="warningNetworkField" style="display:none;">Invalid IP address.</div>
</div>
</div>
<lift:authz role="administration_write">
<div class="col-xs-12">
<label>Add a network</label>
<div class="input-group" id="addNetwork">
<input class="form-control input-sm" id="addaNetworkfield"/>
<span class="input-group-btn">
<button class="btn btn-success btn-sm" id="addNetworkButton" disabled type="submit" title="Add a network"></button>
</span>
<lift:authz role="administration_write">
<div class="col-xs-12">
<label>Add a network</label>
<div class="input-group" id="addNetwork">
<input class="form-control input-sm" id="addaNetworkfield"/>
<span class="input-group-btn">
<button class="btn btn-success btn-sm" id="addNetworkButton" disabled type="submit" title="Add a network"></button>
</span>
</div>
<div id="warningNetworkField" class="warningNetworkField" style="display:none;">Invalid IP address.</div>
<input id="submitAllowedNetwork" type="submit" value="Submit"/>
</div>
<div id="warningNetworkField" class="warningNetworkField" style="display:none;">Invalid IP address.</div>
<input id="submitAllowedNetwork" type="submit" value="Submit"/>
</div>
</lift:authz>
</lift:authz>
</div>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html
View file
Expand Up @@ -11,7 +11,7 @@
<div class="portlet">
<div class="portlet-header page-title">Nodes</div>
<div class="portlet-content">
<div class="intro">
<div class="intro query-search-message">
<div>
Make a query base search and display node details
</div>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/secure/utilities/eventLogs.html
View file
Expand Up @@ -26,7 +26,7 @@
<input type="text" class="pickStartInput form-control input-xs"/>
and
<input type="text" class="pickEndInput form-control input-xs"/>
<button id="filterLogsButton" type="button" class="btn btn-default btn-sm pickDatesButton" title="Get Events">Get events</button>
<button id="filterLogsButton" type="button" class="btn btn-default btn-sm">Get events</button>
</div>

<table id="eventLogsGrid" class="display" cellspacing="0"></table>
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/style/bootstrap/tw-bs-bootstrap-3.3.7.css
View file
Expand Up @@ -133,7 +133,7 @@ input[type="submit"] {
cursor: pointer;
}
button[disabled],
input[disabled] { 4chan d
input[disabled] {
cursor: default;
}
button::-moz-focus-inner,
Expand Down

0 comments on commit 1780faa

Please sign in to comment.