First layout adaptions

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

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 16bc0e5169f4ad4eaf5199eb7b2d90a89856741c..636c115caf1b2111dce530595b3385cd0a02ce73 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -786,7 +786,7 @@ class faiManagement extends plugin
                $smarty->assign("failist"               , $divlist->DrawList());
                $smarty->assign("regex"                 , $faifilter['regex']); 
                $smarty->assign("infoimage"             , get_template_path('images/info.png'));
-               $smarty->assign("branchimage"           , get_template_path('images/action.png'));
+               $smarty->assign("branchimage"           , get_template_path('images/branch.png'));
                $smarty->assign("launchimage"   , get_template_path('images/launch.png'));
                $smarty->assign("alphabet"              , generate_alphabet());
                $smarty->assign("apply"                 , apply_filter());
@@ -799,7 +799,7 @@ class faiManagement extends plugin
 
   function getBranches($base = false,$prefix = "")
   {
-    $ret = array("main"=>_("main"));
+    $ret = array("main"=>"/");
     $ldap = $this->config->get_ldap_link();
   
     $ldap->cd($this->config->current['BASE']);
@@ -817,7 +817,7 @@ class faiManagement extends plugin
       
       if((isset($attrs['ou']))&&($attrs['dn']!=$base)){
         $ret[$attrs['dn']]= $prefix.$attrs['ou'][0];
-        $ret = array_merge($ret,$this->getBranches($attrs['dn'],$prefix.$attrs['ou'][0]."/"));
+        $ret = array_merge($ret,$this->getBranches($attrs['dn'],"".$prefix.$attrs['ou'][0]."/"));
       }
     }
     return($ret);

diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl
index 8b161470308025b3db8bee301d6d1654c504936f..5e3d2e8cc64182a9764dca82417ee161f6fa6204 100644 (file)
--- a/plugins/admin/fai/headpage.tpl
+++ b/plugins/admin/fai/headpage.tpl
@@ -28,25 +28,36 @@
    <div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
     <p class="contentboxh"><img src="{$branchimage}" align="right" alt="[F]">{t}Branches{/t}</p>
    </div>
-   <div class="contentboxb" style="padding:3px;">
-       {t}Selected branch{/t}&nbsp;
+   <div class="contentboxb">
+        <table summary="" style="width:100%;border-bottom:1px solid #B0B0B0;">
+        <tr>
+         <td>
+       {t}Current release{/t}&nbsp;
        <select name="select_branch" onChange="document.mainform.submit();">
                {html_options values=$branchKeys output=$branches selected=$select_branch}
        </select>
-       {if $select_branch != "main"}
-       <br>
-       {t}Delete this branch.{/t}
+         </td>
+        </tr>
+        </table>
+        <table summary="" style="width:100%;border-bottom:1px solid #B0B0B0;">
+        <tr>
+         <td>
+       <input type="image" align="center" value="branch" name="branch_branch" src="images/branch_small.png">
        &nbsp;
-       <input type="image" value="delete" name="remove_branch" src="images/edittrash.png"> 
-       {/if}   
+       {t}Create new branch using the current release{/t}
        <br>
-       {t}Create a new branch{/t}
+       <input type="image" align="center" value="freeze" name="freeze_branch" src="images/closedlock.png">
        &nbsp;
-       <input type="image" value="delete" name="branch_branch" src="images/crossref.png">
+       {t}Create a locked version of the current release{/t}
+       {if $select_branch != "main"}
        <br>
-       {t}Freeze this{/t}
+       <input type="image" align="center" value="delete" name="remove_branch" src="images/edittrash.png"> 
        &nbsp;
-       <input type="image" value="delete" name="freeze_branch" src="images/flag.png">
+       {t}Delete current release{/t}
+       {/if}   
+         </td>
+        </tr>
+        </table>
    </div>
    <br>
    <div class="contentboxh">