From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 12 Jan 2006 17:07:12 +0000 (+0000)
Subject: Fixed new branch dialog
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7e8018f1217c3c7cb84d3b81b50b7431df7f0610;p=gosa.git

Fixed new branch dialog


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

diff --git a/plugins/admin/fai/faiNewBranch.tpl b/plugins/admin/fai/faiNewBranch.tpl
index ac360601a..2c65a7cd8 100755
--- a/plugins/admin/fai/faiNewBranch.tpl
+++ b/plugins/admin/fai/faiNewBranch.tpl
@@ -1,41 +1,20 @@
 <br>
 <p class="seperator">
-{t}Please enter a name for the branch/freeze. Names like 'scripts', 'hooks', 'partitions', 'variables', 'templates', 'fai' and already existing names are not allowed.{/t}
+{t}You are now going to create a branch or locked branch. This action clones the existing release to another release name. Branches can be modified as usual. FAI classes of locked branches cannot be modified, just additional classes are possible. Branch names should be alphanumeric, excluding the reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' and 'fai'.{/t}
 <br>
 <br>
 </p>
 <p class="seperator">
 <br>
-<b>{t}Please enter a name for the branch.{/t}</b>
+<b>{t}Please enter a name for the branch{/t}</b> &nbsp;
+<input type="text"	 name="BranchName" value="{$BranchName}" style="width:120px;">
 <br>
 <br>
 </p>
-<br>
-<table summary="" style='width:100%'>
- <tr>
-  <td style='width:49%'>
-   <table summary="">
-    <tr>
-     <td> 
-       <h1>{t}Enter FAI branch name.{/t}</h1>
-     </td>
-   </tr>
-   <tr>
-     <td>
-      {t}Branch name{/t}&nbsp;<input type="text"	 name="BranchName" value="{$BranchName}" style="width:120px;">
-     </td>
-    </tr>
-   </table>
-   <br>
-   <br>
-  </td>
- </tr>
-</table>
-<p class="seperator">&nbsp;</p>
 
 <div align="right">
 	<p>
-		<input type="submit" value="{t}Use{/t}" 	name="UseBranchName">		
+		<input type="submit" value="{t}Apply{/t}" 	name="UseBranchName">		
 		<input type="submit" value="{t}Cancel{/t}" 	name="CancelBranchName">		
 	</p>
 </div>