Skip to content

Commit 8ceb082

Browse files
author
Marius Cramer
committed
- Layout fixes
- Included new icons and buttons - Layout scaling improved (up to 1260px width)
1 parent ba73165 commit 8ceb082

File tree

147 files changed

+740
-743
lines changed

Some content is hidden

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

147 files changed

+740
-743
lines changed

‎interface/lib/classes/listform.inc.php‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -348,29 +348,33 @@ public function getPagingHTML($vars)
348348

349349
sort($show_pages);
350350
$show_pages = array_unique($show_pages);
351-
351+
352+
$content = '<nav>
353+
<ul class="pagination">';
354+
352355
//* Show Back
353356
if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
354-
$content = '<a class="btn-page first-page" href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'">'
355-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_stop_180.png"></a> &nbsp; ';
356-
$content .= '<a class="btn-page previous-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'">'
357-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_180.png"></a> &nbsp; ';
357+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'" aria-label="First">
358+
<span aria-hidden="true">&laquo;</span></a></li>';
359+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'" aria-label="Previous">
360+
<span aria-hidden="true">&lsaquo;</span></a></li>';
358361
}
359-
$content .= ' '.$this->lng('page_txt').' ';
360362
$prev = -1;
361363
foreach($show_pages as $p) {
362-
if($prev != -1 && $p > $prev + 1) $content .= '<span class="page-spacer">...</span>';
363-
$content .= '<a class="link-page' . ($p == $vars['page'] ? ' current-page' : '') . '" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a>';
364+
if($prev != -1 && $p > $prev + 1) $content .= '<li class="disabled"><a href="#">…</a></li>';
365+
$content .= '<li' . ($p == $vars['page'] ? ' class="active"' : '') . '><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a></li>';
364366
$prev = $p;
365367
}
366368
//.$vars['next_page'].' '.$this->lng('page_of_txt').' '.$vars['max_pages'].' &nbsp; ';
367369
//* Show Next
368370
if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
369-
$content .= '<a class="btn-page next-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'">'
370-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow.png"></a> &nbsp; ';
371-
$content .= '<a class="btn-page last-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'">'
372-
.'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_stop.png"></a>';
371+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'" aria-label="Next">
372+
<span aria-hidden="true">&rsaquo;</span></a></li>';
373+
$content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'" aria-label="Last">
374+
<span aria-hidden="true">&raquo;</span></a></li>';
373375
}
376+
$content .= '</ul></nav>';
377+
374378
return $content;
375379
}
376380

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

Lines changed: 1 addition & 1 deletion
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-
<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>
20+
<div class="col-sm-9"><textarea class="form-control" 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>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ <h1><tmpl_var name="list_head_txt"></h1>
1414
<p><tmpl_var name="list_head_txt"></p>
1515
<div class="table-wrapper marginTop15">
1616
<table class="table">
17-
<thead class="dark">
17+
<thead class="dark form-group-sm">
1818
<tr>
1919
<th><tmpl_var name="active_txt"></th>
2020
<th><tmpl_var name="name_txt"></th>
2121
<th><tmpl_var name="type_txt"></th>
2222
<th>{tmpl_var name='search_limit'}</th>
2323
</tr>
2424
<tr>
25-
<td><select name="search_active">{tmpl_var name='search_active'}</select></td>
26-
<td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
27-
<td><select name="search_type">{tmpl_var name='search_type'}</select></td>
25+
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
26+
<td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
27+
<td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
2828
<td>
29-
<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>
29+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span class="icon icon-filter"></span></button>
3030
</td>
3131
</tr>
3232
</thead>
@@ -37,7 +37,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3737
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
3838
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
3939
<td>
40-
<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>
40+
<a class="btn btn-default formbutton-danger formbutton-narrow" 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 class="icon icon-delete"></span></button>
4141
</td>
4242
</tr>
4343
</tmpl_loop>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
1414
<p><tmpl_var name="list_head_txt"></p>
1515
<div class="table-wrapper marginTop15">
1616
<table class="table">
17-
<thead class="dark">
17+
<thead class="dark form-group-sm">
1818
<tr>
1919
<th><tmpl_var name="active_txt"></th>
2020
<th><tmpl_var name="server_id_txt"></th>
@@ -23,12 +23,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
2323
<th>{tmpl_var name='search_limit'}</th>
2424
</tr>
2525
<tr>
26-
<td><select name="search_active">{tmpl_var name='search_active'}</select></td>
27-
<td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
28-
<td><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
29-
<td><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
26+
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
27+
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
28+
<td><input class="form-control" type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
29+
<td><input class="form-control" type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
3030
<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/firewall_list.php');">{tmpl_var name="filter_txt"}</button>
31+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');"><span class="icon icon-filter"></span></button>
3232
</td>
3333
</tr>
3434
</thead>
@@ -40,7 +40,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4040
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tcp_port"}</a></td>
4141
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="udp_port"}</a></td>
4242
<td>
43-
<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>
43+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
4444
</td>
4545
</tr>
4646
</tmpl_loop>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <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-
<div class="col-sm-9"><textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea></div>
14+
<div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea></div>
1515
</div>
1616

