Copy & Paste dialog.

Added seperator after each plugin that needs attribute modifications.
Fixed & in translated string.
Applied user copy & paste template modifications from r5328

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

diff --git a/ihtml/themes/default/copyPasteDialog.tpl b/ihtml/themes/default/copyPasteDialog.tpl
index e72431d334b10f711d7ebbf307d7ece491c5c008..075d52ed212f6a3099360bb9cd8ebfce4fd30d9f 100644 (file)
--- a/ihtml/themes/default/copyPasteDialog.tpl
+++ b/ihtml/themes/default/copyPasteDialog.tpl
@@ -1,4 +1,4 @@
-<h2>{t}Copy &amp; paste wizard{/t}</h2>
+{t}Copy & paste wizard{/t}</h2>
 
 {if $Complete == false}
        {t}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.{/t}
@@ -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 701631f4a51b30af1580aede32a08b95dc3e0d3b..8e2d42ca4861c77d3dd7305f14edb0c3610c4ce8 100644 (file)
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -278,20 +278,23 @@ 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);
   }
 
 
@@ -322,5 +325,5 @@ class tabs
   }
 
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/personal/generic/paste_generic.tpl b/plugins/personal/generic/paste_generic.tpl
index 6f35f708d9e708192ba3767c000939decd5f1db7..0fc1608888320234fc95846cd7b4adac739b8fd0 100644 (file)
--- a/plugins/personal/generic/paste_generic.tpl
+++ b/plugins/personal/generic/paste_generic.tpl
@@ -1,7 +1,7 @@
-<table>
+<h2>{t}User settings{/t}</h2>
+<table width="100%">
   <tr>
-       <td style='vertical-align:top;'>
-         <h2>{t}User settings{/t}</h2>
+       <td style="vertical-align:top; border-right:1px solid #AAA; width:50%">
          <table>
                <tr>
                  <td><label for="sn">{t}Last name{/t}</label></td>
@@ -15,18 +15,6 @@
                  <td><label for="uid">{t}Login{/t}</label></td>
                  <td><input id="uid" name="uid" size=25 maxlength=60 value="{$uid}"></td>
                </tr>
-               <tr>
-                 <!-- Name, ... -->
-                 <td style="vertical-align:top;">
-                       <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
-                        {t}User picture{/t}
-                 </td>
-                 <td>
-                       <input id="picture_file" name="picture_file" type="file" size="20" maxlength="255" accept="image/*.jpg">
-                       &nbsp;
-                       <input type=submit name="picture_remove" value="{t}Remove picture{/t}">
-                 </td>
-               </tr>
                <tr>
                        <td style='vertical-align:top;'>
                                {t}Password{/t}
@@ -42,20 +30,30 @@
          <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
                <tr>
                <!-- Image container -->
-                 <td>
+                 <td colspan="2">
                        <table>
                          <tr>
                                <td width="147" height="200" bgcolor="gray">
-                                 <img align="middle" style='vertical-align:middle;' border="0" width="100%" src="getbin.php?rand={$rand}"
-                                         alt="{t}Personal picture{/t}">
+                                 <img align="middle" border="0" width="100%" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
                                </td>
                          </tr>
                        </table>
                  </td>
                </tr>
+               <tr>
+                 <!-- Name, ... -->
+                 <td style="vertical-align:top;">
+                       <input type="hidden" name="MAX_FILE_SIZE" value="2000000">
+                        {t}User picture{/t}
+                 </td>
+                 <td>
+                       <input id="picture_file" name="picture_file" type="file" size="20" maxlength="255" accept="image/*.jpg">
+                       &nbsp;
+                       <input type=submit name="picture_remove" value="{t}Remove picture{/t}">
+                 </td>
+               </tr>
          </table>
        </td>
   </tr>
 </table>
 <br>
-<br>