From d00c540f49a26a2d62e481c4823cf775bdff0d43 Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 27 Jun 2006 04:59:26 +0000 Subject: [PATCH] Merged icons for save/restore git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3917 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/images/restore.png | Bin 1080 -> 823 bytes include/class_MultiSelectWindow.inc | 7 +++---- .../applications/class_divListApplication.inc | 3 ++- .../departments/class_divListDepartment.inc | 4 ++-- plugins/admin/fai/class_divListFai.inc | 8 ++++---- plugins/admin/groups/class_divListGroup.inc | 3 ++- plugins/admin/ogroups/class_divListOGroup.inc | 3 ++- plugins/admin/systems/class_divListSystem.inc | 4 ++-- plugins/admin/users/class_divListUsers.inc | 3 ++- .../blocklists/class_divListBlocklists.inc | 4 ++-- .../conference/class_divListConferences.inc | 2 +- plugins/gofon/macro/class_divListMacros.inc | 6 +++--- 12 files changed, 25 insertions(+), 22 deletions(-) diff --git a/html/images/restore.png b/html/images/restore.png index 037c2da98d1c629fd33957baa64edc60197ef767..f61bd38b16e2a6e352f51311d93c8f6ba43681f5 100644 GIT binary patch delta 800 zcmV+*1K<3(2)721B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^RR1{($?GgC#q?*IS-#7RU!R5;6}l1pe@WgNwScOLi7Odf;NlGIe%(2`b& z(1jMMgy^zytqa#(xNzxCaN*MKwNRJZQe5a(Q4k?wBuW@HM1M5IOqz$8JDs_6zxzGz z>-$`!w4&YlhyV6)&iNhBImiFG8o(!aR(F~$zoTV_EejHy+Ur zq1)XYN25P)IJfmR&N)8&d|k%II%}=_@a}i+wYNTUYu!C(t^Ln$?mTdBzkAOG{)>ms zIVu1`m^>0WI)8_?jcs=K`;_IAqlH6(%nKUL*3_d2QYwTrH0zF)SFW&pZIQ)=xhD!3 zW7zNAC(pC;v4Aotm2sG5EWNNmS(bz&$zfPfmL;}yMlc7z9QYmqgFbqdTLqXN^$m5SGVBv1oTQWFWyg=eO@x_B0VckYGEKR1aw)Lf|xF3vT%bn!Gw zl`JnU@#E^Zm4B3Y!ZnfFZO&bP)8AU%|KOnm&0sL3 z(+W^hA*H4$n{;<_o}UX)t$^(#%T~`PtWNR!ACmq?pK))n`H+GliUhLLW*n!)u_he& z%(SbVzue-NJ&)~!DjQwR-fs^OyGIn^uEVc?e}6(DPU_L|fa8NB(ljE=VtV&A=g!m# z(<;Y(MaDbFmu|YIhlL7eBE=-(QaSgsd%n~moqWZz*@`Mm7DF4-@DBDSs$5L zqLCpC6NW>@IFh`7Yt8)JotUoyjK^PG`1fQNU;jyd`c)V-Y92*ipb|qg6o^=n2+d!^ erx|WzP53t?Z_QoI5&8)L0000*6RSXAP#F<6_3Fns;~pW!ditYar$ zGFXd$WRT(e!|?Mb1H<=Ue+9U?Sev*wSbd&6{bUJL^77Mn27d+?CI*H>mwqz<1P}`@ zlm7u-_Wk>BJ5^%+ZkvZGVS)t0!QI3z3gPGyiuYU}Vb_%h}R$p1k!oqau&p$@6 zMF0WBqM^#0n12{A!tnMJ1H;!p3=G;D>mPv(00|1emE zD8j>mot=S!4d~K;Krd9ze#~&`{vQS@ac%|$eU)ZWRYt#?m!AIx2p|@q!3@km8-B2J zGORlDhT+`%PYl0*{$}{|_bDpIKP!W%04u`}W_E@T-~Tau{QQsM{g?j?+;Th&I-1-J zmw>+h4itZX=l#FO`>!%F{QI#NAOHYC0KWeO{{8;|@bmxx>EiSNi+dpe_WAq(1s4SX z)Z+mF?%MwV>goRg*x3Y@8sss z<#`y`g_#&mTxVc-``{nLgXhc)ckljVc=G56!?UNq7(P6F%kb;ndyo@=A;$QRf$8@n zhW~%B0R#{e1JL;wF1};1Gv;Kt0hE9IosHot(174;im-)!#7~Sefjzy$baVnrbrHkmigbmzkc-ZECVwm13&<={QmNj z!Bw9dq8S8$GzT{m12Z!V!~cK3ff|6(`3FP;z47Y@!`C0b8Lr*<{0u009GJuy00M}S z#c=<7Q!^1BZgwUHVAKOs&0nzJfB*Oe^fw6qWcUTt^asfP^9z(i|1i9||7Q`y9~_2c dkYxY?1^}I)qG1v8ZJhuB002ovPDHLkV1jtH1parent->snapshotEnabled()){ - $str .=" "; if(count($this->parent->Available_SnapsShots($dn))){ - $str .=" "; - }else{ - $str.= " "; } } + return($str); } diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index 86f1aa235..8487f9b4d 100755 --- a/plugins/admin/applications/class_divListApplication.inc +++ b/plugins/admin/applications/class_divListApplication.inc @@ -151,7 +151,7 @@ class divListApplication extends MultiSelectWindow foreach($list as $key => $val){ /* Create action icons */ - $actions = $this->GetSnapShotActions($val['dn']); + $actions= ""; if($this->parent->CopyPasteHandler){ $actions.= " "; @@ -160,6 +160,7 @@ class divListApplication extends MultiSelectWindow } $actions.= ""; + $actions.= $this->GetSnapShotActions($val['dn']); $actions.= ""; diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc index f03145108..e2b1509e6 100755 --- a/plugins/admin/departments/class_divListDepartment.inc +++ b/plugins/admin/departments/class_divListDepartment.inc @@ -124,9 +124,9 @@ class divListDepartment extends MultiSelectWindow $disp = get_sub_department($cdn); } - $actions = $this->GetSnapShotActions($val['dn']); - $actions.= ""; + $actions.= $this->GetSnapShotActions($val['dn']); $actions.= ""; diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index b308def3c..fcbb72468 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -223,16 +223,16 @@ _("Submit")."'> ". $desc= ""; } - $action = $this->GetSnapShotActions($value['dn']);; if($value['FAIstate'] == "freeze"){ - $action .= ""; $edi = $editlink; $acti = $action; }else{ - $action .= ""; - $action .= "GetSnapShotActions($value['dn']);; + $action.= ""; $acti = $action; $edi = $editlink; diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index 0e8ac98f1..06c9b5b47 100644 --- a/plugins/admin/groups/class_divListGroup.inc +++ b/plugins/admin/groups/class_divListGroup.inc @@ -165,7 +165,7 @@ class divListGroup extends MultiSelectWindow foreach($groups as $key => $val){ /* Create action icons - copy & paste icons */ - $actions = $this->GetSnapShotActions($val['dn']); + $actions= ""; if($this->parent->CopyPasteHandler){ $actions.= " "; @@ -174,6 +174,7 @@ class divListGroup extends MultiSelectWindow } $actions.= ""; + $actions.= $this->GetSnapShotActions($val['dn']); $actions.= ""; diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index 073286cbf..607a6976c 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -157,7 +157,7 @@ class divListOGroup extends MultiSelectWindow foreach($list as $key => $val){ /* Create action icons */ - $actions = $this->GetSnapShotActions($val['dn']); + $actions= ""; if($this->parent->CopyPasteHandler){ $actions.= " "; @@ -166,6 +166,7 @@ class divListOGroup extends MultiSelectWindow } $actions.= ""; + $actions.= $this->GetSnapShotActions($val['dn']); $actions.= ""; diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index 1f804349a..fe125e2aa 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -153,8 +153,8 @@ class divListSystem extends MultiSelectWindow // Test Every Entry and generate divlist Array foreach($terminals as $key => $val){ - $action = $this->GetSnapShotActions($val['dn']); - $action.= ""; + $action= ""; + $action.= $this->GetSnapShotActions($val['dn']); $action.= ""; /* Generate picture list, which is currently disabled */ diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index af5b0af65..ed885c2d0 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -211,7 +211,7 @@ class divListUsers extends MultiSelectWindow foreach($list as $key => $val){ /* Create action icons */ - $action = $this->GetSnapShotActions($val['dn']); + $action= ""; if($this->parent->CopyPasteHandler){ $action .= " "; @@ -222,6 +222,7 @@ class divListUsers extends MultiSelectWindow name='user_edit_%KEY%' title='"._("Edit user")."'>"; $action.= ""; + $action.= $this->GetSnapShotActions($val['dn']); $action.= ""; diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc index e99ca587b..171393df6 100755 --- a/plugins/gofax/blocklists/class_divListBlocklists.inc +++ b/plugins/gofax/blocklists/class_divListBlocklists.inc @@ -127,8 +127,8 @@ class divListBlocklist extends MultiSelectWindow /* Append to list */ foreach($list as $key => $val){ - $action = $this->GetSnapShotActions($val['dn']); - $action.= ""; + $action= ""; + $action.= $this->GetSnapShotActions($val['dn']); $action.= ""; // Generate Array to Add diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc index 7276357fb..073486bb0 100755 --- a/plugins/gofon/conference/class_divListConferences.inc +++ b/plugins/gofon/conference/class_divListConferences.inc @@ -126,9 +126,9 @@ class divListConference extends MultiSelectWindow /* Insert conferneces*/ foreach($list as $conferencekey => $conference ){ - $action = $this->GetSnapShotActions($conference['dn']); $actions= ""; + $actions.= $this->GetSnapShotActions($conference['dn']); $actions.= ""; $actions2= " $val){ - $action = $this->GetSnapShotActions($val['dn']); - $action .= ""; - $action .= "GetSnapShotActions($val['dn']); + $action.= ""; $display= $val["displayName"][0]; -- 2.30.2