From: cajus Date: Tue, 21 Mar 2006 13:33:24 +0000 (+0000) Subject: Slight layout fixing X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=055a967741a682b4bca6f28410dcaaebf9145a4a;p=gosa.git Slight layout fixing git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2879 594d385d-05f5-0310-b6e9-bd551577e9d8 --- 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 000000000..7ec355a0d Binary files /dev/null and b/html/images/editcut.png differ diff --git a/ihtml/themes/default/copyPasteDialog.tpl b/ihtml/themes/default/copyPasteDialog.tpl index 8ed7b8d1d..52c601b14 100644 --- a/ihtml/themes/default/copyPasteDialog.tpl +++ b/ihtml/themes/default/copyPasteDialog.tpl @@ -1,15 +1,10 @@

{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.= "