[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-729-gaaec9e4

Tue Sep 7 18:59:20 EDT 2010

The branch, 3.9-trunk has been updated
       via  aaec9e415ea485d2c778813e6a791287b5facae1 (commit)
       via  c35b1f3e25412d616e6044a9f73121666f1c9af9 (commit)
       via  b769fde537f7605678964e582165982e7908da6f (commit)
      from  a7febc59dcc3acf7c2bd5e671d036ea410a75351 (commit)

Summary of changes:
 share/html/Admin/Global/Theme.html |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit b769fde537f7605678964e582165982e7908da6f
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Sep 7 18:47:44 2010 -0400

    Don't return empty colors even if there are less than 6

diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index 53d3e4b..9df68f5 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -253,7 +253,8 @@ sub analyze_img {
     for (values %$color) {
         $_->{rank} = $_->{s} * $_->{cnt};
     }
-    my @top5 = (sort { $b->{rank} <=> $a->{rank} } values %$color)[0..5];
+    my @top5 = grep { defined and $_->{'l'} and $_->{'c'} }
+                    (sort { $b->{rank} <=> $a->{rank} } values %$color)[0..5];
     if ((scalar uniq map {$_->{rank}} @top5) == 1) {
         warn "bad";
     }

commit c35b1f3e25412d616e6044a9f73121666f1c9af9
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Sep 7 18:55:04 2010 -0400

    Clarify the conditionals with a couple comments
    
    We might want to make our styles smarter or simpler instead of relying
    on these conditionals.

diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index 9df68f5..3298161 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -142,9 +142,11 @@ jQuery(function($) {
               var rule = new RegExp('\\b'+applying[name]+'\\s*{.*?}');
               var newcss = "background: " + bg;
 
+              /* Don't set the text color on <body> as it affects too much */
               if (applying[name] != "body")
                   newcss += "; color: " + fg;
 
+              /* Kill the border on the quickbar if we're styling it */
               if (applying[name].match(/quickbar/))
                   newcss += "; border: none;"
 

commit aaec9e415ea485d2c778813e6a791287b5facae1
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Sep 7 18:56:23 2010 -0400

    Link elements are only valid in the <head> of an HTML document
    
    Our /Elements/Header elements supports a crude way of injecting them, so
    at least use it.

diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index 3298161..7517b56 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -45,14 +45,16 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => loc("Theme") &>
+<& /Admin/Elements/Header,
+    Title => loc("Theme"),
+    LinkRel => { stylesheet => '/NoAuth/css/farbtastic.css' }
+    &>
 <& /Admin/Elements/SystemTabs, 
     current_tab => 'Admin/Global/Theme.html', 
     Title => loc("Theme") &>
 <& /Elements/ListActions, actions => \@results &>
 
 <script type="text/javascript" src="/NoAuth/js/farbtastic.js"></script>
-<link rel="stylesheet" href="/NoAuth/css/farbtastic.css" type="text/css" />
 <style type="text/css" media="screen" id="test"></style>
 
 <div id="simple-customize">

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