[Rt-commit] rt branch, lcore, updated. 1804d1ca2597f8a2fc61c7f0d918efcf8ee76d9b

[clkao at bestpractical.com]

The branch, lcore has been updated
       via  1804d1ca2597f8a2fc61c7f0d918efcf8ee76d9b (commit)
       via  0625e7e05ab739b020662ab0bfbf99146c3a8c7e (commit)
      from  8866e2d237d8b3e19e133acd99202995db1d75e2 (commit)

Summary of changes:
 share/web/static/css/rulebuilder.css |   14 +++++++++++++-
 share/web/static/js/rulebuilder.js   |    6 ++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 0625e7e05ab739b020662ab0bfbf99146c3a8c7e
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Sat Aug 8 16:35:45 2009 +0100

    move expression button up

diff --git a/share/web/static/js/rulebuilder.js b/share/web/static/js/rulebuilder.js
index 8c874aa..0134d71 100644
--- a/share/web/static/js/rulebuilder.js
+++ b/share/web/static/js/rulebuilder.js
@@ -40,6 +40,8 @@ RuleBuilder.prototype.init = function () {
           .div_()
         .appendTo(ebuilder);
 
+    jQuery("#add-expression").appendTo(ebuilder);
+
     ebuilder.append('<h3>Functions</h3>');
     ebuilder.append('<div class="functions">');
     jQuery.each(this.functions,

commit 1804d1ca2597f8a2fc61c7f0d918efcf8ee76d9b
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Sat Aug 8 16:51:25 2009 +0100

    minor styling

diff --git a/share/web/static/css/rulebuilder.css b/share/web/static/css/rulebuilder.css
index 615b4f2..5bc0fed 100644
--- a/share/web/static/css/rulebuilder.css
+++ b/share/web/static/css/rulebuilder.css
@@ -1,6 +1,18 @@
-div.application_params span.param-placeholder,
+div.application-params span.param-placeholder,
+div.function span.return-type,
 div.expression span.type {
   color:#555555;
   font-style:italic;
 }
 
+div.application-params span.param-placeholder,
+div.function span.return-type {
+  background-color:lightBlue;
+  border:2px solid blue;
+}
+
+div.application-params span.param-placeholder {
+  background-color:pink;
+  border:1px solid red;
+  padding:0.5em;
+}
diff --git a/share/web/static/js/rulebuilder.js b/share/web/static/js/rulebuilder.js
index 0134d71..f62a3fd 100644
--- a/share/web/static/js/rulebuilder.js
+++ b/share/web/static/js/rulebuilder.js
@@ -46,7 +46,7 @@ RuleBuilder.prototype.init = function () {
     ebuilder.append('<div class="functions">');
     jQuery.each(this.functions,
                 function(key, val) {
-                    ebuilder.append('<div class="function ret_'+val.return_type+'"><span class="function_name">'+key+'</span> <span class="type">'+val.return_type+'</span></div>');
+                    ebuilder.append('<div class="function ret_'+val.return_type+'"><span class="function-name">'+key+'</span> <span class="return-type">'+val.return_type+'</span></div>');
                 });
     ebuilder.append('</div>');
 
@@ -54,7 +54,7 @@ RuleBuilder.prototype.init = function () {
 
     jQuery(this.sel+' div.function').click(
         function(e) {
-            var func_name = jQuery('span.function_name', this).text();
+            var func_name = jQuery('span.function-name', this).text();
             that.current_application = func_name;
             that.update_application();
         });

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