From 7d3a9d215d15d2983587de0f56ae2523bf241bee Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sun, 21 Jun 2015 18:04:54 +0100 Subject: [PATCH] Displaying exclusions in results in web app --- web/src/main/scala/coursier/web/Backend.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/web/src/main/scala/coursier/web/Backend.scala b/web/src/main/scala/coursier/web/Backend.scala index 97c2bc649..2c8e50138 100644 --- a/web/src/main/scala/coursier/web/Backend.scala +++ b/web/src/main/scala/coursier/web/Backend.scala @@ -203,8 +203,12 @@ object App { def infoLabel(label: String) = <.span(^.`class` := "label label-info", label) - def errorLabel(label: String, desc: String) = - <.button(^.`type` := "button", ^.`class` := "btn btn-xs btn-danger", + def errorPopOver(label: String, desc: String) = + popOver("danger", label, desc) + def infoPopOver(label: String, desc: String) = + popOver("info", label, desc) + def popOver(`type`: String, label: String, desc: String) = + <.button(^.`type` := "button", ^.`class` := s"btn btn-xs btn-${`type`}", Attr("data-trigger") := "focus", Attr("data-toggle") := "popover", Attr("data-placement") := "bottom", Attr("data-content") := desc, @@ -223,8 +227,9 @@ object App { if (dep.scope == Scope.Compile) Seq() else Seq(infoLabel(dep.scope.name)), if (dep.`type`.isEmpty || dep.`type` == "jar") Seq() else Seq(infoLabel(dep.`type`)), if (dep.classifier.isEmpty) Seq() else Seq(infoLabel(dep.classifier)), + Some(dep.exclusions).filter(_.nonEmpty).map(excls => infoPopOver("Exclusions", excls.toList.sorted.map{case (org, name) => s"$org:$name"}.mkString("; "))).toSeq, if (dep.optional) Seq(infoLabel("optional")) else Seq(), - res.errors.get(dep.moduleVersion).map(errs => errorLabel("Error", errs.mkString("; "))).toSeq + res.errors.get(dep.moduleVersion).map(errs => errorPopOver("Error", errs.mkString("; "))).toSeq )), <.td(Seq[Seq[TagMod]]( res.projectsCache.get(dep.moduleVersion) match {