From 9dc6ac611bbe02539e5d9326a6106f8160bc56c3 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 30 Mar 2010 11:53:18 +0000 Subject: [PATCH] Beautified FAI templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17392 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/fai/admin/fai/askClassName.tpl | 62 ++- .../fai/admin/fai/branch_selector.tpl | 80 ++-- .../fai/classSelect/selectClass-list.tpl | 67 +-- .../fai/admin/fai/class_faiPartitionTable.inc | 10 +- .../fai/class_faiPartitionTableEntry.inc | 11 +- gosa-plugins/fai/admin/fai/fai-list.tpl | 49 ++- gosa-plugins/fai/admin/fai/faiDiskEntry.tpl | 190 ++++---- gosa-plugins/fai/admin/fai/faiGroupHandle.tpl | 171 ++++---- gosa-plugins/fai/admin/fai/faiHook.tpl | 97 ++--- gosa-plugins/fai/admin/fai/faiHookEntry.tpl | 138 +++--- gosa-plugins/fai/admin/fai/faiNewBranch.tpl | 89 ++-- gosa-plugins/fai/admin/fai/faiPackage.tpl | 169 ++++---- .../fai/admin/fai/faiPackageConfiguration.tpl | 16 +- gosa-plugins/fai/admin/fai/faiPartition.tpl | 358 +++++++-------- .../fai/admin/fai/faiPartitionTable.tpl | 125 +++--- .../fai/admin/fai/faiPartitionTableEntry.tpl | 79 ++-- gosa-plugins/fai/admin/fai/faiProfile.tpl | 111 +++-- .../fai/admin/fai/faiProfileEntry.tpl | 165 +++---- gosa-plugins/fai/admin/fai/faiScript.tpl | 100 ++--- gosa-plugins/fai/admin/fai/faiScriptEntry.tpl | 150 +++---- gosa-plugins/fai/admin/fai/faiSummary.tpl | 49 ++- gosa-plugins/fai/admin/fai/faiTemplate.tpl | 97 ++--- .../fai/admin/fai/faiTemplateEdit.tpl | 58 ++- .../fai/admin/fai/faiTemplateEntry.tpl | 409 +++++++++--------- gosa-plugins/fai/admin/fai/faiVariable.tpl | 141 +++--- .../fai/admin/fai/faiVariableEntry.tpl | 119 +++-- .../fai/packageSelect/selectPackage-list.tpl | 68 +-- gosa-plugins/fai/admin/fai/paste_generic.tpl | 11 +- gosa-plugins/fai/admin/fai/remove_branch.tpl | 20 +- 29 files changed, 1573 insertions(+), 1636 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/askClassName.tpl b/gosa-plugins/fai/admin/fai/askClassName.tpl index 0a2d08a41..1998d25a9 100644 --- a/gosa-plugins/fai/admin/fai/askClassName.tpl +++ b/gosa-plugins/fai/admin/fai/askClassName.tpl @@ -1,17 +1,17 @@ +
- {$headline} + {$headline}

-

-{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} -
-
+

{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} +
+

-
-{t}Please use one of the following methods to choose the name for the new FAI class.{/t} -
-
+
+ {t}Please use one of the following methods to choose the name for the new FAI class.{/t} +
+


@@ -20,16 +20,16 @@
- - - - - + + +
- + -

+

  - {t}Class name{/t}  +
  + {t}Class name{/t}  +
@@ -37,22 +37,24 @@
- + - - + @@ -64,17 +66,9 @@
- +

  - {t}Class name{/t}   + {t}Class name{/t}  + +
-

  - - - -

- - - + +

+ \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/branch_selector.tpl b/gosa-plugins/fai/admin/fai/branch_selector.tpl index 20f62e09e..cb6face0e 100644 --- a/gosa-plugins/fai/admin/fai/branch_selector.tpl +++ b/gosa-plugins/fai/admin/fai/branch_selector.tpl @@ -1,49 +1,45 @@ -
-

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

-
-
- - - + +
- {t}Current release{/t}  +
+

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

