[Rt-commit] rt branch, lcore, updated. 664cb2b31f8f7fd73b83089e0bc3a1e1aa64c1e0

[jesse]

The branch, lcore has been updated
       via  664cb2b31f8f7fd73b83089e0bc3a1e1aa64c1e0 (commit)
       via  3c5a4ff5c878b6c771ee54e4dbcbaee891adc0f1 (commit)
      from  92bac07a334283189cfb70dbe5a07d85a547fe38 (commit)

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

- Log -----------------------------------------------------------------
commit 3c5a4ff5c878b6c771ee54e4dbcbaee891adc0f1
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Sep 10 23:14:58 2009 -0400

    New CSS for the rulebuilder

diff --git a/share/web/static/css/rulebuilder.css b/share/web/static/css/rulebuilder.css
index 12b2bbe..2a234d1 100644
--- a/share/web/static/css/rulebuilder.css
+++ b/share/web/static/css/rulebuilder.css
@@ -5,13 +5,9 @@ div.expression span.return-type,
 div.parameter .type,
 div.menu-item span.return-type {
     color:#555555;
-    font-style:italic;
     padding-right:0.5em;
 }
 
-.signature .parameter {
-    border: 1px solid red;
-}
 
 .expression .type {
     background-color: lightGreen;
@@ -21,6 +17,7 @@ div.menu-item span.return-type {
 .signature .parameter {
     background-color: lightBlue;
     border: 2px solid blue;
+	border-right: 10px solid #00c;
 }
 
 div.top-context {
@@ -29,23 +26,25 @@ div.top-context {
 }
 
 div.context {
-    border: 1px dashed;
+    border: 1px solid #ccc;
     margin: 0.5em;
     padding: 0.5em;
 	max-width: 70%;
 	display: inline-block;
+	border-right: 10px solid #ccc;
 }
 
 div.current {
-    border: 1px dotted red;
+    border: 1px solid blue;
 	background: #ffc;
+	border-right: 10px solid #00c;
 }
 
 div.application-params span.param-placeholder,
 div.function span.return-type, 
 .signature .parameter,
 .expression .return-type {
-	font-size: 0.8em;
+	font-size: 0.9em;
   display: inline-block;
   text-align: left;
   padding: 0.25em;
@@ -89,7 +88,7 @@ div#body {
 div.application-params span.param {
   padding:0.5em;
   background: lightBlue;
-  border 1px solid blue;
+  border: 1px solid blue;
 
 }
 
@@ -103,16 +102,39 @@ div.application-params span.param-placeholder.current {
 	background: #f99;	
 }
 
+.functions .unmatched {
+	display: none;
+}
+
+.functions .matched {
+	display: block;
+}
+
+
+.expressions .return-type, .functions .return-type {
+	background: #fff;
+    border: 1px solid #ccc;
+    border-left: 10px solid #ccc;
+	color: #ccc;
+}
+.unmatched * {
+	color: #ccc;
+}
+
+.unmatched .signature {
+	display: none;
+}
 
+.matched .signature {
+	display: block;
+}
 
-.unmatched .return-type {
-    background: #f99;
-    border: 1px solid red;
+.matched .signature * {
+	color: #000;
 }
 
 .matched .return-type {
-    background: lightGreen;
-    border: 1px solid green;
+    border-left: 10px solid #0c0;
 }
 
 .signature {
@@ -122,3 +144,23 @@ div.application-params span.param-placeholder.current {
 div.context span.expression {
     padding-left: 1em;
 }
+
+.context .unmatched {
+	color: red;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	border: 1px solid red;
+
+
+}
+.context .unmatched:before {
+	font-size: 1em;
+	font-weight: bold;
+	color: #f00;
+	content: "TYPE MISMATCH: ";
+}
+.context .transform {
+	float: right;
+	padding: 0.5em;
+	font-size: 2em;
+}

commit 664cb2b31f8f7fd73b83089e0bc3a1e1aa64c1e0
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Sep 10 23:16:16 2009 -0400

    Rulebuilder updates to change css classes

diff --git a/share/web/static/js/rulebuilder.js b/share/web/static/js/rulebuilder.js
index 74cce8e..c4b15b5 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 ', this.ebuilder).removeClass('matched')
+    jQuery('.functions .function', this.ebuilder).removeClass('matched')
                                                      .addClass('unmatched');
 
-    jQuery('.expressions', this.ebuilder).removeClass('matched')
+    jQuery('.functions .expression', this.ebuilder).removeClass('matched')
                                                    .addClass('unmatched');
 
-    jQuery('.functions .return-type:contains('+type+')', this.ebuilder)
-    .parent().addClass('matched');
+    jQuery('.functions .function .return-type:contains('+type+')', this.ebuilder)
+    .parent().removeClass('unmatched').addClass('matched');
 
-    jQuery('.expressions .return-type:contains('+type+')', this.ebuilder)
-    .parent().addClass('matched');
+    jQuery('.expressions .expression .return-type:contains('+type+')', this.ebuilder)
+    .parent().removeClass('unmatched').addClass('matched');
 };
 
 RuleBuilder.prototype.update_expressions = function() {

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