diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala b/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
index b432c8a9eb..e74871d6f9 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
@@ -224,7 +224,7 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
}
private[this] def showPendingPopup : JsCmd = (
- JsRaw("createPopup('%s', 150, 850)".format(pendingPopupHtmlId)) &
+ JsRaw(s"createPopup('${pendingPopupHtmlId}')") &
eventList.initJs(gridName)
)
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
index 045c74b530..8a9c66ff9e 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
@@ -215,8 +215,7 @@ class DirectiveEditForm(
private[this] def clone(): JsCmd = {
SetHtml(CreateCloneDirectivePopup.htmlId_popup,
newCreationPopup(technique, activeTechnique)) &
- JsRaw(""" createPopup("%s",300,400); """
- .format(CreateCloneDirectivePopup.htmlId_popup))
+ JsRaw(s""" createPopup("${CreateCloneDirectivePopup.htmlId_popup}"); """)
}
////////////// Callbacks //////////////
@@ -225,12 +224,12 @@ class DirectiveEditForm(
formTracker.addFormError(error("The form contains some errors, please correct them."))
showErrorNotifications()
}
-
+
private[this] def onNothingToDo() : JsCmd = {
formTracker.addFormError(error("There are no modification to save."))
showErrorNotifications()
}
-
+
private[this] def showErrorNotifications() : JsCmd = {
onFailureCallback() & Replace("editForm", showDirectiveForm) &
JsRaw("""scrollToElement("notifications");""")
@@ -415,7 +414,7 @@ class DirectiveEditForm(
, parentFormTracker = Some(formTracker)
)
} else {
- val callback = {
+ val callback = {
if (action == "delete") {
val nSeq =
Directive successfully deleted
cr : ChangeRequestId => JsRaw("$.modal.close();") &onRemoveSuccessCallBack() & SetHtml(htmlId_policyConf, nSeq) &
@@ -447,7 +446,7 @@ class DirectiveEditForm(
SetHtml("confirmUpdateActionDialog", popup.popupContent) &
- JsRaw("""createPopup("confirmUpdateActionDialog",400,800)""")
+ JsRaw("""createPopup("confirmUpdateActionDialog")""")
}
private[this] def updateAndDisplayNotifications() : NodeSeq = {
@@ -479,12 +478,12 @@ class DirectiveEditForm(
///////////// success pop-up ///////////////
private[this] def successPopup(message: NodeSeq) : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350) """) &
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog") """) &
JsRaw(s""" $$("#successDialogContent").html('${message}') """)
}
private[this] def failurePopup(message: NodeSeq) : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350) """) &
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog") """) &
JsRaw(s""" $$("#successDialogContent").html('${message}') """)
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
index b3b07c3705..3a7158d6d6 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
@@ -189,7 +189,7 @@ class NodeGroupCategoryForm(
) ++
Script(JsRaw("""
$('#removeButton').click(function() {
- createPopup("removeActionDialog",140,850);
+ createPopup("removeActionDialog");
return false;
});
"""))
@@ -331,9 +331,7 @@ class NodeGroupCategoryForm(
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw("""
- callPopupWithTimeout(200, "successConfirmationDialog", 100, 350);
- """)
+ JsRaw("""callPopupWithTimeout(200, "successConfirmationDialog");""")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
index 6865ff2ab6..a86de99dba 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
@@ -195,8 +195,7 @@ class NodeGroupForm(
s.split("\\|").toList match {
case _ :: id :: _ =>
SetHtml("serverDetails", (new ShowNodeDetailsFromNode(new NodeId(id))).display(true)) &
- JsRaw( """ createPopup("nodeDetailsPopup",500,1000)
- """)
+ createPopup("nodeDetailsPopup")
case _ => Alert("Error when trying to display node details: received bad parameter for node ID: %s".format(s))
}
@@ -350,7 +349,7 @@ class NodeGroupForm(
Script(JsRaw("""
correctButtons();
$('#removeButton').click(function() {
- createPopup("removeActionDialog",140,850);
+ createPopup("removeActionDialog");
return false;
});
"""))
@@ -607,11 +606,11 @@ class NodeGroupForm(
, container : String): JsCmd = {
SetHtml("confirmUpdateActionDialog", showUpdatePopupForm(checkAndUpdateGroup(
nodeGroup, name, description, query, isDynamic, srvList, container))) &
- createPopup("updateActionDialog",140,850)
+ createPopup("updateActionDialog")
}
- def createPopup(name:String,height:Int,width:Int) :JsCmd = {
- JsRaw("""createPopup("%s",%s,%s);""".format(name,height,width))
+ def createPopup(name:String) :JsCmd = {
+ JsRaw(s"""createPopup("${name}");""")
}
private[this] def showCloneGroupPopup() : JsCmd = {
@@ -627,7 +626,7 @@ class NodeGroupForm(
case Full(popup) => popup.popupContent()
}
SetHtml("createCloneGroupContainer", nodeSeqPopup) &
- JsRaw("""createPopup("createCloneGroupPopup", 300, 400)""")
+ createPopup("createCloneGroupPopup")
}
private[this] def htmlTreeNodeId(id:String) = "jsTree-" + id
@@ -788,8 +787,7 @@ class NodeGroupForm(
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)
- """)
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog")""")
}
private[this] def updateAndDisplayNotifications(formTracker : FormTracker) : NodeSeq = {
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleEditForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleEditForm.scala
index e5abb1dcc1..62c0c997d0 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleEditForm.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleEditForm.scala
@@ -343,10 +343,6 @@ class RuleEditForm(
}
-// def createPopup(name:String,height:Int,width:Int) :JsCmd = {
-// JsRaw("""createPopup("%s",%s,%s);""".format(name,height,width))
-// }
-
////////////// Callbacks //////////////
private[this] def updateFormClientSide() : JsCmd = {
@@ -371,7 +367,7 @@ class RuleEditForm(
formTracker.addFormError(error("There are no modification to save."))
onFailure()
}
-
+
/*
* Create the ajax save button
*/
@@ -487,7 +483,7 @@ class RuleEditForm(
popup.onSubmit
} else {
SetHtml("confirmUpdateActionDialog", popup.popupContent) &
- JsRaw("""createPopup("confirmUpdateActionDialog",400,800)""")
+ JsRaw("""createPopup("confirmUpdateActionDialog")""")
}
}
@@ -496,7 +492,7 @@ class RuleEditForm(
JsRaw("$.modal.close();") & onSuccessCallback() & SetHtml("editRuleZone",
Rule successfully deleted
) &
- SetHtml(htmlId_rule,
+ SetHtml(htmlId_rule,
Rule successfully deleted
)
} else {
@@ -528,8 +524,7 @@ class RuleEditForm(
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)
- """)
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog")""")
}
/********************************************
@@ -1197,7 +1192,7 @@ class RuleEditForm(
case None => Text("Not Applied")
}
}
-
+
val batch = reportingService.findImmediateReportsByRule(rule.id)
@@ -1668,7 +1663,7 @@ class RuleEditForm(
}
/**
- * Unfold the report to (Seq[ComponentValueRuleStatusReport], DirectiveId)
+ * Unfold the report to (Seq[ComponentValueRuleStatusReport], DirectiveId)
*/
def getComponentValueRule(report: RuleStatusReport): (Seq[ComponentValueRuleStatusReport], DirectiveId) = {
report match {
@@ -1680,7 +1675,7 @@ class RuleEditForm(
(Seq(value), value.directiveid)
}
}
-
+
/**
* convert the componentvaluesrules to componentValueRule and Directive
* Checks as well that all componentvaluesrules belong to the same directive
@@ -1790,7 +1785,7 @@ class RuleEditForm(
}
val (reports, directiveId) = getComponentValueRule(directiveByNode)
val tab = showReportsByType(reports, directiveId)
- xml++tab}
+ xml++tab}
).apply(popupXml)
}
@@ -1838,7 +1833,7 @@ class RuleEditForm(
val htmlId_reportsPopup = "popup_" + htmlId_rulesGridZone
val htmlId_modalReportsPopup = "modal_" + htmlId_rulesGridZone
-
+
/**
* Create the popup
*/
@@ -1850,9 +1845,9 @@ class RuleEditForm(
"""
) //& initJsCallBack(tableId)
) &
- JsRaw( """ createPopup("%s",600,900)""".format(htmlId_modalReportsPopup))
+ JsRaw( s""" createPopup("${htmlId_modalReportsPopup}")""")
}
-
+
/**
* We need to have a Popup with all the ComponentValueRuleStatusReports for
* cases when differents nodes have differents values
@@ -1867,7 +1862,7 @@ class RuleEditForm(
"""
) //& initJsCallBack(tableId)
) &
- JsRaw( """ createPopup("%s",600,900)""".format(htmlId_modalReportsPopup))
+ JsRaw( s""" createPopup("${htmlId_modalReportsPopup}")""")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
index 35e294cac5..505f6e4cc1 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
@@ -145,7 +145,7 @@ class RuleGrid(
""".replaceAll("#table_var#",jsVarNameForId(htmlId_rulesGridId))) &
//pop-ups for multiple Directives
JsRaw( """var openMultiPiPopup = function(popupid) {
- createPopup(popupid,300,520);
+ createPopup(popupid);
}""") &
OnLoad(JsRaw("""
/* Event handler function */
@@ -431,7 +431,7 @@ class RuleGrid(
val trackerVariables: Box[Seq[(Directive,ActiveTechnique,Technique)]] =
sequence(rule.directiveIds.toSeq) { id =>
directiveCache.getOrElseUpdate(id, directiveRepository.getActiveTechniqueAndDirective(id)) match {
- case Full((activeTechnique, directive)) =>
+ case Full((activeTechnique, directive)) =>
techniqueRepository.getLastTechniqueByName(activeTechnique.techniqueName) match {
case None => Failure("Can not find Technique for activeTechnique with name %s referenced in Rule with ID %s".format(activeTechnique.techniqueName, rule.id))
case Some(technique) => Full((directive,activeTechnique,technique))
@@ -734,7 +734,7 @@ class RuleGrid(
moveFilterAndFullPaginateArea('#%1$s');""".format( tableId_reportsPopup).replaceAll("#table_var#",jsVarNameForId(tableId_reportsPopup))
) //& initJsCallBack(tableId)
) &
- JsRaw( """ createPopup("%s",300,500)""".format(htmlId_modalReportsPopup))
+ JsRaw( s""" createPopup("${htmlId_modalReportsPopup}")""")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
index 7c5a638321..fb0825ca75 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
@@ -271,7 +271,6 @@ class TechniqueCategoryEditForm(
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)
- """)
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog")""")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala b/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala
index 24a46093a9..c25ab73469 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala
@@ -234,12 +234,12 @@ class TechniqueEditForm(
correctButtons();
$('#deleteButton').click(function() {
- createPopup("deleteActionDialog",140,400);
+ createPopup("deleteActionDialog");
return false;
});
$('#disableButton').click(function() {
- createPopup("disableActionDialog",140,500);
+ createPopup("disableActionDialog");
return false;
});
""")))
@@ -647,7 +647,7 @@ class TechniqueEditForm(
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog")
""")
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
index 39f2c7197f..9949fac012 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
@@ -659,7 +659,7 @@ def jsInit(nodeId:NodeId, softIds:Seq[SoftwareUuid], salt:String="", tabContaine
SetHtml(deleteNodePopupHtmlId, popupHtml) &
- JsRaw( """ createPopup("%s",300,400) """.format(deleteNodePopupHtmlId))
+ JsRaw(s""" createPopup("${deleteNodePopupHtmlId}") """)
}
@@ -741,7 +741,7 @@ def jsInit(nodeId:NodeId, softIds:Seq[SoftwareUuid], salt:String="", tabContaine
JsRaw( """$.modal.close();""") &
SetHtml(errorPopupHtmlId, popupHtml) &
- JsRaw( """ callPopupWithTimeout(200,"%s",300,400) """.format(errorPopupHtmlId))
+ JsRaw( s""" callPopupWithTimeout(200,"${errorPopupHtmlId}")""")
}
private[this] def onSuccess : JsCmd = {
@@ -772,7 +772,7 @@ def jsInit(nodeId:NodeId, softIds:Seq[SoftwareUuid], salt:String="", tabContaine
JsRaw( """$.modal.close();""") &
SetHtml(successPopupHtmlId, popupHtml) &
- JsRaw( """ callPopupWithTimeout(200,"%s",300,400) """.format(successPopupHtmlId))
+ JsRaw( s""" callPopupWithTimeout(200,"${successPopupHtmlId}") """)
}
private [this] def isRootNode(n: NodeId): Boolean = {
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala
index baf33837ef..8b243abae0 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala
@@ -317,6 +317,6 @@ class Archives extends DispatchSnippet with Loggable {
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw("""callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)""")
+ JsRaw("""callPopupWithTimeout(200, "successConfirmationDialog")""")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ChangeRequestDetails.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ChangeRequestDetails.scala
index a23063d331..467c0aeacc 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ChangeRequestDetails.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ChangeRequestDetails.scala
@@ -257,7 +257,7 @@ class ChangeRequestDetails extends DispatchSnippet with Loggable {
SetHtml("changeRequestChanges", new ChangeRequestChangesForm(cr).dispatch("changes")(NodeSeq.Empty)) &
JsRaw("""correctButtons();
$.modal.close();
- callPopupWithTimeout(200, "successWorkflow", 100, 350); """)
+ callPopupWithTimeout(200, "successWorkflow"); """)
var nextChosen = nextSteps.head._2
val nextSelect =
@@ -375,7 +375,7 @@ class ChangeRequestDetails extends DispatchSnippet with Loggable {
}
SetHtml("popupContent",content) &
- JsRaw("createPopup('changeStatePopup', 150, 850)")
+ JsRaw("createPopup('changeStatePopup')")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
index 000c1b452d..e34c61b3e0 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
@@ -198,7 +198,6 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)
- """)
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog")""")
}
}
\ No newline at end of file
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
index e286aeef2e..ab2d72890a 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
@@ -247,8 +247,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
{ Text("Create a new Directive based on technique ") ++ {technique.name} },
{ () => SetHtml(CreateDirectivePopup.htmlId_popup,
newCreationPopup(technique, activeTechnique)) &
- JsRaw( """ createPopup("%s",300,400) """
- .format(CreateDirectivePopup.htmlId_popup) ) },
+ JsRaw( s""" createPopup("${CreateDirectivePopup.htmlId_popup}") """) },
("class", "autoWidthButton")
)
})
@@ -364,7 +363,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
///////////// finish migration pop-up ///////////////
private[this] def displayFinishMigrationPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200,"finishMigrationPopup",100,350) """)
+ JsRaw(""" callPopupWithTimeout(200,"finishMigrationPopup") """)
}
/**
@@ -440,11 +439,11 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
}
/**
- * Callback used to update the form when the edition of the directive have
+ * Callback used to update the form when the edition of the directive have
* been done
* If it is given a directive, it updated the form, else goes to the changerequest page
*/
- private[this] def directiveEditFormSuccessCallBack(returns: Either[Directive,ChangeRequestId]): JsCmd = {
+ private[this] def directiveEditFormSuccessCallBack(returns: Either[Directive,ChangeRequestId]): JsCmd = {
returns match {
case Left(dir) => // ok, we've received a directive, show it
directiveRepository.getDirectiveWithContext(dir.id) match {
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/RuleManagement.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/RuleManagement.scala
index c363538c46..242ec3aa00 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/RuleManagement.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/RuleManagement.scala
@@ -215,7 +215,7 @@ $.fn.dataTableExt.oStdClasses.sPageButtonStaticDisabled="paginate_button_disable
setCreationPopup(clonedRule)
val popupHtml = createPopup
SetHtml(CreateOrCloneRulePopup.htmlId_popupContainer, popupHtml) &
- JsRaw( """ createPopup("%s",300,400) """.format(CreateOrCloneRulePopup.htmlId_popup))
+ JsRaw( s""" createPopup("${CreateOrCloneRulePopup.htmlId_popup}") """)
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/TechniqueLibraryManagement.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/TechniqueLibraryManagement.scala
index c1e2a3f7d5..cc2ab09d1f 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/TechniqueLibraryManagement.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/TechniqueLibraryManagement.scala
@@ -672,7 +672,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable {
///////////// success pop-up ///////////////
private[this] def successPopup : JsCmd = {
- JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog", 100, 350)
+ JsRaw(""" callPopupWithTimeout(200, "successConfirmationDialog")
""")
}
@@ -681,7 +681,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable {
//update UI
SetHtml("createActiveTechniquesCategoryContainer", createPopup) &
- JsRaw( """createPopup("createActiveTechniqueCategoryPopup", 300, 400)
+ JsRaw( """createPopup("createActiveTechniqueCategoryPopup")
""")
}
@@ -693,7 +693,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable {
//update UI
SetHtml("createActiveTechniquesContainer", createReasonPopup) &
- JsRaw( """createPopup("createActiveTechniquePopup", 200, 350)
+ JsRaw( """createPopup("createActiveTechniquePopup")
""")
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala
index 570be8566a..65aca8d061 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala
@@ -268,9 +268,9 @@ class AcceptNode {
{ "sWidth": "300px" }
]
});"""
- ) & JsRaw("""
- createPopup("#popupId#",300,660);
- $('#pendingNodeConfirm_info').remove();""".replaceAll("#popupId#", popupId))
+ ) & JsRaw(s"""
+ createPopup("${popupId}");
+ $$('#pendingNodeConfirm_info').remove();""")
)
}
}
@@ -327,8 +327,7 @@ class AcceptNode {
def showExpectedPolicyPopup(nodeId : NodeId) = {
SetHtml("expectedPolicyZone", (new ExpectedPolicyPopup("expectedPolicyZone", nodeId)).display ) &
- OnLoad(JsRaw("""createPopup("expectedPolicyPopup",300,660)
- """) )
+ OnLoad(JsRaw("""createPopup("expectedPolicyPopup")""") )
}
newNodeManager.listNewNodes match {
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
index 5a702b9c57..515b2623ca 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala
@@ -496,7 +496,7 @@ class Groups extends StatefulSnippet with SpringExtendableSnippet[Groups] with L
//update UI
SetHtml("createGroupContainer", createPopup) &
- JsRaw( """ createPopup("createGroupPopup",300,400)""")
+ JsRaw( """ createPopup("createGroupPopup")""")
}
}
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
index c8d94f6e9d..a188c0fc6f 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
@@ -267,7 +267,7 @@ class SearchNodes extends StatefulSnippet with Loggable {
case Full(r) => setCreationPopup(r.getQuery, r.getSrvList)
//update UI
SetHtml("createGroupContainer", createPopup) &
- JsRaw( """ createPopup("createGroupPopup",300,400) """)
+ JsRaw( """ createPopup("createGroupPopup") """)
case eb:EmptyBox => Alert("Error when trying to retrieve the resquest, please try again")
}
diff --git a/rudder-web/src/main/webapp/javascript/rudder/rudder.js b/rudder-web/src/main/webapp/javascript/rudder/rudder.js
index 7e6fef2055..64906f1b7d 100644
--- a/rudder-web/src/main/webapp/javascript/rudder/rudder.js
+++ b/rudder-web/src/main/webapp/javascript/rudder/rudder.js
@@ -83,18 +83,16 @@ function createTooltip() {
-function callPopupWithTimeout(timeout, popupName, minHeight, minWidth){
- setTimeout("createPopup('"+popupName+"',"+minHeight+","+minWidth+")", timeout);
+function callPopupWithTimeout(timeout, popupName){
+ setTimeout("createPopup('"+popupName+"')", timeout);
}
-function createPopup(popupName, minHeight, minWidth){
+function createPopup(popupName){
$("#"+popupName).modal({
- minHeight: minHeight,
- minWidth: minWidth,
- maxHeight: 500,
- maxWidth: 1000
+ autoResize: true
});
- $('#simplemodal-container').css('height', 'auto');
+ $('#simplemodal-container').css('height', 'auto').css('width', 'auto');
+ $(window).trigger('resize.simplemodal');
correctButtons();
}
diff --git a/rudder-web/src/main/webapp/templates-hidden/Popup/createCategoryOrGroup.html b/rudder-web/src/main/webapp/templates-hidden/Popup/createCategoryOrGroup.html
index 1edaf4f2d4..a9cb13f46b 100644
--- a/rudder-web/src/main/webapp/templates-hidden/Popup/createCategoryOrGroup.html
+++ b/rudder-web/src/main/webapp/templates-hidden/Popup/createCategoryOrGroup.html
@@ -25,7 +25,7 @@
Create a new item
-
+