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 #9454: The query based search in the node details is inside the hardware table #1304

Merged
merged 1 commit into from
Oct 20, 2016
Merged

Fixes #9454: The query based search in the node details is inside the hardware table #1304

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@
<div data-lift="node.SearchNodes.head"></div>
<div class="inner-portlet">
<div class="inner-portlet-content">
<hr class="spacer"/>
<div id="serverDetails" ></div>
<div class="node-tab-content">
<div id="serverDetails"></div>
</div>
</div>
</div>

<div class="inner-portlet">
<div id="querySearchSection" onclick="$('#query-search-content').toggle(400);$('#querySearchSection').toggleClass('unfoldedSectionQuery');" class="inner-portlet-header">
Query based search
</div>
<div id="query-search-content" style="display:none;">
<div class="intro">
<div>
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 class="inner-portlet-content">
<div id="querySearchSection" onclick="$('#query-search-content').toggle(400);$('#querySearchSection').toggleClass('unfoldedSectionQuery');" class="inner-portlet-header">
Query based search
</div>

<div class="inner-portlet-content" style="overflow:auto;">
<div id="SearchNodes">
<div data-lift="node.SearchNodes.showQuery"></div>
<div id="query-search-content" style="display:none;">
<div class="intro">
<div>
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>
<lift:authz role="group_write">
<div class="tw-bs">
<div data-lift="node.SearchNodes.createGroup"></div>
<div class="inner-portlet-content" style="overflow:auto;">
<div id="SearchNodes">
<div data-lift="node.SearchNodes.showQuery"></div>
</div>
<lift:authz role="group_write">
<div class="tw-bs">
<div data-lift="node.SearchNodes.createGroup"></div>
</div>
</lift:authz>
</div>
</lift:authz>
</div>
</div>
<br/>
</div>
</div>
</div>
Expand Down
11 changes: 11 additions & 0 deletions rudder-web/src/main/webapp/style/rudder/rudder-menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,17 @@ a.sidebar-toggle{
#editForm table{
width:100%;
}
/* --- NODE PAGE --- */
.node-tab-content{
float:left;
width:100%;
margin-bottom:15px;
}
#serverDetails > .ui-tabs.ui-widget.ui-widget-content{
margin:0;
padding:0;
border:none;
}
/* --- DIRECTIVE PAGE --- */
#directiveDetails{
border-left: 15px solid #ECF0F5;
Expand Down
1 change: 1 addition & 0 deletions rudder-web/src/main/webapp/style/rudder/rudder.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2744,6 +2744,7 @@ label span.text-fit{
}
#nodeInventory .ui-tabs-nav{
margin-top: 5px;
margin-bottom: 15px;
}
#node_inventory{
padding : 0 !important;
Expand Down