From 7692f34a23250aa815f368cc9cd17064cf0af141 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 14 Apr 2008 10:37:47 +0000 Subject: [PATCH] List image migration for core git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10411 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/images/list_reload.png | Bin 910 -> 0 bytes .../{small_filter.png => lists/action.png} | Bin .../images/{list_back.png => lists/back.png} | Bin .../images/{editcopy.png => lists/copy.png} | Bin .../images/{editcut.png => lists/cut.png} | Bin gosa-core/html/images/lists/cutpaste.png | Bin 0 -> 898 bytes .../{editdelete.png => lists/delete.png} | Bin gosa-core/html/images/lists/edit.png | Bin 0 -> 946 bytes .../images/{list_home.png => lists/home.png} | Bin .../html/images/{certs.png => lists/key.png} | Bin .../{closedlock.png => lists/locked.png} | Bin .../images/{editpaste.png => lists/paste.png} | Bin .../{status_restart.png => lists/reload.png} | Bin .../images/{list_root.png => lists/root.png} | Bin .../images/{edittrash.png => lists/trash.png} | Bin .../{openlock.png => lists/unlocked.png} | Bin .../html/images/{list_up.png => lists/up.png} | Bin gosa-core/html/images/mailq_requeue.png | Bin 910 -> 0 bytes gosa-core/include/class_MultiSelectWindow.inc | 8 +++---- gosa-core/include/class_SnapShotDialog.inc | 2 +- gosa-core/include/class_acl.inc | 4 ++-- gosa-core/plugins/admin/acl/class_aclRole.inc | 4 ++-- .../plugins/admin/acl/class_divListACL.inc | 18 ++++++++-------- gosa-core/plugins/admin/acl/main.inc | 2 +- .../departments/class_divListDepartment.inc | 4 ++-- .../plugins/admin/departments/generic.tpl | 2 +- gosa-core/plugins/admin/departments/main.inc | 2 +- .../admin/groups/class_divListGroup.inc | 16 +++++++------- .../admin/groups/class_groupGeneric.inc | 6 +++--- gosa-core/plugins/admin/groups/main.inc | 2 +- .../admin/ogroups/class_divListOGroup.inc | 16 +++++++------- .../plugins/admin/ogroups/class_ogroup.inc | 2 +- gosa-core/plugins/admin/ogroups/main.inc | 2 +- .../admin/users/class_divListUsers.inc | 20 +++++++++--------- gosa-core/plugins/admin/users/main.inc | 2 +- .../personal/generic/generic_certs.tpl | 2 +- gosa-core/plugins/personal/generic/main.inc | 4 ++-- .../personal/posix/class_posixAccount.inc | 4 ++-- gosa-core/plugins/personal/posix/generic.tpl | 2 +- gosa-core/plugins/personal/posix/main.inc | 4 ++-- gosa-core/setup/setup_ldap.tpl | 2 +- 41 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 gosa-core/html/images/list_reload.png rename gosa-core/html/images/{small_filter.png => lists/action.png} (100%) rename gosa-core/html/images/{list_back.png => lists/back.png} (100%) rename gosa-core/html/images/{editcopy.png => lists/copy.png} (100%) rename gosa-core/html/images/{editcut.png => lists/cut.png} (100%) create mode 100644 gosa-core/html/images/lists/cutpaste.png rename gosa-core/html/images/{editdelete.png => lists/delete.png} (100%) create mode 100644 gosa-core/html/images/lists/edit.png rename gosa-core/html/images/{list_home.png => lists/home.png} (100%) rename gosa-core/html/images/{certs.png => lists/key.png} (100%) rename gosa-core/html/images/{closedlock.png => lists/locked.png} (100%) rename gosa-core/html/images/{editpaste.png => lists/paste.png} (100%) rename gosa-core/html/images/{status_restart.png => lists/reload.png} (100%) rename gosa-core/html/images/{list_root.png => lists/root.png} (100%) rename gosa-core/html/images/{edittrash.png => lists/trash.png} (100%) rename gosa-core/html/images/{openlock.png => lists/unlocked.png} (100%) rename gosa-core/html/images/{list_up.png => lists/up.png} (100%) delete mode 100644 gosa-core/html/images/mailq_requeue.png diff --git a/gosa-core/html/images/list_reload.png b/gosa-core/html/images/list_reload.png deleted file mode 100644 index 5c6a26dd396fdab3c0b0f5b41a70b0ee34b5fcef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 910 zcmV;919AL`P)f8Te$nK?6^OJ*kIrinHQMng4_5U*WGp<0UFM3gQHE=1aHT)Gl> z`X{&IRMKz{0-QyES^qmfQ%061RA%7(?2n{CSX4j;z- z{kH}mezsIB7DMd_{w;}+w`QkDrapT67!yMZ%XZm2G_gGhLcu^^gjb){Y1vw0ZC{-0 zs{GZtabaoz!}AwE85|rq_x@QOfy6W$^rtkYj^|OLOU?8#AB8w>$kU@SHV(8zr6p41 z@%8K4?4^>97W?AOlNmjofEaC_KQTfosRIz#qcp65UBkh0d@MU46Yp|+Go13>_EiPU zNA+YT8~3Ri9bSKJj35lTUTUyibx6b{wi^hjcZ41m=wi}J30v)sok z<83aS8Sly64?=_x2tW`@3BhL53RyGy`FZmww$slkMskXk-9BnfyGP)l=AtC{T?Y|Z zJ4$&*sp}+~QVeA_j3hT!9Zt{0`1D)Fhzuc|vj5s&W4{CodYXE2G;&wfF?An8x_C`{d*~j~1 z#G{gk66leCduy-5?KNX(*!%I~kSvz~O9NP0S>eoFvflJkUv1Y_YOCT-*^V2vy?{pB z<=(!@ufI1td;15)A@BPS{)StHLZSB?7Zw)CX0y?4cVet9pExB{;z^;!ToG71Ie+a= kUr?@^rfC43VzCIoUl;;lJtwtVUjP6A07*qoM6N<$g5ejSXaE2J diff --git a/gosa-core/html/images/small_filter.png b/gosa-core/html/images/lists/action.png similarity index 100% rename from gosa-core/html/images/small_filter.png rename to gosa-core/html/images/lists/action.png diff --git a/gosa-core/html/images/list_back.png b/gosa-core/html/images/lists/back.png similarity index 100% rename from gosa-core/html/images/list_back.png rename to gosa-core/html/images/lists/back.png diff --git a/gosa-core/html/images/editcopy.png b/gosa-core/html/images/lists/copy.png similarity index 100% rename from gosa-core/html/images/editcopy.png rename to gosa-core/html/images/lists/copy.png diff --git a/gosa-core/html/images/editcut.png b/gosa-core/html/images/lists/cut.png similarity index 100% rename from gosa-core/html/images/editcut.png rename to gosa-core/html/images/lists/cut.png diff --git a/gosa-core/html/images/lists/cutpaste.png b/gosa-core/html/images/lists/cutpaste.png new file mode 100644 index 0000000000000000000000000000000000000000..e514438245d1694d40f9161f334fd7cee8b8b4eb GIT binary patch literal 898 zcmV-|1AY97P)0vI<+du;#!0}n|= zK~y-)MUqQsTxA@^f8U*N?wx6;$;6pS(oWP$YHcz2N?IB!sbCfXEp%l?ix@@F;tO=8 zh`Q2+h>wM$xOSo9LKjke1zRgx3s#8`n}m*SY8x`0#nJtgNhMXBRHMvqS#+`Bd#BaVm%v2*EW;oGY8mOc|vH zYqiSJ>FGl^57jGl0WCiK=&N0(p+}rD^Va2NKr}pOHUPF*`gCY=bjtovVehWn*;Fjh zXe=WH1VO-oiLuJh-_O1}Fj?Z#sWWHd`HKg2vC;sq3y}5xedRsFR2O5;&i_NBaSkvD z;mGAujLC7`V9LPwR-(&`w=H#c4$S5cH?(mG95PBQBrWb8*Ze(q9IYHV&ycDf&adnT z=h$)6-7L&WT3dD#+;zuW?ytrd)+X=eJP*0HsxV=P-oUVb&-!B`qaAq+CzEX7-bbb& zYD1yysAcU54HL7o3j=AYUzTAz!zLj*vk(dp;E9Y*C&CmI0Dc~1FXTI#W}*ngm>>vV zisNjPY`|#g_wl{E@T_>0<$x7Aw)+6tqn7;9b3Q26S z)}WNd7>iO0YvI_jlPxI(^HT7f^uS!*K@gDNd2sj4%%2Yye4H`XItR`!SI-Y;XMNwpXV^<{*aN^_Vx3-ct!@s`>bqi46H0{3;+Ry)quaBJ~J?XSj52m z8_4<2#PIAXBg0pVFh+JBcH2kypF44Kam~GP<{HE8o0k~?0tl-C3?KJ1F#oy8!0>~O z;s49O3@@au7-U_78NS`V&T#4b=bvxiykyw3V+~N@9|nK`V#22X|HH`)th}5I3|}}H z-hbp{_@d#*AS5Hjz|8QMfrW*Y;mV~eKvn;Mn2iA-fG}L}_r(bYW{z7x&A^!b#K7>5 zM~y+yA(Vmh|4#-!9$tnc2M;mayK^3>l9deH=U0|9du%fr$es{1a&N2Ofs^ zGM)^AQql}8zy!d^%*gQO^-E5WZXgx`Vs3x{Vu3~JPf*mnxX8f5{*Zz3k06l4&hY9x zJA-IYEW@ua9~gfB`pNL=<0l3tMkZjIVT8Gy7a)M(Uib&{(%&CIhBN~M2QR~y=T8~l z2wO97{9|VL`T7k|BO}8A2nZd^1@wcFmECVAWI1(5D0*HkP2*F7gh&7GP8B`2R8JGoxfHwbT z_$|Q8z{<`B^!tAXHa2DkW@Z)!E-p@{@TgdZTeog9+`n_30U&@_?%sL$VbzK?JRm1B zG6Q1=6j*LX{7Jy;#>&w?K3pF07*qoM6N<$g5Dym0RR91 literal 0 HcmV?d00001 diff --git a/gosa-core/html/images/list_home.png b/gosa-core/html/images/lists/home.png similarity index 100% rename from gosa-core/html/images/list_home.png rename to gosa-core/html/images/lists/home.png diff --git a/gosa-core/html/images/certs.png b/gosa-core/html/images/lists/key.png similarity index 100% rename from gosa-core/html/images/certs.png rename to gosa-core/html/images/lists/key.png diff --git a/gosa-core/html/images/closedlock.png b/gosa-core/html/images/lists/locked.png similarity index 100% rename from gosa-core/html/images/closedlock.png rename to gosa-core/html/images/lists/locked.png diff --git a/gosa-core/html/images/editpaste.png b/gosa-core/html/images/lists/paste.png similarity index 100% rename from gosa-core/html/images/editpaste.png rename to gosa-core/html/images/lists/paste.png diff --git a/gosa-core/html/images/status_restart.png b/gosa-core/html/images/lists/reload.png similarity index 100% rename from gosa-core/html/images/status_restart.png rename to gosa-core/html/images/lists/reload.png diff --git a/gosa-core/html/images/list_root.png b/gosa-core/html/images/lists/root.png similarity index 100% rename from gosa-core/html/images/list_root.png rename to gosa-core/html/images/lists/root.png diff --git a/gosa-core/html/images/edittrash.png b/gosa-core/html/images/lists/trash.png similarity index 100% rename from gosa-core/html/images/edittrash.png rename to gosa-core/html/images/lists/trash.png diff --git a/gosa-core/html/images/openlock.png b/gosa-core/html/images/lists/unlocked.png similarity index 100% rename from gosa-core/html/images/openlock.png rename to gosa-core/html/images/lists/unlocked.png diff --git a/gosa-core/html/images/list_up.png b/gosa-core/html/images/lists/up.png similarity index 100% rename from gosa-core/html/images/list_up.png rename to gosa-core/html/images/lists/up.png diff --git a/gosa-core/html/images/mailq_requeue.png b/gosa-core/html/images/mailq_requeue.png deleted file mode 100644 index 5c6a26dd396fdab3c0b0f5b41a70b0ee34b5fcef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 910 zcmV;919AL`P)f8Te$nK?6^OJ*kIrinHQMng4_5U*WGp<0UFM3gQHE=1aHT)Gl> z`X{&IRMKz{0-QyES^qmfQ%061RA%7(?2n{CSX4j;z- z{kH}mezsIB7DMd_{w;}+w`QkDrapT67!yMZ%XZm2G_gGhLcu^^gjb){Y1vw0ZC{-0 zs{GZtabaoz!}AwE85|rq_x@QOfy6W$^rtkYj^|OLOU?8#AB8w>$kU@SHV(8zr6p41 z@%8K4?4^>97W?AOlNmjofEaC_KQTfosRIz#qcp65UBkh0d@MU46Yp|+Go13>_EiPU zNA+YT8~3Ri9bSKJj35lTUTUyibx6b{wi^hjcZ41m=wi}J30v)sok z<83aS8Sly64?=_x2tW`@3BhL53RyGy`FZmww$slkMskXk-9BnfyGP)l=AtC{T?Y|Z zJ4$&*sp}+~QVeA_j3hT!9Zt{0`1D)Fhzuc|vj5s&W4{CodYXE2G;&wfF?An8x_C`{d*~j~1 z#G{gk66leCduy-5?KNX(*!%I~kSvz~O9NP0S>eoFvflJkUv1Y_YOCT-*^V2vy?{pB z<=(!@ufI1td;15)A@BPS{)StHLZSB?7Zw)CX0y?4cVet9pExB{;z^;!ToG71Ie+a= kUr?@^rfC43VzCIoUl;;lJtwtVUjP6A07*qoM6N<$g5ejSXaE2J diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc index f258f944b..cc8b4c565 100644 --- a/gosa-core/include/class_MultiSelectWindow.inc +++ b/gosa-core/include/class_MultiSelectWindow.inc @@ -236,7 +236,7 @@ class MultiSelectWindow{ /* Draw root button */ if($enable_root){ - $listhead .= "  "; }else{ $listhead .= " "._("Root")." "; @@ -244,7 +244,7 @@ class MultiSelectWindow{ /* Draw back button */ if($enable_back){ - $listhead .= "  "; }else{ $listhead .= " "._("Up")." "; @@ -252,14 +252,14 @@ class MultiSelectWindow{ /* Draw home button */ if($enable_home){ - $listhead .= "  "; }else{ $listhead .= " "._("Home")." "; } /* And at least draw reload button, this button is enabled everytime */ - $listhead .= "  ". " - "; diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc index bdaac544f..507832f07 100644 --- a/gosa-core/include/class_SnapShotDialog.inc +++ b/gosa-core/include/class_SnapShotDialog.inc @@ -131,7 +131,7 @@ class SnapShotDialog extends plugin $actions= " "; - $actions.= " "; $time_stamp = date(_("Y-m-d, H:i:s"),preg_replace("/\-.*$/","",$entry['gosaSnapshotTimestamp'][0])); diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc index afcbb96fd..f8b36d20f 100644 --- a/gosa-core/include/class_acl.inc +++ b/gosa-core/include/class_acl.inc @@ -427,7 +427,7 @@ class acl extends plugin $action= ""; $action.= ""; $action.= ""; - $action.= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'"); $aclList->AddEntry(array($field1, $field2, $field3)); @@ -470,7 +470,7 @@ class acl extends plugin $field1= array("string" => $dsc, "attach" => "style='width:100px'"); $field2= array("string" => $summary); $action= ""; - $action.= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'"); $aclList->AddEntry(array($field1, $field2, $field3)); } diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc index 45462de8f..e9831c136 100644 --- a/gosa-core/plugins/admin/acl/class_aclRole.inc +++ b/gosa-core/plugins/admin/acl/class_aclRole.inc @@ -358,7 +358,7 @@ class aclrole extends acl $action= ""; $action.= ""; $action.= ""; - $action.= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'"); $aclList->AddEntry(array($field1, $field2, $field3)); @@ -403,7 +403,7 @@ class aclrole extends acl $field1= array("string" => $dsc, "attach" => "style='width:140px'"); $field2= array("string" => $summary); $action= ""; - $action.= ""; + $action.= ""; $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'"); $aclList->AddEntry(array($field1, $field2, $field3)); } diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc index 8f90ddb48..f536025aa 100644 --- a/gosa-core/plugins/admin/acl/class_divListACL.inc +++ b/gosa-core/plugins/admin/acl/class_divListACL.inc @@ -168,22 +168,22 @@ class divListACL extends MultiSelectWindow /* Multiple options */ $s.= "..|---|\n"; - $s.= "..|". + $s.= "..|". " "._("Remove")."|"."remove_multiple|\n"; /* Add multiple copy & cut icons */ if(is_object($this->parent->CopyPasteHandler)){ $s.= "..|---|\n"; - $s.= "..|". + $s.= "..|". " "._("Copy")."|"."multiple_copy_systems|\n"; - $s.= "..|". + $s.= "..|". " "._("Cut")."|"."multiple_cut_systems|\n"; if($this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."|editPaste|\n"; }else{ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."\n"; } } @@ -232,9 +232,9 @@ class divListACL extends MultiSelectWindow /* Add copy & paste handler */ if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $action.= " "; + src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $action.= " "; + src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> "; } /* Add actions depending on acls */ @@ -249,7 +249,7 @@ class divListACL extends MultiSelectWindow } if(preg_match("/d/", $acl)){ - $action.= ""; } }else{ @@ -265,7 +265,7 @@ class divListACL extends MultiSelectWindow name='list_acl_edit_%KEY%' title='"._("Edit acl")."'>"; } if(preg_match("/d/", $acl)){ - $action.= ""; } } diff --git a/gosa-core/plugins/admin/acl/main.inc b/gosa-core/plugins/admin/acl/main.inc index d0f0266c8..3a19c9459 100644 --- a/gosa-core/plugins/admin/acl/main.inc +++ b/gosa-core/plugins/admin/acl/main.inc @@ -42,7 +42,7 @@ if (!session::is_set('macl') || (isset($_GET['reset']) && $_GET['reset'] == 1)){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/acl.png'), _("ACL management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); + $display= print_header(get_template_path('images/acl.png'), _("ACL management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/acl.png'), _("ACL management")); } diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc index 1ab2aaa62..dde837056 100644 --- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc +++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc @@ -156,7 +156,7 @@ class divListDepartment extends MultiSelectWindow " "._("Department")."|dep_new|\n"; } $s.= "..|---|\n"; - $s.= "..|". + $s.= "..|". " "._("Remove")."|"."remove_multiple|\n"; @@ -186,7 +186,7 @@ class divListDepartment extends MultiSelectWindow } if(preg_match("/c/",$acl)){ - $actions.= ""; } diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl index a743aeb34..3bf8877ba 100644 --- a/gosa-core/plugins/admin/departments/generic.tpl +++ b/gosa-core/plugins/admin/departments/generic.tpl @@ -106,7 +106,7 @@
-

{t}Administrative settings{/t}

+

{t}Administrative settings{/t}

{render acl=$gosaUnitTagACL} {/render} diff --git a/gosa-core/plugins/admin/departments/main.inc b/gosa-core/plugins/admin/departments/main.inc index 79cf19e5a..2d8a82dcb 100644 --- a/gosa-core/plugins/admin/departments/main.inc +++ b/gosa-core/plugins/admin/departments/main.inc @@ -40,7 +40,7 @@ if ($remove_lock){ /* Page header*/ if (session::is_set('objectinfo')){ - $display= print_header(get_template_path('images/department.png'), _("Department management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); + $display= print_header(get_template_path('images/department.png'), _("Department management"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/department.png'), _("Department management")); } diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc index 9b9430f6c..977565e0c 100644 --- a/gosa-core/plugins/admin/groups/class_divListGroup.inc +++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc @@ -193,7 +193,7 @@ class divListGroup extends MultiSelectWindow $s.= "..|---|\n"; $s.= "..|". " "._("Edit")."|"."multiple_edit|\n"; - $s.= "..|". + $s.= "..|". " "._("Remove")."|"."remove_multiple|\n"; /* Add event tag */ @@ -210,16 +210,16 @@ class divListGroup extends MultiSelectWindow /* Add multiple copy & cut icons */ if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $s.= "..|---|\n"; - $s.= "..|". + $s.= "..|". " "._("Copy")."|"."multiple_copy_systems|\n"; - $s.= "..|". + $s.= "..|". " "._("Cut")."|"."multiple_cut_systems|\n"; if($this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."|editPaste|\n"; }else{ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."\n"; } } @@ -288,9 +288,9 @@ class divListGroup extends MultiSelectWindow $actions= ""; if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $actions.= " "; + src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $actions.= " "; + src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> "; } /* Add edit icon */ @@ -304,7 +304,7 @@ class divListGroup extends MultiSelectWindow if(preg_match("/d/",$acl)){ $actions.= ""; + src='images/lists/trash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>"; } diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc index bd2062125..612021f49 100644 --- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc +++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc @@ -366,7 +366,7 @@ class group extends plugin } asort($wslist); $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("launchimage", get_template_path('images/small_filter.png')); + $smarty->assign("launchimage", get_template_path('images/lists/action.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->config->idepartments); $smarty->assign("alphabet", generate_alphabet()); @@ -429,7 +429,7 @@ class group extends plugin /* Show dialog */ $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("launchimage", get_template_path('images/small_filter.png')); + $smarty->assign("launchimage", get_template_path('images/lists/action.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->get_allowed_bases("users/user")); @@ -545,7 +545,7 @@ class group extends plugin /* Show main page */ $smarty->assign("alphabet", generate_alphabet(10)); $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("launchimage", get_template_path('images/small_filter.png')); + $smarty->assign("launchimage", get_template_path('images/lists/action.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->config->idepartments); diff --git a/gosa-core/plugins/admin/groups/main.inc b/gosa-core/plugins/admin/groups/main.inc index a8b3e882d..64fa02156 100644 --- a/gosa-core/plugins/admin/groups/main.inc +++ b/gosa-core/plugins/admin/groups/main.inc @@ -40,7 +40,7 @@ if ($remove_lock){ if (session::is_set('objectinfo')){ $display= print_header(get_template_path('images/group.png'), _("Group administration"), "\"\" ". + get_template_path('images/lists/locked.png')."\"> ". @LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/group.png'), _("Group administration")); diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc index 626982607..8e7189110 100644 --- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc @@ -211,7 +211,7 @@ class divListOGroup extends MultiSelectWindow # $s.= "..|". # " "._("Edit")."|"."multiple_edit|\n"; - $s.= "..|". + $s.= "..|". " "._("Remove")."|"."remove_multiple_ogroups/|\n"; /* Add event tag */ @@ -228,16 +228,16 @@ class divListOGroup extends MultiSelectWindow /* Add multiple copy & cut icons */ if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $s.= "..|---|\n"; - $s.= "..|". + $s.= "..|". " "._("Copy")."|"."multiple_copy_systems|\n"; - $s.= "..|". + $s.= "..|". " "._("Cut")."|"."multiple_cut_systems|\n"; if($this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."|editPaste|\n"; }else{ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."\n"; } } @@ -285,9 +285,9 @@ class divListOGroup extends MultiSelectWindow $acl_all= $ui->has_complete_category_acls($val['dn'],"ogroups"); if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $actions.= " "; + src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $actions.= " "; + src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> "; } $actions.= "get_permissions($val['dn'],"ogroups/ogroup"))) { $actions.= ""; + src='images/lists/trash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>"; }else{ $actions.= " "; diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc index b833a9186..ea6abd637 100644 --- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc +++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc @@ -279,7 +279,7 @@ class ogroup extends plugin /* Show dialog */ $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("launchimage", get_template_path('images/small_filter.png')); + $smarty->assign("launchimage", get_template_path('images/lists/action.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->config->idepartments); $smarty->assign("alphabet", generate_alphabet()); diff --git a/gosa-core/plugins/admin/ogroups/main.inc b/gosa-core/plugins/admin/ogroups/main.inc index 7e50efeb1..c6263fd51 100644 --- a/gosa-core/plugins/admin/ogroups/main.inc +++ b/gosa-core/plugins/admin/ogroups/main.inc @@ -36,7 +36,7 @@ if (!$remove_lock){ $display= print_header(get_template_path('images/ogroup.png'), _("Object groups"), "\"\" ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/ogroup.png'), _("Object groups")); diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc index 33bb37809..1897e1ad4 100644 --- a/gosa-core/plugins/admin/users/class_divListUsers.inc +++ b/gosa-core/plugins/admin/users/class_divListUsers.inc @@ -183,7 +183,7 @@ class divListUsers extends MultiSelectWindow " "._("Edit")."|"."multiple_edit|\n"; $s.= "..|". " "._("Change password")."|"."multiple_password_change|\n"; - $s.= "..|". + $s.= "..|". " "._("Remove")."|"."remove_multiple|\n"; $s.= "..|". " "._("Apply template")."|"."templatize_multiple|\n"; @@ -202,16 +202,16 @@ class divListUsers extends MultiSelectWindow /* Add multiple copy & cut icons */ if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $s.= "..|---|\n"; - $s.= "..|". + $s.= "..|". " "._("Copy")."|"."multiple_copy_systems|\n"; - $s.= "..|". + $s.= "..|". " "._("Cut")."|"."multiple_cut_systems|\n"; if($this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."|editPaste|\n"; }else{ - $img = ""; + $img = ""; $s.="..|".$img." "._("Paste")."\n"; } } @@ -306,9 +306,9 @@ class divListUsers extends MultiSelectWindow $acl = $ui->get_permissions($val['dn'],"users/user"); if(preg_match("/(c.*w|w.*c)/",$acl_all) && $this->parent->CopyPasteHandler){ $action .= " "; + src='images/lists/cut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $action.= " "; + src='images/lists/copy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> "; } /* Add deactivate status */ @@ -316,10 +316,10 @@ class divListUsers extends MultiSelectWindow if(isset($val['userPassword'][0]) && preg_match("/^\{[^\}]/",$val['userPassword'][0])){ if(preg_match("/^[^\}]*+\}!/",$val['userPassword'][0])){ - $lock_status = ""; }else{ - $lock_status = ""; } }else{ @@ -351,7 +351,7 @@ class divListUsers extends MultiSelectWindow /* Add remove icon, if we are allowed to remove the current user */ if(preg_match("/d/",$ui->get_permissions($val['dn'],"users/user"))) { - $action.= ""; }else{ $action.= "  ".@LDAP::fix(session::get('objectinfo'))); } else { $display= print_header(get_template_path('images/user.png'), diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl index f59538980..ae85df37c 100644 --- a/gosa-core/plugins/personal/generic/generic_certs.tpl +++ b/gosa-core/plugins/personal/generic/generic_certs.tpl @@ -1,6 +1,6 @@ -

{t}Certificates{/t}

+

{t}Certificates{/t}

diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc index eba6b8f50..0b6dcdcc2 100644 --- a/gosa-core/plugins/personal/generic/main.inc +++ b/gosa-core/plugins/personal/generic/main.inc @@ -161,7 +161,7 @@ if (!$remove_lock){ $display.= " "; $display.= "\n"; - $info= "\"\" ".$ui->dn." "; } else { /* 'viewid' may be set by i.e. the phonelist plugin. This @@ -172,7 +172,7 @@ if (!$remove_lock){ } else { $str= msgPool::editButton(); $fn = "edit"; - $info= "\"\" ".$ui->dn." "; } diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index 596f519df..6fb52cc3e 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -401,7 +401,7 @@ class posixAccount extends plugin } asort($wslist); $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("launchimage", get_template_path('images/small_filter.png')); + $smarty->assign("launchimage", get_template_path('images/lists/action.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->config->idepartments); $smarty->assign("alphabet", generate_alphabet()); @@ -439,7 +439,7 @@ class posixAccount extends plugin $smarty->assign("guser",$this->GroupUserRegex); $smarty->assign("groups", $glist); $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("launchimage", get_template_path('images/small_filter.png')); + $smarty->assign("launchimage", get_template_path('images/lists/action.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("deplist", $this->config->idepartments); $smarty->assign("alphabet", generate_alphabet()); diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl index 8e27c39a1..18c69ad97 100644 --- a/gosa-core/plugins/personal/posix/generic.tpl +++ b/gosa-core/plugins/personal/posix/generic.tpl @@ -122,7 +122,7 @@  
-

{t}System trust{/t}

+

{t}System trust{/t}

{if !$multiple_support} {t}Trust mode{/t}  {render acl=$trustmodeACL} diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc index 73396471e..5199eb73c 100644 --- a/gosa-core/plugins/personal/posix/main.inc +++ b/gosa-core/plugins/personal/posix/main.inc @@ -108,10 +108,10 @@ if (!$remove_lock){ $display.= "\n"; $display.= " "; $display.= "\n"; - $info= "\"\" ".$ui->dn." "; } else { - $info= "\"\" ".$ui->dn." "; /* Only display edit button if there is at least one attribute editable */ diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl index b1ef46ee1..69cd1f0dd 100644 --- a/gosa-core/setup/setup_ldap.tpl +++ b/gosa-core/setup/setup_ldap.tpl @@ -62,7 +62,7 @@ {else} {/if} - +

-- 2.30.2