Skip to content

Commit ba73165

Browse files
author
Marius Cramer
committed
Layout fixes
1 parent 6ab3c5d commit ba73165

File tree

223 files changed

+496
-623
lines changed

Some content is hidden

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

223 files changed

+496
-623
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
1717
</div></div>
1818
<div class="form-group">
1919
<label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
20-
<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>
20+
<div class="col-sm-9"><textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea></div><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>
2222
<div class="form-group">
2323
<label class="col-sm-3 control-label">{tmpl_var name='customer_viewable_txt'}</label>
@@ -36,8 +36,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
3636
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3737

3838
<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>
39+
<button class="btn btn-default formbutton-success" 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="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/directive_snippets_list.php">{tmpl_var name='btn_cancel_txt'}</button>
4141
</div></div>
4242
<script language="JavaScript" type="text/javascript">
4343

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
66

77
<p>{tmpl_var name="toolsarea_head_txt"}</p>
88

9-
<button class="button iconstxt icoAdd" type="button" data-load-content="admin/directive_snippets_edit.php">
10-
<span>{tmpl_var name="add_new_record_txt"}</span>
11-
</button>
9+
<button class="btn btn-default formbutton-success" type="button" data-load-content="admin/directive_snippets_edit.php">{tmpl_var name="add_new_record_txt"}</button>
1210

1311

1412

@@ -34,7 +32,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3432
</thead>
3533
<tbody>
3634
<tmpl_loop name="records">
37-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
35+
<tr>
3836
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
3937
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
4038
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
3030
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3131

3232
<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>
33+
<button class="btn btn-default formbutton-success" 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="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/firewall_list.php">{tmpl_var name='btn_cancel_txt'}</button>
3535
</div></div>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
66

77
<p>{tmpl_var name="toolsarea_head_txt"}</p>
88

9-
<button class="button iconstxt icoAdd" type="button" data-load-content="admin/firewall_edit.php">
10-
<span>{tmpl_var name="add_new_record_txt"}</span>
11-
</button>
9+
<button class="btn btn-default formbutton-success" type="button" data-load-content="admin/firewall_edit.php">{tmpl_var name="add_new_record_txt"}</button>
1210

1311

1412

@@ -36,7 +34,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3634
</thead>
3735
<tbody>
3836
<tmpl_loop name="records">
39-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
37+
<tr>
4038
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
4139
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
4240
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tcp_port"}</a></td>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
1111
</div></div>
1212
<div class="form-group">
1313
<label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
14-
<textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea>
14+
<div class="col-sm-9"><textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea></div>
1515
</div>
1616

1717

1818
<input type="hidden" name="id" value="{tmpl_var name='id'}">
1919

2020
<div class="clear"><div class="right">
21-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/groups_edit.php');">{tmpl_var name='btn_save_txt'}</button>
22-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/groups_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
21+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/groups_edit.php');">{tmpl_var name='btn_save_txt'}</button>
22+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/groups_list.php">{tmpl_var name='btn_cancel_txt'}</button>
2323
</div></div>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
66

77
<p>{tmpl_var name="toolsarea_head_txt"}</p>
88

9-
<button class="button iconstxt icoAdd" type="button" data-load-content="admin/groups_edit.php">
10-
<span>{tmpl_var name="add_new_record_txt"}</span>
11-
</button>
9+
<button class="btn btn-default formbutton-success" type="button" data-load-content="admin/groups_edit.php">{tmpl_var name="add_new_record_txt"}</button>
1210
<p><tmpl_var name="warning_txt"></p>
1311

1412

@@ -33,7 +31,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3331
</thead>
3432
<tbody>
3533
<tmpl_loop name="records">
36-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
34+
<tr>
3735
<td><a href="#" data-load-content="admin/groups_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
3836
<td><a href="#" data-load-content="admin/groups_edit.php?id={tmpl_var name='id'}">{tmpl_var name="description"}</a></td>
3937
<td>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
5757

5858
<input type="hidden" name="id" value="{tmpl_var name='id'}">
5959
<div class="clear"><div class="right">
60-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/iptables_edit.php');">{tmpl_var name='btn_save_txt'}</button>
61-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/iptables_list.php">
62-
<span>{tmpl_var name='btn_cancel_txt'}</span></button>
60+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/iptables_edit.php');">{tmpl_var name='btn_save_txt'}</button>
61+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/iptables_list.php">{tmpl_var name='btn_cancel_txt'}</button>
6362
</div></div>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
55

66
<p>Tools</p>
77

8-
<button class="button iconstxt icoAdd" type="button" data-load-content="admin/iptables_edit.php">
9-
<span>{tmpl_var name="add_new_rule_txt"}</span>
10-
</button>
8+
<button class="btn btn-default formbutton-success" type="button" data-load-content="admin/iptables_edit.php">{tmpl_var name="add_new_rule_txt"}</button>
119

1210

1311

@@ -43,7 +41,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4341
</thead>
4442
<tbody>
4543
<tmpl_loop name="records">
46-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
44+
<tr>
4745
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
4846
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
4947
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="table"}</a></td>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
2121
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2222

2323
<div class="clear"><div class="right">
24-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_add.php');">{tmpl_var name='btn_save_txt'}</button>
25-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
24+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_add.php');">{tmpl_var name='btn_save_txt'}</button>
25+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
2626
</div></div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
2121
</select>
2222
</div></div>
2323
<div class="clear"><div class="right">
24-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_complete.php');">{tmpl_var name='btn_save_txt'}</button>
25-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
24+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_complete.php');">{tmpl_var name='btn_save_txt'}</button>
25+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
2626
</div></div>
2727

2828

0 commit comments

Comments
 (0)