[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-192-ge8e31f2

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  e8e31f200b21410ecc2f81ea42cab775aa3c6640 (commit)
       via  beaf42c9bf948385ad65f11a9c0dc7da12505fd9 (commit)
      from  86f2cba262f22c8a572d47df65f40ee275194b93 (commit)

Summary of changes:
 .gitignore                                         |    2 +-
 share/html/Admin/Global/Theme.html                 |    2 +-
 share/html/Elements/Logo                           |    2 +-
 .../UserLogo => NoAuth/Helpers/CustomLogo}         |    0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename share/html/{Helpers/UserLogo => NoAuth/Helpers/CustomLogo} (100%)

- Log -----------------------------------------------------------------
commit beaf42c9bf948385ad65f11a9c0dc7da12505fd9
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Oct 21 14:46:57 2010 -0400

    Move the UserLogo helper to a NoAuth location
    
    In the process, fix the <img> src URLs to prepend $WebPath and rename
    the component to CustomLogo.

diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index 15baa2e..276d704 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -61,7 +61,7 @@
 <div id="upload-logo">
   <h2>Logo</h2>
 % if ($img) {
-  <img src="/Helpers/UserLogo?<% time() %>" />
+  <img src="<% RT->Config->Get('WebPath') %>/NoAuth/Helpers/CustomLogo?<% time() %>" />
 % }
   <form method="POST" enctype="multipart/form-data">
     <label for="logo-upload"><&|/l&>Upload a new logo</&>:</label>
diff --git a/share/html/Elements/Logo b/share/html/Elements/Logo
index a9231e2..059f773 100644
--- a/share/html/Elements/Logo
+++ b/share/html/Elements/Logo
@@ -48,7 +48,7 @@
 <div id="logo">
 % if ($use_user_logo) {
 <a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img
-    src="/Helpers/UserLogo"
+    src="<% RT->Config->Get('WebPath') %>/NoAuth/Helpers/CustomLogo"
     alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>" /></a>
 % } else {
 <a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img
diff --git a/share/html/Helpers/UserLogo b/share/html/NoAuth/Helpers/CustomLogo
similarity index 100%
rename from share/html/Helpers/UserLogo
rename to share/html/NoAuth/Helpers/CustomLogo

commit e8e31f200b21410ecc2f81ea42cab775aa3c6640
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Oct 21 14:48:26 2010 -0400

    Don't ignore RT.pm, but instead ignore RT/Generated.pm

diff --git a/.gitignore b/.gitignore
index 17a8249..9c8363e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ etc/upgrade/3.8-branded-queues-extension
 etc/upgrade/3.8-ical-extension
 etc/upgrade/split-out-cf-categories
 etc/upgrade/generate-rtaddressregexp
-lib/RT.pm
+lib/RT/Generated.pm
 Makefile
 t/data/gnupg/keyrings/random_seed
 t/data/configs/apache2.2+fastcgi.conf

-----------------------------------------------------------------------