Skip to content

Commit 513347a

Browse files
author
Kristan Kenney
committed
Merge branch 'feature/list-preview-features' into feature/user-roles
2 parents b1714f7 + 8e947cc commit 513347a

File tree

3 files changed

+71
-1
lines changed

3 files changed

+71
-1
lines changed

web/list/server/preview/index.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
error_reporting(NULL);
3+
$TAB = 'SERVER';
4+
5+
// Main include
6+
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
7+
8+
// Render page
9+
render_page($user, $TAB, 'list_server_preview');
10+
11+
// Back uri
12+
$_SESSION['back'] = $_SERVER['REQUEST_URI'];

web/templates/pages/edit_server.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<?php } ?>
198198
<tr>
199199
<td>
200-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] == "true")) echo "checked=yes" ?>><?php print _('Enable preview features');?></label>
200+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_experimental_features" <?php if ((isset($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && (!empty($_SESSION['POLICY_SYSTEM_ENABLE_BACON'])) && ($_SESSION['POLICY_SYSTEM_ENABLE_BACON'] == "true")) echo "checked=yes" ?>><?php print _('Enable preview features');?></label> <span class="hint">(<a href="/list/server/preview/"><?=_('View');?></a>)</span>
201201
</td>
202202
</tr>
203203
<tr>
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<div class="l-center">
2+
<div class="l-sort clearfix noselect">
3+
<div class="l-unit-toolbar__buttonstrip">
4+
<a href="/edit/server/" id="btn-back" class="ui-button cancel" dir="ltr"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back')?></a>
5+
</div>
6+
<div class="l-unit-toolbar__buttonstrip float-right">
7+
</div>
8+
</div>
9+
</div>
10+
11+
<div class="l-separator"></div>
12+
13+
<div class="l-center units">
14+
15+
<div class="header table-header">
16+
<div class="l-unit__col l-unit__col--right">
17+
<div class="clearfix l-unit__stat-col--left super-compact text-center">&nbsp;</div>
18+
<div class="clearfix l-unit__stat-col--left"><b><?php print _('Category');?></b></div>
19+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?php print _('Name');?></b></div>
20+
<div class="clearfix l-unit__stat-col--left wide-2"><b><?php print _('Status');?></b></div>
21+
22+
</div>
23+
</div>
24+
25+
<div class="l-unit header animated fadeIn">
26+
<div class="l-unit__col l-unit__col--right">
27+
<div class="clearfix l-unit__stat-col--left super-compact text-center">
28+
<i class="fas fa-database status-icon blue"></i>
29+
</div>
30+
<div class="clearfix l-unit__stat-col--left"><b><?=_('Databases');?></b></div>
31+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?=_('phpMyAdmin Single Sign On'); ?></b></div>
32+
<div class="clearfix l-unit__stat-col--left wide-2">In final development stages.</div>
33+
</div>
34+
</div>
35+
<div class="l-unit header animated fadeIn">
36+
<div class="l-unit__col l-unit__col--right">
37+
<div class="clearfix l-unit__stat-col--left super-compact text-center">
38+
<i class="fas fa-cog status-icon blue"></i>
39+
</div>
40+
<div class="clearfix l-unit__stat-col--left"><b><?=_('System');?></b></div>
41+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?=_('Policy'); ?>: <?=_('Allow suspended users to log in with read-only access'); ?></b></div>
42+
<div class="clearfix l-unit__stat-col--left wide-2">Partially implemented.</div>
43+
</div>
44+
</div>
45+
</div>
46+
47+
<div id="vstobjects">
48+
<div class="l-separator"></div>
49+
<div class="l-center">
50+
<div class="l-unit-ft">
51+
<table class='data'></table>
52+
<div class="data-count l-unit__col l-unit__col--right clearfix">
53+
54+
</div>
55+
</div>
56+
</div>
57+
</div>
58+

0 commit comments

Comments
 (0)