Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
8f194f4b
Commit
8f194f4b
authored
Oct 30, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mvc: Macro 'base_dialog_header' is already defined on PHP 7.0
parent
745b186b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
23 deletions
+16
-23
base_dialog.volt
src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
+16
-23
No files found.
src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
View file @
8f194f4b
...
@@ -34,28 +34,6 @@ label : dialog label
...
@@ -34,28 +34,6 @@ label : dialog label
#}
#}
{# close table and reopen for new header#}
{%- 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 %}
{# Find if there are help supported or advanced field on this page #}
{# Find if there are help supported or advanced field on this page #}
{% set help=false %}
{% set help=false %}
{% set advanced=false %}
{% set advanced=false %}
...
@@ -101,7 +79,22 @@ label : dialog label
...
@@ -101,7 +79,22 @@ label : dialog label
{% for field in fields|default({})%}
{% for field in fields|default({})%}
{% if field['type'] == 'header' %}
{% if field['type'] == 'header' %}
{# close table and start new one with header #}
{# close table and start new one with header #}
{{ base_dialog_header(field['label']) }}
</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>
{% else %}
{% else %}
{{ partial("layout_partials/form_input_tr",field)}}
{{ partial("layout_partials/form_input_tr",field)}}
{% endif %}
{% endif %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment