Updated templates using <textarea>, there was a whitespace in front of the textarea...

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

diff --git a/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc b/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc
index 850a07a005d0e9ff45d5edde10e7b9af68345a21..5bfdf5823d6ec248b67b111d6b83a93bc21ae104 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiHookEntry.inc
@@ -131,7 +131,8 @@ class faiHookEntry extends plugin
     /* Call common method to give check the hook */
     $message= plugin::check();
 
-    if(isset($this->parent->SubObjects[$this->cn]) && $this->cn != $this->orig_cn){
+    if(isset($this->parent->SubObjects[$this->cn]) && $this->cn != $this->orig_cn && 
+        $this->parent->SubObjects[$this->cn]['status'] != 'delete'){
       $message[]= msgPool::duplicated(_("Name"));
     }
 

diff --git a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl
index dd01aaf4db096d2fa009fafb8737531bcc1f87dc..591598ede0cc97e37970572f774f1fe484eff025 100644 (file)
--- a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl
+++ b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl
@@ -43,8 +43,8 @@
 <hr>
 <h3><LABEL for="FAIscript">{t}Script{/t}</LABEL>
 </h3>
-{render acl=$FAIscriptACL}<textarea name="FAIscript" style="width:100%;height:300px;" id="FAIscript"                           rows=20 cols=120>
- {$FAIscript}</textarea>
+{render acl=$FAIscriptACL}
+    <textarea name="FAIscript" style="width:100%;height:300px;" id="FAIscript" rows=20 cols=120>{$FAIscript}</textarea>
 {/render}
 <br>
 <div>
@@ -70,4 +70,4 @@
  <button type='submit' name='CancelSubObject'>
  {msgPool type=cancelButton}</button>
 </div><!-- Place cursor -->
-<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>

diff --git a/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl b/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl
index b46d7bb9eb11b94cf6c4ea8e00781deaba23e24d..f33e4c139e6e89ec316613e2ad8167c4a9a1aab1 100644 (file)
--- a/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl
+++ b/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl
@@ -19,8 +19,8 @@
  {/if}
  
  
- <textarea {if $write_protect} disabled {/if}  style='width:100%; height: 350px;'  {if !$write_protect}name="templateValue"{/if}>
- {$templateValue}</textarea>
+ <textarea {if $write_protect} disabled {/if}  style='width:100%; height: 350px;' 
+     {if !$write_protect}name="templateValue"{/if}>{$templateValue}</textarea>
 
  <div class="plugin-actions">
   <button type='submit' name='templateEditSave'>{msgPool type=okButton}</button>&nbsp;