maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

minor preparations for system-hostname as 'normal' domain (to use ssl/LE/etc.)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-04-11 09:19:43 +02:00
parent 84f1d94ad6
commit a014b5cc2b
3 changed files with 547 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

995
admin_domains.php
View File

File diff suppressed because it is too large Load Diff

21
templates/Sparkle/admin/domains/domains_domain.tpl vendored
View File

@@ -1,23 +1,20 @@
<if $row['termination_date'] != ''> <if $row['termination_css'] != ''>
<tr class="{$row['termination_css']}"> <tr class="{$row['termination_css']}">
</if> </if>
<if $row['termination_date'] == ''> <if $row['termination_css'] == ''>
<tr> <tr>
</if> </if>
<td>{$row['domain']} <td>{$row['domain']}
<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> <if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;({$lng['admin']['stdsubdomain']}) &nbsp;({$lng['admin']['stdsubdomain']})
</if> </if>
<if $row['termination_date'] != ''> <if $row['termination_date'] != ''>
<br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small> <br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small>
</if> </if>
</td> </td>
<td>{$row['ipandport']}</td> <td>{$row['ipandport']}</td>
<td>{$row['customername']}&nbsp; <td>{$row['customername']}&nbsp;
(<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a>) <if !empty($row['loginname'])>(<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $row['customerid']))}" rel="external">{$row['loginname']}</a>)</if>
</td> </td>
<td> <td>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}"> <a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
@@ -26,7 +23,7 @@
<if $row['letsencrypt'] == '1'> <if $row['letsencrypt'] == '1'>
<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" /> <img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if> </if>
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)> <if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != Settings::Get('system.hostname_id')>
<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> <if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}"> &nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" /> <img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />

20
templates/Sparkle/assets/css/main.css vendored
View File

@@ -1495,11 +1495,21 @@ fieldset.file {
} }
.domain-canceled { .domain-canceled {
/* Color copied from .warningcontainer */ /* Color copied from .warningcontainer */
background-color: #fffecc; background-color: #fffecc;
} }
.domain-expired { .domain-expired {
/* Color copied from .errorcontainer */ /* Color copied from .errorcontainer */
background-color: rgb(242, 222, 222); background-color: rgb(242, 222, 222);
} }
.domain-hostname {
background-color: rgb(53, 106, 160);
color: #ddd;
font-weight: bold;
}
table.hl tbody tr.domain-hostname:hover {
background-color: rgb(64, 150, 238);
}