X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2FfaiNewBranch.tpl;h=322f98ef2b0158461eae56a1a5a7c5bb1a37b7f2;hb=90cb0cbd940168e234d506e42644e52fc7af5c4d;hp=de54b285c25049129a0cfa06e2b7c9cea4d43bab;hpb=88d36e51ab3be87520f88fcb83122342c1cba832;p=gosa.git

diff --git a/plugins/admin/fai/faiNewBranch.tpl b/plugins/admin/fai/faiNewBranch.tpl
index de54b285c..322f98ef2 100755
--- a/plugins/admin/fai/faiNewBranch.tpl
+++ b/plugins/admin/fai/faiNewBranch.tpl
@@ -4,6 +4,8 @@
 <p class="seperator">
 {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>
+{t}Branches are created as subreleases of the currently selected branch. Creating a new branch named 1.0.2 in SARGE for example, will result in a new release called SARGE/1.0.2.{/t}
+<br>
 <br>
 </p>
 <p class="seperator">
@@ -30,18 +32,16 @@
 </script>
 {else}
 
-<h2>{t}Processing requested operation, the status of this operation will be displayed in an iframe below.{/t}</h2>
-{t}As soon as the operation has finished, you can scroll down to end of the page and press the 'Back' button to return to the fai management dialog.{/t}
-<br>
+<h2>{t}Processing the requested operation{/t}</h2>
+{t}As soon as the copy operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the fai management dialog.{/t}
 <br>
-<p class='seperator'>&nbsp;</p>
 <br>
-<div>
-<iframe src="?plug={$plugID}&PerformBranch=1" width="100%" name="status" style="height:450px;background-color:#FFFFFF;">
+<div style="margin:3px;background-color:white; border:1px solid #A0A0A0">
+<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>