Skip to content

Commit c513fa1

Browse files
author
cfoe
committed
backporting from ispc-larry: country-flags in lists, added groups to admin/users list, added icons for user_typ
1 parent 4f9c385 commit c513fa1

File tree

9 files changed

+73
-29
lines changed

9 files changed

+73
-29
lines changed

‎interface/web/themes/default-v2/CHANGELOG‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ resources @ https://github.com/foe-services/ispc-resources
2727
- all icons separate: https://github.com/downloads/foe-services/ispc-larry/ispc-default_separate.zip
2828
- all used icons as layers and sprite as .psd: https://github.com/downloads/foe-services/ispc-larry/ispc-default_psd.zip
2929
- added sprites for (nearly) all used icons where suitable
30+
- added flags for country text in lists
31+
- added some list column widths

‎interface/web/themes/default-v2/css/styles.css‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,22 @@ tbody th.sub {
363363
background: #ddd;
364364
color: #333;
365365
}
366-
366+
table.list th[class$="_pid"],
367+
table.list td[class$="_pid"],
368+
table.list th[class$="_active"],
369+
table.list td[class$="_active"],
370+
table.list th.tbl_col_autoresponder,
371+
table.list td.tbl_col_autoresponder {
372+
width: 70px;
373+
text-align: center;
374+
}
375+
table.list .tbl_col_buttons,
376+
table.list .tbl_col_limit {
377+
width: 150px;
378+
}
379+
.tbl_col_client_pid input {
380+
width: 50px;
381+
}
367382
.pnl_listarea th[class^="tbl_col"] { cursor:pointer; }
368383
.pnl_listarea th[class^="tbl_col"]:hover { background-position:0 -15px!important; }
369384

