[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-1061-g8178ac6

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  8178ac6ccdd707045fb25b7a9b07fec4f5508b41 (commit)
       via  c1525149c003a949cc50b36f639021d91bad7007 (commit)
       via  2142df6a23f70399cd5014cc5ed1aa80f3c310ef (commit)
       via  46976ee7551191c9888e7e3d99860c11156d680c (commit)
       via  7628a51c8977a89fda5860a59bff74fd08f94e80 (commit)
       via  58f9fc1a1357d592ea07c59a38b6d40ff0f7326b (commit)
       via  3a5f91569b88172942b27bff4cdd93006644f6cf (commit)
       via  4485a37d9703379007b70573eb1661a3db89bde4 (commit)
       via  5b572ed8c64f9ce240c548ef81776193d9451c41 (commit)
       via  ac4105da4e97b07f3b981306a5f440593d261a27 (commit)
       via  ecaf1a8580703c3e47235a9bd168a83af034e2f9 (commit)
       via  a5e4e3867164e0d7e38a4bbc824987a4ce981de0 (commit)
       via  78cde82a53774bfdec5c84bbeba0895e915ec269 (commit)
       via  aa26405f0de61ac2160114fe2eea1972c9e7322d (commit)
       via  1ca17a66423132b7cba61b741b7be89fb32d8e8f (commit)
       via  800fbe0813e1b583d73b6170228baf3cd4632aa5 (commit)
       via  41bcc7baf5319981676f323dc563a463c5030e6e (commit)
       via  e3fd940616ee33348182b3c05d7961a1bf83517a (commit)
       via  e396fb46ea399249a3f6e848ca792d8dfd2c8761 (commit)
       via  6ed672847d837abaf0e04f83af725463c631c21b (commit)
       via  e6b03ead8284f491aa01d7976f46220e0411708f (commit)
      from  b03f18097b8d98e84841463053f7cfb3a08bca62 (commit)

Summary of changes:
 etc/RT_Config.pm.in                        |   20 ++++++--
 lib/RT.pm                                  |   56 ++++++++++++++++++++
 lib/RT/Interface/Web.pm                    |   23 ++++-----
 lib/RT/Squish.pm                           |   62 +++++-----------------
 lib/RT/Squish/CSS.pm                       |   71 +++-----------------------
 lib/RT/Squish/JS.pm                        |   77 ++-------------------------
 share/html/Elements/Header                 |   12 +++--
 share/html/Elements/HeaderJavascript       |   18 +++----
 share/html/NoAuth/css/aileron/misc.css     |    1 -
 share/html/NoAuth/css/aileron/msie-pie.css |    2 +-
 share/html/NoAuth/css/aileron/msie6.css    |    2 +-
 share/html/NoAuth/css/aileron/nav.css      |    2 +-
 share/html/NoAuth/css/ballard/misc.css     |    1 -
 share/html/NoAuth/css/base/superfish.css   |    4 +-
 share/html/NoAuth/css/base/tablesorter.css |    6 +-
 share/html/NoAuth/css/dhandler             |   10 ++--
 share/html/NoAuth/css/web2/misc.css        |    1 -
 share/html/NoAuth/css/web2/msie-pie.css    |    2 +-
 share/html/NoAuth/css/web2/msie6.css       |    4 +-
 share/html/NoAuth/css/web2/nav.css         |    4 +-
 share/html/NoAuth/js/dhandler              |    9 ++--
 t/api/squish.t                             |   19 ++-----
 t/web/squish.t                             |   25 +++++----
 23 files changed, 166 insertions(+), 265 deletions(-)

- Log -----------------------------------------------------------------
commit 8178ac6ccdd707045fb25b7a9b07fec4f5508b41
Merge: b03f180 c152514
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Dec 27 13:07:37 2010 -0500

    Merge branch 'squish-refactor' into 3.9-trunk
    
    Conflicts:
    	share/html/Elements/Header
    	share/html/NoAuth/css/web2/nav.css
    	t/web/squish.t

diff --cc share/html/Elements/Header
index 34a3ac7,79687c8..80c31a4
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@@ -59,7 -56,12 +59,9 @@@
  % }
  
  <link rel="shortcut icon" href="<%RT->Config->Get('WebImagesURL')%>/favicon.png" type="image/png" />
- <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/<% $style_path %>" type="text/css" media="all" />
 -
+ % for my $cssfile ( @css_files ) {
+ <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/<% $cssfile %>" type="text/css" media="all" />
+ % }
 -
 -<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/site.css" type="text/css" media="all" />
  <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/print.css" type="text/css" media="print" />
  
  % for (keys %{$LinkRel || {}}) {
diff --cc share/html/NoAuth/css/web2/nav.css
index 1858bcc,992efef..7b0e9e3
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@@ -64,8 -64,8 +64,8 @@@
      padding-left: 0.5em;
  }
  
 -#app-nav .sf-sub-indicator {
 +.sf-sub-indicator {
-     background-image: url(../images/arrows-grey.png);
+     background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/css/images/arrows-grey.png);
      margin-top: -3px;
  }
  
@@@ -99,8 -99,7 +99,8 @@@
  }
  
  #prefs-menu .sf-sub-indicator {
-     background-image: url(../images/arrows-grey.png);
+     background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/css/images/arrows-grey.png);
 +    margin-top: 0;
  }
  
  #main-navigation ul li {
diff --cc share/html/NoAuth/js/dhandler
index 33eef87,9aeae39..1102d66
--- a/share/html/NoAuth/js/dhandler
+++ b/share/html/NoAuth/js/dhandler
@@@ -47,16 -47,15 +47,15 @@@
  %# END BPS TAGGED BLOCK }}}
  <%ONCE>
  my $content = '';
 +require HTTP::Date;
  </%ONCE>
 -
  <%INIT>
  my $arg = $m->dhandler_arg;
- if ( $arg =~ m{squished-(.+)-([a-z0-9]{32})\.js$} ) {
-     my $name = $1;
-     my $squished = RT::Interface::Web::SquishedJS( Name => $name );
+ if ( $arg =~ m{squished-[a-f0-9]{32}\.js$} ) {
+     my $squished = RT::Interface::Web::SquishedJS();
  
-     $r->header_out( 'Last-Modified'  => 
-         HTTP::Date::time2str( $squished->ModifiedTime ) );
+     # Don't send Last-Modified since we don't handle If-Modified-Since
+     #$r->header_out( 'Last-Modified'  => $squished->ModifiedTimeString );
  
      $m->out( $squished->Content );
  }

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