1717

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ <h1><tmpl_var name="list_head_txt"></h1>
1515
<p><tmpl_var name="list_head_txt"></p>
1616
<div class="table-wrapper marginTop15">
1717
<table class="table">
18-
<thead class="dark">
18+
<thead class="dark form-group-sm">
1919
<tr>
2020
<th><tmpl_var name="name_txt"></th>
2121
<th><tmpl_var name="description_txt"></th>
2222
<th>&nbsp;</th>
2323
</tr>
2424
<tr>
25-
<td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
26-
<td><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
25+
<td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
26+
<td><input class="form-control" type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
2727
<td>
28-
<button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');">{tmpl_var name="filter_txt"}</button>
28+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');"><span class="icon icon-filter"></span></button>
2929
</td>
3030
</tr>
3131
</thead>
@@ -35,7 +35,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3535
<td><a href="#" data-load-content="admin/groups_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
3636
<td><a href="#" data-load-content="admin/groups_edit.php?id={tmpl_var name='id'}">{tmpl_var name="description"}</a></td>
3737
<td>
38-
<a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
38+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
3939
</td>
4040
</tr>
4141
</tmpl_loop>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
1313
<p><tmpl_var name="list_head_txt"></p>
1414
<div class="table-wrapper marginTop15">
1515
<table class="table">
16-
<thead class="dark">
16+
<thead class="dark form-group-sm">
1717
<tr>
1818
<th><tmpl_var name="active_txt"></th>
1919
<th><tmpl_var name="server_id_txt"></th>
@@ -26,16 +26,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
2626
<th>&nbsp;</th>
2727
</tr>
2828
<tr>
29-
<td><select name="search_active">{tmpl_var name='search_active'}</select></td>
30-
<td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
29+
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
30+
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
3131
<td></td>
32-
<td><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
32+
<td><select class="form-control" name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
3333
<td></td>
3434
<td></td>
3535
<td></td>
36-
<td><select name="search_target">{tmpl_var name='search_target'}</select></td>
36+
<td><select class="form-control" name="search_target">{tmpl_var name='search_target'}</select></td>
3737
<td>
38-
<button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');">{tmpl_var name="filter_txt"}filter_txt</button>
38+
<button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');"><span class="icon icon-filter"></span></button>
3939
</td>
4040
</tr>
4141
</thead>
@@ -51,7 +51,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5151
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="state"}</a></td>
5252
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="target"}</a></td>
5353
<td>
54-
<a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
54+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
5555
</td>
5656
</tr>
5757
</tmpl_loop>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
99
<tmpl_loop name="records">
1010
<span class="wf_oneField">
1111
<label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
12-
<div class="col-sm-9"><input type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" >
12+
<div class="col-sm-9"><input class="form-control" type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" >
1313
</div></span>
1414
</tmpl_loop>
1515
</span>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
1212
<div class="form-group">
1313
<label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
1414
<div class="col-sm-9">
15-
<div class="col-sm-9"><input type="checkbox" id="overwrite" value="1" name="overwrite"/>
15+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/>
1616
</div></div>
1717
</div>
1818
<div class="form-group">
1919
<label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
2020
<div class="col-sm-9">
21-
<div class="col-sm-9"><input type="checkbox" id="ignore_version" value="1" name="ignore_version"/>
21+
<div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/>
2222
</div></div>
2323
</div>
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
2020
<p><tmpl_var name="list_head_txt"></p>
2121
<div class="table-wrapper marginTop15">
2222
<table class="table">
23-
<thead class="dark">
23+
<thead class="dark form-group-sm">
2424
<tr>
2525
<th><tmpl_var name="module_txt"></th>
2626
<th><tmpl_var name="lang_file_txt"></th>

0 commit comments

Comments
 (0)