From 6650d8be394be533bf3125b4fe9722ea9e30e5d1 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 9 Jul 2007 13:16:39 +0000 Subject: [PATCH] Updated fai branch freeze grey out git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6782 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/images/branch_small_grey.png | Bin 0 -> 370 bytes html/images/freeze.png | Bin 0 -> 750 bytes html/images/freeze_grey.png | Bin 0 -> 481 bytes plugins/admin/fai/branch_selector.tpl | 34 +++++++++++++--------- plugins/admin/fai/class_faiManagement.inc | 1 - 5 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 html/images/branch_small_grey.png create mode 100644 html/images/freeze.png create mode 100644 html/images/freeze_grey.png diff --git a/html/images/branch_small_grey.png b/html/images/branch_small_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..85dedaf5a270158212c0e65f8cdcc64ea0de127e GIT binary patch literal 370 zcmV-&0ge8NP);m%tS5v zY9?98VC(>scPC1HD`DazigRgzuLv7&9m-&qAyU>S*7i5Q6(@G<|01mHXFnAC{&}h; zlPs+XTaE|hs$?3r@ZzUrEXiI>eUL1W6}`X0_se^oDC%@NQKuh@Kl-m;0U0uzrpPy_ QR{#J207*qoM6N<$f_iO`iU0rr literal 0 HcmV?d00001 diff --git a/html/images/freeze.png b/html/images/freeze.png new file mode 100644 index 0000000000000000000000000000000000000000..04a05c1cb1fec55b1d037f11b7340d8d24f9b969 GIT binary patch literal 750 zcmVsmTOMf>H=7Ly%CAwRb5*>sq*K2!wDGwwax7f*>fu zMXOv`(8`V0A~f(jlp#%LhH>6F&-d=U?-tXHQ<7(O?mhqi?_AEgb^H_4({CefZQ+Nl zt<8^`n(D6s$g-NsW~G^2uK0R#@_|&Vch?@Kre3v#!=Xex-v4Z9s5csmwbRwrLU(t2 zb0FZmolfW7@%a7K#l?AX4v_JRTV6 z3rC~P3pr#qW2szP^{qWTcnL}KA-1` z5L&fy6`&|8hM^;bAd|_Tn5MZ}sm;zNva+mbnpQ&BbreOd&aFzid1*6*==2I{AFrA9 zOb*U%0ouXUQnRmynpc7Kn&0|}rGU^Uq{>J8Q>tjN`oP-7@?A{9g=Ag|YM z=vajMo0`Kx^;9W&3VX|jP+tr@+4$@M$V%LckKGz=>c|1dfD?q^P%R*a1?0hT0>zz< zJ73@Legn#YqnwSU?m#ieh2a2_z}k>F%7xBmaF}y23M%-t3(O7_OK@<4Avql8oHIba z=wKB!@QS|;m9CZziVnvr7#3E^MZQ=Aa2!B2z^{R;4r~WZyKFRV&@Ct#VAx<-pu4O5 z>KZZZGD-g^l7_SWI}*9SXmpY40*@IsJ=F5qcK(ct@a?L+yZ+;HDjF9Z6Eo)!Z(9b9U^ z#Sy^!n&tZh*Z^n%g&|LGA+)K&6ac5XjjtDTG@%bRW>U+U>7i81O&zOD?n86H_N;yH z?NUX9=Is1T76}79CYDTHz4-WriUxITwW&uEn{(>wh6Wb;e}Ka;EE)>9#i74vHp0h3 z5OAviiH}Euh=_;~L5GkKf&3dY1Oy?12tnAj`1c1j7xq{X;l)68x2*XreAT00000NkvXXu0mjfWW&;7 literal 0 HcmV?d00001 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"); } } - } /**************** -- 2.30.2
+ {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}