Skip to content

Commit 825dd67

Browse files
author
Marius Cramer
committed
- First run of template converting for new layout
1 parent 62e2548 commit 825dd67

File tree

242 files changed

+8249
-8699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+8249
-8699
lines changed

‎interface/web/admin/templates/directive_snippets_edit.htm‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,44 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
1+
<div class='page-header'>
2+
<h1><tmpl_var name="list_head_txt"></h1>
3+
</div>
24
<p><tmpl_var name="list_desc_txt"></p>
35

4-
<div class="panel panel_directive_snippets">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<label for="name">{tmpl_var name='name_txt'}</label>
10-
<input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
11-
</div>
12-
<div class="ctrlHolder">
13-
<label for="type">{tmpl_var name='type_txt'}</label>
14-
<select name="type" id="type" class="selectInput">
6+
7+
8+
<div class="form-group">
9+
<label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
10+
<div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
11+
</div></div>
12+
<div class="form-group">
13+
<label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
14+
<div class="col-sm-9"><select name="type" id="type" class="form-control">
1515
{tmpl_var name='type'}
1616
</select>
17-
</div>
18-
<div class="ctrlHolder">
19-
<label for="snippet">{tmpl_var name='snippet_txt'}</label>
17+
</div></div>
18+
<div class="form-group">
19+
<label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
2020
<textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea><span class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
2121
</div>
22-
<div class="ctrlHolder">
23-
<p class="label">{tmpl_var name='customer_viewable_txt'}</p>
24-
<div class="multiField">
22+
<div class="form-group">
23+
<label class="col-sm-3 control-label">{tmpl_var name='customer_viewable_txt'}</label>
24+
<div class="col-sm-9">
2525
{tmpl_var name='customer_viewable'}
2626
</div>
2727
</div>
28-
<div class="ctrlHolder">
29-
<p class="label">{tmpl_var name='active_txt'}</p>
30-
<div class="multiField">
28+
<div class="form-group">
29+
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
30+
<div class="col-sm-9">
3131
{tmpl_var name='active'}
3232
</div>
3333
</div>
34-
</fieldset>
34+
3535

3636
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3737

38-
<div class="buttonHolder buttons">
39-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
40-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/directive_snippets_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
41-
</div>
42-
</div>
43-
44-
</div>
38+
<div class="clear"><div class="right">
39+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');">{tmpl_var name='btn_save_txt'}</button>
40+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/directive_snippets_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
41+
</div></div>
4542
<script language="JavaScript" type="text/javascript">
4643

