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 #10116: On Group creation, the tooltip on the "Save" button doesn't appear when it is disabled #1485

Merged
merged 1 commit into from Feb 9, 2017
Merged

Fixes #10116: On Group creation, the tooltip on the "Save" button doesn't appear when it is disabled #1485

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
2 changes: 1 addition & 1 deletion rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
View file
Open in desktop
Expand Up @@ -340,7 +340,7 @@ class SearchNodeComponent(
srvList match {
case Full(seq) =>
val refresh = srvGrid.refreshData(() => seq, onClickCallback, "serverGrid")
JsRaw(s"""(${refresh.toJsCmd}());""")
JsRaw(s"""(${refresh.toJsCmd}());createTooltip();""")

case Empty =>
Noop
Expand Down
3 changes: 1 addition & 2 deletions rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
View file
Open in desktop
Expand Up @@ -414,8 +414,7 @@ class Groups extends StatefulSnippet with SpringExtendableSnippet[Groups] with L
////////////////////

private[this] def refreshTree(selectedNode:String, workflowEnabled: Boolean) : JsCmd = {
Replace(htmlId_groupTree, buildGroupTree(selectedNode, workflowEnabled)) &
OnLoad(After(TimeSpan(50), JsRaw("""createTooltip();""")))
Replace(htmlId_groupTree, buildGroupTree(selectedNode, workflowEnabled))
}

/********************************************
Expand Down
7 changes: 5 additions & 2 deletions rudder-web/src/main/webapp/javascript/rudder/rudder.js
View file
Open in desktop
Expand Up @@ -297,8 +297,11 @@ function disableButton(buttonId) {
function scrollToElement(elementId, containerSelector) {
var container = $(containerSelector);
// We need to remove the container offset from the elem offset so we scroll the correct amount in scroll function
var offset = $("#"+ elementId).offset().top - container.offset().top;
container.animate({ scrollTop: offset }, 500);
var offset = $("#"+ elementId).offset()
if(offset){
var offsetTop = offset.top - container.offset().top;
container.animate({ scrollTop: offsetTop }, 500);
}
}

function scrollToElementPopup(elementSelector, popupId){
Expand Down
11 changes: 7 additions & 4 deletions rudder-web/src/main/webapp/style/rudder/rudder-menu.css
View file
Open in desktop
Expand Up @@ -815,11 +815,13 @@ a.sidebar-toggle{
color: #FFFFFF;
}
/* ----- </DROPDOWN MENU> ----- */

/* GROUP PAGE */
#groupParametersTab .page-title{
margin-left: 12px;
margin-right: 12px;
margin-bottom: 5px;

#groupParametersTab .btn.btn-success[disabled]{
pointer-events: none;
background-color: #b4b4b4;
border-color: #7a7a7a;
}
#groupParametersTab .section-title{
margin: 15px 13px 8px 8px;
Expand Down Expand Up @@ -1479,6 +1481,7 @@ form .tooltip-content p {
/*
* INPUT GROUP GENERAL
*/

.group-button button.btn{
color: white;
border-right: none;
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/webapp/style/rudder/rudder.css
View file
Open in desktop
Expand Up @@ -1407,7 +1407,7 @@ p img {
}

.inner-portlet-content {
padding: 5px 0 2px 5px;
padding: 5px 5px 2px 5px;
}

.arrondishaut {
Expand Down