From: hickert Date: Mon, 9 Jul 2007 13:16:39 +0000 (+0000) Subject: Updated fai branch freeze grey out X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6650d8be394be533bf3125b4fe9722ea9e30e5d1;p=gosa.git Updated fai branch freeze grey out git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6782 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/images/branch_small_grey.png b/html/images/branch_small_grey.png new file mode 100644 index 000000000..85dedaf5a Binary files /dev/null and b/html/images/branch_small_grey.png differ diff --git a/html/images/freeze.png b/html/images/freeze.png new file mode 100644 index 000000000..04a05c1cb Binary files /dev/null and b/html/images/freeze.png differ diff --git a/html/images/freeze_grey.png b/html/images/freeze_grey.png new file mode 100644 index 000000000..65fa982bb Binary files /dev/null and b/html/images/freeze_grey.png differ diff --git a/plugins/admin/fai/branch_selector.tpl b/plugins/admin/fai/branch_selector.tpl index 2211b0347..2285737e5 100644 --- a/plugins/admin/fai/branch_selector.tpl +++ b/plugins/admin/fai/branch_selector.tpl @@ -1,4 +1,4 @@ -
+

[F]{t}Branches{/t}

@@ -16,21 +16,27 @@ diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index a991b1d8d..86fb0c4c9 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -420,7 +420,6 @@ class faiManagement extends plugin new log("remove","fai/".get_class($this),$br[$bb],array(),"Release removed"); } } - } /****************
+ {if $allow_create} + +   + {t}Create new branch{/t} +
+ + {else} + {t}Branch{/t} +   + {t}Create new branch{/t} +
+ {t}Freeze{/t} + {/if} +   + {t}Create new locked branch{/t} - {if $allow_create} - -   - {t}Create new branch{/t} -
- -   - {t}Create new locked branch{/t} - {/if} {if $selectedBranch != "main" && $allow_remove} -
- -   - {t}Delete current release{/t} +
+ +   + {t}Delete current release{/t} {/if}