4744
if(jQuery('#type').val() == 'nginx'){

‎interface/web/admin/templates/directive_snippets_list.htm‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
1+
<div class='page-header'>
2+
<h1><tmpl_var name="list_head_txt"></h1>
3+
</div>
24
<p><tmpl_var name="list_desc_txt"></p>
35

4-
<div class="panel panel_list_directive_snippets">
56

6-
<div class="pnl_toolsarea">
7-
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
8-
<div class="buttons">
9-
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/directive_snippets_edit.php');">
7+
<p>{tmpl_var name="toolsarea_head_txt"}</p>
8+
9+
<button class="button iconstxt icoAdd" type="button" data-load-content="admin/directive_snippets_edit.php">
1010
<span>{tmpl_var name="add_new_record_txt"}</span>
1111
</button>
12-
</div>
13-
</fieldset>
14-
</div>
12+
13+
1514

16-
<div class="pnl_listarea">
17-
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
18-
<table class="list">
19-
<thead>
20-
<tr class="caption">
21-
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
22-
<th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
23-
<th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
24-
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
15+
16+
<p><tmpl_var name="list_head_txt"></p>
17+
<div class="table-wrapper marginTop15">
18+
<table class="table">
19+
<thead class="dark">
20+
<tr>
21+
<th><tmpl_var name="active_txt"></th>
22+
<th><tmpl_var name="name_txt"></th>
23+
<th><tmpl_var name="type_txt"></th>
24+
<th>{tmpl_var name='search_limit'}</th>
2525
</tr>
26-
<tr class="filter">
27-
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
28-
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
29-
<td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
30-
<td class="tbl_col_buttons">
31-
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
26+
<tr>
27+
<td><select name="search_active">{tmpl_var name='search_active'}</select></td>
28+
<td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
29+
<td><select name="search_type">{tmpl_var name='search_type'}</select></td>
30+
<td>
31+
<button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');">{tmpl_var name="filter_txt"}</button>
3232
</td>
3333
</tr>
3434
</thead>
3535
<tbody>
3636
<tmpl_loop name="records">
3737
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
38-
<td class="tbl_col_active"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
39-
<td class="tbl_col_name"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
40-
<td class="tbl_col_type"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
41-
<td class="tbl_col_buttons">
42-
<a class="button icons16 icoDelete" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
38+
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
39+
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
40+
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
41+
<td>
42+
<a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
4343
</td>
4444
</tr>
4545
</tmpl_loop>
@@ -52,11 +52,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
5252

5353
<tfoot>
5454
<tr>
55-
<td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
55+
<td colspan="4"><tmpl_var name="paging"></td>
5656
</tr>
5757
</tfoot>
5858
</table>
59-
</fieldset>
60-
</div>
61-
62-
</div>
59+
</div>
60+
61+

‎interface/web/admin/templates/firewall_edit.htm‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,35 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
1+
<div class='page-header'>
2+
<h1><tmpl_var name="list_head_txt"></h1>
3+
</div>
24
<p><tmpl_var name="list_desc_txt"></p>
35

4-
<div class="panel panel_firewall">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<label for="server_id">{tmpl_var name='server_id_txt'}</label>
10-
<select name="server_id" id="server_id" class="selectInput">
6+
7+
8+
<div class="form-group">
9+
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
10+
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
1111
{tmpl_var name='server_id'}
1212
</select>
13-
</div>
14-
<div class="ctrlHolder">
15-
<label for="tcp_port">{tmpl_var name='tcp_port_txt'}</label>
16-
<input name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" size="30" maxlength="255" type="text" class="textInput" />
17-
</div>
18-
<div class="ctrlHolder">
19-
<label for="udp_port">{tmpl_var name='udp_port_txt'}</label>
20-
<input name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" size="30" maxlength="255" type="text" class="textInput" />
21-
</div>
22-
<div class="ctrlHolder">
23-
<p class="label">{tmpl_var name='active_txt'}</p>
24-
<div class="multiField">
13+
</div></div>
14+
<div class="form-group">
15+
<label for="tcp_port" class="col-sm-3 control-label">{tmpl_var name='tcp_port_txt'}</label>
16+
<div class="col-sm-9"><input type="text" name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" class="form-control" />
17+
</div></div>
18+
<div class="form-group">
19+
<label for="udp_port" class="col-sm-3 control-label">{tmpl_var name='udp_port_txt'}</label>
20+
<div class="col-sm-9"><input type="text" name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" class="form-control" />
21+
</div></div>
22+
<div class="form-group">
23+
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
24+
<div class="col-sm-9">
2525
{tmpl_var name='active'}
2626
</div>
2727
</div>
28-
</fieldset>
28+
2929

3030
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3131

32-
<div class="buttonHolder buttons">
33-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
34-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
35-
</div>
36-
</div>
37-
38-
</div>
32+
<div class="clear"><div class="right">
33+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/firewall_edit.php');">{tmpl_var name='btn_save_txt'}</button>
34+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/firewall_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
35+
</div></div>

‎interface/web/admin/templates/firewall_list.htm‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
1+
<div class='page-header'>
2+
<h1><tmpl_var name="list_head_txt"></h1>
3+
</div>
24
<p><tmpl_var name="list_desc_txt"></p>
35

4-
<div class="panel panel_list_firewall">
56

6-
<div class="pnl_toolsarea">
7-
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
8-
<div class="buttons">
9-
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/firewall_edit.php');">
7+
<p>{tmpl_var name="toolsarea_head_txt"}</p>
8+
9+
<button class="button iconstxt icoAdd" type="button" data-load-content="admin/firewall_edit.php">
1010
<span>{tmpl_var name="add_new_record_txt"}</span>
1111
</button>
12-
</div>
13-
</fieldset>
14-
</div>
12+
13+
1514

16-
<div class="pnl_listarea">
17-
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
18-
<table class="list">
19-
<thead>
20-
<tr class="caption">
21-
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
22-
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
23-
<th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
24-
<th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
25-
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
15+
16+
<p><tmpl_var name="list_head_txt"></p>
17+
<div class="table-wrapper marginTop15">
18+
<table class="table">
19+
<thead class="dark">
20+
<tr>
21+
<th><tmpl_var name="active_txt"></th>
22+
<th><tmpl_var name="server_id_txt"></th>
23+
<th><tmpl_var name="tcp_port_txt"></th>
24+
<th><tmpl_var name="udp_port_txt"></th>
25+
<th>{tmpl_var name='search_limit'}</th>
2626
</tr>
27-
<tr class="filter">
28-
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
29-
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
30-
<td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
31-
<td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
32-
<td class="tbl_col_buttons">
33-
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
27+
<tr>
28+
<td><select name="search_active">{tmpl_var name='search_active'}</select></td>
29+
<td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
30+
<td><div class="col-sm-9"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></div></td>
31+
<td><div class="col-sm-9"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></div></td>
32+
<td>
33+
<button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name="filter_txt"}</button>
3434
</td>
3535
</tr>
3636
</thead>
3737
<tbody>
3838
<tmpl_loop name="records">
3939
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
40-
<td class="tbl_col_active"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
41-
<td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
42-
<td class="tbl_col_tcp_port"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
43-
<td class="tbl_col_udp_port"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
44-
<td class="tbl_col_buttons">
45-
<a class="button icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
40+
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
41+
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
42+
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tcp_port"}</a></td>
43+
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="udp_port"}</a></td>
44+
<td>
45+
<a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
4646
</td>
4747
</tr>
4848
</tmpl_loop>
@@ -55,11 +55,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
5555

5656
<tfoot>
5757
<tr>
58-
<td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
58+
<td colspan="5"><tmpl_var name="paging"></td>
5959
</tr>
6060
</tfoot>
6161
</table>
62-
</fieldset>
63-
</div>
64-
65-
</div>
62+
</div>
63+
64+

0 commit comments

Comments
 (0)