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 8ca80a44c052129e1d6659facd99deb71adea476..a7dcd436dfcb1efe11e3825d19ac2e8ddd4c98db 100755 (executable)
--- 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 (file)
index 0000000..7ec355a
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 8ed7b8d1d1dca038e950862d742e052adcac47fc..52c601b142c43c5ff0f742be66f9cc508415b4a9 100644 (file)
--- a/ihtml/themes/default/copyPasteDialog.tpl
+++ b/ihtml/themes/default/copyPasteDialog.tpl
@@ -1,15 +1,10 @@
 <h2>{t}Copy &amp; paste wizard{/t}</h2>
 
-{t}This dialog assists you with GOsas copy and paste functionality.{/t}<br>
-{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}
-<br><br>
-{t}If a paste requires such unique attributes, the wizard will display them below.{/t}
-<br><br>
+{$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.
+<br>
+<p class='seperator'>&nbsp;</p>
 <br>
 {if $Complete == false}
-       <div class="pluginfo">
-       {$objectDN}
-       </div>
        {$AttributesToFix}
        <p class='seperator'>&nbsp;</p>
        <br>

diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index 154c940bde99bf3a2c8759c11c4e7bd786a544b1..e0a24e26a085382b2ae37f6723ed0677feafdd60 100644 (file)
--- 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 9ccd6cba0099a74a87bcd825fb4f33295ff8c83f..36f3ddd66657fa3c50387dee5e2cf1f778dd078b 100644 (file)
--- 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 = "<input class='center' type='image' 
-            src='images/editdelete.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+            src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
           $actions.= "<input class='center' type='image' 
             src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
           $actions.= "<input class='center' type='image' 

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index a3d90a0df86ff587f7c4dc2c255fd20487179cfb..60cb12d9ad7bba1bb5a5833c3c07dccd534249f9 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -462,7 +462,7 @@ class groupManagement extends plugin
     
     if($this->enableCopyPaste){
       $actions = "<input class='center' type='image'
-        src='images/editdelete.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+        src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
       $actions.= "<input class='center' type='image'
         src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       $actions.= "<input class='center' type='image' 

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index ab4360eabf1c90ccc64795c28eba1eb81a89f96b..ecd339518092184daf300a95273ecaa78b891b6e 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -457,7 +457,7 @@ name='dep_root' alt='"._("Root")."'> ".
      */
     if($this->enableCopyPaste){
       $actions = "<input class='center' type='image'
-        src='images/editdelete.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+        src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
       $actions.= "<input class='center' type='image'
         src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       $actions.= "<input class='center' type='image' 

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 093e66446eacaff44da22c8e6778a7fbe50a8841..3970c7727e89d75441678e68bca8d0e2026908a0 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -792,7 +792,7 @@ class userManagement extends plugin
     
     if($this->enableCopyPaste){
       $action = "<input class='center' type='image'
-        src='images/editdelete.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
+        src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
       $action.= "<input class='center' type='image'
         src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'