From fe821545f63347cc5e506c3d3a96970767d9a4db Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 9 Nov 2006 07:32:31 +0000 Subject: [PATCH] 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 --- ihtml/themes/default/copyPasteDialog.tpl | 1 - include/class_tabs.inc | 33 ++++++++++++---------- plugins/personal/generic/class_user.inc | 2 +- plugins/personal/generic/paste_generic.tpl | 2 -- 4 files changed, 19 insertions(+), 19 deletions(-) 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 @@

 


{$AttributesToFix} -

 

{if $SubDialog == false}
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 .= "

 

"; + } + } + } + } + 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 = "
"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.").""; + $add_str_info = "
"._("(Some types of certificates are currently not supported and may be displayed as 'invalid'.)").""; } $str = " 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 @@

-
-

-- 2.30.2