[Rt-commit] rt branch, 4.2/drop-logo-size, created. rt-4.2.5-161-g9553040

[Alex Vandiver]

The branch, 4.2/drop-logo-size has been created
        at  95530402fc3f85e813a3736ef40e96c1f6af356f (commit)

- Log -----------------------------------------------------------------
commit 95530402fc3f85e813a3736ef40e96c1f6af356f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Apr 30 11:42:02 2014 -0400

    Drop the ineffective logo height and width configurations
    
    The $LogoImageHeight and $LogoImageWidth configurations were only output
    on the <img> tag if the stock BPS logo was in use.  Additionally,
    however, those values were ignored by the browser, because every RT
    style sets:
    
        div#logo a img {
             height: 100% !important;
             width: auto !important;
        }
    
    ...which overrides explicit height="..." and width=".." attributes.
    
    Remove the configuration options which thus do not actually control
    anything.
    
    Fixes: I#26827

diff --git a/docs/UPGRADING-4.2 b/docs/UPGRADING-4.2
index a6ee547..ccd8575 100644
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@ -338,4 +338,11 @@ want to modify or remove the Notify Owner and AdminCcs scrip to avoid
 duplicate notifications. This Scrip Action is not used in any default
 Scrips at this time.
 
+=head1 UPGRADING FROM 4.2.6 AND EARLIER
+
+The C<$LogoImageHeight> and C<$LogoImageWidth> configuration options
+have been overridden by CSS since 4.0.0, and thus did not affect
+display.  They have been removed, and setting them will trigger an
+informational message that setting them is ineffective.
+
 =cut
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 0ad4268..09eb3dd 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -1101,24 +1101,6 @@ will be passed through C<loc> for localization.
 
 Set($LogoAltText, "Best Practical Solutions, LLC corporate logo");
 
-=item C<$LogoImageHeight>
-
-C<$LogoImageHeight> is the value of the C<height> attribute of the logo
-C<img> tag.
-
-=cut
-
-Set($LogoImageHeight, 38);
-
-=item C<$LogoImageWidth>
-
-C<$LogoImageWidth> is the value of the C<width> attribute of the logo
-C<img> tag.
-
-=cut
-
-Set($LogoImageWidth, 181);
-
 =item C<$WebNoAuthRegex>
 
 What portion of RT's URL space should not require authentication.  The
diff --git a/share/html/Elements/Logo b/share/html/Elements/Logo
index 1907eef..8b6d2e3 100644
--- a/share/html/Elements/Logo
+++ b/share/html/Elements/Logo
@@ -53,9 +53,7 @@
 % } else {
 <a href="<%$ARGS{'LogoLinkURL'}||RT->Config->Get('LogoLinkURL')%>"><img
     src="<%$ARGS{'LogoURL'}||RT->Config->Get('LogoURL')%>"
-    alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>"
-    width="<%$ARGS{'LogoImageWidth'}||RT->Config->Get('LogoImageWidth')%>"
-    height="<%$ARGS{'LogoImageHeight'}||RT->Config->Get('LogoImageHeight')%>" /></a>
+    alt="<%loc($ARGS{'LogoAltText'}||RT->Config->Get('LogoAltText'))%>" /></a>
 % }
 % if ( $ShowName ) {
     <span class="rtname"><% $Name || loc("RT for [_1]", RT->Config->Get('rtname')) %></span>

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