Updated preg_matches

[gosa.git] / plugins / admin / fai / faiNewBranch.tpl

diff --git a/plugins/admin/fai/faiNewBranch.tpl b/plugins/admin/fai/faiNewBranch.tpl
index 4c42c9e841ad79fcc5506df1b2bb265f3a20003b..ec7dbf4901e8c40b2b1f103ec65bb6b89e36ba8a 100755 (executable)
--- 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,9 +32,11 @@
 </script>
 {else}
 
-<h2>{t}Processing requested operation, the status of this operation will be displayed in an iframe below.{/t}</h2>
-
-<div>
+<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>
+<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;">
 
        <p>{t}Your browser doesn't support iframes, please use this link to perform the requested operation.{/t}
@@ -41,10 +45,12 @@
        </p>    
 </iframe>
 </div>
+<!--
 <p class="seperator">&nbsp;</p>
 <div style="text-align: right;width:99%;">
        <p>
                <input type="submit" name="CancelBranchName" value="{t}Back{/t}">
        </p>
 </div>
+-->
 {/if}