From 0c797b2c385c5972766ac868e052db3d8f65f149 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 17 Mar 2010 16:30:29 +0000 Subject: [PATCH] Updated FAI templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16832 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/fai/admin/fai/askClassName.tpl | 5 ++-- .../fai/admin/fai/branch_selector.tpl | 23 ++++++++++------ gosa-plugins/fai/admin/fai/faiDiskEntry.tpl | 5 ++-- gosa-plugins/fai/admin/fai/faiGroupHandle.tpl | 9 ++++--- gosa-plugins/fai/admin/fai/faiHookEntry.tpl | 8 +++--- gosa-plugins/fai/admin/fai/faiPackage.tpl | 5 ++-- .../fai/admin/fai/faiPackageConfiguration.tpl | 3 ++- gosa-plugins/fai/admin/fai/faiPartition.tpl | 12 ++++----- .../fai/admin/fai/faiPartitionTable.tpl | 3 ++- .../fai/admin/fai/faiPartitionTableEntry.tpl | 3 ++- gosa-plugins/fai/admin/fai/faiProfile.tpl | 9 ++++--- .../fai/admin/fai/faiProfileEntry.tpl | 26 ++++++++++++------- gosa-plugins/fai/admin/fai/faiScript.tpl | 3 ++- gosa-plugins/fai/admin/fai/faiScriptEntry.tpl | 5 ++-- gosa-plugins/fai/admin/fai/faiSummary.tpl | 9 ++++--- gosa-plugins/fai/admin/fai/faiTemplate.tpl | 3 ++- .../fai/admin/fai/faiTemplateEntry.tpl | 24 +++++++++++------ gosa-plugins/fai/admin/fai/faiVariable.tpl | 3 ++- .../fai/admin/fai/faiVariableEntry.tpl | 3 ++- gosa-plugins/fai/admin/fai/remove_branch.tpl | 3 ++- 20 files changed, 104 insertions(+), 60 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/askClassName.tpl b/gosa-plugins/fai/admin/fai/askClassName.tpl index 80e9b6e1a..87ee33bb4 100644 --- a/gosa-plugins/fai/admin/fai/askClassName.tpl +++ b/gosa-plugins/fai/admin/fai/askClassName.tpl @@ -36,7 +36,8 @@

- + + @@ -51,7 +52,7 @@ diff --git a/gosa-plugins/fai/admin/fai/branch_selector.tpl b/gosa-plugins/fai/admin/fai/branch_selector.tpl index 268a995cb..56cfe1b67 100644 --- a/gosa-plugins/fai/admin/fai/branch_selector.tpl +++ b/gosa-plugins/fai/admin/fai/branch_selector.tpl @@ -1,12 +1,14 @@
-

[F]{t}Releases{/t}

+

{image path="{$branchimage}" align="right"}{t}Releases{/t} +

-
  - {t}Class name{/t}  {html_options options=$ClassNames}
+
+ @@ -16,22 +18,27 @@ diff --git a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl index 329422153..888ad12fc 100644 --- a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl @@ -2,7 +2,8 @@

{t}Device{/t}

{t}Current release{/t}  - {html_options output=$fai_releases values=$fai_releases selected=$fai_release}
{if $allow_create} - + {image path="plugins/fai/images/branch_small.png" action="branch_branch"} + {t}Create release{/t}
- + {image path="plugins/fai/images/freeze.png" action="freeze_branch"} + {t}Create read-only release{/t} {else} - {t}Release{/t} + {image path="plugins/fai/images/branch_small_grey.png"} + {t}Create release{/t}
- {t}Freeze{/t} + {image path="plugins/fai/images/freeze_grey.png"} + {t}Create read-only release{/t} {/if} {if $fai_release != $fai_base && $allow_remove}
- + {image path="images/lists/trash.png" action="remove_branch"} + {t}Delete current release{/t} {/if}
- - -
+ + @@ -75,7 +76,7 @@ {html_options options=$plist}
- {html_options options=$physicalPartitionList}   diff --git a/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl b/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl index e8a7081c0..839aec833 100644 --- a/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl +++ b/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl @@ -8,14 +8,15 @@ @@ -38,7 +39,7 @@ {if $item.selected} checked {/if}> @@ -61,7 +62,7 @@ {if $item.selected} checked {/if}> diff --git a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl index 00e2562fe..b74e0da49 100644 --- a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl @@ -26,10 +26,12 @@
{if $item.freezed} - + {image path="images/lists/locked.png"} + {else} {/if} - {$types.$key.KZL} {$types.$key.NAME} - {$types.$key.KZL} {$types.$key.NAME} - {$types.$key.KZL} {$types.$key.NAME}
+ +   + +

{t}Hook attributes{/t}

@@ -38,7 +40,7 @@ {t}Task{/t}  {render acl=$FAItaskACL} - {html_options values=$tasks output=$tasks selected=$FAItask} {/render} diff --git a/gosa-plugins/fai/admin/fai/faiPackage.tpl b/gosa-plugins/fai/admin/fai/faiPackage.tpl index 5d58c5895..afa91380e 100644 --- a/gosa-plugins/fai/admin/fai/faiPackage.tpl +++ b/gosa-plugins/fai/admin/fai/faiPackage.tpl @@ -1,6 +1,7 @@
-
+ +

{t}Generic{/t}

@@ -54,7 +55,7 @@ @@ -100,7 +100,7 @@ {html_options options=$plist}
- {html_options options=$physicalPartitionList}   @@ -125,7 +125,7 @@ {t}Filesystem{/t} diff --git a/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl b/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl index 8184ae93e..523139346 100644 --- a/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl @@ -32,7 +32,8 @@

{t}Use 'setup-storage' to partition the disk{/t}

- -
{render acl=$FAIinstallMethodACL} - {html_options options=$FAIinstallMethods output=$FAIinstallMethod selected=$FAIinstallMethod} {/render} diff --git a/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl b/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl index 4fee0bfec..bf2cfb90b 100644 --- a/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl +++ b/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl @@ -1,4 +1,5 @@ -

 {$headline}

+

{image path="images/forward.png" title="{t}Package{/t}"} {$headline} +

{$Config}

diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl index c96cd2705..f6287a937 100644 --- a/gosa-plugins/fai/admin/fai/faiPartition.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartition.tpl @@ -11,7 +11,7 @@ {else}
{t}Type{/t} - {html_options options=$partitionTypes selected=$FAIpartitionType} {if $cn != ""} ({$cn}){/if} @@ -38,7 +38,7 @@ {else} - {html_options options=$sizeTypes} {/if} @@ -50,7 +50,7 @@ {else} - {html_options options=$sizeTypes} {/if} @@ -75,7 +75,7 @@   - {html_options options=$preserveTypes selected=$preserveType} - {html_options options=$FAIfsTypes selected=$FAIfsType} + +   diff --git a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl index 37fd5844c..2a710246b 100644 --- a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl @@ -2,7 +2,8 @@

{t}Device{/t}

-
+{$must}  {render acl=$DISKcnACL} diff --git a/gosa-plugins/fai/admin/fai/faiProfile.tpl b/gosa-plugins/fai/admin/fai/faiProfile.tpl index ee78927eb..60f3c7c6a 100644 --- a/gosa-plugins/fai/admin/fai/faiProfile.tpl +++ b/gosa-plugins/fai/admin/fai/faiProfile.tpl @@ -29,10 +29,13 @@
- +
+ + + -
+ +

{t}FAI classes{/t}