Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #18424: Beautify Nodes page #3394

Merged
merged 1 commit into from
Nov 19, 2020
Merged

Fixes #18424: Beautify Nodes page #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<head>

<title>Rudder - API accounts</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<style>
.rudder-template > .one-col{
flex: 1;
Expand Down
1 change: 0 additions & 1 deletion ...p/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<head>
<title>Rudder - Reports database</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<style>
.rudder-template > .one-col{
flex: 1;
Expand Down
1 change: 0 additions & 1 deletion ...urces/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<head>
<title>Rudder - General settings</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<style>
.template-sidebar.sidebar-left{
box-shadow : none !important;
Expand Down
1 change: 0 additions & 1 deletion ...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<head>
<title>Rudder - Directives Management</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<link media="screen" data-lift="with-cached-resource" href="/style/rudder/rudder-directives.css" rel="stylesheet" type="text/css">
<link media="screen" data-lift="with-cached-resource" href="/style/rudder/rudder-tags.css" rel="stylesheet" type="text/css">
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/rudder/tree-tag-plugin.js"></script>
Expand Down
1 change: 0 additions & 1 deletion ...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

<head>
<title>Rudder - Global parameters</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<style>
.template-sidebar.sidebar-left{
box-shadow : none !important;
Expand Down
1 change: 0 additions & 1 deletion ...ources/rudder/rudder-web/src/main/webapp/secure/configurationManager/techniqueEditor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<div id="technique-editor" ng-controller="ncf-builder">
<head>
<title>Rudder - Technique Editor</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-technique-editor.css"/>

<script type="text/javascript" src="/techeditor/js/polyfill.js?version=dev"></script>
Expand Down
1 change: 0 additions & 1 deletion webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/groups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<head_merge>
<title>Rudder - Node Groups Management</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-groups.css"/>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/angular/elastic.min.js"></script>
<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/angular/nodeProperties.js"></script>
Expand Down
137 changes: 84 additions & 53 deletions webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,99 @@
<lift:surround with="common-layout" at="content">

<head>
<title>Rudder - New Nodes Management</title>
<title>Rudder - Pending nodes</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-node.css" media="screen">
<style>
.rudder-template > .one-col{
flex: 1;
}
.template-main{
flex-basis : initial !important;
flex: auto !important;
}
</style>
</head>

<div class="portlet">
<div class="portlet-header page-title">Pending nodes</div>
<div class="page-title-description">
Accept or refuse nodes in your infrastructure that have declared themselves to Rudder by sending an inventory report. To add new nodes, install the rudder-agent package on a machine, and follow the instructions provided.
</div>

<div class="portlet-content">
<div id="new_servers_tab">
<ul class="rudder-ui-tabs">
<li><a href="#review_new_server">Review new nodes</a></li>
<li><a href="#history">History</a></li>
</ul>

<div id="review_new_server">
<div class="callout-fade callout-info">
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
</div>
<p>Click on a node name to view detailed inventory information.</p>

<p>Click on <i class="glyphicon glyphicon-search"></i>to list Rules that would be applied to this node if you accept it.</p>

<div class="rudder-template">
<div class="one-col">
<div class="main-header">
<div class="header-title">
<h1>
<span>Pending nodes</span>
</h1>
</div>
<lift:Msgs>[error]</lift:Msgs>
<div data-lift="lazy-load?template=lazy-load-spinner">
<div data-lift="node.AcceptNode.list">
<pending-servers></pending-servers>
<div id="acceptNodeGrid_paginate_area" class="nodisplay"></div>
<lift:authz role="node_write">
<div class="action-btns">
<pending-refuse></pending-refuse>
<pending-accept></pending-accept>
</div>
</lift:authz>
<pending-errors></pending-errors>
</div>
<div class="header-description">
<p>
Accept or refuse nodes in your infrastructure that have declared themselves to Rudder by sending an inventory report.
To add new nodes, install the rudder-agent package on a machine, and follow the instructions provided.
</p>
</div>
</div>
<div id="new_servers_tab">
<div class="main-navbar">
<ul class="ui-tabs-nav nav nav-tabs">
<li class="ui-tabs-tab" role="presentation">
<a href="#review_new_server">
Review new nodes
</a>
</li>
<li class="ui-tabs-tab" role="presentation">
<a href="#history">
History
</a>
</li>
</ul>
</div>
<div class="one-col-main">
<div class="template-main">
<div class="main-container">
<div class="main-details">
<div id="review_new_server">
<div class="callout-fade callout-info">
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
</div>
<p>Click on a node name to view detailed inventory information.</p>
<p>Click on <i class="glyphicon glyphicon-search"></i>to list Rules that would be applied to this node if you accept it.</p>
</div>
<lift:Msgs>[error]</lift:Msgs>
<div data-lift="lazy-load?template=lazy-load-spinner">
<div data-lift="node.AcceptNode.list">
<pending-servers></pending-servers>
<div id="acceptNodeGrid_paginate_area" class="nodisplay"></div>
<lift:authz role="node_write">
<div class="action-btns">
<pending-refuse></pending-refuse>
<pending-accept></pending-accept>
</div>
</lift:authz>
<pending-errors></pending-errors>
</div>
</div>
</div>

<div id="history">
<div data-lift="lazy-load?template=lazy-load-spinner">
<div class="callout-fade callout-info">
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
</div>
<p>View history of Nodes that have been accepted or refused.</p>
<p>Click on a node name to view detailed inventory information (as it was at review time).</p>
</div>
<div data-lift="node.PendingHistoryGrid.displayAndInit">
<pending-history></pending-history>
</div>
</div>
</div>

<div id="history"><div data-lift="lazy-load?template=lazy-load-spinner">
<div class="callout-fade callout-info">
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
<div id="manageNewNode"></div>
<div id="expectedPolicyZone"></div>
</div>
</div>
</div>
<p>View history of Nodes that have been accepted or refused.</p>
<p>Click on a node name to view detailed inventory information (as it was at review time).</p>
</div>
<div data-lift="node.PendingHistoryGrid.displayAndInit">
<pending-history></pending-history>
</div>
</div></div>
</div>
</div>
<div id="manageNewNode"></div>
<div id="expectedPolicyZone"></div>

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

</lift:surround>

35 changes: 21 additions & 14 deletions webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/node.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,32 @@
<title>Rudder - Node details</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-tags.css" media="screen">
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-node.css" media="screen">
<style>
.rudder-template > .one-col{
flex: 1;
}
.template-main{
flex-basis : initial !important;
flex: auto !important;
}
</style>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/angular/elastic.min.js"></script>
<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/angular/nodeProperties.js"></script>
</head>

<div class="portlet">
<div class="portlet-header page-title">Nodes</div>
<div class="portlet-content">
<div data-lift="node.SearchNodes.head"></div>
<div class="inner-portlet">
<div class="inner-portlet-content">
<div class="node-tab-content">
<div id="serverDetails">
<div data-lift="node.NodeDetails.details"></div>
</div>
<div class="rudder-template">
<div class="one-col">
<div class="main-header">
<div class="header-title">
<h1>
<span>Node</span>
</h1>
</div>
</div>
<div id="serverDetails">
<div data-lift="node.NodeDetails.details"></div>
</div>
</div>
</div>
</div>
</div>

<div data-lift="node.SearchNodes.head"></div>
</lift:surround>
35 changes: 27 additions & 8 deletions webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/nodes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,35 @@
<lift:surround with="common-layout" at="content">
<head>
<title>Rudder - Nodes</title>

<style>
.rudder-template > .one-col{
flex: 1;
}
.template-main{
flex-basis : initial !important;
flex: auto !important;
}
</style>
</head>
<div class="portlet col-lg-12">
<div class="portlet-content">
<div class="inner-portlet">
<div class="page-title">Nodes</div>
<div data-lift="node.Nodes.table"></div>
<div class="rudder-template">
<div class="one-col">
<div class="main-header">
<div class="header-title">
<h1>
<span>Nodes</span>
</h1>
</div>
</div>
<div class="one-col-main">
<div class="template-main">
<div class="main-container">
<div class="main-details">
<div data-lift="node.Nodes.table"></div>
</div>
</div>
</div>
</div>
<br/>
</div>
<div data-lift="node.Nodes.loadData"></div>
</div>
<div data-lift="node.Nodes.loadData"></div>
</lift:surround>
86 changes: 49 additions & 37 deletions webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,61 @@
<lift:surround with="common-layout" at="content">

<head>
<title>Rudder - Search Nodes</title>
<title>Rudder - Node search</title>
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-tags.css" media="screen">
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-node.css" media="screen">
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/angular/elastic.min.js"></script>
<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/angular/nodeProperties.js"></script>
</head>

<div class="portlet">
<div class="portlet-header page-title">Nodes</div>
<div class="portlet-content">
<div data-lift="node.SearchNodes.head"></div>
<div class="inner-portlet">
<div class="inner-portlet-content">
<div id="query-search-content">
<div class="callout-fade callout-info">
<div class="marker">
<span class="glyphicon glyphicon-info-sign"></span>
</div>
<div>
<h4>Query based search</h4>
Find nodes in your Rudder infrastructure that match different criteria.<br />
Define <a href="/secure/nodeManager/groups">node groups</a> from your search results.
</div>
</div>
<div class="inner-portlet-content">
<div id="SearchNodes">
<div data-lift="node.SearchNodes.showQuery"></div>
<style>
.rudder-template > .one-col{
flex: 1;
}
.template-main{
flex-basis : initial !important;
flex: auto !important;
}
</style>
<script type="text/javascript" data-lift="with-cached-resource" src="/javascript/angular/elastic.min.js"></script>
<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/angular/nodeProperties.js"></script>
</head>
<div class="rudder-template">
<div class="one-col">
<div class="main-header">
<div class="header-title">
<h1>
<span>Node search</span>
</h1>
</div>
<div class="header-description">
<p>
Find nodes in your Rudder infrastructure that match different criteria.
Define <a href="/secure/nodeManager/groups">node groups</a> from your search results.
</p>
</div>
</div>
<div class="one-col-main">
<div class="template-main">
<div class="main-container">
<div class="main-details">
<div id="query-search-content">
<div class="inner-portlet-content">
<div id="SearchNodes">
<div data-lift="node.SearchNodes.showQuery"></div>
</div>
<lift:authz role="group_write">
<div data-lift="node.SearchNodes.createGroup"></div>
</lift:authz>
</div>
</div>
</div>
<lift:authz role="group_write">
<div data-lift="node.SearchNodes.createGroup"></div>
</lift:authz>
</div>
</div>
</div>
</div>
</div>
</div>
<div id="createGroupPopup" class="modal fade" data-keyboard="true" tabindex="-1">
<lift:ignore>
This div gets the content of the createCategoryOrGroup injected within
</lift:ignore>
<div id="createGroupContainer"></div>
</div>

<div id="createGroupPopup" class="modal fade" data-keyboard="true" tabindex="-1">
<lift:ignore>
This div gets the content of the createCategoryOrGroup injected within
</lift:ignore>
<div id="createGroupContainer"></div>
</div>
</lift:surround>