Copy & Paste dialog : Added seperator after each displayed plugin.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5055 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/ihtml/themes/default/copyPasteDialog.tpl b/ihtml/themes/default/copyPasteDialog.tpl
index e72431d334b10f711d7ebbf307d7ece491c5c008..eeaa5055f945319490650b0c04bdc3ae275c4829 100644 (file)
--- a/ihtml/themes/default/copyPasteDialog.tpl
+++ b/ihtml/themes/default/copyPasteDialog.tpl
@@ -6,7 +6,6 @@
        <p class='seperator'>&nbsp;</p>
        <br>
        {$AttributesToFix}
-       <p class='seperator'>&nbsp;</p>
        {if $SubDialog == false}
        <br>
 

diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index 76101a90f2e3bc767438d53bfc602e90b344075f..a8ffef5b0128d0bc2e32c25af09e310eedb8d29a 100644 (file)
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -280,22 +280,25 @@ class tabs
    */
   function getCopyDialog()
   {
-         $ret = "";
-         $this->SubDialog = false;
-         foreach ($this->by_object as $key => $obj){
-                 if($obj->is_account){
-                         $tmp = $this->by_object[$key]->getCopyDialog();
-                         if($tmp['status'] == "SubDialog"){
-                                 $this->SubDialog = true;
-                     return($tmp['string']);
-                 }else{
-                 $ret .= $tmp['string'];
-                         }
-                 }
-         }
-         return($ret);
+    $ret = "";
+    $this->SubDialog = false;
+    foreach ($this->by_object as $key => $obj){
+      if($obj->is_account){
+        $tmp = $this->by_object[$key]->getCopyDialog();
+        if($tmp['status'] == "SubDialog"){
+          $this->SubDialog = true;
+          return($tmp['string']);
+        }else{
+          if(!empty($tmp['string'])){
+            $ret .= $tmp['string'];
+            $ret .= "<p class='seperator'>&nbsp;</p>";
+          }
+        }
+      }
+    }
+    return($ret);
   }
-
 }
 
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index b334c6c47eb2280fb4c81fe03be8201165aa4ad9..cbc936215356373f2956dc4a33cbd9e06e9b2800 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -459,7 +459,7 @@ class user extends plugin
           /* Additional info if start end time is '0' */
           $add_str_info = "";
           if($timeto == 0 && $timefrom == 0){
-            $add_str_info = "<br><i>"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.")."</i>";
+            $add_str_info = "<br><i>"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.)")."</i>";
           }
 
           $str = "<table summary=\"\" border=0>

diff --git a/plugins/personal/generic/paste_generic.tpl b/plugins/personal/generic/paste_generic.tpl
index 8ce65a1d03446bd0e8d09a8f142bd746d7bf48a1..1eecbf9023ceeba6d40f3438d7a0d9e087ba4609 100644 (file)
--- a/plugins/personal/generic/paste_generic.tpl
+++ b/plugins/personal/generic/paste_generic.tpl
@@ -57,5 +57,3 @@
   </tr>
 </table>
 <br>
-<br>
-<p class="seperator"></p>