lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(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

Browse Source
This commit is contained in:
Ad Schellevis 2016-12-19 11:05:41 +01:00
parent c48cf61f4a
commit b5eda23e80
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
View File

@ -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 #}
{% set base_dialog_id=id %}
{% set base_dialog_fields=fields %}
@ -86,22 +105,7 @@ label : dialog label
{% set help=false %}
{% if field['type'] == 'header' %}
{# close table and start new one with header #}
</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>{{field['label']}}</h2></th>
</tr>
</thead>
<tbody>
{{ base_dialog_header(field['label']) }}
{% else %}
{{ partial("layout_partials/form_input_tr",field)}}
{% endif %}