@@ -604,11 +619,11 @@ div#ir-No {
604619
background: url("../icons/x16_sprite.png") no-repeat transparent;
605620
}
606621
#ir-Yes {
607-
background-position: left -342px !important;
622+
background-position: center -342px !important;
608623
height: 16px;
609624
}
610625
#ir-No {
611-
background-position: left -362px !important;
626+
background-position: center -362px !important;
612627
height: 16px;
613628
}
614629
.swap {
@@ -741,6 +756,21 @@ button.icons16 {
741756
.icons16.icoDbAdmin { background-position: -1px -221px; }
742757
.icons16.icoAction { background-position: -1px -241px; }
743758

759+
div.group-icon {
760+
float: left;
761+
padding: 2px 0;
762+
}
763+
.group-admin,
764+
.group-user {
765+
height: 20px;
766+
width: 20px;
767+
padding: 0;
768+
float: left;
769+
background: url("../icons/x16_sprite.png") no-repeat transparent;
770+
}
771+
.group-admin { background-position: 0 -380px; }
772+
.group-user { background-position: 0 -400px; }
773+
744774
#ajaxloader {
745775
text-align:center;
746776
margin-top: 180px;
@@ -786,6 +816,15 @@ select.withicons option {
786816
background-position: 1px;
787817
padding-left:24px;
788818
}
819+
div[class^=country-] {
820+
background-image: url("../icons/flags_sprite.png");
821+
background-repeat: no-repeat;
822+
height: 20px;
823+
width: 26px;
824+
}
825+
div[class^=country-] span {
826+
display: none;
827+
}
789828
select.flags option {
790829
background-image: url("../icons/flags_sprite.png");
791830
background-repeat: no-repeat;
@@ -794,7 +833,7 @@ select.flags option {
794833
select.flags option[value=EL] {background-position:0 -1475px}
795834
select.flags option[value=AD], select.flags option[value=ad] {background-position:0 -1px}
796835
select.flags option[value=AE], select.flags option[value=ae] {background-position:0 -23px}
797-
select.flags option[value=AF], select.flags option[value=af] {background-position:0 -45px}
836+
select.flags option[value=AF], select.flags option[value=af], .country-AF {background-position:0 -45px}
798837
select.flags option[value=AG], select.flags option[value=ag] {background-position:0 -67px}
799838
select.flags option[value=AI], select.flags option[value=ai] {background-position:0 -89px}
800839
select.flags option[value=AL], select.flags option[value=al] {background-position:0 -111px}
@@ -847,7 +886,7 @@ select.flags option[value=CV], select.flags option[value=cv] {background-positio
847886
select.flags option[value=CX], select.flags option[value=cx] {background-position:0 -1167px}
848887
select.flags option[value=CY], select.flags option[value=cy] {background-position:0 -1189px}
849888
select.flags option[value=CZ], select.flags option[value=cz] {background-position:0 -1211px}
850-
select.flags option[value=DE], select.flags option[value=de] {background-position:0 -1233px}
889+
select.flags option[value=DE], select.flags option[value=de], .country-DE {background-position:0 -1233px}
851890
select.flags option[value=DJ], select.flags option[value=dj] {background-position:0 -1255px}
852891
select.flags option[value=DK], select.flags option[value=dk] {background-position:0 -1277px}
853892
select.flags option[value=DM], select.flags option[value=dm] {background-position:0 -1299px}
@@ -866,7 +905,7 @@ select.flags option[value=FM], select.flags option[value=fm] {background-positio
866905
select.flags option[value=FO], select.flags option[value=fo] {background-position:0 -1673px}
867906
select.flags option[value=FR], select.flags option[value=fr] {background-position:0 -1695px}
868907
select.flags option[value=GA], select.flags option[value=ga] {background-position:0 -1717px}
869-
select.flags option[value=GB], select.flags option[value=en], select.flags option[value=gb] {background-position:0 -1739px}
908+
select.flags option[value=GB], select.flags option[value=en], select.flags option[value=gb], .country-GB, .country-EN {background-position:0 -1739px}
870909
select.flags option[value=GD], select.flags option[value=gd] {background-position:0 -1761px}
871910
select.flags option[value=GE], select.flags option[value=ge] {background-position:0 -1783px}
872911
select.flags option[value=GF], select.flags option[value=gf] {background-position:0 -1805px}

‎interface/web/themes/default-v2/icons/x16_sprite.png‎

2.71 KB
Loading

‎interface/web/themes/default-v2/templates/admin/server_ip_list.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
1818
<thead>
1919
<tr class="caption">
2020
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
21-
<th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
21+
<th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
2222
<th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
2323
<th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
2424
<th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
@@ -27,7 +27,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
2727
</tr>
2828
<tr class="filter">
2929
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
30-
<td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
30+
<td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
3131
<td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
3232
<td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
3333
<td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
@@ -41,7 +41,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
4141
<tmpl_loop name="records">
4242
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
4343
<td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
44-
<td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
44+
<td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
4545
<td class="tbl_col_ip_type"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
4646
<td class="tbl_col_ip_address"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
4747
<td class="tbl_col_virtualhost"><a href="#" onClick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>

‎interface/web/themes/default-v2/templates/admin/server_php_list.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ <h2><tmpl_var name="list_head_txt"></h2>
1818
<thead>
1919
<tr class="caption">
2020
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
21-
<th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
21+
<th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
2222
<th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
2323
<th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
2424
</tr>
2525
<tr class="filter">
2626
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
27-
<td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
27+
<td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
2828
<td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
2929
<td class="tbl_col_buttons">
3030
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
@@ -35,7 +35,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3535
<tmpl_loop name="records">
3636
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
3737
<td class="tbl_col_server_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
38-
<td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
38+
<td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
3939
<td class="tbl_col_name"><a href="#" onClick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
4040
<td class="tbl_col_buttons">
4141
<a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_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>

‎interface/web/themes/default-v2/templates/admin/users_list.htm‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ <h2><tmpl_var name="list_head_txt"></h2>
1919
<table class="list">
2020
<thead>
2121
<tr class="caption">
22-
<th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
22+
<th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
2323
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
2424
<th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
25+
<th class="tbl_col_groups" scope="col"><tmpl_var name="groups_txt"></th>
2526
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
2627
</tr>
2728
<tr class="filter">
28-
<td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
29+
<td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
2930
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
3031
<td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
32+
<td class="tbl_col_groups"><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
3133
<td class="tbl_col_buttons">
3234
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
3335
</td>
@@ -36,9 +38,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
3638
<tbody>
3739
<tmpl_loop name="records">
3840
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
39-
<td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
41+
<td class="tbl_col_client_pid"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
4042
<td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
41-
<td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
43+
<td class="tbl_col_username"><div class="icons16 group-{tmpl_var name="typ"}" title="{tmpl_var name="typ"}"><span>{tmpl_var name="typ"}</span></div> <div class="group-icon"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></div></td>
44+
<td class="tbl_col_groups">{tmpl_var name="groups"}</td>
4245
<td class="tbl_col_buttons">
4346
<tmpl_if name="username" op="!=" value="admin">
4447
<a class="button icons16 icoLoginAs" href="javascript: loadContent('admin/login_as.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>

‎interface/web/themes/default-v2/templates/client/client_circle_list.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
1818
<table class="list">
1919
<thead>
2020
<tr class="caption">
21-
<th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
21+
<th class="tbl_col_circle_pid" scope="col"><tmpl_var name="circle_id_txt"></th>
2222
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
2323
<th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
2424
<th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
2525
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
2626
</tr>
2727
<tr class="filter">
28-
<td class="tbl_col_circle_id"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td>
28+
<td class="tbl_col_circle_pid"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td>
2929
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
3030
<td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></td>
3131
<td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
@@ -37,7 +37,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
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_circle_id"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
40+
<td class="tbl_col_circle_pid"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
4141
<td class="tbl_col_active"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
4242
<td class="tbl_col_circle_name"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_name"}</a></td>
4343
<td class="tbl_col_description"><a href="#" onClick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>

0 commit comments

Comments
 (0)