[Rt-commit] rt branch, lcore, updated. 92bac07a334283189cfb70dbe5a07d85a547fe38

[jesse]

The branch, lcore has been updated
       via  92bac07a334283189cfb70dbe5a07d85a547fe38 (commit)
      from  1660b512047eeaaedb885c2d93ea0f30dfc5c89e (commit)

Summary of changes:
 share/web/static/css/rulebuilder.css |   12 ++++++++----
 share/web/static/js/rulebuilder.js   |    8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 92bac07a334283189cfb70dbe5a07d85a547fe38
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Sep 10 22:10:25 2009 -0400

    css cleanups to rulebuilder. move match/nomatch up one level.

diff --git a/share/web/static/css/rulebuilder.css b/share/web/static/css/rulebuilder.css
index dfe2982..12b2bbe 100644
--- a/share/web/static/css/rulebuilder.css
+++ b/share/web/static/css/rulebuilder.css
@@ -32,11 +32,13 @@ div.context {
     border: 1px dashed;
     margin: 0.5em;
     padding: 0.5em;
-    min-height: 1.5em;
+	max-width: 70%;
+	display: inline-block;
 }
 
 div.current {
     border: 1px dotted red;
+	background: #ffc;
 }
 
 div.application-params span.param-placeholder,
@@ -101,12 +103,14 @@ div.application-params span.param-placeholder.current {
 	background: #f99;	
 }
 
-.return-type.unmatched {
+
+
+.unmatched .return-type {
     background: #f99;
     border: 1px solid red;
 }
 
-.return-type.matched {
+.matched .return-type {
     background: lightGreen;
     border: 1px solid green;
 }
@@ -117,4 +121,4 @@ div.application-params span.param-placeholder.current {
 
 div.context span.expression {
     padding-left: 1em;
-}
\ No newline at end of file
+}
diff --git a/share/web/static/js/rulebuilder.js b/share/web/static/js/rulebuilder.js
index c203540..74cce8e 100644
--- a/share/web/static/js/rulebuilder.js
+++ b/share/web/static/js/rulebuilder.js
@@ -101,17 +101,17 @@ RuleBuilder.prototype.focus = function(ctx) {
     this.current_ctx = ctx;
     jQuery(this.current_ctx.element).addClass('current');
     var type = this.current_ctx.expected_type;
-    jQuery('.functions .return-type', this.ebuilder).removeClass('matched')
+    jQuery('.functions ', this.ebuilder).removeClass('matched')
                                                      .addClass('unmatched');
 
-    jQuery('.expressions .return-type', this.ebuilder).removeClass('matched')
+    jQuery('.expressions', this.ebuilder).removeClass('matched')
                                                    .addClass('unmatched');
 
     jQuery('.functions .return-type:contains('+type+')', this.ebuilder)
-    .addClass('matched');
+    .parent().addClass('matched');
 
     jQuery('.expressions .return-type:contains('+type+')', this.ebuilder)
-    .addClass('matched');
+    .parent().addClass('matched');
 };
 
 RuleBuilder.prototype.update_expressions = function() {

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