+
+
+ + + - -
{t}Current release{/t}  -
- - - + +
+
+ + + - -
+ {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} - {image path="plugins/fai/images/branch_small_grey.png"} - - {t}Create release{/t} -
- {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"} + {t}Create release{/t} +
+ {image path="plugins/fai/images/freeze.png" action="freeze_branch"} + {t}Create read-only release{/t} + {else} + {image path="plugins/fai/images/branch_small_grey.png"}{t}Create release{/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} +
+ {image path="images/lists/trash.png" action="remove_branch"} + {t}Delete current release{/t} + {/if} -
-
-
- +
+
+
\ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl index 6e20cf679..a7576d1b3 100644 --- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl +++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl @@ -1,30 +1,47 @@ -
-
-

{$HEADLINE} {$SIZELIMIT}

-
- - - - - - - - - - -
{$ROOT}{$BACK}{$HOME}{$RELOAD}{t}Base{/t} {$BASE}{$ACTIONS}{$FILTER}
-
+
+
+

+ {$HEADLINE}  + {$SIZELIMIT} +

+
+ + + + + + + + + + + +
+ {$ROOT} + + {$BACK} + + {$HOME} + + {$RELOAD} + {t}Base{/t} + {$BASE} + + {$ACTIONS} + + {$FILTER} +
- - {$LIST} +
+ {$LIST} +
+
- -
-
- - + +
- - + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 197e1b2b2..e390ea36d 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -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"; diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc index a5adc2f1c..5bacf93e0 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc @@ -196,7 +196,7 @@ class faiPartitionTableEntry extends plugin */ $FAIfsType= ""; if($this->acl_is_writeable("FAIfsType")){ - $FAIfsType= ""; foreach($FAIfsTypes as $type){ if($part['FAIfsType'] == $type){ $FAIfsType .=""; @@ -212,7 +212,7 @@ class faiPartitionTableEntry extends plugin foreach(array("FAImountPoint","FAIpartitionSize","FAImountOptions","FAIfsOptions") as $attr){ $$attr = ""; if($this->acl_is_writeable($attr)){ - $$attr = ""; }elseif($this->acl_is_readable($attr)){ @@ -249,9 +249,9 @@ class faiPartitionTableEntry extends plugin } } if($this->acl_is_removeable()){ - $str .= "\n"; + $str .= "\n"; }else{ - $str .= "\n"; + $str .= "\n"; } $str .= "\n"; } @@ -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])){ diff --git a/gosa-plugins/fai/admin/fai/fai-list.tpl b/gosa-plugins/fai/admin/fai/fai-list.tpl index eb244dbb7..7fcb0c755 100644 --- a/gosa-plugins/fai/admin/fai/fai-list.tpl +++ b/gosa-plugins/fai/admin/fai/fai-list.tpl @@ -1,23 +1,32 @@ -
-
-

{$HEADLINE} {$SIZELIMIT}

-
- - - - - - - -
{$RELOAD}{t}Release{/t} {$RELEASE}{$ACTIONS}{$FILTER}
-
+
+
+

+ {$HEADLINE}  + {$SIZELIMIT} +

+
+ + + + + + + + +
+ {$RELOAD} + {t}Release{/t} + {$RELEASE} + + {$ACTIONS} + + {$FILTER} +
- - {$LIST} +
+ {$LIST}
- -
- - - +
+
+ \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl index 072229dd5..80a4e0c4e 100644 --- a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl @@ -1,115 +1,107 @@ + -

{t}Device{/t}

+

{t}Device{/t} +

- - - - + + + +
- - - - - - - - - - - -
- {$must}  - -{render acl=$DISKcnACL} - -{/render} -
- - -{render acl=$DISKFAIdiskOptionACL} - -{/render} -
- - 		- - - - - - - - - - -
-   - -{render acl=$DISKdescriptionACL} - -{/render} -
- - -{render acl=$DISKFAIdiskOptionACL} - -{/render} -
- -
+ + + + + + + + + +
+ {$must}  + + {render acl=$DISKcnACL} + + {/render} +
+ + {render acl=$DISKFAIdiskOptionACL} + + {/render} +
+ 		+ + + + + + + + + +
  + + {render acl=$DISKdescriptionACL} + + {/render} +
+ + {render acl=$DISKFAIdiskOptionACL} + + {/render} +
+
{if $FAIdiskType == "lvm"} - -
-

{t}Combined physical partitions{/t}

- - -
- -   -   - +
+

{t}Combined physical partitions{/t} +

+ +
+ +   +   + {/if}

-

{t}Partition entries{/t}

+

{t}Partition entries{/t} +

{$setup}
-{if !$freeze} - {if $sub_object_is_createable} - - - {else} - - {/if} +{if !$freeze} + + {if $sub_object_is_createable} + + {else} + + + {/if} + {/if} -
+


-{if !$freeze} - - -{/if} - - -
- - - + + {if !$freeze} + + + {/if} + +
+ \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl b/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl index efe6247dd..eb0ad7d71 100644 --- a/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl +++ b/gosa-plugins/fai/admin/fai/faiGroupHandle.tpl @@ -1,86 +1,99 @@ -{if $mode == "remove"} - -{t}Please select the objects you want to remove:{/t} -
-
- -{foreach from=$FAI_group item=item key=key} - - - - - - - -{/foreach} -
- {if $item.freezed} - {image path="images/lists/locked.png"} - - {else} - - {/if} - - {image path="{$types.$key.IMG}" title="{$types.$key.NAME}"} - class='center'> - {$types.$key.NAME}{if $item.freezed}({t}Freezed{/t}){/if}({$item.description.0})
- -{elseif $mode == "edit"} - -{t}Select the object you want to edit:{/t} -
-
- -{foreach from=$FAI_group item=item key=key} - - - - - - -{/foreach} -
- - - {image path="{$types.$key.IMG}" title="{$types.$key.NAME}"} - class='center'> - {$types.$key.NAME}({$item.description.0}) -
-{elseif $mode == "copy"} - -{t}Select the object you want to copy:{/t} -
-
- -{foreach from=$FAI_group item=item key=key} - - - - - - -{/foreach} -
- - - {image path="{$types.$key.IMG}" title="{$types.$key.NAME}"} - class='center'> - {$types.$key.NAME}({$item.description.0}) -
+{if $mode == "remove"} + {t}Please select the objects you want to remove:{/t} +
+
+ {foreach from=$FAI_group item=item key=key} + + + + + + + {/foreach} +
+ + {if $item.freezed} + {image path="images/lists/locked.png"} + {else} + + + + + {/if} + + {image path=" + {$types.$key.IMG}" title=" + {$types.$key.NAME}"}class='center'> + + {$types.$key.NAME} + + + {if $item.freezed}({t}Freezed{/t}) + + {/if} + ( + {$item.description.0}) +
+ {elseif $mode == "edit"} + {t}Select the object you want to edit:{/t} +
+
+ {foreach from=$FAI_group item=item key=key} + + + + + + {/foreach} +
+ + + + + {image path=" + {$types.$key.IMG}" title=" + {$types.$key.NAME}"}class='center'> + + {$types.$key.NAME} + ( + {$item.description.0}) +
+ {elseif $mode == "copy"} + {t}Select the object you want to copy:{/t} +
+
+ {foreach from=$FAI_group item=item key=key} + + + + + + {/foreach} +
+ + + + + {image path=" + {$types.$key.IMG}" title=" + {$types.$key.NAME}"}class='center'> + + {$types.$key.NAME} + ( + {$item.description.0}) +
+ {/if}

-

-
- - -   - - +

+
+   + +
\ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiHook.tpl b/gosa-plugins/fai/admin/fai/faiHook.tpl index 9ab3741d3..d9e139d9d 100644 --- a/gosa-plugins/fai/admin/fai/faiHook.tpl +++ b/gosa-plugins/fai/admin/fai/faiHook.tpl @@ -1,57 +1,50 @@ + - - - + + +
-

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
-
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+
- - - + + +
-

- {t}List of hook scripts{/t} -

- {$Entry_divlist} -{if $sub_object_is_addable} - -{else} - -{/if} -
+

{t}List of hook scripts{/t} +

+ {$Entry_divlist} + + {if $sub_object_is_addable} + + {else} + + + {/if} +
- - - - + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl index 1a8e3aa38..dd01aaf4d 100644 --- a/gosa-plugins/fai/admin/fai/faiHookEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiHookEntry.tpl @@ -1,87 +1,73 @@ + - - - - - + + + + +
-

{t}Generic{/t}

- - - - - - - - - -
- {t}Name{/t}{$must}  - -{render acl=$cnACL} - -{/render} -
- {t}Description{/t}  - -{render acl=$descriptionACL} - -{/render} -
- 		- -   - - -

{t}Hook attributes{/t}

- -{render acl=$FAItaskACL} - -{/render} -
+

{t}Generic{/t} +

+ + + + + + + + + +
{t}Name{/t} + {$must}  + + {render acl=$cnACL} + + {/render} +
{t}Description{/t}  + + {render acl=$descriptionACL} + + {/render} +
+ 		  + +

{t}Hook attributes{/t} +

+ {render acl=$FAItaskACL} + + {/render} +
- -
-

- -

-{render acl=$FAIscriptACL} - +

+

+{render acl=$FAIscriptACL} {/render}
-{render acl=$FAIscriptACL} -   -{/render} -{render acl=$FAIscriptACL} - - -{/render} -{render acl=$FAIscriptACL} - {$DownMe} -{/render} + {render acl=$FAIscriptACL} +   + {/render} + {render acl=$FAIscriptACL} + + {/render} + {render acl=$FAIscriptACL} + {$DownMe} + {/render}
-

-{if !$freeze} -   - -{/if} - - -
- - - + + {if !$freeze} +   + + {/if} + +
+ \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiNewBranch.tpl b/gosa-plugins/fai/admin/fai/faiNewBranch.tpl index 59228a520..000c1fe60 100644 --- a/gosa-plugins/fai/admin/fai/faiNewBranch.tpl +++ b/gosa-plugins/fai/admin/fai/faiNewBranch.tpl @@ -1,51 +1,42 @@ -{if $iframe == false} - -
-

-{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} -

-

-{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} -
-
-

-
-{t}Please enter a name for the branch{/t}   - -
- -
- - -
- - - -{else} -

{t}Processing the requested operation{/t}

-{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} -
-
-
- -
- -{/if} +{if $iframe == false} +
+

{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} +

+

{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} +
+
+

+
+ {t}Please enter a name for the branch{/t}  + +
+
+ + +
+ + {else} +

{t}Processing the requested operation{/t} +

{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} +
+
+
+ +
+ + +{/if} \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiPackage.tpl b/gosa-plugins/fai/admin/fai/faiPackage.tpl index 12e3316dc..1d1e6d92c 100644 --- a/gosa-plugins/fai/admin/fai/faiPackage.tpl +++ b/gosa-plugins/fai/admin/fai/faiPackage.tpl @@ -1,96 +1,81 @@ - - - - - +
-

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
- 		-

{t}Repository{/t}

- - - - - - - - - - - - - -
- {t}Release{/t} : - - {$release} -
- {t}Section{/t} : - - {$section} -
- {t}Install method{/t} : - -{render acl=$FAIinstallMethodACL} - -{/render} -
-
+ + + +
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+ 		+

{t}Repository{/t} +

+ + + + + + + + + + + + + +
{t}Release{/t}: + + {$release} +
{t}Section{/t}: + + {$section} +
{t}Install method{/t}: + + {render acl=$FAIinstallMethodACL} + + {/render} +
+
- - - -{render acl=$FAIpackageACL} - - - -{/render} -
-

{t}Used packages{/t}

- {$divlist} -
- - - -   - - -
- - - - + + +

{t}Used packages{/t} +

+ {$divlist} + + + {render acl=$FAIpackageACL} + + + +   + + + + {/render} + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl b/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl index bf2cfb90b..40490524c 100644 --- a/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl +++ b/gosa-plugins/fai/admin/fai/faiPackageConfiguration.tpl @@ -1,12 +1,12 @@ -

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

+

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

{$Config}

- - - - -
- + + +
\ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl index 3651674d4..cb3743dce 100644 --- a/gosa-plugins/fai/admin/fai/faiPartition.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartition.tpl @@ -1,192 +1,200 @@ -

{t}Partition{/t}

- - - -{if $FAIdiskType == "lvm"} - - -{else} - - -{/if} - - - - -{if $FAIdiskType == "disk" || $FAIdiskType == "lvm"} - - - - - - - - - - - - - - - - -{/if} - - - - - -{if $FAIdiskType == "raid"} - - - - +

{t}Partition{/t} +

+
{t}Name{/t} - - {t}Type{/t} - - {if $cn != ""} ({$cn}){/if} - {t}Description{/t} - -
{t}Size{/t} - - {if $FAIpartitionSizeType != "remaining"} - - - {else} - - - {/if} -  -  - {if $FAIpartitionSizeType != "fixed" && $FAIpartitionSizeType != "remaining"} - - - {else} - - - {/if} -
-
-
- -   - - -   -
- -   - -
-
-
-

{t}Combined physical partitions{/t}

- - -
- -   - -   - -   - -   - -
+ + + {if $FAIdiskType == "lvm"} + + + {else} + + + + {/if} + + + + + {if $FAIdiskType == "disk" || $FAIdiskType == "lvm"} - + + -{/if} - - - - - + - - - + + - + + + {/if} + + + + + {if $FAIdiskType == "raid"} - - - - + - - - - + + + {/if} + + + + + + + + + + + + + + + + + + + + + + + +
{t}Name{/t} + + + {t}Type{/t} + + + + {if $cn != ""} ( + {$cn}) + + {/if} + {t}Description{/t} + + +
-
- 		{t}Size{/t} + + + + {if $FAIpartitionSizeType != "remaining"} + + + {else} + + + + {/if} -  + + {if $FAIpartitionSizeType != "fixed" && $FAIpartitionSizeType != "remaining"} + + + {else} + + + + {/if} +
- {t}Filesystem{/t} - - - - {t}Filesystem create options{/t} - - - +
+
- -   - - {t}Tune options{/t} - - - + + +   + + + +   +
-
- 		+ + +   + +
+
+
- {t}Mount point{/t} - - {if $FAIfsType != "swap"} - - {else} - - {/if} - - {t}Mount options{/t} - - - +

{t}Combined physical partitions{/t} +

+ +
+ +   +   +   +   +
+
+
{t}Filesystem{/t} + + + {t}Filesystem create options{/t} + + +
+ + +   + {t}Tune options{/t} + + +
+
+
{t}Mount point{/t} + + + {if $FAIfsType != "swap"} + + {else} + + + {/if} + {t}Mount options{/t} + + +
+ +
-
- {if !$freeze} - - -   - {/if} - - -
+ + {if !$freeze} +   + + {/if} + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl b/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl index 5bc0241cc..a6a90cc19 100644 --- a/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartitionTable.tpl @@ -1,73 +1,56 @@ - - - - - - +
- -

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
-
-

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

- 		- -   - -

- -

- {$Entry_divlist} -{if $sub_object_is_addable} - - - - - - -{else} - - - - - -{/if} - -
+ + + + +
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+
+

+ + +

+ 		  + +

+

+ {$Entry_divlist} + + {if $sub_object_is_addable} + + + + {else} + + + + + {/if} +
- - - - + + diff --git a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl index 2b17ae6d1..6194137fb 100644 --- a/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiPartitionTableEntry.tpl @@ -1,55 +1,52 @@ + -

{t}Device{/t}

+

{t}Device{/t} +

- - - - + + + +
-{$must}  -{render acl=$DISKcnACL} - -{/render} -   -{render acl=$DISKdescriptionACL} - -{/render} -
+ {$must}  + {render acl=$DISKcnACL} + + {/render} +   + {render acl=$DISKdescriptionACL} + + {/render} +


-

{t}Partition entries{/t}

+

{t}Partition entries{/t} +

{$setup}
-{if !$freeze} - {if $sub_object_is_createable} - - - {else} - - {/if} +{if !$freeze} + + {if $sub_object_is_createable} + + {else} + + + {/if} + {/if} -
+


-{if !$freeze} - - -{/if} - - -
- - - + + {if !$freeze} + + + {/if} + + + diff --git a/gosa-plugins/fai/admin/fai/faiProfile.tpl b/gosa-plugins/fai/admin/fai/faiProfile.tpl index 8dc53673f..c56d39879 100644 --- a/gosa-plugins/fai/admin/fai/faiProfile.tpl +++ b/gosa-plugins/fai/admin/fai/faiProfile.tpl @@ -1,62 +1,51 @@ - - - - - -
-

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
- 		- - - - - - -
- -

{t}FAI classes{/t}

- - {$divlist} -
-{render acl=$FAIclassACL} - - -{/render} - -
-
- - + + + + + +
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+ 		+ + + + +
+

{t}FAI classes{/t} +

+ + {$divlist} +
+ {render acl=$FAIclassACL} + + {/render} + +
+
+ \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiProfileEntry.tpl b/gosa-plugins/fai/admin/fai/faiProfileEntry.tpl index 9baf4e3a8..58e0982b1 100644 --- a/gosa-plugins/fai/admin/fai/faiProfileEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiProfileEntry.tpl @@ -1,83 +1,94 @@ - - +
+ - +
+

+ {image path=" + {$infoimage}" align="right"}{t}Information{/t} +

+
+
+

{t}This menu allows you to select FAI class names and to add them to the currently edited profile.{/t} +

+
+
+
+

+ {image path=" + {$launchimage}" align="right"}{t}Filters{/t} +

+
+
+
- -
-

- {t}List of FAI objects (Fully Automatic Installation){/t} -

-
-
- {$faihead} -
-
-
- {$failist} - -
+
+

{t}List of FAI objects (Fully Automatic Installation){/t} +

+
+
+ {$faihead} +
+
+
+
+ {$failist} + +
- -
-

- {image path="{$infoimage}" align="right"}{t}Information{/t} - -

-
-
-

- {t}This menu allows you to select FAI class names and to add them to the currently edited profile.{/t} -

-
-
-
-

{image path="{$launchimage}" align="right"}{t}Filters{/t} -

-
-
- - - {$alphabet} -
- - - - - - - - -
{t}Show only classes with templates{/t}
{t}Show only classes with scripts{/t}
{t}Show only classes with hooks{/t}
{t}Show only classes with variables{/t}
{t}Show only classes with packages{/t}
{t}Show only classes with partitions{/t}
- - - - - - -
- {image path="{$search_image}"} - align=middle title='{t}Display objects matching{/t}'> - - -
- {$apply} -
-
+ {$alphabet} +
+ + + + + + + + + + + + + + + + + + + +
+ {t}Show only classes with templates{/t} +
+ {t}Show only classes with scripts{/t} +
+ {t}Show only classes with hooks{/t} +
+ {t}Show only classes with variables{/t} +
+ {t}Show only classes with packages{/t} +
+ {t}Show only classes with partitions{/t} +
+ + + + + +
+ {image path=" + {$search_image}"}align=middle title='{t}Display objects matching{/t}'> + + +
+ {$apply} + + + -
- - - - -
- + + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiScript.tpl b/gosa-plugins/fai/admin/fai/faiScript.tpl index 24ea23c96..9b4e81551 100644 --- a/gosa-plugins/fai/admin/fai/faiScript.tpl +++ b/gosa-plugins/fai/admin/fai/faiScript.tpl @@ -1,58 +1,52 @@ + - - - + + +
-

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
-
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+
- - - + + +
-

- {t}List of scripts{/t} -

- {$Entry_divlist} -
- {if $sub_object_is_addable} - - {else} - - {/if} -
+

{t}List of scripts{/t} +

+ {$Entry_divlist} +
+ + {if $sub_object_is_addable} + + {else} + + + {/if} +
- - - - + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiScriptEntry.tpl b/gosa-plugins/fai/admin/fai/faiScriptEntry.tpl index 4b5d41c45..66090f624 100644 --- a/gosa-plugins/fai/admin/fai/faiScriptEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiScriptEntry.tpl @@ -1,91 +1,81 @@ + - - - - - + + + + +
-

{t}Generic{/t}

- - - - - - - - - -
- {t}Name{/t}{$must}  - -{render acl=$cnACL} - -{/render} -
- {t}Description{/t}  - -{render acl=$descriptionACL} - -{/render} -
- 		- -   - -

{t}Script attributes{/t}

- - - - - -
- - -{render acl=$FAIpriorityACL} - -{/render} -
-
+

{t}Generic{/t} +

+ + + + + + + + + +
{t}Name{/t} + {$must}  + + {render acl=$cnACL} + + {/render} +
{t}Description{/t}  + + {render acl=$descriptionACL} + + {/render} +
+ 		  + +

{t}Script attributes{/t} +

+ + + + + +
+ + {render acl=$FAIpriorityACL} + + {/render} +
+
-

- -

-{render acl=$FAIscriptACL} - +

+

+{render acl=$FAIscriptACL} {/render}
-{render acl=$FAIscriptACL} -   -{/render} -{render acl=$FAIscriptACL} - - -{/render} -{render acl=$FAIscriptACL} - {$DownMe} -{/render} + {render acl=$FAIscriptACL} +   + {/render} + {render acl=$FAIscriptACL} + + {/render} + {render acl=$FAIscriptACL} + {$DownMe} + {/render}

-{if !$freeze} -   -{/if} - -
- - - + + {if !$freeze} +   + + {/if} + + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiSummary.tpl b/gosa-plugins/fai/admin/fai/faiSummary.tpl index 1dd9c9477..d5e79f2f4 100644 --- a/gosa-plugins/fai/admin/fai/faiSummary.tpl +++ b/gosa-plugins/fai/admin/fai/faiSummary.tpl @@ -1,25 +1,30 @@ + - - -{if $readable} - - + - - - -{else} - - - -{/if} -

{t}FAI object tree{/t}

- {image path="images/lists/reload.png" action="reloadList"} - {t}Reload class and release configuration from parent object.{/t} - +

{t}FAI object tree{/t} +

+
- {$objectList} -
-

{t}You are not allowed to view the fai summary.{/t}

-
- + + {if $readable} + + + {image path="images/lists/reload.png" action="reloadList"}{t}Reload class and release configuration from parent object.{/t} + + + + + {$objectList} + + + {else} + + +

{t}You are not allowed to view the fai summary.{/t} +

+ + + + {/if} + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiTemplate.tpl b/gosa-plugins/fai/admin/fai/faiTemplate.tpl index 04e66c3ab..7fc77057f 100644 --- a/gosa-plugins/fai/admin/fai/faiTemplate.tpl +++ b/gosa-plugins/fai/admin/fai/faiTemplate.tpl @@ -1,55 +1,46 @@ - - - - - +
- -

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
- 		-

- {t}List of template files{/t} -

- {$Entry_divlist} -{if $sub_object_is_addable} - - -{else} - -{/if} -
+ + + +
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+ 		+

{t}List of template files{/t} +

+ {$Entry_divlist} + + {if $sub_object_is_addable} + + {else} + + + {/if} +
- - - - + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl b/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl index 1eb15ba16..081223ed1 100644 --- a/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl +++ b/gosa-plugins/fai/admin/fai/faiTemplateEdit.tpl @@ -1,37 +1,33 @@ -

Template entry

-{if !$mb_extension} - -{msgPool type=missingext param1='multi byte'} +

Template entry +

-

+{if !$mb_extension} + {msgPool type=missingext param1='multi byte'} +

- - +
-

- -{else} - -{if $write_protect} -{t}This FAI template is write protected. Editing may break it!{/t} -
- -{/if} - - - -

+

+ {else} + + {if $write_protect}{t}This FAI template is write protected. Editing may break it!{/t} +
+ + + {/if} + + + +

- - -   - - +   +
-

- -{/if} +

+ +{/if} \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiTemplateEntry.tpl b/gosa-plugins/fai/admin/fai/faiTemplateEntry.tpl index 689f0eb47..cb238b8b7 100644 --- a/gosa-plugins/fai/admin/fai/faiTemplateEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiTemplateEntry.tpl @@ -1,222 +1,223 @@ - -

{t}Generic{/t}

+ +

{t}Generic{/t} +

- + - + - +
- - - - - - - - - - -
- {t}File name{/t}{$must}  - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$FAItemplatePathACL} - -{/render} -
- 		- - {t}Description{/t} -{render acl=$descriptionACL} - -{/render} + + + + + + + + + +
{t}File name{/t} + {$must}  + + {render acl=$cnACL} + + {/render} +
+ + {render acl=$FAItemplatePathACL} + + {/render} +
+ 		{t}Description{/t} + {render acl=$descriptionACL} + + {/render}
-
- - + - - + + - - - - - +
-

