Code

Beautified FAI templates
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 30 Mar 2010 11:53:18 +0000 (11:53 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 30 Mar 2010 11:53:18 +0000 (11:53 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17392 594d385d-05f5-0310-b6e9-bd551577e9d8

29 files changed:
gosa-plugins/fai/admin/fai/askClassName.tpl
gosa-plugins/fai/admin/fai/branch_selector.tpl
gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl
gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc
gosa-plugins/fai/admin/fai/fai-list.tpl
gosa-plugins/fai/admin/fai/faiDiskEntry.tpl
gosa-plugins/fai/admin/fai/faiGroupHandle.tpl
gosa-plugins/fai/admin/fai/faiHook.tpl
gosa-plugins/fai/admin/fai/faiHookEntry.tpl
gosa-plugins/fai/admin/fai/faiNewBranch.tpl
gosa-plugins/fai/admin/fai/faiPackage.tpl
gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl
gosa-plugins/fai/admin/fai/faiPartition.tpl
gosa-plugins/fai/admin/fai/faiPartitionTable.tpl
gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl
gosa-plugins/fai/admin/fai/faiProfile.tpl
gosa-plugins/fai/admin/fai/faiProfileEntry.tpl
gosa-plugins/fai/admin/fai/faiScript.tpl
gosa-plugins/fai/admin/fai/faiScriptEntry.tpl
gosa-plugins/fai/admin/fai/faiSummary.tpl
gosa-plugins/fai/admin/fai/faiTemplate.tpl
gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl
gosa-plugins/fai/admin/fai/faiTemplateEntry.tpl
gosa-plugins/fai/admin/fai/faiVariable.tpl
gosa-plugins/fai/admin/fai/faiVariableEntry.tpl
gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl
gosa-plugins/fai/admin/fai/paste_generic.tpl
gosa-plugins/fai/admin/fai/remove_branch.tpl

index 0a2d08a419a37b1b86756dd84e37a96c1d42e4b4..1998d25a9d17e492c5b68bbdb1911c6f23259856 100644 (file)
@@ -1,17 +1,17 @@
+
 <div style="font-size: 18px;">
      {$headline}
+ {$headline}
 </div>
 <br>
-<p class="seperator">
-{t}Adding a new class to the FAI management, requires a class name. You have to specify a unique class name for unique types of FAI classes, while you can use the same class name for different types of FAI classes. In the laste case, FAI will automatically enclose all these different class types to one unique class name.{/t}
-<br>
-<br>
+<p class="seperator">{t}Adding a new class to the FAI management, requires a class name. You have to specify a unique class name for unique types of FAI classes, while you can use the same class name for different types of FAI classes. In the laste case, FAI will automatically enclose all these different class types to one unique class name.{/t}
+ <br>
+ <br>
 </p>
 <p class="seperator">
-<br>
-<b>{t}Please use one of the following methods to choose the name for the new FAI class.{/t}</b>
-<br>
-<br>
+ <br>
+ <b>{t}Please use one of the following methods to choose the name for the new FAI class.{/t}</b>
+ <br>
+ <br>
 </p>
 <br>
 <table summary="{t}FAI class creator{/t}" style='width:100%' >
    <table summary="{t}Class settings{/t}">
     <tr>
      <td>
-       <input type=radio name="classSelector" id="classSelector1" value="1" checked>
+      <input type=radio name="classSelector" id="classSelector1" value="1" checked>
      </td>
-     <td> 
-       <h1><label for='classSelector1'>{t}Enter FAI class name manually{/t}</label></h1>
+     <td><h1><label for='classSelector1'>{t}Enter FAI class name manually{/t}</label></h1>
      </td>
-   </tr>
-   <tr>
-     <td>&nbsp;</td>
-     <td>
-      {t}Class name{/t}&nbsp;<input type="text"         name="UseTextInputName" value="{$ClassName}" style="width:120px;">
+    </tr>
+    <tr>
+     <td>&nbsp;
+     </td>
+     <td>{t}Class name{/t}&nbsp;
+      <input type="text"        name="UseTextInputName" value="{$ClassName}" style="width:120px;">
      </td>
     </tr>
    </table>
    <br>
   </td>
   <td class='left-border'>
-
   </td>
   <td>
+   
    <table summary="{t}Class name selector{/t}" {$grey}>
     <tr>
      <td>
-       <input type=radio name="classSelector" value="2" id="classSelector2" {$ClassNamesAvailable}>
+      <input type=radio name="classSelector" value="2" id="classSelector2" {$ClassNamesAvailable}>
      </td>
      <td>
       <h1 {$grey}><label for='classSelector2'>{t}Choose FAI class name from a list of existing classes{/t}</label></h1>
      </td>
     </tr>
     <tr>
-     <td>&nbsp;</td>
-     <td>
-      {t}Class name{/t}&nbsp;<select name="SelectedClass" title="{t}Choose class name{/t}" style="width:120px;" {$ClassNamesAvailable} size=1>
+     <td>&nbsp;
+     </td>
+     <td>{t}Class name{/t}&nbsp;
+      
+      <select name="SelectedClass" title="{t}Choose class name{/t}" style="width:120px;" {$ClassNamesAvailable}size=1>
        {html_options options=$ClassNames}
       </select>
      </td>
  </tr>
 </table>
 <hr>
-
 <p style="text-align:right">
  <button type='submit' name='edit_continue'>{t}Continue{/t}</button>&nbsp;
-
- <button type='submit' name='edit_cancel'>{msgPool type='cancelButton'}</button>
-
-</p>
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-       <!--
-       focus_field('UseTextInputName');
-       -->
-</script>
+ <button type='submit' name='edit_cancel'>
+ {msgPool type='cancelButton'}</button>
+</p><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!--      focus_field('UseTextInputName');        --></script>
\ No newline at end of file
index 20f62e09ef7c3efeedf5af19b7e8a8599729f657..cb6face0eb49e5b892a9b5b1411c5a0e0aed536b 100644 (file)
@@ -1,49 +1,45 @@
- <div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
-    <p class="contentboxh">{image path="{$branchimage}" align="right"}{t}Releases{/t}
-</p>
-   </div>
-   <div class="contentboxb">
-        <table style='width:100%;' summary="{t}FAI release selector{/t}">
 
-     <tr>
-      <td>
-    {t}Current release{/t}&nbsp;
+<div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
+ <p class="contentboxh">
+  {image path="
+  {$branchimage}" align="right"}{t}Releases{/t}
+ </p>
+</div>
+<div class="contentboxb">
+ <table style='width:100%;' summary="{t}FAI release selector{/t}">
+  <tr>
+   <td>{t}Current release{/t}&nbsp;
     <select name="fai_release" onChange="document.mainform.submit();" size=1>
-        {html_options output=$fai_releases values=$fai_releases selected=$fai_release}
+     {html_options output=$fai_releases values=$fai_releases selected=$fai_release}
     </select>
-      </td>
-     </tr>
-        </table>
-        <table summary="{t}FAI release selector{/t}" style="width:100%;">
-     <tr>
-      <td>
+   </td>
+  </tr>
+ </table>
+ <table summary="{t}FAI release selector{/t}" style="width:100%;">
+  <tr>
+   <td>
+    
     {if $allow_create}
-        {image path="plugins/fai/images/branch_small.png" action="branch_branch"}
-
-        <a href="?plug={$plug_id}&act=branch_branch">{t}Create release{/t}</a>
-        <br>
-        {image path="plugins/fai/images/freeze.png" action="freeze_branch"}
-
-               <a href="?plug={$plug_id}&act=freeze_branch">{t}Create read-only release{/t}</a>
-    {else}
-        {image path="plugins/fai/images/branch_small_grey.png"}
-
-        {t}Create release{/t}
-        <br>
-        {image path="plugins/fai/images/freeze_grey.png"}
-
-               {t}Create read-only release{/t}
+     {image path="plugins/fai/images/branch_small.png" action="branch_branch"}
+     <a href="?plug={$plug_id}&act=branch_branch">{t}Create release{/t}</a>
+     <br>
+     {image path="plugins/fai/images/freeze.png" action="freeze_branch"}
+     <a href="?plug={$plug_id}&act=freeze_branch">{t}Create read-only release{/t}</a>
+     {else}
+     {image path="plugins/fai/images/branch_small_grey.png"}{t}Create release{/t}
+     <br>
+     {image path="plugins/fai/images/freeze_grey.png"}{t}Create read-only release{/t}
+     
     {/if}
-
+    
     {if $fai_release != $fai_base && $allow_remove}
-    <br>
-        {image path="images/lists/trash.png" action="remove_branch"}
-
-           <a href="?plug={$plug_id}&act=remove_branch">{t}Delete current release{/t}</a>
+     <br>
+     {image path="images/lists/trash.png" action="remove_branch"}
+     <a href="?plug={$plug_id}&act=remove_branch">{t}Delete current release{/t}</a>
+     
     {/if}
-      </td>
-     </tr>
  </table>
-   </div>
-<br>
-
+   </td>
+  </tr>
+ </table>
+</div>
+<br>
\ No newline at end of file
index 6e20cf67978275fe2f4a1551e536a675458866ab..a7576d1b320a9badeab4ff766233e6b5ee164257 100644 (file)
@@ -1,30 +1,47 @@
-<div id="mainlist">
 
-  <div class="mainlist-header">
-   <p>{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-   <div class="mainlist-nav">
-    <table summary="{$HEADLINE}">
-     <tr>
-      <td>{$ROOT}</td>
-      <td>{$BACK}</td>
-      <td>{$HOME}</td>
-      <td>{$RELOAD}</td>
-      <td class="left-border">{t}Base{/t} {$BASE}</td>
-      <td class="left-border">{$ACTIONS}</td>
-      <td class="left-border">{$FILTER}</td>
-     </tr>
-    </table>
-   </div>
+<div id="mainlist">
+ <div class="mainlist-header">
+  <p>
+   {$HEADLINE}&nbsp;
+   {$SIZELIMIT}
+  </p>
+  <div class="mainlist-nav">
+   
+   <table summary="{$HEADLINE}">
+    <tr>
+     <td>
+      {$ROOT}
+     </td>
+     <td>
+      {$BACK}
+     </td>
+     <td>
+      {$HOME}
+     </td>
+     <td>
+      {$RELOAD}
+     </td>
+     <td class="left-border">{t}Base{/t}
+      {$BASE}
+     </td>
+     <td class="left-border">
+      {$ACTIONS}
+     </td>
+     <td class="left-border">
+      {$FILTER}
+     </td>
+    </tr>
+   </table>
   </div>
-
-  {$LIST}
+ </div>
+ {$LIST}
+</div>
+<div class="clear">
 </div>
-
-<div class="clear"></div>
-
 <div class="plugin-actions">
-  <button type=submit name="classSelect_save">{msgPool type=okButton}</button>
-  <button type=submit name="classSelect_cancel">{msgPool type=cancelButton}</button>
+ <button type=submit name="classSelect_save">
+ {msgPool type=okButton}</button>
+ <button type=submit name="classSelect_cancel">
+ {msgPool type=cancelButton}</button>
 </div>
-
-<input type="hidden" name="ignore">
+<input type="hidden" name="ignore">
\ No newline at end of file
index 197e1b2b28cd9591c7eb33e93bed4a994390f205..e390ea36d6b62473f72047c650f3c47f0cd6f82e 100644 (file)
@@ -458,11 +458,11 @@ class faiPartitionTable extends plugin
     if(isset($_POST['FAIpartitionTablePosted'])){
       if (preg_match("/freeze/", $this->FAIstate)) return;
       plugin::save_object();
-      foreach($this->attributes as $attrs){
-        if(isset($_POST[$attrs])){
-          $this->$attrs = $_POST[$attrs];
-        }
-      }
+#     foreach($this->attributes as $attrs){
+#       if(isset($_POST[$attrs])){
+#         $this->$attrs = $_POST[$attrs];
+#       }
+#     }
       if(!count($this->disks)){
         if(isset($_POST['mode'])){
           $this->FAIpartitionMethod = "setup-storage";
index a5adc2f1c65b6dbe3df9c1e0176be5ebb4387a8c..5bacf93e02bdc5b227e2bdc92e776e230637a622 100644 (file)
@@ -196,7 +196,7 @@ class faiPartitionTableEntry extends plugin
        */
       $FAIfsType= "";
       if($this->acl_is_writeable("FAIfsType")){
-        $FAIfsType= "<select name='FAIfsType_".$key."' id='FAIfsType_".$key."' ".$dis." ".$disableALL.">";
+        $FAIfsType= "<select size='1' name='FAIfsType_".$key."' id='FAIfsType_".$key."' ".$dis." ".$disableALL.">";
         foreach($FAIfsTypes as $type){
           if($part['FAIfsType'] == $type){
             $FAIfsType  .="<option value='".$type."' selected >".$type."</option>";
@@ -212,7 +212,7 @@ class faiPartitionTableEntry extends plugin
       foreach(array("FAImountPoint","FAIpartitionSize","FAImountOptions","FAIfsOptions") as $attr){
         $$attr  = "";
         if($this->acl_is_writeable($attr)){
-          $$attr = "<input name='".$attr."_".$key."'  ".$disableALL."  ".$dis."
+          $$attr = "<input type='text' name='".$attr."_".$key."'  ".$disableALL."  ".$dis."
             value='".$part[$attr]."'    id='".$attr."_".$key."'>";
 
         }elseif($this->acl_is_readable($attr)){
@@ -249,9 +249,9 @@ class faiPartitionTableEntry extends plugin
         }
       }
       if($this->acl_is_removeable()){
-        $str .= "\n<td><input type='submit' name='Delete_".$key."' value='"._("Remove")."' ".$disableALL."></td>";    
+        $str .= "\n<td><button type='submit' {$disableALL} name='Delete_".$key."'>"._("Remove")."</button></td>";    
       }else{
-        $str .= "\n<td><input type='submit' name='restricted' disabled value='"._("Remove")."'></td>";    
+        $str .= "\n<td><button type='button' disabled name='restricted'>"._("Remove")."</button></td>";    
       }
       $str .= "\n</tr>";    
     }
@@ -295,7 +295,8 @@ class faiPartitionTableEntry extends plugin
 
       foreach($this->partitions as $key => $part){
         foreach($this->UsedAttrs as $attrs){
-
+          if(in_array($attrs,array('cn','description'))) continue;
+          
           if($this->acl_is_writeable($attrs)){
 
             if(isset($_POST[$attrs."_".$key])){
index eb244dbb7b0d4fa3e08fb09be8e04c463894c25c..7fcb0c75563326e312f2821a3fc202b3055dd931 100644 (file)
@@ -1,23 +1,32 @@
-<div id="mainlist">
 
-  <div class="mainlist-header">
-   <p>{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-   <div class="mainlist-nav">
-    <table summary="{$HEADLINE}">
-     <tr>
-      <td>{$RELOAD}</td>
-      <td class="left-border">{t}Release{/t} {$RELEASE}</td>
-      <td class="left-border">{$ACTIONS}</td>
-      <td class="left-border">{$FILTER}</td>
-     </tr>
-    </table>
-   </div>
+<div id="mainlist">
+ <div class="mainlist-header">
+  <p>
+   {$HEADLINE}&nbsp;
+   {$SIZELIMIT}
+  </p>
+  <div class="mainlist-nav">
+   
+   <table summary="{$HEADLINE}">
+    <tr>
+     <td>
+      {$RELOAD}
+     </td>
+     <td class="left-border">{t}Release{/t}
+      {$RELEASE}
+     </td>
+     <td class="left-border">
+      {$ACTIONS}
+     </td>
+     <td class="left-border">
+      {$FILTER}
+     </td>
+    </tr>
+   </table>
   </div>
-
 {$LIST}
+ </div>
+ {$LIST}
 </div>
-
-<div class="clear"></div>
-
-<input type="hidden" name="ignore">
-
+<div class="clear">
+</div>
+<input type="hidden" name="ignore">
\ No newline at end of file
index 072229dd5780b0863673131b0a0a242ab54c74b5..80a4e0c4e89c7c709ce2cead61dd64e1ebdc0a72 100644 (file)
+
 <input type="hidden" name="TableEntryFrameSubmitted" value="1">
-<h3>{t}Device{/t}</h3>
+<h3>{t}Device{/t}
+</h3>
 <table style='width:100%' summary="{t}FAI disk entry{/t}">
-       <tr>
-               <td style='width:50%;' class='right-border'>
-
-
-      <table summary="{t}Disk options{/t}">
-        <tr>
-          <td>
-            <LABEL for="DISKcn">{t}Name{/t}</LABEL>{$must}&nbsp;
-          </td>
-          <td>
-{render acl=$DISKcnACL}
-                             <input type='text' value="{$DISKcn}" size="45" maxlength="80" name="DISKcn" id="DISKcn">
-{/render}
-               </td>
-        </tr>
-        <tr>
-                     <td>
-            <LABEL for="fstabkey">{t}fstab key{/t}</LABEL>
-          </td>
-          <td>
-{render acl=$DISKFAIdiskOptionACL}
-            <select name="fstabkey" size="1">
-               {html_options options=$fstabkeys selected=$fstabkey}
-            </select>
-{/render}
-                     </td>
-        </tr>
-      </table>
-
-    </td>
-               <td>
-
-      <table summary="{t}Generic settings{/t}">
-        <tr>
-          <td>
-            <LABEL for="DISKdescription">{t}Description{/t}</LABEL>&nbsp;
-          </td>
-          <td>
-{render acl=$DISKdescriptionACL}
-                             <input value="{$DISKdescription}" size="45" maxlength="80" 
-              name="DISKdescription" id="DISKdescription">
-{/render}
-                     </td>
-        </tr>
-        <tr>
-                     <td>
-            <LABEL for="disklabel">{t}Disk label{/t}</LABEL>
-          </td>
-          <td>
-{render acl=$DISKFAIdiskOptionACL}
-            <select name="disklabel" size="1">
-               {html_options options=$disklabels selected=$disklabel}
-            </select>
-{/render}
-                     </td>
-        </tr>
-      </table>
-
-    </td>
-       </tr>
+ <tr>
+  <td style='width:50%;' class='right-border'>
+   <table summary="{t}Disk options{/t}">
+    <tr>
+     <td><LABEL for="DISKcn">{t}Name{/t}</LABEL>
+      {$must}&nbsp;
+     </td>
+     <td>
+      {render acl=$DISKcnACL}
+       <input type='text' value="{$DISKcn}" size="45" maxlength="80" name="DISKcn" id="DISKcn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="fstabkey">{t}fstab key{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$DISKFAIdiskOptionACL}
+       <select name="fstabkey" size="1">
+        {html_options options=$fstabkeys selected=$fstabkey}
+       </select>
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td>
+   <table summary="{t}Generic settings{/t}">
+    <tr>
+     <td><LABEL for="DISKdescription">{t}Description{/t}</LABEL>&nbsp;
+     </td>
+     <td>
+      {render acl=$DISKdescriptionACL}
+       <input value="{$DISKdescription}" size="45" maxlength="80"               name="DISKdescription" id="DISKdescription">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="disklabel">{t}Disk label{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$DISKFAIdiskOptionACL}
+       <select name="disklabel" size="1">
+        {html_options options=$disklabels selected=$disklabel}
+       </select>
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 
 {if $FAIdiskType == "lvm"}
-
-<hr>
     <h3>{t}Combined physical partitions{/t}</h3>
-
-      <select style='font-family: monospace; width: 100%;' 
-        name='physicalPartition[]' size=5 multiple> 
-        {html_options options=$plist}
     </select>
-      <br>
     <select name='lvmPartitionAdd' style='width:240px;' size=1>
-        {html_options options=$physicalPartitionList}
-      </select>
-      <button type='submit' name='addLvmPartition'>{msgPool type="addButton"}</button>&nbsp;
     <button type='submit' name='delLvmPartition'>{msgPool type="delButton"}</button>&nbsp;
-
+ <hr>
+ <h3>{t}Combined physical partitions{/t}
+ </h3>
+ <select style='font-family: monospace; width: 100%;'         name='physicalPartition[]' size=5 multiple>
+  {html_options options=$plist}
+ </select>
+ <br>
<select name='lvmPartitionAdd' style='width:240px;' size=1>
+  {html_options options=$physicalPartitionList}
</select>
+ <button type='submit' name='addLvmPartition'>
+ {msgPool type="addButton"}</button>&nbsp;
+ <button type='submit' name='delLvmPartition'>
+ {msgPool type="delButton"}</button>&nbsp;
 {/if}
 <hr>
 <br>
-<h3>{t}Partition entries{/t}</h3>
+<h3>{t}Partition entries{/t}
+</h3>
 {$setup}
 <br>
-{if !$freeze}
-       {if $sub_object_is_createable}
-               <button type='submit' name='AddPartition'>{t}Add partition{/t}</button>
-
-       {else}
-               <button type='submit' name='restricted'>{t}Add partition{/t}</button>
 
-       {/if}
+{if !$freeze}
+ {if $sub_object_is_createable}
+  <button type='submit' name='AddPartition'>{t}Add partition{/t}</button>
+  {else}
+  <button type='submit' name='restricted'>{t}Add partition{/t}</button>
+  
+ {/if}
 {/if}
-<br>   
+<br>
 <br>
 <hr>
 <br>
 <div class="plugin-actions">
-{if !$freeze}
-       <button type='submit' name='SaveDisk'>{msgPool type=saveButton}</button>
-
-{/if}
-<button type='submit' name='CancelDisk'>{msgPool type=cancelButton}</button>
-
-</div>
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('DISK_cn');
-  -->
-</script>
-
+ {if !$freeze}
+  <button type='submit' name='SaveDisk'>
+  {msgPool type=saveButton}</button>
+  
+ {/if}
+ <button type='submit' name='CancelDisk'>
+ {msgPool type=cancelButton}</button>
+</div><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('DISK_cn');  --></script>
\ No newline at end of file
index efe6247ddf64857a816034fe48e33a461df276d2..eb0ad7d71c68bd075999cfa4ea708c7989e3bc8c 100644 (file)
@@ -1,86 +1,99 @@
-{if $mode == "remove"}
-
-<b>{t}Please select the objects you want to remove:{/t}</b>
-<br>
-<br>
-<table summary="{t}FAI object removal{/t}">
-{foreach from=$FAI_group item=item key=key}
-       <tr>
-               <td>
-                       {if $item.freezed}
-                               {image path="images/lists/locked.png"}
-
-                       {else}
-                               <input type='checkbox' name='{$mode}_{$key}'
-                       {if $item.selected} checked {/if}>
-                       {/if}
-               </td>
-               <td>
-                       {image path="{$types.$key.IMG}" title="{$types.$key.NAME}"}
-                               class='center'>
-               </td>
-               <td style='width:150px;'>{$types.$key.NAME}</td>
-               <td style='width:80px;'>{if $item.freezed}<i>({t}Freezed{/t})</i>{/if}</td>
-               <td><i>({$item.description.0})</i></td>
-       </tr>
-{/foreach}
-</table>
-
-{elseif $mode == "edit"}
-
-<b>{t}Select the object you want to edit:{/t}</b>
-<br>
-<br>
-<table summary="{t}FAI group edit{/t}">
-{foreach from=$FAI_group item=item key=key}
-       <tr>
-               <td>
-               <input type='radio' name='{$mode}_selected' value='{$key}'
-               {if $item.selected} checked {/if}>
-               </td>
-               <td>
-                       {image path="{$types.$key.IMG}" title="{$types.$key.NAME}"}
-                               class='center'>
-               </td>
-               <td style='width:150px;'>{$types.$key.NAME}</td>
-               <td><i>({$item.description.0})</i>
-               </td>
-       </tr>
-{/foreach}
-</table>
 
-{elseif $mode == "copy"}
-
-<b>{t}Select the object you want to copy:{/t}</b>
-<br>
-<br>
-<table summary="{t}FAI group copy{/t}">
-{foreach from=$FAI_group item=item key=key}
-       <tr>
-               <td>
-                       <input type='checkbox' name='{$mode}_{$key}'
-                       {if $item.selected} checked {/if}>
-               </td>
-               <td>
-                       {image path="{$types.$key.IMG}" title="{$types.$key.NAME}"}
-                               class='center'>
-               </td>
-               <td style='width:150px;'>{$types.$key.NAME}</td>
-               <td><i>({$item.description.0})</i>
-               </td>
-       </tr>
-{/foreach}
-</table>
 
+{if $mode == "remove"}
+ <b>{t}Please select the objects you want to remove:{/t}</b>
+ <br>
+ <br>
+ <table summary="{t}FAI object removal{/t}">{foreach from=$FAI_group item=item key=key}
+  <tr>
+   <td>
+    
+    {if $item.freezed}
+     {image path="images/lists/locked.png"}
+     {else}
+     
+     
+     <input type='checkbox' name='{$mode}_{$key}'                      {if $item.selected} checked {/if}>
+     
+    {/if}
+   </td>
+   <td>
+    {image path="
+    {$types.$key.IMG}" title="
+    {$types.$key.NAME}"}class='center'>
+   </td>
+   <td style='width:150px;'>
+    {$types.$key.NAME}
+   </td>
+   <td style='width:80px;'>
+    
+    {if $item.freezed}<i>({t}Freezed{/t})</i>
+     
+    {/if}
+   </td>
+   <td><i>(
+    {$item.description.0})</i>
+   </td>
+  </tr>{/foreach}
+ </table>
+ {elseif $mode == "edit"}
+ <b>{t}Select the object you want to edit:{/t}</b>
+ <br>
+ <br>
+ <table summary="{t}FAI group edit{/t}">{foreach from=$FAI_group item=item key=key}
+  <tr>
+   <td>
+    
+    
+    <input type='radio' name='{$mode}_selected' value='{$key}'               {if $item.selected} checked {/if}>
+   </td>
+   <td>
+    {image path="
+    {$types.$key.IMG}" title="
+    {$types.$key.NAME}"}class='center'>
+   </td>
+   <td style='width:150px;'>
+    {$types.$key.NAME}
+   </td>
+   <td><i>(
+    {$item.description.0})</i>
+   </td>
+  </tr>{/foreach}
+ </table>
+ {elseif $mode == "copy"}
+ <b>{t}Select the object you want to copy:{/t}</b>
+ <br>
+ <br>
+ <table summary="{t}FAI group copy{/t}">{foreach from=$FAI_group item=item key=key}
+  <tr>
+   <td>
+    
+    
+    <input type='checkbox' name='{$mode}_{$key}'                       {if $item.selected} checked {/if}>
+   </td>
+   <td>
+    {image path="
+    {$types.$key.IMG}" title="
+    {$types.$key.NAME}"}class='center'>
+   </td>
+   <td style='width:150px;'>
+    {$types.$key.NAME}
+   </td>
+   <td><i>(
+    {$item.description.0})</i>
+   </td>
+  </tr>{/foreach}
+ </table>
 {/if}
 <br>
 <br>
 <input type='hidden' value='faiGroupHandle' name='faiGroupHandle'>
-<p class='seperator'></div>
-<div style='text-align:right; padding:5px'>
-       <button type='submit' name='faiGroupHandle_apply'>{msgPool type=applyButton}</button>
-
-       &nbsp;
-       <button type='submit' name='faiGroupHandle_cancel'>{msgPool type=cancelButton}</button>
-
+<p class='seperator'>
 </div>
+<div style='text-align:right; padding:5px'>
+ <button type='submit' name='faiGroupHandle_apply'>
+ {msgPool type=applyButton}</button>&nbsp;
+ <button type='submit' name='faiGroupHandle_cancel'>
+ {msgPool type=cancelButton}</button>
+</div>
\ No newline at end of file
index 9ab3741d391c90f2df947eed69127548247fa7fa..d9e139d9dc803b0246b4e0ed43df87e12bff8e16 100644 (file)
@@ -1,57 +1,50 @@
+
 <table width="100%" summary='{t}FAI hook{/t}'>
-       <tr>
-               <td width="50%" valign="top">
-                               <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="cn">
-                                                       {t}Name{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" maxlength="80" disabled id="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="description">
-                                                       {t}Description{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-       </tr>
+ <tr>
+  <td width="50%" valign="top">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" disabled id="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 <hr>
 <table width="100%" summary='{t}List of hooks{/t}'>
-       <tr>
-               <td>
-                               <h3>
-                                       {t}List of hook scripts{/t}
-                               </h3>
-        {$Entry_divlist}
-{if $sub_object_is_addable}
-        <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-{else}
-        <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-{/if}
-               </td>
-       </tr>
+ <tr>
+  <td>
+   <h3>{t}List of hook scripts{/t}
+   </h3>
+   {$Entry_divlist}
+   
+   {if $sub_object_is_addable}
+    <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+    {msgPool type=addButton}</button>
+    {else}
+    <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+    {msgPool type=addButton}</button>
+    
+   {/if}
+  </td>
+ </tr>
 </table>
-<input type="hidden" value="1" name="FAIhook_posted">
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+<input type="hidden" value="1" name="FAIhook_posted"><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 1a8e3aa38db7084e21617b54e54004ee27202424..dd01aaf4db096d2fa009fafb8737531bcc1f87dc 100644 (file)
@@ -1,87 +1,73 @@
+
 <input type="hidden" name="SubObjectFormSubmitted" value="1">
 <table width="100%" summary="{t}FAI hook entry{/t}">
-       <tr>
-               <td valign="top" width="50%">
-                       <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}">
-                                       <tr>
-                                               <td>
-                                                       {t}Name{/t}{$must}&nbsp;
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" name="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       {t}Description{/t}&nbsp;
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' value="{$description}" size="45" name="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-               <td class='left-border'>
-
-           &nbsp;
-        </td>
-               <td>
-
-                               <h3>{t}Hook attributes{/t}</h3>
-        <LABEL for="FAItask">{t}Task{/t}&nbsp;</LABEL>
-{render acl=$FAItaskACL}
-        <select id="FAItask" name="FAItask" title="{t}Choose an existing FAI task{/t}" size=1>
-          {html_options values=$tasks output=$tasks selected=$FAItask}
-        </select>
-{/render}
-               </td>
-       </tr>
+ <tr>
+  <td valign="top" width="50%">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}">
+    <tr>
+     <td>{t}Name{/t}
+      {$must}&nbsp;
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" name="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Description{/t}&nbsp;
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" name="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td class='left-border'>&nbsp;
+  </td>
+  <td>
+   <h3>{t}Hook attributes{/t}
+   </h3><LABEL for="FAItask">{t}Task{/t}&nbsp;</LABEL>
+   {render acl=$FAItaskACL}
+    <select id="FAItask" name="FAItask" title="{t}Choose an existing FAI task{/t}" size=1>
+     {html_options values=$tasks output=$tasks selected=$FAItask}
+    </select>
+   {/render}
+  </td>
+ </tr>
 </table>
-
-
 <hr>
-<h3>
-    <LABEL for="FAIscript">
-        {t}Script{/t}
-    </LABEL>
-    </h3>
-{render acl=$FAIscriptACL}
-            <textarea name="FAIscript" style="width:100%;height:300px;" id="FAIscript" 
-                               rows=20 cols=120>{$FAIscript}</textarea>
+<h3><LABEL for="FAIscript">{t}Script{/t}</LABEL>
+</h3>
+{render acl=$FAIscriptACL}<textarea name="FAIscript" style="width:100%;height:300px;" id="FAIscript"                           rows=20 cols=120>
+ {$FAIscript}</textarea>
 {/render}
 <br>
 <div>
-{render acl=$FAIscriptACL}
-    <input type="file" name="ImportFile">&nbsp;
-{/render}
-{render acl=$FAIscriptACL}
-    <button type='submit' name='ImportUpload'>{t}Import script{/t}</button>
-
-{/render}
-{render acl=$FAIscriptACL}
-       {$DownMe}
-{/render}
+ {render acl=$FAIscriptACL}
+  <input type="file" name="ImportFile">&nbsp;
+ {/render}
+ {render acl=$FAIscriptACL}
+  <button type='submit' name='ImportUpload'>{t}Import script{/t}</button>
+ {/render}
+ {render acl=$FAIscriptACL}
+  {$DownMe}
+ {/render}
 </div>
-
 <hr>
 <br>
 <div class="plugin-actions">
-{if !$freeze}
-       <button type='submit' name='SaveSubObject'>{msgPool type=applyButton}</button>&nbsp;
-
-{/if}
-       <button type='submit' name='CancelSubObject'>{msgPool type=cancelButton}</button>
-
-</div>
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+ {if !$freeze}
+  <button type='submit' name='SaveSubObject'>
+  {msgPool type=applyButton}</button>&nbsp;
+  
+ {/if}
+ <button type='submit' name='CancelSubObject'>
+ {msgPool type=cancelButton}</button>
+</div><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 59228a5207f058eeff8683ca049e43385b0b98ea..000c1fe606c8ce1d9a56376e5af315f0401561e2 100644 (file)
@@ -1,51 +1,42 @@
-{if $iframe == false}
-
-<br>
-<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}
-</p>
-<p>
-{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>
-<hr>
-<b>{t}Please enter a name for the branch{/t}</b> &nbsp;
-<input type="text" id="BranchName" name="BranchName" value="{$BranchName}" style="width:120px;">
-<hr>
-
-<div class="plugin-actions">
-  <button type='submit' name='UseBranchName'>{msgPool type=applyButton}</button>               
-  <button type='submit' name='CancelBranchName'>{msgPool type=cancelButton}</button>           
-</div>
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-       <!--
-       focus_field('BranchName');
-       -->
-</script>
-{else}
 
-<h3>{t}Processing the requested operation{/t}</h3>
-{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}&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}&amp;PerformBranch=1' target="_blank" title="{t}Perform requested operation.{/t}"><b>{t}Initiate operation{/t}</b></a>
-       </p>    
-</iframe>
-</div>
-<!--
-<hr>
-<div style="text-align: right;width:99%;">
-       <p>
-               <input type="submit" name="CancelBranchName" value="{msgPool type=backButton}">
-       </p>
-</div>
--->
-{/if}
+{if $iframe == false}
+ <br>
+ <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}
+ </p>
+ <p>{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>
+ <hr>
+ <b>{t}Please enter a name for the branch{/t}</b>&nbsp;
+ <input type="text" id="BranchName" name="BranchName" value="{$BranchName}" style="width:120px;">
+ <hr>
+ <div class="plugin-actions">
+  <button type='submit' name='UseBranchName'>
+  {msgPool type=applyButton}</button>
+  <button type='submit' name='CancelBranchName'>
+  {msgPool type=cancelButton}</button>
+ </div><!-- Place cursor -->
+ <script language="JavaScript" type="text/javascript"><!--     focus_field('BranchName');      --></script>
+ {else}
+ <h3>{t}Processing the requested operation{/t}
+ </h3>{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}&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}&amp;PerformBranch=1' target="_blank" title="{t}Perform requested operation.{/t}">
+   <b>{t}Initiate operation{/t}</b></a>
+  </p></iframe>
+ </div>
+ <!--<hr>
+ <div style="text-align: right;width:99%;">
+  <p>
+   <input type="submit" name="CancelBranchName" value="{msgPool type=backButton}">
+  </p>
+ </div>-->
+{/if}
\ No newline at end of file
index 12e3316dc5b20072d59936d4158f3809c35f0603..1d1e6d92c6a8ca83eedfa7f977906743a1f33efb 100644 (file)
@@ -1,96 +1,81 @@
-<table width="100%" summary="{t}FAI package{/t}">
-       <tr>
-               <td class='right-border'>
 
-                               <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="cn">
-                                                       {t}Name{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" disabled id="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="description">
-                                                       {t}Description{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' value="{$description}" size="45" name="description" id="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-               <td width="50%" valign="top">
-                       <h3>{t}Repository{/t}</h3>
-                               <table summary="{t}Repository settings{/t}" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       {t}Release{/t} : 
-                                               </td>
-                                               <td>
-                                                       {$release}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       {t}Section{/t} : 
-                                               </td>
-                                               <td>
-                                                       {$section}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                           <td>
-                                                 {t}Install method{/t} :
-                                               </td>
-                                               <td>
-{render acl=$FAIinstallMethodACL}
-                                                       <select name="FAIinstallMethod" title='{t}Please select the installation method{/t}' size=1>
-                                                         {html_options options=$FAIinstallMethods output=$FAIinstallMethod selected=$FAIinstallMethod}
-                                                       </select>
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-       </tr>
+<table width="100%" summary="{t}FAI package{/t}">
+ <tr>
+  <td class='right-border'>
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" disabled id="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" name="description" id="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td width="50%" valign="top">
+   <h3>{t}Repository{/t}
+   </h3>
+   <table summary="{t}Repository settings{/t}" cellspacing="4">
+    <tr>
+     <td>{t}Release{/t}:
+     </td>
+     <td>
+      {$release}
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Section{/t}:
+     </td>
+     <td>
+      {$section}
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Install method{/t}:
+     </td>
+     <td>
+      {render acl=$FAIinstallMethodACL}
+       <select name="FAIinstallMethod" title='{t}Please select the installation method{/t}' size=1>
+        {html_options options=$FAIinstallMethods output=$FAIinstallMethod selected=$FAIinstallMethod}
+       </select>
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 <hr>
 <table width="99%" summary="{t}Package settings{/t}">
-       <tr>
-               <td> 
-                       <h3>{t}Used packages{/t}</h3>
-                       {$divlist}
-               </td>
-       </tr>
-{render acl=$FAIpackageACL}
-       <tr>
-               <td>
-                       <input type="text" size="25" name="addPpkgsText" value="" />
-                       <button type='submit' name='AddManualpkg'>{msgPool type=addButton}</button>
-
-                       &nbsp;
-                       <button type='submit' name='Addpkg'>{t}Add from list{/t}</button>
-
-               </td>
-       </tr>
-{/render}
-</table>
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+ <tr>
+  <td>
+   <h3>{t}Used packages{/t}
+   </h3>
+   {$divlist}
+  </td>
+ </tr>
+ {render acl=$FAIpackageACL}
+  <tr>
+   <td>
+    <input type="text" size="25" name="addPpkgsText" value="" />
+    <button type='submit' name='AddManualpkg'>
+    {msgPool type=addButton}</button>&nbsp;
+    <button type='submit' name='Addpkg'>{t}Add from list{/t}</button>
+   </td>
+  </tr>
+ {/render}
+</table><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index bf2cfb90ba42ab524c813ee0342c6958dc06d363..40490524c5899731f315e4873f040eeef78cf951 100644 (file)
@@ -1,12 +1,12 @@
-<h1>{image path="images/forward.png" title="{t}Package{/t}"}&nbsp;{$headline}
-</h1>
+<h1>
+{image path="images/forward.png" title="{t}Package{/t}"}&nbsp;
+{$headline}</h1>
 {$Config}
 <hr>
 <br>
 <div align="right" style="align:right;">
   <button type='submit' name='SaveObjectConfig'>{msgPool type=applyButton}</button>
-
   <button type='submit' name='CancelObjectConfig'>{msgPool type=cancelButton}</button>
-
-</div>
-
<button type='submit' name='SaveObjectConfig'>
+ {msgPool type=applyButton}</button>
<button type='submit' name='CancelObjectConfig'>
+ {msgPool type=cancelButton}</button>
+</div>
\ No newline at end of file
index 3651674d47d27a20ed77df705143a0acadbaf1f1..cb3743dcecf43824c8067fef659b593034046080 100644 (file)
 
-<h3>{t}Partition{/t}</h3>
-
-<table style='width: 100%;' width="100%" summary="{t}FAI partition{/t}"> 
-  <tr>
-{if $FAIdiskType == "lvm"}
-    <td>{t}Name{/t}</td>
-    <td width="35%">
-      <input type='text' name="cn" value="{$cn}">
-    </td>
-{else}
-    <td>{t}Type{/t}</td>
-    <td width="35%">
-      <select name="FAIpartitionType" onChange='document.mainform.submit();' size=1>
-        {html_options options=$partitionTypes selected=$FAIpartitionType}
-      </select>
-      {if $cn != ""}&nbsp;({$cn}){/if}
-    </td>
-{/if}
-    <td>{t}Description{/t}</td>
-    <td width="35%">
-      <input type="text" value="{$description}" name="description">
-    </td>
-  </tr>
-
-{if $FAIdiskType == "disk" || $FAIdiskType == "lvm"}
-
-  <tr>
-    <td>{t}Size{/t}</td>
-    <td colspan=3>
-      <select name="FAIpartitionSizeType" onChange='document.mainform.submit();'>
-        {html_options options=$partitionSizeTypes selected=$FAIpartitionSizeType}
-      </select>
-      {if $FAIpartitionSizeType != "remaining"}
-        <input type='text' name='sizeStart' value='{$sizeStart}' size='5'>
-        <select name='sizeStart_Type'>
-          {html_options options=$sizeTypes selected=$sizeStart_Type}
-        </select>
-      {else}
-        <input type='text' name='dummy3' value='' size='5' disabled>
-        <select name='dummy4' disabled size=1>
-          {html_options options=$sizeTypes}
-        </select>
-      {/if}
-      &nbsp;-&nbsp;
-      {if $FAIpartitionSizeType != "fixed" && $FAIpartitionSizeType != "remaining"}
-        <input type='text' name='sizeStop' value='{$sizeStop}' size='5'>
-        <select name='sizeStop_Type'>
-          {html_options options=$sizeTypes selected=$sizeStop_Type}
-        </select>
-      {else}
-        <input type='text' name='dummy1' value='' size='5' disabled>
-        <select name='dummy2' disabled size=1>
-          {html_options options=$sizeTypes}
-        </select>
-      {/if}
-    </td>
-  </tr>
-  <tr>
-    <td colspan="4">
-      <hr>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2">
-      <input id="resize" type='checkbox' value='1' name='resize' {if $resize} checked {/if}>
-      &nbsp;<label for='resize'>{t}Resize existing partition{/t}</label>
-    </td>
-    <td colspan="2">
-      <input id="bootable" type='checkbox' value='1' name='bootable' {if $bootable} checked {/if}>
-      &nbsp;<label for='bootable'>{t}Bootable{/t}</label>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="4">
-      <input id="preserve" type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}>
-      &nbsp;<label for="preserve">{t}Preserve{/t}</label>
-      <select name='preserveType' size=1>
-        {html_options options=$preserveTypes selected=$preserveType}
-      </select>
-    </td>
-  </tr>
-
-{/if}
-
-  <tr>
-    <td colspan="4">
-      <hr>
-    </td>
-  </tr>
-
-{if $FAIdiskType == "raid"}
-
-  <tr>
-    <td colspan="4">
-      <h3>{t}Combined physical partitions{/t}</h3>      
-
-      <select name='physicalPartition[]' size=5 style="width:100%; font-family: monospace;"
-        multiple>
-        {html_options options=$plist}
-      </select>
-      <br>
-      <select name='physicalPartitionAdd' style='width:240px;' size=1>
-        {html_options options=$physicalPartitionList}
-      </select>
-      <button type='submit' name='addPhysicalPartition'>{msgPool type=addButton}</button>&nbsp; 
-
-      <button type='submit' name='delPhysicalPartition'>{msgPool type=delButton}</button>&nbsp; 
-
-      <button type='submit' name='toggleMissing'>{t}Toggle missing{/t}</button>&nbsp; 
-
-      <button type='submit' name='toggleSpare'>{t}Toggle spare{/t}</button>&nbsp; 
-
-    </td>
-  </tr>
+<h3>{t}Partition{/t}
+</h3>
+<table style='width: 100%;' width="100%" summary="{t}FAI partition{/t}">
+ <tr>
+  
+  {if $FAIdiskType == "lvm"}
+   <td>{t}Name{/t}
+   </td>
+   <td width="35%">
+    <input type='text' name="cn" value="{$cn}">
+   </td>
+   {else}
+   <td>{t}Type{/t}
+   </td>
+   <td width="35%">
+    <select name="FAIpartitionType" onChange='document.mainform.submit();' size=1>
+     {html_options options=$partitionTypes selected=$FAIpartitionType}
+    </select>
+    
+    {if $cn != ""}&nbsp;(
+     {$cn})
+     
+    {/if}
+   </td>
+   
+  {/if}
+  <td>{t}Description{/t}
+  </td>
+  <td width="35%">
+   <input type="text" value="{$description}" name="description">
+  </td>
+ </tr>
+ {if $FAIdiskType == "disk" || $FAIdiskType == "lvm"}
   <tr>
-    <td colspan="4">
-      <hr>
-    </td>
+   <td>{t}Size{/t}
+   </td>
+   <td colspan=3>
+    <select name="FAIpartitionSizeType" onChange='document.mainform.submit();'>
+     {html_options options=$partitionSizeTypes selected=$FAIpartitionSizeType}
+    </select>
+    
+    {if $FAIpartitionSizeType != "remaining"}
+     <input type='text' name='sizeStart' value='{$sizeStart}' size='5'>
+     <select name='sizeStart_Type'>
+      {html_options options=$sizeTypes selected=$sizeStart_Type}
+     </select>
+     {else}
+     <input type='text' name='dummy3' value='' size='5' disabled>
+     <select name='dummy4' disabled size=1>
+      {html_options options=$sizeTypes}
+     </select>
+     
+    {/if}&nbsp;-&nbsp;
+    
+    {if $FAIpartitionSizeType != "fixed" && $FAIpartitionSizeType != "remaining"}
+     <input type='text' name='sizeStop' value='{$sizeStop}' size='5'>
+     <select name='sizeStop_Type'>
+      {html_options options=$sizeTypes selected=$sizeStop_Type}
+     </select>
+     {else}
+     <input type='text' name='dummy1' value='' size='5' disabled>
+     <select name='dummy2' disabled size=1>
+      {html_options options=$sizeTypes}
+     </select>
+     
+    {/if}
+   </td>
   </tr>
-{/if}
-
   <tr>
-    <td>
-      {t}Filesystem{/t}
-    </td>
-    <td>
-      <select name='FAIfsType' onChange="document.mainform.submit();" size=1>
-        {html_options options=$FAIfsTypes selected=$FAIfsType}
-      </select>
-    </td>
-    <td>
-      {t}Filesystem create options{/t}
-    </td>
-    <td>
-      <input type='text' name="FAIfsCreateOptions" value="{$FAIfsCreateOptions}">
-    </td>
+   <td colspan="4">
+    <hr>
+   </td>
   </tr>
   <tr>
-    <td colspan=2>
-      <input id="encrypted" type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}>
-      &nbsp;<label for="encrypted">{t}Encrypted{/t}</label>
-    </td>
-    <td>
-      {t}Tune options{/t}
-    </td>
-    <td>
-      <input type='text' name="FAIfsTuneOptions" value="{$FAIfsTuneOptions}">
-    </td>
+   <td colspan="2">
+    
+    
+    <input id="resize" type='checkbox' value='1' name='resize' {if $resize} checked {/if}>      &nbsp;<label for='resize'>{t}Resize existing partition{/t}</label>
+   </td>
+   <td colspan="2">
+    
+    
+    <input id="bootable" type='checkbox' value='1' name='bootable' {if $bootable} checked {/if}>      &nbsp;<label for='bootable'>{t}Bootable{/t}</label>
+   </td>
   </tr>
   <tr>
-    <td colspan="4">
-      <hr>
-    </td>
+   <td colspan="4">
+    
+    
+    <input id="preserve" type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}>      &nbsp;<label for="preserve">{t}Preserve{/t}</label>
+    <select name='preserveType' size=1>
+     {html_options options=$preserveTypes selected=$preserveType}
+    </select>
+   </td>
   </tr>
+  
+ {/if}
+ <tr>
+  <td colspan="4">
+   <hr>
+  </td>
+ </tr>
+ {if $FAIdiskType == "raid"}
   <tr>
-    <td>
-      {t}Mount point{/t}
-    </td>
-    <td>
-      {if $FAIfsType != "swap"}
-        <input type='text' name="FAImountPoint" value="{$FAImountPoint}">
-      {else}
-        <input type='text' name="dummy10" value="swap" disabled>
-      {/if}
-    </td>
-    <td>
-      {t}Mount options{/t}
-    </td>
-    <td>
-      <input type='text' name="FAImountOptions" value="{$FAImountOptions}">
-    </td>
+   <td colspan="4">
+    <h3>{t}Combined physical partitions{/t}
+    </h3>
+    <select name='physicalPartition[]' size=5 style="width:100%; font-family: monospace;"        multiple>
+     {html_options options=$plist}
+    </select>
+    <br>
+    <select name='physicalPartitionAdd' style='width:240px;' size=1>
+     {html_options options=$physicalPartitionList}
+    </select>
+    <button type='submit' name='addPhysicalPartition'>
+    {msgPool type=addButton}</button>&nbsp;
+    <button type='submit' name='delPhysicalPartition'>
+    {msgPool type=delButton}</button>&nbsp;
+    <button type='submit' name='toggleMissing'>{t}Toggle missing{/t}</button>&nbsp;
+    <button type='submit' name='toggleSpare'>{t}Toggle spare{/t}</button>&nbsp;
+   </td>
   </tr>
-
-  <!-- Table cell sizing  --> 
   <tr>
-    <td colspan=2 style='width:50%;'></td>
-    <td colspan=2 style='width:50%;'></td>
+   <td colspan="4">
+    <hr>
+   </td>
   </tr>
+  
+ {/if}
+ <tr>
+  <td>{t}Filesystem{/t}
+  </td>
+  <td>
+   <select name='FAIfsType' onChange="document.mainform.submit();" size=1>
+    {html_options options=$FAIfsTypes selected=$FAIfsType}
+   </select>
+  </td>
+  <td>{t}Filesystem create options{/t}
+  </td>
+  <td>
+   <input type='text' name="FAIfsCreateOptions" value="{$FAIfsCreateOptions}">
+  </td>
+ </tr>
+ <tr>
+  <td colspan=2>
+   
+   
+   <input id="encrypted" type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}>      &nbsp;<label for="encrypted">{t}Encrypted{/t}</label>
+  </td>
+  <td>{t}Tune options{/t}
+  </td>
+  <td>
+   <input type='text' name="FAIfsTuneOptions" value="{$FAIfsTuneOptions}">
+  </td>
+ </tr>
+ <tr>
+  <td colspan="4">
+   <hr>
+  </td>
+ </tr>
+ <tr>
+  <td>{t}Mount point{/t}
+  </td>
+  <td>
+   
+   {if $FAIfsType != "swap"}
+    <input type='text' name="FAImountPoint" value="{$FAImountPoint}">
+    {else}
+    <input type='text' name="dummy10" value="swap" disabled>
+    
+   {/if}
+  </td>
+  <td>{t}Mount options{/t}
+  </td>
+  <td>
+   <input type='text' name="FAImountOptions" value="{$FAImountOptions}">
+  </td>
+ </tr><!-- Table cell sizing  -->
+ <tr>
+  <td colspan=2 style='width:50%;'>
+  </td>
+  <td colspan=2 style='width:50%;'>
+  </td>
+ </tr>
 </table>
-
 <input type='hidden' name='faiPartition' value='1'>
 <hr>
 <div style='text-align:right; width:100%; padding:5px'>
-  {if !$freeze}
-  <button type='submit' name='PartitionSave'>{msgPool type=okButton}</button>
-
-  &nbsp;
-  {/if}
-  <button type='submit' name='PartitionCancel'>{msgPool type=cancelButton}</button>
-
-</div>
+ {if !$freeze}
+  <button type='submit' name='PartitionSave'>
+  {msgPool type=okButton}</button>&nbsp;
+  
+ {/if}
+ <button type='submit' name='PartitionCancel'>
+ {msgPool type=cancelButton}</button>
+</div>
\ No newline at end of file
index 5bc0241cc5e653334637ebc02b382a898e42d852..a6a90cc19db540d6ad340d29303fd53498e46c1e 100644 (file)
@@ -1,73 +1,56 @@
-<table width="100%" summary="{t}FAI partition table{/t}">
-       <tr>
-               <td width="50%" valign="top">
-
-                               <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="cn">
-                                                       {t}Name{/t}{$must}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" maxlength="80" id='cn' disabled >
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="description">
-                                                       {t}Description{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-                                <hr>
-                                <p>
-                                <input type="checkbox" name="mode" value="1" {$mode} {$lockmode} onClick="changeState('AddRaid'); changeState('AddVolgroup');"> {t}Use 'setup-storage' to partition the disk{/t}                                      </p>
-               </td>
-               <td class='left-border'>
-
-                  &nbsp;
-               </td>
-               <td>
-                               <h3>
-                                       <LABEL for="SubObject">
-                                               {t}Discs{/t}
-                                       </LABEL>
-                               </h3>
-                                {$Entry_divlist}
-{if $sub_object_is_addable}
-                                <button type='submit' name='AddDisk' title="{t}Add disk{/t}">{t}Add disk{/t}</button>
-
-                                <button type='submit' name='AddRaid' id="AddRaid" title="{t}Add RAID{/t}">{t}Add RAID{/t}</button>
-
-                                <button type='submit' name='AddVolgroup' id="AddVolgroup" title="{t}Add volume group{/t}">{t}Add volume group{/t}</button>
-
-{else}
-                                <button type='submit' name='AddDisk' title="{t}Add disk{/t}">{t}Add disk{/t}</button>
 
-                                <button type='submit' name='AddRaid' title="{t}Add RAID{/t}">{t}Add RAID{/t}</button>
-
-                                <button type='submit' name='AddVolgroup' title="{t}Add volume group{/t}">{t}Add volume group{/t}</button>
-
-{/if}
-
-               </td>
-       </tr>
+<table width="100%" summary="{t}FAI partition table{/t}">
+ <tr>
+  <td width="50%" valign="top">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}
+      {$must}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" id='cn' disabled >
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+   <hr>
+   <p>
+    <input type="checkbox" name="mode" value="1" {$mode} {$lockmode} id='setup-storage'
+      onClick="changeState('AddRaid'); changeState('AddVolgroup');">
+    <label for='setup-storage'>{t}Use 'setup-storage' to partition the disk{/t}</label>
+   </p>
+  </td>
+  <td class='left-border'>&nbsp;
+  </td>
+  <td>
+   <h3><LABEL for="SubObject">{t}Discs{/t}</LABEL>
+   </h3>
+   {$Entry_divlist}
+   
+   {if $sub_object_is_addable}
+    <button type='submit' name='AddDisk' title="{t}Add disk{/t}">{t}Add disk{/t}</button>
+    <button type='submit' name='AddRaid' id="AddRaid" title="{t}Add RAID{/t}">{t}Add RAID{/t}</button>
+    <button type='submit' name='AddVolgroup' id="AddVolgroup" title="{t}Add volume group{/t}">{t}Add volume group{/t}</button>
+    {else}
+    <button type='submit' name='AddDisk' title="{t}Add disk{/t}">{t}Add disk{/t}</button>
+    <button type='submit' name='AddRaid' title="{t}Add RAID{/t}">{t}Add RAID{/t}</button>
+    <button type='submit' name='AddVolgroup' title="{t}Add volume group{/t}">{t}Add volume group{/t}</button>
+    
+   {/if}
+  </td>
+ </tr>
 </table>
-<input type='hidden' name='FAIpartitionTablePosted' value='1'>
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+<input type='hidden' name='FAIpartitionTablePosted' value='1'><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
index 2b17ae6d1fc6e2f81a97501bb3163284203d279f..6194137fbe6119034f38c9fb770498ada2465993 100644 (file)
@@ -1,55 +1,52 @@
+
 <input type="hidden" name="TableEntryFrameSubmitted" value="1">
-<h3>{t}Device{/t}</h3>
+<h3>{t}Device{/t}
+</h3>
 <table style='width:100%' summary="{t}FAI partition table entry{/t}">
-       <tr>
-               <td style='width:50%;' class='right-border'>
-<LABEL for="DISKcn">
-                       {t}Name{/t}
-                       </LABEL>{$must}&nbsp;
-{render acl=$DISKcnACL}
-                       <input type='text' value="{$DISKcn}" size="45" maxlength="80" name="DISKcn" id="DISKcn">
-{/render}
-               </td>
-               <td><LABEL for="DISKdescription">
-                       &nbsp;{t}Description{/t}
-                       </LABEL>&nbsp;
-{render acl=$DISKdescriptionACL}
-                       <input type='text' value="{$DISKdescription}" size="45" maxlength="80" name="DISKdescription" id="DISKdescription">
-{/render}
-               </td>
-       </tr>
+ <tr>
+  <td style='width:50%;' class='right-border'><LABEL for="DISKcn">{t}Name{/t}</LABEL>
+   {$must}&nbsp;
+   {render acl=$DISKcnACL}
+    <input type='text' value="{$DISKcn}" size="45" maxlength="80" name="DISKcn" id="DISKcn">
+   {/render}
+  </td>
+  <td><LABEL for="DISKdescription">&nbsp;{t}Description{/t}</LABEL>&nbsp;
+   {render acl=$DISKdescriptionACL}
+    <input type='text' value="{$DISKdescription}" size="45" maxlength="80" name="DISKdescription" id="DISKdescription">
+   {/render}
+  </td>
+ </tr>
 </table>
 <br>
 <hr>
 <br>
-<h3>{t}Partition entries{/t}</h3>
+<h3>{t}Partition entries{/t}
+</h3>
 {$setup}
 <br>
-{if !$freeze}
-       {if $sub_object_is_createable}
-               <button type='submit' name='AddPartition'>{t}Add partition{/t}</button>
-
-       {else}
-               <button type='submit' name='restricted'>{t}Add partition{/t}</button>
 
-       {/if}
+{if !$freeze}
+ {if $sub_object_is_createable}
+  <button type='submit' name='AddPartition'>{t}Add partition{/t}</button>
+  {else}
+  <button type='submit' name='restricted'>{t}Add partition{/t}</button>
+  
+ {/if}
 {/if}
-<br>   
+<br>
 <br>
 <hr>
 <br>
 <div class="plugin-actions">
-{if !$freeze}
-       <button type='submit' name='SaveDisk'>{msgPool type=saveButton}</button>
-
-{/if}
-<button type='submit' name='CancelDisk'>{msgPool type=cancelButton}</button>
-
-</div>
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('DISK_cn');
-  -->
-</script>
-
+ {if !$freeze}
+  <button type='submit' name='SaveDisk'>
+  {msgPool type=saveButton}</button>
+  
+ {/if}
+ <button type='submit' name='CancelDisk'>
+ {msgPool type=cancelButton}</button>
+</div><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('DISK_cn');  --></script>
index 8dc53673f51169c3bf86b44f38e1567930d99480..c56d39879f2e9ce0261b7f8e020067bcd32fd1e1 100644 (file)
@@ -1,62 +1,51 @@
-<table width="100%" summary="{t}FAI profile{/t}">
-       <tr>
-               <td width="50%" valign="top">
-                       <h3>{t}Generic{/t}</h3>
-                       <table summary="{t}Generic settings{/t}" cellspacing="4">
-                               <tr>
-                                       <td>
-                                               <LABEL for="cn">
-                                               {t}Name{/t}{$must}
-                                               </LABEL>
-                                       </td>
-                                       <td>
-{render acl=$cnACL}
-                                               <input type='text' value="{$cn}" size="45" maxlength="80" id="cn" name="cn">
-{/render}
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               <LABEL for="description">
-                                               {t}Description{/t}
-                                               </LABEL>
-                                       </td>
-                                       <td>
-{render acl=$descriptionACL}
-                                               <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
-{/render}
-                                       </td>
-                               </tr>
-                       </table>
-               </td>
-               <td class='left-border'>
-
-                       <table summary="{t}FAI classes{/t}" width="100%">
-
-                               <tr>
-                                       <td>
-
-                                               <h3>{t}FAI classes{/t}</h3> 
-<!--                                           <select name="FAIclass" title="{t}Choose a priority{/t}" size="20" style="width:100%;" multiple>
-                                                       {html_options values=$FAIclasses output=$FAIclasses}
-                                               </select>-->
-                                               {$divlist}
-                                               <br>
-{render acl=$FAIclassACL}
-                                               <button type='submit' name='AddClass'>{msgPool type=addButton}</button>
-
-{/render}
-                                               <input type="hidden" name="edit_helper">
-                                       </td>
-                               </tr>
-                       </table>
-               </td>
-       </tr>
-</table>
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
 
+<table width="100%" summary="{t}FAI profile{/t}">
+ <tr>
+  <td width="50%" valign="top">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}
+      {$must}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" id="cn" name="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td class='left-border'>
+   <table summary="{t}FAI classes{/t}" width="100%">
+    <tr>
+     <td>
+      <h3>{t}FAI classes{/t}
+      </h3>
+      <!--                                             <select name="FAIclass" title="{t}Choose a priority{/t}" size="20" style="width:100%;" multiple>
+       {html_options values=$FAIclasses output=$FAIclasses}
+      </select>-->
+      {$divlist}
+      <br>
+      {render acl=$FAIclassACL}
+       <button type='submit' name='AddClass'>
+       {msgPool type=addButton}</button>
+      {/render}
+      <input type="hidden" name="edit_helper">
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+</table><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 9baf4e3a8d1dafe4823f6e023013c31f2dc37b33..58e0982b106aa9f4dcd101190ec7b6f06e8acf0a 100644 (file)
@@ -1,83 +1,94 @@
-<table style='width:100%; ' summary="{t}FAI profile entry{/t}">
 
-<tr>
+<table style='width:100%; ' summary="{t}FAI profile entry{/t}">
+ <tr>
   <td style='width:600px'>
-
-       <div class="contentboxh" style="height:20px">
-       <p class="contentboxh" style="font-size:12px">
-               {t}List of FAI objects (Fully Automatic Installation){/t}
-       </p>
-       </div>
-       <div class="contentboxb">
-       {$faihead}
-       </div>
-       <div style='height:4px;'></div>
-       <div class="contentboxb" style="border-top:1px solid #B0B0B0;">
-       {$failist}
-               <input type=hidden name="edit_helper">
-       </div>
+   <div class="contentboxh" style="height:20px">
+    <p class="contentboxh" style="font-size:12px">{t}List of FAI objects (Fully Automatic Installation){/t}
+    </p>
+   </div>
+   <div class="contentboxb">
+    {$faihead}
+   </div>
+   <div style='height:4px;'>
+   </div>
+   <div class="contentboxb" style="border-top:1px solid #B0B0B0;">
+    {$failist}
+    <input type=hidden name="edit_helper">
+   </div>
   </td>
   <td>
-
-       <div class="contentboxh" style="height:20px;border-bottom:1px solid #B0B0B0">
-       <p class="contentboxh" style="font-size:12px">
-                       {image path="{$infoimage}" align="right"}{t}Information{/t}
-
-               </p>
-       </div>
-       <div class="contentboxb">
-               <p class="contentboxb" style="border-color:#f0f0f0;">
-               {t}This menu allows you to select FAI class names and to add them to the currently edited profile.{/t}
-               </p>
-       </div>
-       <br>
-       <div class="contentboxh" style="height:20px">
-       <p class="contentboxh" style="font-size:12px">{image path="{$launchimage}" align="right"}{t}Filters{/t}
-</p>
-       </div>
-       <div class="contentboxb">
-       <table style='width:100%;' summary="{t}Filter options{/t}">
-
-               {$alphabet}
-       </table>
-               <table style='width:100%;' summary="{t}Filter options{/t}">
-
-                       <tr><td><input onClick='document.mainform.submit()' 
-                                                               type="checkbox" name="SShowTemplates"   {$SShowTemplatesCHK}>{t}Show only classes with templates{/t}</td></tr>
-                       <tr><td><input onClick='document.mainform.submit()'
-                                                                       type="checkbox" name="SShowScripts"             {$SShowScriptsCHK}>{t}Show only classes with scripts{/t}</td></tr>
-                       <tr><td><input onClick='document.mainform.submit()'
-                                                                       type="checkbox" name="SShowHooks"               {$SShowHooksCHK}>{t}Show only classes with hooks{/t}</td></tr>
-                       <tr><td><input onClick='document.mainform.submit()'
-                                                                       type="checkbox" name="SShowVariables"   {$SShowVariablesCHK}>{t}Show only classes with variables{/t}</td></tr>
-                       <tr><td><input onClick='document.mainform.submit()'
-                                                                       type="checkbox" name="SShowPackages"    {$SShowPackagesCHK}>{t}Show only classes with packages{/t}</td></tr>
-                       <tr><td><input onClick='document.mainform.submit()'
-                                                               type="checkbox" name="SShowPartitions"  {$SShowPartitionsCHK}>{t}Show only classes with partitions{/t}</td></tr>
-                </table>
-        <table style='width:100%;' summary="{t}Filter options{/t}">
-
-               <tr>
-                       <td>
-                                       {image path="{$search_image}"}
-                                                       align=middle title='{t}Display objects matching{/t}'>
-                       </td>
-                       <td width="99%">
-                                       <input type='text' name='Sregex' maxlength='20' style='width:99%' value='{$Sregex}' id='filter' 
-                                               title='{t}Regular expression for matching object names{/t}' >
-                       </td>
-               </tr>
-       </table>
-               {$apply}
-               </div>
-       </td>
-</tr>
+   <div class="contentboxh" style="height:20px;border-bottom:1px solid #B0B0B0">
+    <p class="contentboxh" style="font-size:12px">
+     {image path="
+     {$infoimage}" align="right"}{t}Information{/t}
+    </p>
+   </div>
+   <div class="contentboxb">
+    <p class="contentboxb" style="border-color:#f0f0f0;">{t}This menu allows you to select FAI class names and to add them to the currently edited profile.{/t}
+    </p>
+   </div>
+   <br>
+   <div class="contentboxh" style="height:20px">
+    <p class="contentboxh" style="font-size:12px">
+     {image path="
+     {$launchimage}" align="right"}{t}Filters{/t}
+    </p>
+   </div>
+   <div class="contentboxb">
+    <table style='width:100%;' summary="{t}Filter options{/t}">
+     {$alphabet}
+    </table>
+    <table style='width:100%;' summary="{t}Filter options{/t}">
+     <tr>
+      <td>
+       <input onClick='document.mainform.submit()'                                                             type="checkbox" name="SShowTemplates"   {$SShowTemplatesCHK}>{t}Show only classes with templates{/t}
+      </td>
+     </tr>
+     <tr>
+      <td>
+       <input onClick='document.mainform.submit()'                                                                     type="checkbox" name="SShowScripts"             {$SShowScriptsCHK}>{t}Show only classes with scripts{/t}
+      </td>
+     </tr>
+     <tr>
+      <td>
+       <input onClick='document.mainform.submit()'                                                                     type="checkbox" name="SShowHooks"               {$SShowHooksCHK}>{t}Show only classes with hooks{/t}
+      </td>
+     </tr>
+     <tr>
+      <td>
+       <input onClick='document.mainform.submit()'                                                                     type="checkbox" name="SShowVariables"   {$SShowVariablesCHK}>{t}Show only classes with variables{/t}
+      </td>
+     </tr>
+     <tr>
+      <td>
+       <input onClick='document.mainform.submit()'                                                                     type="checkbox" name="SShowPackages"    {$SShowPackagesCHK}>{t}Show only classes with packages{/t}
+      </td>
+     </tr>
+     <tr>
+      <td>
+       <input onClick='document.mainform.submit()'                                                             type="checkbox" name="SShowPartitions"  {$SShowPartitionsCHK}>{t}Show only classes with partitions{/t}
+      </td>
+     </tr>
+    </table>
+    <table style='width:100%;' summary="{t}Filter options{/t}">
+     <tr>
+      <td>
+       {image path="
+       {$search_image}"}align=middle title='{t}Display objects matching{/t}'>
+      </td>
+      <td width="99%">
+       <input type='text' name='Sregex' maxlength='20' style='width:99%' value='{$Sregex}' id='filter'                                                 title='{t}Regular expression for matching object names{/t}' >
+      </td>
+     </tr>
+    </table>
+    {$apply}
+   </div>
+  </td>
+ </tr>
 </table>
-
 <div align="right" style="align:right;">
      <button type='submit' name='SaveSubObject'>{msgPool type=applyButton}</button>
-
      <button type='submit' name='CancelSubObject'>{msgPool type=cancelButton}</button>
-
-</div>
-<!-- Place cursor -->
<button type='submit' name='SaveSubObject'>
+ {msgPool type=applyButton}</button>
<button type='submit' name='CancelSubObject'>
+ {msgPool type=cancelButton}</button>
+</div><!-- Place cursor -->
\ No newline at end of file
index 24ea23c96fcce069a8b9e8bd0a8f2de5898d5568..9b4e8155195ece50ff141a6f057954fb5d4c906d 100644 (file)
@@ -1,58 +1,52 @@
+
 <table width="100%" summary="{t}FAI script{/t}">
-       <tr>
-               <td width="50%" valign="top">
-                               <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="cn">
-                                                       {t}Name{/t}{$must}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}"  maxlength="80" size="45" disabled id="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="description">
-                                                       {t}Description{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' size="45" maxlength="80" value="{$description}" name="description" id="description" >
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-       </tr>
+ <tr>
+  <td width="50%" valign="top">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}
+      {$must}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}"  maxlength="80" size="45" disabled id="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' size="45" maxlength="80" value="{$description}" name="description" id="description" >
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 <hr>
 <table width="100%" summary="{t}List of scripts{/t}">
-       <tr>
-               <td>
-                       <h3>
-                                       {t}List of scripts{/t}
-                       </h3>
-      {$Entry_divlist}
-      <hr>
-      {if $sub_object_is_addable}
-        <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-      {else}
-        <button type='submit' name='Dummy2' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-      {/if}
-               </td>
-       </tr>
+ <tr>
+  <td>
+   <h3>{t}List of scripts{/t}
+   </h3>
+   {$Entry_divlist}
+   <hr>
+   
+   {if $sub_object_is_addable}
+    <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+    {msgPool type=addButton}</button>
+    {else}
+    <button type='submit' name='Dummy2' title="{msgPool type=addButton}">
+    {msgPool type=addButton}</button>
+    
+   {/if}
+  </td>
+ </tr>
 </table>
-<input type="hidden" value="1" name="FAIscript_posted" >
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-<!--
-       focus_field("cn","description");
--->
-</script>
-
+<input type="hidden" value="1" name="FAIscript_posted" ><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!--      focus_field("cn","description");--></script>
\ No newline at end of file
index 4b5d41c453e063587177dade4c9dcfba921ef322..66090f6241ae901d2fb6b418a76011520e7488e3 100644 (file)
@@ -1,91 +1,81 @@
+
 <input type="hidden" name="SubObjectFormSubmitted" value="1">
 <table width="100%" summary="{t}FAI script{/t}">
-       <tr>
-               <td valign="top" width="50%">
-                       <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}">
-                                       <tr>
-                                               <td>
-                                                       {t}Name{/t}{$must}&nbsp;
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" maxlength="80" name="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       {t}Description{/t}&nbsp;
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' size="45" maxlength="80" value="{$description}" name="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-               <td class='left-border'>
-
-           &nbsp;
-        </td>
-               <td valign="top">
-                               <h3>{t}Script attributes{/t}</h3>
-                               <table summary="{t}Priority configuration{/t}" width="100%">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="FAIpriority">
-                                                       {t}Priority{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$FAIpriorityACL}
-                                                   <select id="FAIpriority" name="FAIpriority" title="{t}Choose a priority. Low values result in an earlier, high values in a later execution.{/t}" size=1>
-                                               {html_options options=$FAIprioritys selected=$FAIpriority}
-                                       </select>
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-       </tr>
+ <tr>
+  <td valign="top" width="50%">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}">
+    <tr>
+     <td>{t}Name{/t}
+      {$must}&nbsp;
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" name="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Description{/t}&nbsp;
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' size="45" maxlength="80" value="{$description}" name="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td class='left-border'>&nbsp;
+  </td>
+  <td valign="top">
+   <h3>{t}Script attributes{/t}
+   </h3>
+   <table summary="{t}Priority configuration{/t}" width="100%">
+    <tr>
+     <td><LABEL for="FAIpriority">{t}Priority{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$FAIpriorityACL}
+       <select id="FAIpriority" name="FAIpriority" title="{t}Choose a priority. Low values result in an earlier, high values in a later execution.{/t}" size=1>
+        {html_options options=$FAIprioritys selected=$FAIpriority}
+       </select>
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 <hr>
-<h3>
-       <LABEL for="FAIscript">
-               {t}Script{/t}
-       </LABEL>
-       </h3>
-{render acl=$FAIscriptACL}
-            <textarea name="FAIscript" style="width:100%;height:300px;" id="FAIscript"  
-                               rows="20" cols="120">{$FAIscript}</textarea>
+<h3><LABEL for="FAIscript">{t}Script{/t}</LABEL>
+</h3>
+{render acl=$FAIscriptACL}<textarea name="FAIscript" style="width:100%;height:300px;" id="FAIscript"                           rows="20" cols="120">
+ {$FAIscript}</textarea>
 {/render}
 <br>
 <div>
-{render acl=$FAIscriptACL}
-       <input type="file" name="ImportFile">&nbsp;
-{/render}
-{render acl=$FAIscriptACL}
-       <button type='submit' name='ImportUpload'>{t}Import script{/t}</button>
-
-{/render}
-{render acl=$FAIscriptACL}
-       {$DownMe}
-{/render}
+ {render acl=$FAIscriptACL}
+  <input type="file" name="ImportFile">&nbsp;
+ {/render}
+ {render acl=$FAIscriptACL}
+  <button type='submit' name='ImportUpload'>{t}Import script{/t}</button>
+ {/render}
+ {render acl=$FAIscriptACL}
+  {$DownMe}
+ {/render}
 </div>
 <br>
 <hr>
 <div class="plugin-actions">
-{if !$freeze}
-       <button type='submit' name='SaveSubObject'>{msgPool type=applyButton}</button>&nbsp;
-{/if}
-       <button type='submit' name='CancelSubObject'>{msgPool type=cancelButton}</button>
-</div>
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+ {if !$freeze}
+  <button type='submit' name='SaveSubObject'>
+  {msgPool type=applyButton}</button>&nbsp;
+  
+ {/if}
+ <button type='submit' name='CancelSubObject'>
+ {msgPool type=cancelButton}</button>
+</div><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 1dd9c94774285a478061119dd9b1c1aca40c66a0..d5e79f2f4c81482bcd2e5b9893d85645429edcc6 100644 (file)
@@ -1,25 +1,30 @@
+
 <table style='width:100%; ' summary="{t}Summary of used FAI classes{/t}">
  <tr>
-  <td><h3>{t}FAI object tree{/t}</h3></td>
- </tr>
-{if $readable}
- <tr>
-       <td>
-               {image path="images/lists/reload.png" action="reloadList"}      
-               {t}Reload class and release configuration from parent object.{/t}
-       </td>
+  <td>
+   <h3>{t}FAI object tree{/t}
+   </h3>
+  </td>
  </tr>
- <tr>
-       <td>
-   {$objectList}
-       </td>
- </tr>
-{else}
-<tr>
- <td>
-  <h3>{t}You are not allowed to view the fai summary.{/t}</h3>
- </td>
-</tr>
-{/if}
-</table>
-
+ {if $readable}
+  <tr>
+   <td>
+    {image path="images/lists/reload.png" action="reloadList"}{t}Reload class and release configuration from parent object.{/t}
+   </td>
+  </tr>
+  <tr>
+   <td>
+    {$objectList}
+   </td>
+  </tr>
+  {else}
+  <tr>
+   <td>
+    <h3>{t}You are not allowed to view the fai summary.{/t}
+    </h3>
+   </td>
+  </tr>
+  
+ {/if}
+</table>
\ No newline at end of file
index 04e66c3ab62fa2de325c47c62783b38cc9edae21..7fc77057fde4333646f85d2b897b848b026b144e 100644 (file)
@@ -1,55 +1,46 @@
-<table summary="" width="100%">
-       <tr>
-               <td style='width:50%' class='right-border'>
-
-                               <h3>{t}Generic{/t}</h3>
-                               <table summary="" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="cn">
-                                                       {t}Name{/t}{$must}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" maxlength="80" disabled id="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="description">
-                                                       {t}Description{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-               <td style="width:50%">
-                               <h3>
-                                       {t}List of template files{/t}
-                               </h3>
-                       {$Entry_divlist}
-{if $sub_object_is_addable}
-                               <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-
-{else}
-                               <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
 
-{/if}
-               </td>
-       </tr>
+<table summary="" width="100%">
+ <tr>
+  <td style='width:50%' class='right-border'>
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}
+      {$must}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" disabled id="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" maxlength="80" name="description" id="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td style="width:50%">
+   <h3>{t}List of template files{/t}
+   </h3>
+   {$Entry_divlist}
+   
+   {if $sub_object_is_addable}
+    <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+    {msgPool type=addButton}</button>
+    {else}
+    <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+    {msgPool type=addButton}</button>
+    
+   {/if}
+  </td>
+ </tr>
 </table>
-<input type="hidden" value="1" name="FAItemplate_posted">
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+<input type="hidden" value="1" name="FAItemplate_posted"><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 1eb15ba168e61438f81bf2475ad1c665d9ffa442..081223ed10363b47177e3b9965a02c4354f4c8e1 100644 (file)
@@ -1,37 +1,33 @@
-<h3>Template entry</h3>
 
-{if !$mb_extension}
-
-{msgPool type=missingext param1='multi byte'}
+<h3>Template entry
+</h3>
 
-<p class='seperator'>
+{if !$mb_extension}
+ {msgPool type=missingext param1='multi byte'}
+ <p class='seperator'>
   <div style='text-align:right;'>
-    <button type='submit' name='templateEditCancel'>{msgPool type=cancelButton}</button>
-
+   <button type='submit' name='templateEditCancel'>
+   {msgPool type=cancelButton}</button>
   </div>
-</p>
-
-{else}
-
-{if $write_protect}
-{t}This FAI template is write protected. Editing may break it!{/t}
-<br><button type='submit' name='editAnyway'>{t}Edit anyway{/t}</button>
-
-{/if}
-
-<textarea {if $write_protect} disabled {/if}
-  style='width:100%; height: 350px;'
-  {if !$write_protect}name="templateValue"{/if}
->{$templateValue}</textarea>
-
-<p class='seperator'>
+ </p>
+ {else}
+ {if $write_protect}{t}This FAI template is write protected. Editing may break it!{/t}
+  <br>
+  <button type='submit' name='editAnyway'>{t}Edit anyway{/t}</button>
+  
+ {/if}
+ <textarea {if $write_protect} disabled {/if}  style='width:100%; height: 350px;'  {if !$write_protect}name="templateValue"{/if}>
+ {$templateValue}</textarea>
+ <p class='seperator'>
   <div style='text-align:right;'>
-    <button type='submit' name='templateEditSave'>{msgPool type=okButton}</button>
-
-    &nbsp;
-    <button type='submit' name='templateEditCancel'>{msgPool type=cancelButton}</button>
-
+   <button type='submit' name='templateEditSave'>
+   {msgPool type=okButton}</button>&nbsp;
+   <button type='submit' name='templateEditCancel'>
+   {msgPool type=cancelButton}</button>
   </div>
-</p>
-
-{/if}
+ </p>
+{/if}
\ No newline at end of file
index 689f0eb47ec284b748ba86d6a3ba0b4eb5ce09f9..cb238b8b70259916ad6dcd7f54208eb7a476ccfd 100644 (file)
-<input type="hidden" name="SubObjectFormSubmitted" value="1">
 
-<h3>{t}Generic{/t}</h3>
+<input type="hidden" name="SubObjectFormSubmitted" value="1">
+<h3>{t}Generic{/t}
+</h3>
 <table width="100%" summary="{t}FAI template entry{/t}">
-<tr>
+ <tr>
   <td style='width:50%;padding-right:10px;' class='right-border'>
-
-               <table style='width:100%;' summary="{t}Generic settings{/t}">
-                 <tr>
-                   <td>
-               {t}File name{/t}{$must}&nbsp;
-                   </td>
-                   <td style='width:100%;'>
-{render acl=$cnACL}
-                     <input style='width:100%;' value="{$templateFile}" 
-            name="templateFile" maxlength="80">
-{/render}
-                   </td>
-           </tr>
-                 <tr>
-                         <td>
-                                 <LABEL for="templatePath">
-                                       {t}Destination path{/t}{$must}&nbsp;
-                                 </LABEL>
-                         </td>
-                         <td>
-{render acl=$FAItemplatePathACL}
-                                 <input style='width:100%;' type="text" name="templatePath" 
-            value="{$templatePath}" id="templatePath" >
-{/render}
-                               </td>
-      </tr>
-               </table>
-       </td>
-  <td>
-
-    {t}Description{/t}
-{render acl=$descriptionACL}
-    <input  style='width:100%;' maxlength="80" 
-      value="{$description}" name="description">
-{/render}
+   <table style='width:100%;' summary="{t}Generic settings{/t}">
+    <tr>
+     <td>{t}File name{/t}
+      {$must}&nbsp;
+     </td>
+     <td style='width:100%;'>
+      {render acl=$cnACL}
+       <input style='width:100%;' value="{$templateFile}"             name="templateFile" maxlength="80">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="templatePath">{t}Destination path{/t}
+      {$must}&nbsp;</LABEL>
+     </td>
+     <td>
+      {render acl=$FAItemplatePathACL}
+       <input style='width:100%;' type="text" name="templatePath"             value="{$templatePath}" id="templatePath" >
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td>{t}Description{/t}
+   {render acl=$descriptionACL}
+    <input  style='width:100%;' maxlength="80"       value="{$description}" name="description">
+   {/render}
   </td>
-</tr>
+ </tr>
 </table>
-
 <hr>
-
 <table width="100%" summary="{t}Template attributes{/t}">
-<tr>
+ <tr>
   <td colspan=2>
-    <h3>
-      <img class="center" alt="" 
-        src="plugins/fai/images/fai_template.png" 
-        title="{t}Template attributes{/t}">&nbsp;{t}Template attributes{/t}
-    </h3>
+   <h3><img class="center" alt=""         src="plugins/fai/images/fai_template.png"         title="{t}Template attributes{/t}">&nbsp;{t}Template attributes{/t}
+   </h3>
   </td>
-</tr>
-<tr>
+ </tr>
+ <tr>
   <td style='width:50%;' class='right-border'>
-
-  <table summary="{t}Template file status{/t}">
+   <table summary="{t}Template file status{/t}">
     <tr>
-      <td>
-        {t}File{/t}{$must}:&nbsp; {$status}
-        {if $bStatus}
-          <a href="{$plug}&amp;getFAItemplate">
-          <img class="center" alt="{t}Save template{/t}..." 
-            title="{t}Save template{/t}..." src="images/save.png" border="0" />
-          </a>
-          <a href="{$plug}&amp;editFAItemplate">
-          <img class="center" alt="{t}Edit template{/t}..." 
-            title="{t}Edit template{/t}..." src="images/lists/edit.png" border="0" />
-          </a>
-        {/if}
-      </td>
+     <td>{t}File{/t}
+      {$must}:&nbsp;
+      {$status}
+      
+      {if $bStatus}
+       <a href="{$plug}&amp;getFAItemplate"><img class="center" alt="{t}Save template{/t}..."             title="{t}Save template{/t}..." src="images/save.png" border="0" /></a>
+       <a href="{$plug}&amp;editFAItemplate"><img class="center" alt="{t}Edit template{/t}..."             title="{t}Edit template{/t}..." src="images/lists/edit.png" border="0" /></a>
+       
+      {/if}
+     </td>
     </tr>
+    
     {if $bStatus}
-    <tr>
-      <td>
-                   {t}Full path{/t}:&nbsp; <i>{$FAItemplatePath}</i>
+     <tr>
+      <td>{t}Full path{/t}:&nbsp;<i>
+       {$FAItemplatePath}</i>
       </td>
-    </tr>
+     </tr>
+     
     {/if}
     <tr>
-                 <td class='center'>
-
-{render acl=$FAItemplateFileACL}
-                         <input type="file" name="FAItemplateFile" value="" id="FAItemplateFile">
-{/render}
-{render acl=$FAItemplateFileACL}
-                         <button type='submit' name='TmpFileUpload'>{t}Upload{/t}</button>
-
-{/render}
-                 </td>
+     <td class='center'>
+      {render acl=$FAItemplateFileACL}
+       <input type="file" name="FAItemplateFile" value="" id="FAItemplateFile">
+      {/render}
+      {render acl=$FAItemplateFileACL}
+       <button type='submit' name='TmpFileUpload'>{t}Upload{/t}</button>
+      {/render}
+     </td>
     </tr>
-       </table>
-       </td>
-       <td>
-         <table summary="{t}File attributes{/t}">
-               <tr>
-       
-               <td>
-                       <LABEL for="user">
-                               {t}Owner{/t}{$must}&nbsp;
-                       </LABEL>
-                       </td>
-               <td>
-{render acl=$FAIownerACL}
-                       <input type="text" name="user" value="{$user}" id="user" size="15">
-{/render}
-               </td>
-       </tr><tr>
-               <td>
-
-                       <LABEL for="group">
-                               {t}Group{/t}{$must}&nbsp;
-                       </LABEL>
-                       </td>
-               <td>
-{render acl=$FAIownerACL}
-                       <input type="text" name="group" value="{$group}" id="group" size="15">
-{/render}
-                       <br>
-                       <br>
-               </td>
-       </tr><tr>
-               <td>{t}Access{/t}{$must}&nbsp; 
-</td>
-               <td>
-         <table summary="{t}File permissions{/t}">
-
-              <colgroup width="55" span="3">
-               </colgroup>
-               <tr>
-                       <th>{t}Class{/t}</th>
-                       <th>{t}Read{/t}</th>
-                       <th>{t}Write{/t}</th>
-                       <th>{t}Execute{/t}</th>
-                       <th>&nbsp;</th>
-                       <th>{t}Special{/t}</th>
-                       <th>&nbsp;</th>
-               </tr>
-               <tr><td>{t}User{/t}</td>
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="u4" value="4" {$u4}></td>
-{/render}
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="u2" value="2" {$u2}></td>
-{/render}
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="u1" value="1" {$u1}></td>
-{/render}
-                       <td>&nbsp;</td>
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="s4" value="4" {$s4}></td>
-{/render}
-                       <td>({t}SUID{/t})</td>
-                       </tr>
-
-               <tr><td>{t}Group{/t}</td>
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="g4" value="4" {$g4}></td>
-{/render}
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="g2" value="2" {$g2}></td>
-{/render}
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="g1" value="1" {$g1}></td>
-{/render}
-                       <td>&nbsp;</td>
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="s2" value="2" {$s2}></td>
-{/render}
-                       <td>({t}SGID{/t})</td>
-                       </tr>
-
-               <tr><td>{t}Others{/t}</td>
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="o4" value="4" {$o4}></td>
-{/render}
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="o2" value="2" {$o2}></td>
-{/render}
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="o1" value="1" {$o1}></td>
-{/render}
-                       <td>&nbsp;</td>
-{render acl=$FAImodeACL}
-                       <td align="center"><input type="checkbox" name="s1" value="1" {$s1}></td>
-{/render}
-                       <td>({t}sticky{/t})</td>
-       </tr></table>
-       
-               </td></tr></table>
-       </td>
-</tr>
-<tr>
-<td colspan=2>
-<br>
-<hr>
-<br>
-<div class="plugin-actions">
-{if !$freeze}
-       <button type='submit' name='SaveSubObject'>{msgPool type=applyButton}</button>&nbsp;
-
-{/if}
-       <button type='submit' name='CancelSubObject'>{msgPool type=cancelButton}</button>
-
-</div>
-</td>
-</tr>
+   </table>
+  </td>
+  <td>
+   <table summary="{t}File attributes{/t}">
+    <tr>
+     <td><LABEL for="user">{t}Owner{/t}
+      {$must}&nbsp;</LABEL>
+     </td>
+     <td>
+      {render acl=$FAIownerACL}
+       <input type="text" name="user" value="{$user}" id="user" size="15">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="group">{t}Group{/t}
+      {$must}&nbsp;</LABEL>
+     </td>
+     <td>
+      {render acl=$FAIownerACL}
+       <input type="text" name="group" value="{$group}" id="group" size="15">
+      {/render}
+      <br>
+      <br>
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Access{/t}
+      {$must}&nbsp;
+     </td>
+     <td>
+      <table summary="{t}File permissions{/t}"><colgroup width="55" span="3"></colgroup>
+       <tr><th>{t}Class{/t}</th><th>{t}Read{/t}</th><th>{t}Write{/t}</th><th>{t}Execute{/t}</th><th>&nbsp;</th><th>{t}Special{/t}</th><th>&nbsp;</th>
+       </tr>
+       <tr>
+        <td>{t}User{/t}
+        </td>
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="u4" value="4" {$u4}>
+         </td>
+        {/render}
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="u2" value="2" {$u2}>
+         </td>
+        {/render}
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="u1" value="1" {$u1}>
+         </td>
+        {/render}
+        <td>&nbsp;
+        </td>
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="s4" value="4" {$s4}>
+         </td>
+        {/render}
+        <td>({t}SUID{/t})
+        </td>
+       </tr>
+       <tr>
+        <td>{t}Group{/t}
+        </td>
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="g4" value="4" {$g4}>
+         </td>
+        {/render}
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="g2" value="2" {$g2}>
+         </td>
+        {/render}
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="g1" value="1" {$g1}>
+         </td>
+        {/render}
+        <td>&nbsp;
+        </td>
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="s2" value="2" {$s2}>
+         </td>
+        {/render}
+        <td>({t}SGID{/t})
+        </td>
+       </tr>
+       <tr>
+        <td>{t}Others{/t}
+        </td>
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="o4" value="4" {$o4}>
+         </td>
+        {/render}
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="o2" value="2" {$o2}>
+         </td>
+        {/render}
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="o1" value="1" {$o1}>
+         </td>
+        {/render}
+        <td>&nbsp;
+        </td>
+        {render acl=$FAImodeACL}
+         <td align="center">
+          <input type="checkbox" name="s1" value="1" {$s1}>
+         </td>
+        {/render}
+        <td>({t}sticky{/t})
+        </td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
+ <tr>
+  <td colspan=2>
+   <br>
+   <hr>
+   <br>
+   <div class="plugin-actions">
+    
+    {if !$freeze}
+     <button type='submit' name='SaveSubObject'>
+     {msgPool type=applyButton}</button>&nbsp;
+     
+    {/if}
+    <button type='submit' name='CancelSubObject'>
+    {msgPool type=cancelButton}</button>
+   </div>
+  </td>
+ </tr>
 </table>
-
-<input type='hidden' name='FAItemplateEntryPosted' value='1'>
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+<input type='hidden' name='FAItemplateEntryPosted' value='1'><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 366c4ad2f7c117cc7855f1b8b6e4b8f7111fbb3c..5ff1c04594bd92cb014f85f118e95cdc6dc8ca8c 100644 (file)
@@ -1,78 +1,67 @@
-<table summary="" width="100%">
-       <tr>
-               <td width="50%" valign="top">
-                               <h3>{t}Generic{/t}</h3>
-                               <table summary="" cellspacing="4">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="cn">
-                                                       {t}Name{/t}{$must}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" maxlength="80" disabled id="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="description">
-                                                       {t}Description{/t}
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' size="45" maxlength="80" value="{$description}" name="description" id="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-               <td class='left-border'>
-
-                  &nbsp;
-               </td>
-               <td>
-                               <h3>
-                                       <LABEL for="SubObject">
-                                               {t}List of assigned variables{/t}
-                                       </LABEL>
-                               </h3>
-                               <table summary="" width="100%">
-                               <tr>
-                                       <td>
-                                               <select name="SubObject[]" multiple  title="{t}Choose a variable to delete or edit{/t}" 
-                                                       style="width:100%;" size="20" id="SubObject">
-                                                       {html_options options=$SubObjects}
-                                               </select><br>
-{if $is_createable}
-                                       <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-
-{else}
-                                       <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">{msgPool type=addButton}</button>
-
-{/if}
-                                       <button type='submit' name='EditSubObject' title="{t}Edit{/t}">{t}Edit{/t}</button>
 
-{if $is_removeable}
-                                       <button type='submit' name='DelSubObject' title="{msgPool type=delButton}">{msgPool type=delButton}</button>
-
-{else}
-                                       <button type='submit' name='DelSubObject' title="{msgPool type=delButton}">{msgPool type=delButton}</button>
-
-{/if}
-                                       </td>
-                               </tr>
-                               </table>
-               </td>
-       </tr>
+<table summary="" width="100%">
+ <tr>
+  <td width="50%" valign="top">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="" cellspacing="4">
+    <tr>
+     <td><LABEL for="cn">{t}Name{/t}
+      {$must}</LABEL>
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" disabled id="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL>
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' size="45" maxlength="80" value="{$description}" name="description" id="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td class='left-border'>&nbsp;
+  </td>
+  <td>
+   <h3><LABEL for="SubObject">{t}List of assigned variables{/t}</LABEL>
+   </h3>
+   <table summary="" width="100%">
+    <tr>
+     <td>
+      <select name="SubObject[]" multiple  title="{t}Choose a variable to delete or edit{/t}"                                                  style="width:100%;" size="20" id="SubObject">
+       {html_options options=$SubObjects}
+      </select>
+      <br>
+      
+      {if $is_createable}
+       <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+       {msgPool type=addButton}</button>
+       {else}
+       <button type='submit' name='AddSubObject' title="{msgPool type=addButton}">
+       {msgPool type=addButton}</button>
+       
+      {/if}
+      <button type='submit' name='EditSubObject' title="{t}Edit{/t}">{t}Edit{/t}</button>
+      
+      {if $is_removeable}
+       <button type='submit' name='DelSubObject' title="{msgPool type=delButton}">
+       {msgPool type=delButton}</button>
+       {else}
+       <button type='submit' name='DelSubObject' title="{msgPool type=delButton}">
+       {msgPool type=delButton}</button>
+       
+      {/if}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
-<input type="hidden" value="1" name="FAIvariable_posted">
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+<input type="hidden" value="1" name="FAIvariable_posted"><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index efe8ee236b28d4a09635dfe678c3b32424d36179..d00e97f133622c4d1aa098d3a2191a720b497f32 100644 (file)
@@ -1,69 +1,62 @@
+
 <input type="hidden" name="SubObjectFormSubmitted" value="1">
 <table width="100%" summary="{t}FAI variable entry{/t}">
-       <tr>
-               <td valign="top" width="50%">
-                       <h3>{t}Generic{/t}</h3>
-                               <table summary="{t}Generic settings{/t}">
-                                       <tr>
-                                               <td>
-                                                       {t}Name{/t}{$must}&nbsp;
-                                               </td>
-                                               <td>
-{render acl=$cnACL}
-                                                       <input type='text' value="{$cn}" size="45" maxlength="80" name="cn">
-{/render}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       {t}Description{/t}&nbsp;
-                                               </td>
-                                               <td>
-{render acl=$descriptionACL}
-                                                       <input type='text' value="{$description}" size="45" maxlength="80" name="description">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-               <td class='left-border'>
-
-           &nbsp;
-        </td>
-               <td valign="top">
-                               <h3>{t}Variable attributes{/t}</h3>
-                               <table  summary="{t}Variable attributes{/t}" width="100%">
-                                       <tr>
-                                               <td>
-                                                       <LABEL for="Content">
-                                                       {t}Variable content{/t}{$must}&nbsp;
-                                                       </LABEL>
-                                               </td>
-                                               <td>
-{render acl=$FAIvariableContentACL}
-                                                       <input type="text" name="FAIvariableContent" value="{$FAIvariableContent}" id="Content" style="width:250px;">
-{/render}
-                                               </td>
-                                       </tr>
-                               </table>
-               </td>
-       </tr>
+ <tr>
+  <td valign="top" width="50%">
+   <h3>{t}Generic{/t}
+   </h3>
+   <table summary="{t}Generic settings{/t}">
+    <tr>
+     <td>{t}Name{/t}
+      {$must}&nbsp;
+     </td>
+     <td>
+      {render acl=$cnACL}
+       <input type='text' value="{$cn}" size="45" maxlength="80" name="cn">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td>{t}Description{/t}&nbsp;
+     </td>
+     <td>
+      {render acl=$descriptionACL}
+       <input type='text' value="{$description}" size="45" maxlength="80" name="description">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td class='left-border'>&nbsp;
+  </td>
+  <td valign="top">
+   <h3>{t}Variable attributes{/t}
+   </h3>
+   <table  summary="{t}Variable attributes{/t}" width="100%">
+    <tr>
+     <td><LABEL for="Content">{t}Variable content{/t}
+      {$must}&nbsp;</LABEL>
+     </td>
+     <td>
+      {render acl=$FAIvariableContentACL}
+       <input type="text" name="FAIvariableContent" value="{$FAIvariableContent}" id="Content" style="width:250px;">
+      {/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 <hr>
 <br>
 <div class="plugin-actions">
-{if !$freeze}
-       <button type='submit' name='SaveSubObject'>{msgPool type=applyButton}</button>&nbsp;
-
-{/if}
-       <button type='submit' name='CancelSubObject'>{msgPool type=cancelButton}</button>
-
-</div>
-
-<!-- Place cursor -->
-<script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('cn','description');
-  -->
-</script>
-
+ {if !$freeze}
+  <button type='submit' name='SaveSubObject'>
+  {msgPool type=applyButton}</button>&nbsp;
+  
+ {/if}
+ <button type='submit' name='CancelSubObject'>
+ {msgPool type=cancelButton}</button>
+</div><!-- Place cursor -->
+<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('cn','description');  --></script>
\ No newline at end of file
index 49054aa48fa6a8f1b73de7ce59c47b17b7732ee5..fede5f72163e0dcf5af2b67c1951b83263ed4039 100644 (file)
@@ -1,31 +1,47 @@
-<div id="mainlist">
 
-  <div class="mainlist-header">
-   <p>{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-   <div class="mainlist-nav">
-    <table summary="{$HEADLINE}">
-     <tr>
-      <td>{$ROOT}</td>
-      <td>{$BACK}</td>
-      <td>{$HOME}</td>
-      <td>{$RELOAD}</td>
-      <td class="left-border">{t}Base{/t} {$BASE}</td>
-      <td class="left-border">{$ACTIONS}</td>
-      <td class="left-border">{$FILTER}</td>
-     </tr>
-    </table>
-   </div>
+<div id="mainlist">
+ <div class="mainlist-header">
+  <p>
+   {$HEADLINE}&nbsp;
+   {$SIZELIMIT}
+  </p>
+  <div class="mainlist-nav">
+   
+   <table summary="{$HEADLINE}">
+    <tr>
+     <td>
+      {$ROOT}
+     </td>
+     <td>
+      {$BACK}
+     </td>
+     <td>
+      {$HOME}
+     </td>
+     <td>
+      {$RELOAD}
+     </td>
+     <td class="left-border">{t}Base{/t}
+      {$BASE}
+     </td>
+     <td class="left-border">
+      {$ACTIONS}
+     </td>
+     <td class="left-border">
+      {$FILTER}
+     </td>
+    </tr>
+   </table>
   </div>
-
-  {$LIST}
+ </div>
+ {$LIST}
+</div>
+<div class="clear">
 </div>
-
-<div class="clear"></div>
-
 <hr>
 <div class="plugin-actions">
-  <button type='submit' name='packageSelect_save'>{msgPool type=addButton}</button>
-
-  <button type='submit' name='packageSelect_cancel'>{msgPool type=cancelButton}</button>
-
-</div>
+ <button type='submit' name='packageSelect_save'>
+ {msgPool type=addButton}</button>
+ <button type='submit' name='packageSelect_cancel'>
+ {msgPool type=cancelButton}</button>
+</div>
\ No newline at end of file
index d51583a1f1940fda550aff40c246cc77be705e86..ef07c5dc63286069624c85b9a72b678a0108d642 100644 (file)
@@ -1,11 +1,12 @@
-<h3>{t}FAI settings{/t}</h3>
-<table summary="{t}Paste FAI class{/t}"> 
+
+<h3>{t}FAI settings{/t}
+</h3>
+<table summary="{t}Paste FAI class{/t}">
  <tr>
-  <td>
-   {t}Class name{/t}
+  <td>{t}Class name{/t}
   </td>
   <td>
    <input type="text" name="cn" value="{$cn}" >
   </td>
  </tr>
-</table>
+</table>
\ No newline at end of file
index 67628ee54b9d85ae0ed976204a4676978ac07f8d..a8bdd384c993ce7de9c5b18dceb9064650228581 100644 (file)
@@ -1,21 +1,17 @@
+
 <div style="font-size:18px;">
  {image path="images/warning.png" align="top"}&nbsp;{t}Warning{/t}
-
 </div>
 <p>
-  {$info}
-  {t}This includes all account data, system access, etc. for this branch. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
+ {$info}{t}This includes all account data, system access, etc. for this branch. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
 </p>
-
-<p>
- {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
+<p>{t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
 </p>
 <input type='hidden' name='release_hidden' value='{$release_hidden}'>
-
 <hr>
 <div class="plugin-actions">
-  <button type='submit' name='delete_branch_confirm'>{msgPool type=delButton}</button>
-
-  <button type='submit' name='delete_cancel'>{msgPool type=cancelButton}</button>
-
-</div>
+ <button type='submit' name='delete_branch_confirm'>
+ {msgPool type=delButton}</button>
+ <button type='submit' name='delete_cancel'>
+ {msgPool type=cancelButton}</button>
+</div>
\ No newline at end of file