From 007391d5f1bdcb58a6c1528e16faf26b62b5b0a3 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 10 May 2010 10:55:02 -0700
Subject: [PATCH] Label the form field for entering in sub-keywords.

---
 docs/changelog/7.x.x.txt                         |   1 +
 .../wiki-master-by-keyword-template.tmpl.wgpkg   | Bin 0 -> 1326 bytes
 lib/WebGUI/i18n/English/Asset_WikiMaster.pm      |   6 ++++++
 3 files changed, 7 insertions(+)
 create mode 100644 docs/upgrades/packages-7.9.5/wiki-master-by-keyword-template.tmpl.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e6e86658f..8188c81e7 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - fixed #11561: PayDriver_Cash - password help
  - fixed #11541: running workflows screen
  - fixed #11544: VersionTag Workflows with missing Version Tags run forever
+ - fixed #11555: Wiki subcategories entry field is not labeled
 
 7.9.4
  - We're shipping underscore.js now for its suite of extremely handy utility
diff --git a/docs/upgrades/packages-7.9.5/wiki-master-by-keyword-template.tmpl.wgpkg b/docs/upgrades/packages-7.9.5/wiki-master-by-keyword-template.tmpl.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..b4e74c04f2e1c2b9c10cc2afc6cdfdd8d1bf0c5e
GIT binary patch
literal 1326
zcmV+}1=0E+iwFP!00000|Ls?8Zz4Ak=5v09MWrf{F0jkn<_JZ~%jJSDM7f4Em6{eA
z)_}vVy|TR_w7vh{vDb?iLL&8)NR^tE0%+&$nP=>oNu~7mkLP(o&@7ca&kvfO{`UMv
zqf|nx$1C}MJ*at&h8NUI$oD~^guvwOpHwO=0MeL8l+B-ymr5e!^J1M8JSI8w{etR$
zNn}v_?z7o2zYi++lCxI=3LaZ6sP{AVZ?;;&M*SOgFDM~k^X;Fvs(<C}p}$6izjojf
zmKBMU2rDwgO5yP=CQQjPYNOwN|6t@&ae=3#_$m=RAwp4N6pb70DZ)~HdQ7-bBs?-A
zmPV2BqQzrDAWV3?)UL|)@=9PM^ukY%7_gX7YnE_Lm3doE(osa^jD*gbk;N@#Azv7`
zo)eHqCGa`H;Q&wN6&}yQ3L>w2UNW9Y`V{P%@e?z?U_{(NSLhj+#bi<u86XQfr~5H5
zLd5=Pxj!e%1sCCd&UQsXrVcBXk|^u!7A(JH>gGP058vrhc_p~wYMEr56jG-0oQ5G`
zn^a5%PZQubq{@g2<mZ6Q`#aW|`Q47jHhjPWS=8N56<*&l5E~JlpfP4gVN4m-34+Mk
zOt^?O>-IGsMFc#Kc({Zw0e@llj~)Xnh85)uN4wYQDCb9hIMPfEH3xk|-rixS3MSgj
z#jv=}AQWKJqN;XXwPC8tM$Pk(=_sbksBc0&<J@LYwYjY)YD39k#Cf6<oz*w-kKuGq
zxq$0{B0M6I&7qH#ppP0qn1G?NHZioToLlEOr<TeAPcFy<iL@0)GeIUl-IZPTaKyTI
z<pLdwDot_~chRm>3yB;P7Gk*1-M!98psMy)$kP7K6RR441vzNvm=fp!^1?EZY!dJ@
z(G4U-S6XXp1&!;}B;*(<I@RkyC!*bdnQxYs%URm{3}k?_Rl2JbGYHS-NV79p(a27C
z%2b8Qei|tXT?xDykRg3QV`y~}Y65!J1nQB=jgHAtUm&MYNd$SIJcUj)C0&Gm{J}q{
zA0h|6s0u0<aI-3DGT^?~eNmY~t1><<zA6B8nbQgU1|BqOsg@BjsKb!5X&W6RkB9mo
zZ8>8xm+FcqX@td1cHA~DZ9(CpaOl@BE*!|e(Kh#jz|mAEGtA(`Y!9%e@*N>`13u?5
z+3r1;zT~)Lsk~!_=F4V8Pz6rU1dp$<fHXF{tvMZ+IL_MhEg5~j>9yOYv9;R+J8qpz
z*gXjpJoBQP{g#!?X`5M?5w~TO>Ji-MA)U}{*p>ZSP;dGTuikPl>@@g=l5A!MPGmZX
zL4tH8vm1?$m&gtzv>TEMh8wZxY~-9Kms~+iXoS$wjrrQV(sM_5<V}g0de`(%D+v4o
z5}jvi=5iS)uy8ySXFe<`=|DHV7oa+T2^KJ_jp{SSXt&P?{fnoiq0sa6-jMAqYnua=
zrx_EQNfir}$!fLQfmi?7ER;a^0tsB5=8Mg?I>Dfatz~sITte{wNVd=9+l`4+*aPH@
zFM3SRyNtm?H5i;rnc#6oox85X(bCq~#UX4gmWk;un-TK0!R=M$7gmQ3^xdq}nb8NW
z&Q6o>Y5BUd7e`m83f>)Pg{O9r`ue37o+<xh@AFOn@-$-S_n6@$r%C1Y64sY^GdC);
zEq2?HHHFI$M7hAL*>2Y=>K`<NW}_Jtl;9*nzsTV=(qD%s&1QhbAZeWr?-$4Z{Z|KX
kRb`7$Z{y!~zU{om>i_QJoq=}-{^tz*1L_x}X#f-e0F*P3$^ZZW

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/i18n/English/Asset_WikiMaster.pm b/lib/WebGUI/i18n/English/Asset_WikiMaster.pm
index 87871c87b..5dcc0273f 100644
--- a/lib/WebGUI/i18n/English/Asset_WikiMaster.pm
+++ b/lib/WebGUI/i18n/English/Asset_WikiMaster.pm
@@ -656,6 +656,12 @@ listing of pages that are related to a specific keyword?| },
         context     => q{template variable help},
     },
 
+    'Sub-keywords' => {
+        message     => q{Sub-keywords},
+        lastUpdated => 0,
+        context     => q{template label},
+    },
+
 };
 
 1;