Commit b5eda23e authored by Ad Schellevis's avatar Ad Schellevis

(volt, macro usage) revert macro change, it looks like this really was a bug...

(volt, macro usage) revert macro change, it looks like this really was a bug in PHP7/Phalcon, looks solved now. closes https://github.com/opnsense/core/issues/1245
parent c48cf61f
...@@ -34,6 +34,25 @@ label : dialog label ...@@ -34,6 +34,25 @@ label : dialog label
#} #}
{%- macro base_dialog_header(header_text) %}
</tbody>
</table>
</div>
<div class="table-responsive">
<table class="table table-striped table-condensed">
<colgroup>
<col class="col-md-3"/>
<col class="col-md-{{ 12-3-msgzone_width|default(5) }}"/>
<col class="col-md-{{ msgzone_width|default(5) }}"/>
</colgroup>
<thead>
<tr colspan="3">
<th><h2>{{header_text}}</h2></th>
</tr>
</thead>
<tbody>
{%- endmacro %}
{# Volt templates in php7 have issues with scope sometimes, copy input values to make them more unique #} {# Volt templates in php7 have issues with scope sometimes, copy input values to make them more unique #}
{% set base_dialog_id=id %} {% set base_dialog_id=id %}
{% set base_dialog_fields=fields %} {% set base_dialog_fields=fields %}
...@@ -86,22 +105,7 @@ label : dialog label ...@@ -86,22 +105,7 @@ label : dialog label
{% set help=false %} {% set help=false %}
{% if field['type'] == 'header' %} {% if field['type'] == 'header' %}
{# close table and start new one with header #} {# close table and start new one with header #}
</tbody> {{ base_dialog_header(field['label']) }}
</table>
</div>
<div class="table-responsive">
<table class="table table-striped table-condensed">
<colgroup>
<col class="col-md-3"/>
<col class="col-md-{{ 12-3-msgzone_width|default(5) }}"/>
<col class="col-md-{{ msgzone_width|default(5) }}"/>
</colgroup>
<thead>
<tr colspan="3">
<th><h2>{{field['label']}}</h2></th>
</tr>
</thead>
<tbody>
{% else %} {% else %}
{{ partial("layout_partials/form_input_tr",field)}} {{ partial("layout_partials/form_input_tr",field)}}
{% endif %} {% endif %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment