Updated display of parameters

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

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc
index 566fecccf9120d63901a4c22a32e7d4b6a7badbd..a8c1f73bc935e5793ec52865fd8ab1b6e978f16b 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc
@@ -186,8 +186,7 @@ class macroParameter extends plugin
     }
 
     /* get current content */
-    $macroManagment = session::get('macroManagement') ;
-    $content = $macroManagment->macrotabs->by_object['macro']->goFonMacroContent;
+    $content = $this->parent->by_object['macro']->goFonMacroContent;
 
     if(strstr($content,"ARG")){
       $vorpos = strpos($content,"ARG");

diff --git a/gosa-plugins/gofon/gofon/macro/macro-list.tpl b/gosa-plugins/gofon/gofon/macro/macro-list.tpl
index b233c5874c0a4d5101b80258c2d6c3e5687d5be6..063087b02e5f2b6c4874c49785e973f81d298aef 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/macro-list.tpl
+++ b/gosa-plugins/gofon/gofon/macro/macro-list.tpl
@@ -8,7 +8,7 @@
       </div>
       
       <div class="contentboxb">
-       <div style='background:white;padding:0px;padding:3px;'>
+       <div style='background:white;padding:3px;'>
         <table><tr>
           <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;<input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
         </tr></table>