[Rt-commit] rt branch, lcore, updated. d97b6a48fe2efb20b096057360b9de3d8cb90f42

[jesse]

The branch, lcore has been updated
       via  d97b6a48fe2efb20b096057360b9de3d8cb90f42 (commit)
      from  a87def504f054818873fe18ffb2f4dad76566b78 (commit)

Summary of changes:
 lib/RT/View/RuleBuilder.pm           |    6 +-----
 share/web/static/css/rulebuilder.css |   24 +++++++++++++++++-------
 share/web/static/js/rulebuilder.js   |   17 ++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

- Log -----------------------------------------------------------------
commit d97b6a48fe2efb20b096057360b9de3d8cb90f42
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Sep 11 00:30:34 2009 -0400

    Update the rule-builder CSS to look a little nicer for clkao's presentation

diff --git a/lib/RT/View/RuleBuilder.pm b/lib/RT/View/RuleBuilder.pm
index 8ad827c..5d01350 100644
--- a/lib/RT/View/RuleBuilder.pm
+++ b/lib/RT/View/RuleBuilder.pm
@@ -42,13 +42,9 @@ template 'index.html' => page {
     # given transaction :: RT::Model::Transaction
     #       ticket :: RT::Model::Ticket
     # expect Bool
-	div { { id is 'expression-filter'};
-    input { { id is 'type-filter-type', type is 'text' } };
-    input { { id is 'type-filter', type is 'button', value is 'filter' } };
-    input { { id is 'type-unfilter', type is 'button', value is 'unfilter' } };
-	}
     div { { id is 'expressionbuilder' } };
     input { { id is 'add-expression', type is 'button', value is 'Add Expression' } };
+
     outs_raw('<script type="text/javascript">
 jQuery(function() {
     var rb = new RuleBuilder("#expressionbuilder");
diff --git a/share/web/static/css/rulebuilder.css b/share/web/static/css/rulebuilder.css
index 2a234d1..5193388 100644
--- a/share/web/static/css/rulebuilder.css
+++ b/share/web/static/css/rulebuilder.css
@@ -56,7 +56,7 @@ div.function span.return-type,
 
 
 div#body {
-	margin-left: 1em;
+	margin-left: 24em;
 
 }
 
@@ -74,16 +74,22 @@ div#body {
 }
 		
 .library {
-	position: relative;
-	top: -5em;
-	left: 1em;
-	width: 15em;
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 21em;
+	bottom: 0;
 	padding: 0.5em;
-	background: #ccc;
+	background: #fff;
+	overflow: auto;
 	-moz-border-radius: 0.5em;
 
 }
 
+.library * {
+ 0.25em;
+}
+
 
 div.application-params span.param {
   padding:0.5em;
@@ -106,8 +112,12 @@ div.application-params span.param-placeholder.current {
 	display: none;
 }
 
-.functions .matched {
+.functions .matched, .expressions .matched {
 	display: block;
+	padding: 0.25em;
+
+	background: #eee;
+	margin-bottom: 3px;
 }
 
 
diff --git a/share/web/static/js/rulebuilder.js b/share/web/static/js/rulebuilder.js
index 6d7d7ee..da52447 100644
--- a/share/web/static/js/rulebuilder.js
+++ b/share/web/static/js/rulebuilder.js
@@ -39,9 +39,13 @@ RuleBuilder.prototype.init = function () {
         null,
         this
     );
-    this.update_expressions();
 
-    ebuilder.append('<div class="functions">');
+	ebuilder.append('<div class="library">');
+
+
+    jQuery('.library').append('<div class="expressions">');
+    jQuery('.library').append('<div class="functions">');
+    this.update_expressions();
 
     functions_div = jQuery('.functions');
     functions_div.append('<h3>Functions</h3>');
@@ -119,14 +123,9 @@ RuleBuilder.prototype.update_expressions = function() {
     var ebuilder = jQuery(sel);
     var that = this;
 
-    jQuery('div.expressions', ebuilder).remove();
-
-    jQuery._div({'class': 'expressions'})
-            ._h3_().text("Current Expressions")
-          .div_()
-        .prependTo(ebuilder);
-
     var expressions_div = jQuery('div.expressions', ebuilder);
+	expressions_div.html('<h3>Current Expressions</h3>');
+
 
     jQuery.each(this.expressions,
                 function(idx, val) {

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