From a791b48929516832bca78311995b5453a4b41a7d Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 27 May 2008 15:36:15 +0000 Subject: [PATCH] Added graphical icons for active / inactive rows in lists and also a graphical delete button. --- .../lib/classes/listform_actions.inc.php | 5 +++ .../lib/classes/searchform_actions.inc.php | 5 +++ interface/web/admin/templates/dbsync_list.htm | 2 +- interface/web/admin/templates/groups_list.htm | 2 +- .../web/admin/templates/server_ip_list.htm | 2 +- interface/web/admin/templates/server_list.htm | 2 +- interface/web/admin/templates/users_list.htm | 2 +- .../web/client/templates/clients_list.htm | 2 +- interface/web/dns/templates/dns_a_list.htm | 4 +-- interface/web/dns/templates/dns_soa_list.htm | 4 +-- .../help/templates/support_message_list.htm | 14 ++++---- .../web/mail/templates/mail_alias_list.htm | 4 +-- .../mail/templates/mail_blacklist_list.htm | 4 +-- .../templates/mail_content_filter_list.htm | 4 +-- .../templates/mail_domain_catchall_list.htm | 4 +-- .../web/mail/templates/mail_domain_list.htm | 4 +-- .../web/mail/templates/mail_forward_list.htm | 4 +-- .../web/mail/templates/mail_get_list.htm | 4 +-- .../mail/templates/mail_transport_list.htm | 32 +++++++++--------- .../web/mail/templates/mail_user_list.htm | 2 +- .../mail/templates/mail_whitelist_list.htm | 4 +-- .../templates/spamfilter_blacklist_list.htm | 4 +-- .../web/sites/templates/ftp_user_list.htm | 4 +-- .../web/sites/templates/shell_user_list.htm | 4 +-- .../sites/templates/web_aliasdomain_list.htm | 4 +-- .../web/sites/templates/web_domain_list.htm | 4 +-- .../sites/templates/web_subdomain_list.htm | 4 +-- .../web/themes/default/graphics licence.txt | 1 + .../themes/default/icons/list_icon_delete.png | Bin 0 -> 792 bytes .../themes/default/icons/list_icon_false.png | Bin 0 -> 785 bytes .../themes/default/icons/list_icon_true.png | Bin 0 -> 821 bytes 31 files changed, 73 insertions(+), 62 deletions(-) create mode 100644 interface/web/themes/default/graphics licence.txt create mode 100644 interface/web/themes/default/icons/list_icon_delete.png create mode 100644 interface/web/themes/default/icons/list_icon_false.png create mode 100644 interface/web/themes/default/icons/list_icon_true.png diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php index e45a57453d..7e02066c29 100644 --- a/interface/lib/classes/listform_actions.inc.php +++ b/interface/lib/classes/listform_actions.inc.php @@ -96,6 +96,11 @@ class listform_actions { foreach($app->listform->listDef['item'] as $field) { $key = $field['field']; if(isset($field['formtype']) && $field['formtype'] == 'SELECT') { + if($rec[$key] == 'y' or $rec[$key] == 'n') { + // Set a additional image variable for bolean fields + $rec['_'.$key.'_'] = ($rec[$key] == 'y')?'list_icon_true.png':'list_icon_false.png'; + } + //* substitute value for select field $rec[$key] = @$field['value'][$rec[$key]]; } } diff --git a/interface/lib/classes/searchform_actions.inc.php b/interface/lib/classes/searchform_actions.inc.php index 97b5ab032c..e128ce8e4e 100644 --- a/interface/lib/classes/searchform_actions.inc.php +++ b/interface/lib/classes/searchform_actions.inc.php @@ -109,6 +109,11 @@ class searchform_actions { foreach($app->searchform->listDef["item"] as $field) { $key = $field["field"]; if($field['formtype'] == "SELECT") { + if($rec[$key] == 'y' or $rec[$key] == 'n') { + // Set a additional image variable for bolean fields + $rec['_'.$key.'_'] = ($rec[$key] == 'y')?'list_icon_true.png':'list_icon_false.png'; + } + // substitute value for select field $rec[$key] = $field['value'][$rec[$key]]; } } diff --git a/interface/web/admin/templates/dbsync_list.htm b/interface/web/admin/templates/dbsync_list.htm index 54dd51401a..88e4e48b4a 100644 --- a/interface/web/admin/templates/dbsync_list.htm +++ b/interface/web/admin/templates/dbsync_list.htm @@ -18,7 +18,7 @@ {tmpl_var name="jobname"} {tmpl_var name="db_host"} {tmpl_var name="db_name"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index b65196457b..9b2e6ec45e 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -15,7 +15,7 @@ {tmpl_var name="name"} {tmpl_var name="description"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index 8c19c38bb5..374827933a 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -15,7 +15,7 @@ {tmpl_var name="server_id"} {tmpl_var name="ip_address"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index 658e792682..d2b5709760 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -30,7 +30,7 @@ {tmpl_var name="file_server"} {tmpl_var name="db_server"} {tmpl_var name="vserver_server"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index f8a669c1ad..e748add00a 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -21,7 +21,7 @@ {tmpl_var name="vorname"} {tmpl_var name="name"} {tmpl_var name="ort"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index 6f4418e954..77fdbed0a9 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -21,7 +21,7 @@ {tmpl_var name="contact_name"} {tmpl_var name="city"} {tmpl_var name="country"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 9f143907d8..ed4129d532 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -26,11 +26,11 @@ Add: - {tmpl_var name="active"} + {tmpl_var name="type"} {tmpl_var name="name"} {tmpl_var name="data"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index 7193668159..b6be7054a1 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -19,12 +19,12 @@ - {tmpl_var name="active"} + {tmpl_var name="server_id"} {tmpl_var name="origin"} {tmpl_var name="ns"} {tmpl_var name="mbox"} - [{tmpl_var name='delete_txt'}] + {tmpl_var name='delete_txt'} diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm index 66ec25c047..207d40ee63 100644 --- a/interface/web/help/templates/support_message_list.htm +++ b/interface/web/help/templates/support_message_list.htm @@ -2,20 +2,20 @@


- - + + - - + + - - - + + + diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index ad8fcb9f7a..22d6b8f017 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -15,10 +15,10 @@ - + - + diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index 1caff00827..eb1b662cf0 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index 6f92b53e44..601ea2ee3e 100644 --- a/interface/web/mail/templates/mail_content_filter_list.htm +++ b/interface/web/mail/templates/mail_content_filter_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index b2026a9f80..b4b5b14141 100644 --- a/interface/web/mail/templates/mail_domain_catchall_list.htm +++ b/interface/web/mail/templates/mail_domain_catchall_list.htm @@ -15,10 +15,10 @@ - + - + diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index e628405e6d..10dcba373f 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -15,10 +15,10 @@ - + - + diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index 0f88d2378c..8fdaf11030 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -15,10 +15,10 @@ - + - + diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index f2eb35eec4..89bc3085d7 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -19,12 +19,12 @@ - + - + diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index 30dcab001c..e3584f66bc 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -2,29 +2,29 @@


 
{tmpl_var name="sender_id"}{tmpl_var name="subject"}[{tmpl_var name='delete_txt'}]{tmpl_var name="sender_id"}{tmpl_var name="subject"}{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="source"} {tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="source"} {tmpl_var name="type"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="pattern"} {tmpl_var name="action"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="source"} {tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="source"} {tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="source_server"} {tmpl_var name="source_username"} {tmpl_var name="destination"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
- - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 08dcae1f3c..7434678325 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -15,7 +15,7 @@ - + diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index 09a1db88df..26f129fe45 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index 29ab3cbc84..b90ac57a5f 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -19,12 +19,12 @@ - + - + diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index ee5d4365a8..92e410c384 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index 0c424bc392..af76e9eb11 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm index 270325f315..6abab552d8 100644 --- a/interface/web/sites/templates/web_aliasdomain_list.htm +++ b/interface/web/sites/templates/web_aliasdomain_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm index bfdef742fb..83bed62837 100644 --- a/interface/web/sites/templates/web_domain_list.htm +++ b/interface/web/sites/templates/web_domain_list.htm @@ -15,10 +15,10 @@ - + - + diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm index 70c491e75c..701c17e17a 100644 --- a/interface/web/sites/templates/web_subdomain_list.htm +++ b/interface/web/sites/templates/web_subdomain_list.htm @@ -17,11 +17,11 @@ - + - + diff --git a/interface/web/themes/default/graphics licence.txt b/interface/web/themes/default/graphics licence.txt new file mode 100644 index 0000000000..390a6ca164 --- /dev/null +++ b/interface/web/themes/default/graphics licence.txt @@ -0,0 +1 @@ +The icons and graphics in this theme may only be used for ISPConfig 3 software. The graphic files are not licensed under BSD license and may not be copied or used for other projects. \ No newline at end of file diff --git a/interface/web/themes/default/icons/list_icon_delete.png b/interface/web/themes/default/icons/list_icon_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..1294132968da8a359cc0a3d87c617d7015921829 GIT binary patch literal 792 zcmV+z1LypSP)WdKBJATux^Q)O@&l1qU%EbBxo5uSZ0`6poC!r6&bMa@1V8c%;iN38>C1FXaWgG+w_K|C7k zHy2j`!$5WG9$4iiy~DssR#`T9)Z5^Ox&h5F5t@oe?ZDjvf->Os(%7toqz9ehu(z?Y zxWYZs*40!6H37jb%zRgc+YmR-0crukK43OBF*gp&1WXGKmjmrx2NkF^%T0tM8WNG@ zvlGCFO-wSf@mVNq+ytDSbWb zJ+YC*!0@s)zogMyIAJ*nvS3#vI$DaWN#BE91`eCjySuKGe5SMDRW%9U*lJ8_W=9~X zK3|AZT?j~0!ARNUJOiDzml>=*b4zhK%C(I{hD$-1hJQ}0(ICMfJ@I}CxeWS%ic)9Mps*`ddWyfG6nbuvmi)Be0*~kuI^DplD?n)5{@%Zh WJ}STSwfcAf0000zg6 literal 0 HcmV?d00001 diff --git a/interface/web/themes/default/icons/list_icon_false.png b/interface/web/themes/default/icons/list_icon_false.png new file mode 100644 index 0000000000000000000000000000000000000000..d33897164ea14f8d8b9b06f2209a19136151aebc GIT binary patch literal 785 zcmV+s1Md8ZP)WdKHUATc!{PH%P~GB7YQATcmHFgQ9gIUp-AF)%RoqGHAX000McNliru z(*zh0Bsl$_=h*-N010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00L=A zL_t(|+NG0CPZL2H$NxLK-R&;jzF2BhKs?kMK7f7+C75^sUlQe_w_f!-c;jL?kr)%> z!3%mK9*xF>MkOH@2~euEl|pGtUv_6_$7i>(is*?+o|$K7=lMNvGr%#2^7n>3kCBRl zJR6Qps>x(laDnb_eXZH(Em}RyWp}atUx2)To2|2>kF2R_TTQ2d(mGHp1Fe1VY89pB zQcG_-_r|JtdIS&{cP?IfY)#*0SpNciD*){SpwlMlkWQ=HL2=ld0{GWB_u7~pr#bgYi$IINWgXY z%Rv`RiMhh(VvBaeYRjMl9sxvXj{`d8QVm!21Xd#BFe)3(7%+F}A{A1&jyRs=(qNpr zNWs9PHP9VmeZ&|(u~DST1^;Ao@5WW&*^#UKA&!}5gv}49qj5#k(D8NbUCR!H33A?!6sbZ8C(v P00000NkvXXu0mjfG_q3_ literal 0 HcmV?d00001 diff --git a/interface/web/themes/default/icons/list_icon_true.png b/interface/web/themes/default/icons/list_icon_true.png new file mode 100644 index 0000000000000000000000000000000000000000..deefc129d2f4df81b59d8d264391c9e3b9285890 GIT binary patch literal 821 zcmV-51Iqk~P)WdKHUATc!{PH%P~GB7YQATcmHFgQ9gIUp-AF)%RoqGHAX000McNliru z(*zh0B`p440_6Yz010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00NCk zL_t(|+NG0UNRv?*#(&?pxf$uErHdG3`7cC-uDT0DGrQVFbkS8J7!`^UL`jNJB1jkA zbWvnNh_`h!h%Cs;OT#IK1gq)RA2)UB_HA?DzJDFH6tS*6@WOcy=Xu`udCq%ak4xHh z@{9taw8;+HcW8fcwV~_MQc4M08Pm@`2I(UCe}Z97mt@@|Ehn12HJ)QclnBxEBEM9H zU@Xe)+(JyVX_vUk>)iwbTx&0X)qSeP8A*R7n4Do%&5%-aq;fh+P9>?T{0J*KO*Vak zWON-S|82Wu%{9_f-|C!Mogk=8VOXYMm$58Kghe8o=5j?lWfg7*acP*_6m1jypzUH^ zlQ*J-h^<91O$k*uPz@8^G=+>fZ<_+#sq4pIKT3XSp$C;~+XQ*|YCM%p$0zufNRZZY zWJF{&jql15Z_Z3p?ydqmjIF#NYvu{@l5dNkRJgs6`N>3RiAMW%CKsY4)HIP~jM2s^ z%8Lcq22Vmgbc_!`E?=OW$F~S9!<0TPhqzb$kQ=ofJU{skC1c}dLx7`2l^aby72wYC zeoS2?85fwF-fs{rC&fEUCVk;sB=jT|g_V3f7pARTN#X8Y=^16?FXD1TF?YhayqkvJr^S z(h_K3#h4ducXMS-fHeVLufBW$Rt^jBTpWW(I|pfivvx!F+r6?QYv>d@Kv@&##-CU` z0&%Y}Y*r^fah?a89qb(CyEKy(L*jON$a4yvLPMqiQU}F8B_bThrM7Z^6a4Sb)Fmb? z%~edB4>_+2OA?0Uz6cF|;rwHUi0}0W?^wS9&Fe1rAe)!x00000NkvXXu0mjfNW@od literal 0 HcmV?d00001 -- GitLab
 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="domain"}{tmpl_var name="transport"}{tmpl_var name="sort_order"}[{tmpl_var name='delete_txt'}]{tmpl_var name="server_id"}{tmpl_var name="domain"}{tmpl_var name="transport"}{tmpl_var name="sort_order"}{tmpl_var name='delete_txt'}
{tmpl_var name="email"} {tmpl_var name="autoresponder"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="source"} {tmpl_var name="type"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="priority"} {tmpl_var name="rid"} {tmpl_var name="email"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} {tmpl_var name="username"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} {tmpl_var name="username"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} {tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="parent_domain_id"} {tmpl_var name="domain"}[{tmpl_var name='delete_txt'}]{tmpl_var name='delete_txt'}