diff --git a/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala index a625c1fa718..f9cd05c09cb 100644 --- a/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala @@ -163,7 +163,7 @@ class Boot extends Loggable { // All the following is related to the sitemap val nodeManagerMenu = - Menu("NodeManagerHome", Node Management) / + Menu("NodeManagerHome", ++ Node Management) / "secure" / "nodeManager" / "index" >> TestAccess( () => userIsAllowed("/secure/index",Read("node")) ) submenus ( @@ -189,7 +189,7 @@ class Boot extends Loggable { ) def buildManagerMenu(name:String) = - Menu(name+"ManagerHome", {name.capitalize} Policy) / + Menu(name+"ManagerHome", ++ {name.capitalize} Policy) / "secure" / (name+"Manager") / "index" >> TestAccess ( () => userIsAllowed("/secure/index",Read("configuration")) ) submenus ( @@ -210,11 +210,11 @@ class Boot extends Loggable { ) def administrationMenu = - Menu("AdministrationHome", Administration) / + Menu("AdministrationHome", ++ Settings) / "secure" / "administration" / "index" >> TestAccess ( () => userIsAllowed("/secure/index",Read("administration"), Read("technique")) ) submenus ( - Menu("policyServerManagement", Settings) / + Menu("policyServerManagement", General) / "secure" / "administration" / "policyServerManagement" >> LocGroup("administrationGroup") >> TestAccess ( () => userIsAllowed("/secure/index",Read("administration")) ) @@ -244,7 +244,7 @@ class Boot extends Loggable { // (don't give rights if you don't know) def workflowEnabled = RudderConfig.configService.rudder_workflow_enabled.getOrElse(false) - Menu("UtilitiesHome", Utilities) / + Menu("UtilitiesHome", ++ Utilities) / "secure" / "utilities" / "index" >> TestAccess ( () => if (workflowEnabled || CurrentUser.checkRights(Read("administration"))) @@ -291,7 +291,7 @@ class Boot extends Loggable { } val rootMenu = List( - Menu("Home", Home) / "secure" / "index" >> Hidden + Menu("Dashboard", ++ Dashboard) / "secure" / "index" , Menu("Login") / "index" >> Hidden , nodeManagerMenu , buildManagerMenu("configuration") 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 c46b19bb6ae..051b3959bc8 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 @@ -108,29 +108,33 @@ class AsyncDeployment extends CometActor with CometListener with Loggable { case IdleDeployer => deploymentStatus.current match { case NoStatus => - + case _:SuccessStatus => - + case _:ErrorStatus => - + } case _ => - + } } private[this] def lastStatus = { - def commonStatement(start : DateTime, end : DateTime, durationText : String, headText : String) = { -
  • {headText}
    • -
  • Started at {DateFormaterService.getFormatedDate(start)}
    • -
  • Finished {DateFormaterService.getFormatedPeriod(end, DateTime.now)} ago
    • -
  • {durationText} {DateFormaterService.getFormatedPeriod(start,end)}
    • + def commonStatement(start : DateTime, end : DateTime, durationText : String, headText : String, iconClass: String, statusClass : String) = { +
  • + +
    • } deploymentStatus.current match { case NoStatus =>
  • Policy update status unavailable
    • case SuccessStatus(id,start,end,configurationNodes) => - commonStatement(start, end, "Update took", "Policies updated") + commonStatement(start, end, "Update took", "Policies updated","text-success fa fa-check","text-success") case ErrorStatus(id,start,end,failure) => val popupContent = failure.messageChain match { @@ -163,8 +167,8 @@ class AsyncDeployment extends CometActor with CometListener with Loggable { val callback = JsRaw("$('#errorDetailsDialog').bsModal('show');") & SetHtml("errorDetailsMessage" , popupContent) - commonStatement(start, end, "Error occured in", "Error during policy update") ++ -
  • { SHtml.a(Text("Details"), callback, ("href","#"))}
    • + commonStatement(start, end, "Error occured in", "Error during policy update","text-danger fa fa-times","text-danger") ++ +
  • { SHtml.a(Text("Details"), callback, ("href","#") , ("style","color:#a94442 !important;"))}
    • } } @@ -184,22 +188,27 @@ class AsyncDeployment extends CometActor with CometListener with Loggable { } private[this] def layout = { - -
  • - - Status {statusIcon} - -
    • - {errorPopup} +
  • + + Status + + {statusIcon} + + + +
    • + {errorPopup}     } private[this] def errorPopup = { -