-  {t}Template attributes{/t} -

+

 {t}Template attributes{/t} +

- - +
- + + {if $bStatus} - - + - + + {/if} - + -
- {t}File{/t}{$must}:  {$status} - {if $bStatus} - - {t}Save template{/t}... - - - {t}Edit template{/t}... - - {/if} - {t}File{/t} + {$must}:  + {$status} + + {if $bStatus} + {t}Save template{/t}... + {t}Edit template{/t}... + + {/if} +
- {t}Full path{/t}:  {$FAItemplatePath} +
{t}Full path{/t}:  + {$FAItemplatePath}
- -{render acl=$FAItemplateFileACL} - -{/render} -{render acl=$FAItemplateFileACL} - - -{/render} - + {render acl=$FAItemplateFileACL} + + {/render} + {render acl=$FAItemplateFileACL} + + {/render} +
- 		- - - - - - - - - - -
- - -{render acl=$FAIownerACL} - -{/render} -
- - - -{render acl=$FAIownerACL} - -{/render} -
-
-
{t}Access{/t}{$must}  - - - - - - - - - - - - - - - -{render acl=$FAImodeACL} - -{/render} -{render acl=$FAImodeACL} - -{/render} -{render acl=$FAImodeACL} - -{/render} - -{render acl=$FAImodeACL} - -{/render} - - - - -{render acl=$FAImodeACL} - -{/render} -{render acl=$FAImodeACL} - -{/render} -{render acl=$FAImodeACL} - -{/render} - -{render acl=$FAImodeACL} - -{/render} - - - - -{render acl=$FAImodeACL} - -{/render} -{render acl=$FAImodeACL} - -{/render} -{render acl=$FAImodeACL} - -{/render} - -{render acl=$FAImodeACL} - -{/render} - -
{t}Class{/t}{t}Read{/t}{t}Write{/t}{t}Execute{/t} {t}Special{/t} 
{t}User{/t} ({t}SUID{/t})
{t}Group{/t} ({t}SGID{/t})
{t}Others{/t} ({t}sticky{/t})
- -
-
-
-
-
-
-{if !$freeze} -   - -{/if} - - -
-
+ + + + + + + + + + + + + + + +
+ + {render acl=$FAIownerACL} + + {/render} +
+ + {render acl=$FAIownerACL} + + {/render} +
+
+
{t}Access{/t} + {$must}  + + + + + + + {render acl=$FAImodeACL} + + {/render} + {render acl=$FAImodeACL} + + {/render} + {render acl=$FAImodeACL} + + {/render} + + {render acl=$FAImodeACL} + + {/render} + + + + + {render acl=$FAImodeACL} + + {/render} + {render acl=$FAImodeACL} + + {/render} + {render acl=$FAImodeACL} + + {/render} + + {render acl=$FAImodeACL} + + {/render} + + + + + {render acl=$FAImodeACL} + + {/render} + {render acl=$FAImodeACL} + + {/render} + {render acl=$FAImodeACL} + + {/render} + + {render acl=$FAImodeACL} + + {/render} + + +
{t}Class{/t}{t}Read{/t}{t}Write{/t}{t}Execute{/t} {t}Special{/t} 
{t}User{/t} + + + + + + +   + + + ({t}SUID{/t}) +
{t}Group{/t} + + + + + + +   + + + ({t}SGID{/t}) +
{t}Others{/t} + + + + + + +   + + + ({t}sticky{/t}) +
+
+ + + + +
+
+
+
+ + {if !$freeze} +   + + {/if} + +
+ + - - - - - - + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiVariable.tpl b/gosa-plugins/fai/admin/fai/faiVariable.tpl index 366c4ad2f..5ff1c0459 100644 --- a/gosa-plugins/fai/admin/fai/faiVariable.tpl +++ b/gosa-plugins/fai/admin/fai/faiVariable.tpl @@ -1,78 +1,67 @@ - - - - - - +
-

