[dw-free] link to dw merch in shop menu

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/aa89589bfd4d]

http://bugs.dwscoalition.org/show_bug.cgi?id=2528

Add a configurable link to merchandise.

Patch by kareila.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/DW/Logic/MenuNav.pm
• doc/config-local.pl.txt

--------------------------------------------------------------------------------
diff -r 5a791508cd9c -r aa89589bfd4d bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Fri Jun 04 12:58:57 2010 +0800
+++ b/bin/upgrading/en.dat	Fri Jun 04 13:20:19 2010 +0800
@@ -2201,6 +2201,8 @@ menunav.shop.paidtime=Buy a Paid Account
 
 menunav.shop.history=Payment History
 
+menunav.shop.merchandise=[[siteabbrev]] Merchandise
+
 menunav.shop.sponsor=Sponsor a User
 
 menunav.shop.transferpoints=Transfer Shop Points
diff -r 5a791508cd9c -r aa89589bfd4d cgi-bin/DW/Logic/MenuNav.pm
--- a/cgi-bin/DW/Logic/MenuNav.pm	Fri Jun 04 12:58:57 2010 +0800
+++ b/cgi-bin/DW/Logic/MenuNav.pm	Fri Jun 04 13:20:19 2010 +0800
@@ -262,6 +262,12 @@ sub get_menu_navigation {
                     text => "menunav.shop.transferpoints",
                     display => LJ::is_enabled( 'payments' ) && $loggedin_person ? 1 : 0,
                 },
+                {
+                    url => $LJ::MERCH_URL,
+                    text => "menunav.shop.merchandise",
+                    text_opts => { siteabbrev => $LJ::SITENAMEABBREV },
+                    display => $LJ::MERCH_URL ? 1 : 0,
+                },
             ],
         },
     );
diff -r 5a791508cd9c -r aa89589bfd4d doc/config-local.pl.txt
--- a/doc/config-local.pl.txt	Fri Jun 04 12:58:57 2010 +0800
+++ b/doc/config-local.pl.txt	Fri Jun 04 13:20:19 2010 +0800
@@ -91,6 +91,9 @@
     # (Note: you need to provide your own 404-error-local.bml)
     # $PAGE_404 = "404-error-local.bml";
 
+    # merchandise link
+    # $MERCH_URL = "http://www.zazzle.com/dreamwidth*";
+
     # shop/pricing configuration
     # %SHOP = (
     #    key => [ $USD, months, account type, cost in points ],
--------------------------------------------------------------------------------