From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 9 Nov 2006 07:32:31 +0000 (+0000)
Subject: Copy & Paste dialog : Added seperator after each displayed plugin.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fe821545f63347cc5e506c3d3a96970767d9a4db;p=gosa.git

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 e72431d33..eeaa5055f 100644
--- 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 76101a90f..a8ffef5b0 100644
--- 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 b334c6c47..cbc936215 100644
--- 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 8ce65a1d0..1eecbf902 100644
--- 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>