diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
index 8a721973aec..25ff4205270 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
@@ -175,15 +175,31 @@ object DisplayDirectiveTree extends Loggable {
)
}
}
-
+ def isDeprecated = {
+ activeTechnique.techniques.values.forall { t => t.deprecrationInfo.isDefined }
+ }
+ def deprecatedIcon = {
+ if(isDeprecated){
+
+ }else{
+ NodeSeq.Empty
+ }
+ }
+ def deprecatedInfo = {
+ if(isDeprecated){
+
{deprecatedIcon}All versions of this technique are deprecated.
+ }else{
+ NodeSeq.Empty
+ }
+ }
override def body = {
val tooltipId = Helpers.nextFuncName
//display information (name, etc) relative to last technique version
-
val xml = activeTechnique.newestAvailableTechnique match {
case Some(technique) =>
- {technique.name}
+
+ {technique.name}
}
diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-directives.css b/rudder-web/src/main/webapp/style/rudder/rudder-directives.css
index 0a0f3b83988..d81ee3f4ff1 100644
--- a/rudder-web/src/main/webapp/style/rudder/rudder-directives.css
+++ b/rudder-web/src/main/webapp/style/rudder/rudder-directives.css
@@ -116,5 +116,18 @@
padding:0 0 0 15px;
}
.version-group select.form-control{
- margin-right:5px;
+ margin-right:5px;
+}
+
+.deprecated-info{
+ margin-top:5px;
+ color: #337ab7;
+}
+.deprecated-info .icon-info{
+ margin-left:3px;
+}
+.deprecation-icon{
+ height:14px;
+ position:relative;
+ top:-2px;
}
\ No newline at end of file
diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-menu.css b/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
index 82bba6d0417..50db2f97220 100644
--- a/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
+++ b/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
@@ -1149,6 +1149,9 @@ table > tbody > tr > td.action{
.ui-widget.ui-tooltip li b{
color : #f08004;
}
+.text-grey-rudder{
+ color:#555;
+}
.text-warning-rudder{
color: #f08004;
}
@@ -1376,7 +1379,7 @@ form .tooltip-content p {
float: left;
font-family: Verdana,Arial,sans-serif;
}
-.tw-bs label > .icon-info{
+.icon-info{
margin-left: 5px;
color: #337ab7;
cursor:help;