![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl
index a6f8536e444711b2a8424af61aead6150d42acb2..17756ba7b6225144d8881b2286799d71a8b4c5e9 100644 (file)
-<h2>{t}Partition{/t}</h2>
-
-<table style='width: 100%;' width="100%">
- <tr>
-{if $FAIdiskType == "lvm"}
- <td>{t}Name{/t}</td>
- <td>
- <input name="FAIpartitionType" value="{$FAIpartitionType}">
- </td>
-{else}
- <td>{t}Name{/t}</td>
- <td>
- <select name="FAIpartitionType" onChange='document.mainform.submit();'>
- {html_options options=$partitionTypes selected=$FAIpartitionType}
- </select>
- </td>
-{/if}
- <td>{t}Description{/t}</td>
- <td>
- <input type="text" value="{$description}" name="description">
- </td>
- </tr>
-
-{if $FAIdiskType == "disk"}
-
- <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 name='sizeStart' value='{$sizeStart}' size='5'>
- <select name='sizeStart_Type'>
- {html_options options=$sizeTypes selected=$sizeStart_Type}
- </select>
- {else}
- <input name='dummy3' value='' size='5' disabled>
- <select name='dummy4' disabled>
- {html_options options=$sizeTypes}
- </select>
- {/if}
- -
- {if $FAIpartitionSizeType != "fixed" && $FAIpartitionSizeType != "remaining"}
- <input name='sizeStop' value='{$sizeStop}' size='5'>
- <select name='sizeStop_Type'>
- {html_options options=$sizeTypes selected=$sizeStop_Type}
- </select>
- {else}
- <input name='dummy1' value='' size='5' disabled>
- <select name='dummy2' disabled>
- {html_options options=$sizeTypes}
- </select>
- {/if}
- </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 != ""} (
+ {$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">
- <p class="seperator"> </p>
- </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} -
+
+ {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>
- <input type='checkbox' value='1' name='resize' {if $resize} checked {/if}>
- {t}Resize{/t}
- </td>
- <td>
- <input type='checkbox' value='1' name='bootable' {if $bootable} checked {/if}>
- {t}Bootable{/t}
- </td>
- <td>
- <input type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}>
- {t}Preserve{/t}
- </td>
- <td>
- <select name='preserveType'>
- {html_options options=preserveType selected=$preserveType}
- </select>
- </td>
+ <td colspan="4">
+ <hr>
+ </td>
</tr>
-
-{/if}
-
<tr>
- <td colspan="4">
- <p class="seperator"> </p>
- </td>
+ <td colspan="2">
+
+
+ <input id="resize" type='checkbox' value='1' name='resize' {if $resize} checked {/if}> <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}> <label for='bootable'>{t}Bootable{/t}</label>
+ </td>
</tr>
-
-{if $FAIdiskType == "raid"}
-
<tr>
- <td colspan="4">
- <h2>{t}Combined physical partitions{/t}</h2>
-
- <select name='phyiscalPartition' size=5 style="width:100%;">
- {html_options options=$plist}
- </select>
- <br>
- <select name='phyiscalPartitionAdd'>
- {html_options options=$phyiscalPartitionList}
- </select>
- <input type="submit" name='addPhysicalPartition' value="{msgPool type="addButton"}">
- <input type="submit" name='delPhysicalPartition' value="{msgPool type="delButton"}">
- <input type="submit" name='toggleMissing' value="{t}Toggle missing{/t}">
- <input type="submit" name='toggleSpare' value="{t}Toggle spare{/t}">
- </td>
+ <td colspan="4">
+
+
+ <input id="preserve" type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}> <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">
- <p class="seperator"> </p>
- </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>
+ <button type='submit' name='delPhysicalPartition'>
+ {msgPool type=delButton}</button>
+ <button type='submit' name='toggleMissing'>{t}Toggle missing{/t}</button>
+ <button type='submit' name='toggleSpare'>{t}Toggle spare{/t}</button>
+ </td>
</tr>
-{/if}
-
-{if $FAIdiskType == "raid" || $FAIdiskType == "disk"}
-
<tr>
- <td>
- {t}Filesystem{/t}
- </td>
- <td>
- <select name='FAIfsType'>
- {html_options options=$FAIfsTypes selected=$FAIfsType}
- </select>
-
- <input type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}>
- {t}Encrypted{/t}
- </td>
- <td>
- {t}Create options{/t}
- </td>
- <td>
- <input name="FAIfsCreateOptions" value="{$FAIfsCreateOptions}">
- </td>
- </tr>
- <tr>
- <td colspan=2>
- </td>
- <td>
- {t}Tune options{/t}
- </td>
- <td>
- <input name="FAIfsTuneOptions" value="{$FAIfsTuneOptions}">
- </td>
- </tr>
- <tr>
- <td colspan="4">
- <p class="seperator"> </p>
- </td>
- </tr>
- <tr>
- <td>
- {t}Mount point{/t}
- </td>
- <td>
- <input name="FAImountPoint" value="{$FAImountPoint}">
- </td>
- <td>
- {t}Mount options{/t}
- </td>
- <td>
- <input name="FAImountOptions" value="{$FAImountOptions}">
- </td>
- </tr>
-
-{/if}
-
-
-
- <!-- 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}> <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}{$must}
+ </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'>
-<p class='seperator'> </p>
+<hr>
<div style='text-align:right; width:100%; padding:5px'>
- <input type='submit' name='PartitionSave' value='{msgPool type=okButton}'>
-
- <input type='submit' name='PartitionCancel' value='{msgPool type=cancelButton}'>
+
+ {if !$freeze}
+ <button type='submit' name='PartitionSave'>
+ {msgPool type=okButton}</button>
+
+ {/if}
+ <button type='submit' name='PartitionCancel'>
+ {msgPool type=cancelButton}</button>
</div>