{t}Generic{/t}

- - - - - - - - - -
- - -{render acl=$cnACL} - -{/render} -
- - -{render acl=$descriptionACL} - -{/render} -
- 		- -   - -

- -

- - - - -
-
-{if $is_createable} - - -{else} - - -{/if} - -{if $is_removeable} - - -{else} - - -{/if} -
-
+ + + + +
+

{t}Generic{/t} +

+ + + + + + + + + +
+ + {render acl=$cnACL} + + {/render} +
+ + {render acl=$descriptionACL} + + {/render} +
+ 		  + +

+

+ + + + +
+ +
+ + {if $is_createable} + + {else} + + + {/if} + + + {if $is_removeable} + + {else} + + + {/if} +
+
- - - - + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/faiVariableEntry.tpl b/gosa-plugins/fai/admin/fai/faiVariableEntry.tpl index efe8ee236..d00e97f13 100644 --- a/gosa-plugins/fai/admin/fai/faiVariableEntry.tpl +++ b/gosa-plugins/fai/admin/fai/faiVariableEntry.tpl @@ -1,69 +1,62 @@ + - - - - - + + + + +
-

{t}Generic{/t}

- - - - - - - - - -
- {t}Name{/t}{$must}  - -{render acl=$cnACL} - -{/render} -
- {t}Description{/t}  - -{render acl=$descriptionACL} - -{/render} -
- 		- -   - -

