From c9b1431bfad92e1359b7647ed5b320e082477ddd Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 22 Mar 2011 22:16:43 +0000
Subject: [PATCH] Bug 643904 - Bugzilla::Extension should export a web_dir
 attribute to get full path to the extension's web directory r/a=mkanat

git-svn-id: svn://10.0.0.236/trunk@262091 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                  |  2 +-
 mozilla/webtools/bugzilla/Bugzilla/Extension.pm    | 12 +++++++++++-
 mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm |  9 +++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 7f1edb6e4da..fe324c23931 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7756
\ No newline at end of file
+7757
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Extension.pm b/mozilla/webtools/bugzilla/Bugzilla/Extension.pm
index 857d0d75b8a..dbfee097134 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Extension.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Extension.pm
@@ -26,7 +26,7 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Install::Util qw(
     extension_code_files extension_template_directory 
-    extension_package_directory);
+    extension_package_directory extension_web_directory);
 
 use File::Basename;
 use File::Spec;
@@ -214,6 +214,7 @@ sub lib_dir {
 
 sub template_dir { return extension_template_directory(@_); }
 sub package_dir  { return extension_package_directory(@_);  }
+sub web_dir      { return extension_web_directory(@_);      }
 
 ######################
 # Helper Subroutines #
@@ -786,6 +787,15 @@ This defaults to the C<template> subdirectory of the L</package_dir>.
 If you want to override this method, and you have a F<Config.pm>, you must
 override this method in F<Config.pm>.
 
+=head3 C<web_dir>
+
+The directory that your package's web related files are in, such as css and javascript.
+
+This defaults to the C<web> subdirectory of the L</package_dir>.
+
+If you want to override this method, and you have a F<Config.pm>, you must
+override this method in F<Config.pm>.
+
 =head3 C<lib_dir>
 
 The directory where your extension's libraries are.
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
index c8d3d8eb412..a2371a0be0c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
@@ -46,6 +46,7 @@ our @EXPORT_OK = qw(
     extension_package_directory
     extension_requirement_packages
     extension_template_directory
+    extension_web_directory
     indicate_progress
     install_string
     include_languages
@@ -214,6 +215,14 @@ sub extension_template_directory {
     return "$base_dir/template";
 }
 
+# Used in this file and in Bugzilla::Extension.
+sub extension_web_directory {
+    my $extension = shift;
+    my $class = ref($extension) || $extension;
+    my $base_dir = extension_package_directory($class);
+    return "$base_dir/web";
+}
+
 # For extensions that are in the extensions/ dir, this both sets and fetches
 # the name of the directory that stores an extension's "stuff". We need this
 # when determining the template directory for extensions (or other things