From 8b3877c34e4717caf3f127b6a82e1637355345e2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 13 Jun 2011 13:44:47 -0700
Subject: [PATCH] Update the default CS notification template.

---
 docs/changelog/7.x.x.txt                         |   1 +
 docs/templates.txt                               |   4 ++++
 .../default_forum_notification.wgpkg             | Bin 0 -> 1420 bytes
 lib/WebGUI/i18n/English/Asset_Collaboration.pm   |   6 ++++++
 4 files changed, 11 insertions(+)
 create mode 100644 docs/upgrades/packages-7.10.18/default_forum_notification.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 3c03b8a10..9afcd2936 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - fixed #12156: Asset Manager performance
  - fixed #12158: Shop credit cannot be used to pay for Shipping on PayPal
  - rfe #12159: Asset Manager sort preferences
+ - added: new default Collaboration System notification template.
 
 7.10.17
  - fixed: Forced to use a PayDriver even with a balance of 0 in the cart.
diff --git a/docs/templates.txt b/docs/templates.txt
index 8157d8b58..999e7f13d 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -1,6 +1,10 @@
 This is a running list of template changes made during upgrades.  If you have copied the default
 templates, you will need to apply these changes manually to your copies.
 
+7.10.18
+  * Collaboration System Default Notification Template /default_forum_notification
+    Replace table with divs to make inline replying easier.
+
 7.10.15
   * Gallery CSS - root/import/gallery-templates/gallery.css
     Remove float:left on .wgAlbum.
diff --git a/docs/upgrades/packages-7.10.18/default_forum_notification.wgpkg b/docs/upgrades/packages-7.10.18/default_forum_notification.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..aebd53790fa5609b653a4a69f20fbb1395e25f0f
GIT binary patch
literal 1420
zcmV;71#|iziwFP!00000|Ls_9ZyGre=5v3AMWxeKO2aO%g;1m<4J}pLOPi!U>9|8)
z)_^aIy|TR_+^PTlX1oh)2%(7t(tXHAN*0f2=JD8`=OKrM{Xd@PH5#=-!Snn^&BMQ*
zU#%7jWchdn->)@l)kekhD+S{FUb$Q#;IjWG(S|C3G?Wn+HxK7aG*kLvGcF1qyEyxI
z%hdmq$)fh1-*52UuO0rarPvWr2w1PfesA7?AF@@}_P<*3s|5np-2bz${Xg74^j&25
z_XS+SqBc^|F)NZ5`Qy(6I}|G!Gi5l_IBKWi%%Nh`u<&G#qs2<mPDVpSwK=<sr2^}*
z^$|%FEzMbmUU+s#r*ULctxbTqHfWp#5!VwI=D`J<edi*SGdsb{4SFtQtoi+X?9M3q
zfzj}aj`al{-at4&ypmGR1XI^=uY1<!u4cvko+H(onat_p#K3y+(&SIMkt0l0WI=~)
zM3cx2Mp7lyfslre_>dYdMLw774?GN+unxXEexan1W*(;%atbh3GKrz8AvdX4Id?M*
zkS(g(j)^w&h`sF>11JajiSRXaJ*iqGh+yc5WS?deZdj)sblSMI!7Wt;yPu#_)**lO
zgu!=2PNQEZRFhb0*mPnfk%AF9B6FE2qLV-m6_0VEJ~+mb4Nheg(E!dG4!$~Smmo(e
z?({`p<hh0tG6>_0MpDLv8bgPZDOd*h8O*5*ACbYJ+xvQXH5lMvpa8n+tl`YP^#Mu2
z9K-1zM(ouQI3*Ffmh5`@2;U>#X;U&$Z1lF@?-z4;u%R6sajG-o5wq24mnbX<Tp>Uf
z3&5QpFR+#F=Sg#BD{|bh;_ujq3l{nqF66gcHt=QF!=EF7)fY&s4&JpuC5VIp-Ni1j
zI!VjBN@@c=GHGR3No}A<Cavx&sSWhVq_tfowShJzEtx=ub4*h*G>90!#rc_bPqfJH
zYQV1XaJxr4$!+JLkFKCG!U@MyZf~FyaPuYk#@URR3D;!Gv<8lW9s!>jnX!Oq=rf0T
zw7he1F=2`uK+{!ndO;Q3dfVQd&gb0dkDyi1ywcr4*BN#?p<=v|uHa&2j90XcdxHkb
z@eG08^k?XQ7Q}ZJyua?XTDFa}T33rUyCgg0!cQ`U4xh44(XV)oX0y@o-0sXxN`pnX
z=12{si_}0qZ={B-&to|)28Us|#_o?>Y%LCN=o=odghS4D?9fb;t0%$0q9&GYi!=s_
zaO<)()QFi&{!fad{Kl{66^yBZKD4cTt=5ODPv`fG$@RHJ`c5Us$`*5-mG0icoxQg<
zD1Nh9Ym}Yyqu4FiKtt~q47q8OxYZ8JgOaaDPvop8V8^CuHJqwK6HNujLVj2TPG+PE
z9n)c2rxi{tt!&rwKrNU&7cy{tamNXeX~-0iy4Np~A&a7zh9MVY7^!3<m?|A9TY6|O
z8-r2U6inFpMFctqI)+!<FVgYMN`kQ!2B;iRCqUQ-l|(8eu!D?%#Zy56epXT7DBSr>
zgrr)-8j!VC`D$NM13^LS`q?sHzU$)8wuNR>EcAs;a9b+$(U<v}?9J#wan}oz71Uk+
zX3w-s{uFpB1GWOsl|qhhA-NtX&D!~R@W7y21UcrY2rFF{$ILlMnO=D^(3Q|@XdfeJ
z_5-E7ex`l`#j2D2K&d<tiq$Opfl_@U6su(R1EsbN%Kn8?P8&=N)jT#A8yLmVarTw6
z`$c{`xgK4<zZt~!L2&l%%xCp4c@VBI=kSedy3Q+>(H2DM@;oR6`^|ilMzCM#S7^{L
zS1Zk0y}8QXpujSC??3-`tbcF5xjog9_wnm&G&_Gi9_R3u{FmXwe<%ES@#DoV{$24L
a<GBLQ6?m?|a|L!(f&T#cVzPw*8UO%&UBSTs

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/i18n/English/Asset_Collaboration.pm b/lib/WebGUI/i18n/English/Asset_Collaboration.pm
index 42bccecde..13e40d26d 100644
--- a/lib/WebGUI/i18n/English/Asset_Collaboration.pm
+++ b/lib/WebGUI/i18n/English/Asset_Collaboration.pm
@@ -1809,6 +1809,12 @@ the Collaboration Asset, the user will be notified.|,
         lastUpdated => 0,
     },
 
+    'View this message on the website' => {
+        message     => q{View this message on the website},
+        context     => q{label in the default notification email template},
+        lastUpdated => 0,
+    },
+
 };
 
 1;