Merge 3245516 into cde05b9

eclipsesource · May 6, 2016 · 87cc8a7 · 87cc8a7
2 parents cde05b9 + 3245516
commit 87cc8a7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/examples/css/main.css b/examples/css/main.css
@@ -147,3 +147,15 @@ body {
 .jsf-masterdetail-header {
     text-decoration: none;
 }
+
+.jsf .popover-title {
+    color: black;
+    background-color: lemonchiffon;
+}
+
+.jsf .popover-content {
+    color: black;
+    font-style: italic;
+
+}
+
diff --git a/src/components/renderers/controls/control.html b/src/components/renderers/controls/control.html
@@ -2,9 +2,12 @@
     <div>
         <label ng-if="vm.showLabel" for="{{vm.id}}">{{vm.label}}</label>
     </div>
-    <div ng-transclude>
-    </div>
-    <div>
-        <alert ng-repeat="alert in vm.alerts" type="{{alert.type}}" >{{alert.msg}}</alert>
+    <div ng-transclude uib-popover-template="'validation.html'" popover-enable="vm.alerts.length>0" popover-trigger="mouseenter" popover-title="Invalid value" popover-placement="bottom-left">
     </div>
+    <script id="validation.html" type="text/ng-template">
+        <div>
+            <alert ng-repeat="alert in vm.alerts" type="{{alert.type}}">{{alert.msg}}</alert>
+        </div>
+    </script>
 </div>
+