Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit 6faa35e

Browse files
committed
use macros instead of block set tag
1 parent 874464b commit 6faa35e

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

provisioning/templates/dashboard.html.j2

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -107,63 +107,63 @@
107107
{%- macro sectionDevelopmentTools() -%}
108108
<table class="table">
109109
{% if 'adminer' in installed_extras -%}
110-
{% set servername %}{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}{% endset %}
111-
{%- if servername != "/{{ adminer_install_filename }}" -%}
110+
{% macro servername %}{{ getServernameFromDocroot(adminer_install_dir) }}/{{ adminer_install_filename }}{% endmacro %}
111+
{%- if servername() != "/{{ adminer_install_filename }}" -%}
112112
<tr>
113113
<th>Adminer</th>
114-
<td><a href="http://{{ servername }}">{{ servername }}</a></td>
114+
<td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
115115
<td class="text-right">
116-
<a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
116+
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
117117
<a href="http://docs.drupalvm.com/en/latest/extras/mysql/#connect-using-adminer" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
118118
</td>
119119
</tr>
120120
{%- endif -%}
121121
{%- endif %}
122122
{% if 'mailhog' in installed_extras -%}
123-
{% set servername %}{{ vagrant_hostname }}:8025{% endset %}
124-
{%- if servername != ":8025" -%}
123+
{% macro servername %}{{ vagrant_hostname }}:8025{% endmacro %}
124+
{%- if servername() != ":8025" -%}
125125
<tr>
126126
<th>MailHog</th>
127-
<td><a href="http://{{ servername }}">{{ servername }}</a></td>
127+
<td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
128128
<td class="text-right">
129-
<a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
129+
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
130130
<a href="http://docs.drupalvm.com/en/latest/extras/mailhog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
131131
</td>
132132
</tr>
133133
{%- endif -%}
134134
{%- endif %}
135135
{% if 'pimpmylog' in installed_extras -%}
136-
{% set servername = getServernameFromDocroot(pimpmylog_install_dir) %}
137-
{%- if servername -%}
136+
{% macro servername %}{{ getServernameFromDocroot(pimpmylog_install_dir) }}{% endmacro %}
137+
{%- if servername() -%}
138138
<tr>
139139
<th>PimpMyLog</th>
140-
<td><a href="http://{{ servername }}">{{ servername }}</a></td>
140+
<td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
141141
<td class="text-right">
142-
<a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
142+
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
143143
<a href="http://docs.drupalvm.com/en/latest/extras/pimpmylog/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
144144
</td>
145145
</tr>
146146
{%- endif -%}
147147
{%- endif %}
148148
{% if 'solr' in installed_extras -%}
149-
{% set servername %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endset %}
149+
{% macro servername %}{{ vagrant_hostname }}:{{ solr_port }}/solr/{% endmacro %}
150150
<tr>
151151
<th>Solr</th>
152-
<td><a href="http://{{ servername }}">{{ servername }}</a></td>
152+
<td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
153153
<td class="text-right">
154-
<a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
154+
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
155155
<a href="http://docs.drupalvm.com/en/latest/extras/solr/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
156156
</td>
157157
</tr>
158158
{%- endif %}
159159
{% if 'xhprof' in installed_extras -%}
160-
{% set servername = getServernameFromDocroot(php_xhprof_html_dir) %}
161-
{%- if servername -%}
160+
{% macro servername %}{{ getServernameFromDocroot(php_xhprof_html_dir) }}{% endmacro %}
161+
{%- if servername() -%}
162162
<tr>
163163
<th>XHProf</th>
164-
<td><a href="http://{{ servername }}">{{ servername }}</a></td>
164+
<td><a href="http://{{ servername() }}">{{ servername() }}</a></td>
165165
<td class="text-right">
166-
<a href="http://{{ servername }}" class="btn btn-success btn-xs" role="button">Open</a>
166+
<a href="http://{{ servername() }}" class="btn btn-success btn-xs" role="button">Open</a>
167167
<a href="http://docs.drupalvm.com/en/latest/extras/xhprof/" target="_blank" class="btn btn-info btn-xs" role="button">Documentation</a>
168168
</td>
169169
</tr>

0 commit comments

Comments
 (0)