[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 957790b)
Added Auto-Scroll to FAI-new-branch Iframe.
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 13 Dec 2006 07:17:03 +0000 (07:17 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 13 Dec 2006 07:17:03 +0000 (07:17 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5371 594d385d-05f5-0310-b6e9-bd551577e9d8

include/class_ldap.inc patch | blob | history
plugins/admin/fai/class_faiManagement.inc patch | blob | history
plugins/admin/fai/faiNewBranch.tpl patch | blob | history

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index b57755ab828672327f0c411d59b74443af7bafb6..affcc67a902917d0917e8db73dda34b674f0f741 100644 (file)
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -598,6 +598,8 @@ class LDAP{
         }
       }
 
+      echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
+
       $this->ls ("(objectClass=*)",$sourcedn);
       while ($this->fetch()){
         $deldn= $this->getDN();
diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 2bd6dd1567c24b14ca2c333f6404b58c6fc79b91..7175099fdcabb949f89bbb4049c72b72b0d617b8 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -398,9 +398,16 @@ class faiManagement extends plugin
       $appsrc = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=apps,",$baseToUse); 
       $appdst = preg_replace("/ou=fai,ou=configs,ou=systems,/","ou=apps,","ou=".$name.",".$baseToUse) ; 
 
-      /* Print header to have styles included */
-      echo "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
-      echo "<body style='background-image:none;margin:3px;color:black'>";
+      /* Print out html introduction */
+      echo '  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+        <html>
+        <head>
+        <title></title>
+        <style type="text/css">@import url("themes/default/style.css");</style>
+        <script language="javascript" src="include/focus.js" type="text/javascript"></script>
+        </head>
+        <body style="background: none; margin:4px;" id="body" >
+        ';
 
       /* Duplicate applications 
        */
@@ -420,6 +427,8 @@ class faiManagement extends plugin
               <br><input type='submit' name='CloseIFrame' value='"._("Continue")."'>
             </form></div>";
 
+      echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
+
       /* Print footer to have valid html */
       echo "</body></html>";
 
diff --git a/plugins/admin/fai/faiNewBranch.tpl b/plugins/admin/fai/faiNewBranch.tpl
index ec7dbf4901e8c40b2b1f103ec65bb6b89e36ba8a..322f98ef2b0158461eae56a1a5a7c5bb1a37b7f2 100755 (executable)
--- a/plugins/admin/fai/faiNewBranch.tpl
+++ b/plugins/admin/fai/faiNewBranch.tpl
@@ -37,11 +37,11 @@
 <br>
 <br>
 <div style="margin:3px;background-color:white; border:1px solid #A0A0A0">
-<iframe src="?plug={$plugID}&PerformBranch=1" width="100%" name="status" style="height:450px;background-color:#FFFFFF;">
+<iframe src="?plug={$plugID}&amp;PerformBranch=1" width="100%" name="status" style="height:450px;background-color:#FFFFFF;">
 
        <p>{t}Your browser doesn't support iframes, please use this link to perform the requested operation.{/t}
                <br>
-               <a href='?plug={$plugID}&PerformBranch=1' target="_blank" title="{t}Perform requested operation.{/t}"><b>{t}Initiate operation{/t}</b></a>
+               <a href='?plug={$plugID}&amp;PerformBranch=1' target="_blank" title="{t}Perform requested operation.{/t}"><b>{t}Initiate operation{/t}</b></a>
        </p>    
 </iframe>
 </div>
GONICUS system administrator (SVN clone)