Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev

templates/Froxlor/table/callbacks.html.twig

@@ -18,6 +18,17 @@
     {% endif %}
 {% endmacro %}
 
+{% macro booleanWithInfo(data) %}
+    {% if (data.checked) %}
+        <i class="fa fa-check-circle text-success"></i>
+    {% else %}
+        <i class="fa fa-times-circle text-danger"></i>
+    {% endif %}
+	{% if data.info is not empty %}
+	{{ data.info }}
+	{% endif %}
+{% endmacro %}
+
 {% macro link(data) %}
     {% apply spaceless %}
         <a href="{{ data.href }}" {% if data.class is defined %}class="{{ data.class }}"{% endif %} {% if data.target is defined %}target="{{ data.target }}"{% endif %}>

templates/Froxlor/table/table.html.twig

@@ -32,6 +32,8 @@
 											{{ callbacks.progressbar(td.data.data) }}
 										{% elseif td.data.type == 'boolean' %}
 											{{ callbacks.boolean(td.data.data) }}
+										{% elseif td.data.type == 'booleanWithInfo' %}
+											{{ callbacks.booleanWithInfo(td.data.data) }}
 										{% elseif td.data.type == 'link' %}
 											{{ callbacks.link(td.data.data) }}
 										{% elseif td.data.type == 'domainWithSan' %}