From 055a967741a682b4bca6f28410dcaaebf9145a4a Mon Sep 17 00:00:00 2001 From: cajus Date: Tue, 21 Mar 2006 13:33:24 +0000 Subject: [PATCH] Slight layout fixing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2879 594d385d-05f5-0310-b6e9-bd551577e9d8 --- debian/gosa.postinst | 3 ++- html/images/editcut.png | Bin 0 -> 804 bytes ihtml/themes/default/copyPasteDialog.tpl | 11 +++-------- include/class_CopyPasteHandler.inc | 1 + .../applications/class_applicationManagement.inc | 2 +- plugins/admin/groups/class_groupManagement.inc | 2 +- plugins/admin/ogroups/class_ogroupManagement.inc | 2 +- plugins/admin/users/class_userManagement.inc | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 html/images/editcut.png diff --git a/debian/gosa.postinst b/debian/gosa.postinst index 8ca80a44c..a7dcd436d 100755 --- a/debian/gosa.postinst +++ b/debian/gosa.postinst @@ -40,9 +40,10 @@ chmod 770 -R /var/spool/gosa # Add links for safe mode for link in /usr/bin/convert /usr/bin/lpstat; do + [ ! -e $link ] && continue target=/usr/share/gosa/bin/${link##*/} [ -L $target ] && continue - [ -f $link ] || ln -sf $link $target + ln -sf $link $target done # Finally restart servers diff --git a/html/images/editcut.png b/html/images/editcut.png new file mode 100644 index 0000000000000000000000000000000000000000..7ec355a0dcf91ad072161b6eb1857943b12dcd4a GIT binary patch literal 804 zcmV+<1Ka$GP)HV(FCI$h{l5;NJpZPL>W`I33Ha2@@ zVq!ipIyznTFQ42C!1LUl?CdO~EGKt+eSIHK4GxZ<0RVb008Nt?Ns%go8#D*0EYJ5ARLY(9FD=~3($ga;H=$l?Y7y>MO#~e;JzY+LNSCwQFy)nhO)Av z4y*OBeQIiP(&bw1-B$#^KLkZl;Bb^Y6a)h|JUsE)Jq4vvku-5b{lf^cP>E<=S}>eBpU zThDtg302k5-~VY&6g}4nf}C+W?`k`91ORkhD6rK!Qm>1T5!Psg`DU~*M&3$SCExLmwjIsw+ zrE755gC#nFtWU(WKx=*WO4o4sPlUWIDK8mLlk;wjXX#bsZ>mj#Sy9C~buQaNI)qYM zLj>jeT(U+^kjJICavFel_l#QsDx%X;?1_@dqsk-kfgHVjQT(p-FMd_dE0Gk!Gl^yK zUGnnQWYQ_<)1`7!YutS_09f#Gy)32G6_`_vDnS^;HRf3$N!%^(`PJUIwH7l$dDSb58;QzC19k@=Ur~Tqnwl^V3xcZ^{sh zkns$_y#bE~Ao9C1w6Td7{t}Copy & paste wizard{/t} -{t}This dialog assists you with GOsas copy and paste functionality.{/t}
-{t}Some objects require unique attributes, as example the often used attribute cn should be unique within the complete ldap database in order to exclude a confounding.{/t} -

-{t}If a paste requires such unique attributes, the wizard will display them below.{/t} -

+{$message} Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fullfill the policies. +
+

 


{if $Complete == false} -
- {$objectDN} -
{$AttributesToFix}

 


diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc index 154c940bd..e0a24e26a 100644 --- a/include/class_CopyPasteHandler.inc +++ b/include/class_CopyPasteHandler.inc @@ -169,6 +169,7 @@ class CopyPasteHandler { $smarty->assign("Complete",false); $smarty->assign("AttributesToFix",$this->generateAttributesToFix()); $smarty->assign("objectDN" ,$this->objectdn); + $smarty->assign("message", sprintf(_("You are going to copy the entry '%s'."), $this->objectdn)); return($smarty->fetch(get_template_path("copyPasteDialog.tpl",FALSE))); } } diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index 9ccd6cba0..36f3ddd66 100644 --- a/plugins/admin/applications/class_applicationManagement.inc +++ b/plugins/admin/applications/class_applicationManagement.inc @@ -417,7 +417,7 @@ class applicationManagement extends plugin if($this->enableCopyPaste){ $actions = " "; + src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $actions.= " "; $actions.= "enableCopyPaste){ $actions = " "; + src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $actions.= " "; $actions.= " ". */ if($this->enableCopyPaste){ $actions = " "; + src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $actions.= " "; $actions.= "enableCopyPaste){ $action = " "; + src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> "; $action.= " "; $action.= "