{t}Variable attributes{/t}

- - - - - -
- - -{render acl=$FAIvariableContentACL} - -{/render} -
-
+

{t}Generic{/t} +

+ + + + + + + + + +
{t}Name{/t} + {$must}  + + {render acl=$cnACL} + + {/render} +
{t}Description{/t}  + + {render acl=$descriptionACL} + + {/render} +
+ 		  + +

{t}Variable attributes{/t} +

+ + + + + +
+ + {render acl=$FAIvariableContentACL} + + {/render} +
+

-{if !$freeze} -   - -{/if} - - -
- - - - + + {if !$freeze} +   + + {/if} + + + \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl index 49054aa48..fede5f721 100644 --- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl +++ b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl @@ -1,31 +1,47 @@ -
-
-

{$HEADLINE} {$SIZELIMIT}

-
- - - - - - - - - - -
{$ROOT}{$BACK}{$HOME}{$RELOAD}{t}Base{/t} {$BASE}{$ACTIONS}{$FILTER}
-
+
+
+

+ {$HEADLINE}  + {$SIZELIMIT} +

+
+ + + + + + + + + + + +
+ {$ROOT} + + {$BACK} + + {$HOME} + + {$RELOAD} + {t}Base{/t} + {$BASE} + + {$ACTIONS} + + {$FILTER} +
- - {$LIST} +
+ {$LIST} +
+
- -
-
- - - - -
+ + +
\ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/paste_generic.tpl b/gosa-plugins/fai/admin/fai/paste_generic.tpl index d51583a1f..ef07c5dc6 100644 --- a/gosa-plugins/fai/admin/fai/paste_generic.tpl +++ b/gosa-plugins/fai/admin/fai/paste_generic.tpl @@ -1,11 +1,12 @@ -

{t}FAI settings{/t}

- + +

{t}FAI settings{/t} +

+
- -
- {t}Class name{/t} + {t}Class name{/t}
+ \ No newline at end of file diff --git a/gosa-plugins/fai/admin/fai/remove_branch.tpl b/gosa-plugins/fai/admin/fai/remove_branch.tpl index 67628ee54..a8bdd384c 100644 --- a/gosa-plugins/fai/admin/fai/remove_branch.tpl +++ b/gosa-plugins/fai/admin/fai/remove_branch.tpl @@ -1,21 +1,17 @@ +
{image path="images/warning.png" align="top"} {t}Warning{/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} + {$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}

- -

- {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t} +

{t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}

-
- - - - -
+ + +
\ No newline at end of file -- 2.30.2