Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates"

This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-03 23:31:19 +01:00
parent ca807583df
commit f6e519d779
10 changed files with 128 additions and 126 deletions

View File

@@ -19,9 +19,8 @@ $header
<tr>
<th>{$lng['admin']['phpsettings']['description']}</th>
<th>{$lng['admin']['phpsettings']['activedomains']}</th>
<th>{$lng['admin']['webserver']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</tr>
</thead>
<tbody>
$tablecontent

View File

@@ -1,7 +1,6 @@
<tr class="top">
<td><strong>{$row['description']}</strong></td>
<td>{$domains}</td>
<td>{$webserver}</td>
<td>
<a href="{$linker->getLink(array('section' => 'vhostsettings', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />