Changeset 508925

Timestamp:

02/22/2012 05:01:46 PM (14 years ago)

Author:

jazzigor

Message:

Updating trunk to v0.9.4

Location:

jazzy-forms/trunk

Files:

• 3rdparty/mustache.js (modified) (17 diffs)
• back/ctrl-forms.php (modified) (1 diff)
• back/elements.js (modified) (4 diffs)
• back/gui.css (modified) (8 diffs)
• back/gui.js (modified) (10 diffs)
• back/id.js (modified) (1 diff)
• back/img (added)
• back/img/c.png (added)
• back/img/d.png (added)
• back/img/del.png (added)
• back/img/del_hi.png (added)
• back/img/f.png (added)
• back/img/h.png (added)
• back/img/m.png (added)
• back/img/n.png (added)
• back/img/r.png (added)
• back/img/t.png (added)
• back/img/u.png (added)
• back/tpl-forms.php (modified) (6 diffs)
• core/Parser.php (modified) (3 diffs)
• front/ctrl-shortcode.php (modified) (3 diffs)
• front/jazzy-forms.js (modified) (2 diffs)
• front/themes/1.css (modified) (2 diffs)
• front/tmpl-list.php (modified) (5 diffs)
• generated/Basic_Model.php (modified) (8 diffs)
• generated/schema.sql (modified) (1 diff)
• generated/update.sql (added)
• jazzy-forms.php (modified) (5 diffs)
• readme.txt (modified) (5 diffs)

jazzy-forms/trunk/3rdparty/mustache.js

@@ -5 +5 @@
 */
 
-var Mustache = function() {
-  var Renderer = function() {};
+var Mustache = function () {
+  var _toString = Object.prototype.toString;
+
+  Array.isArray = Array.isArray || function (obj) {
+    return _toString.call(obj) == "[object Array]";
+  }
+
+  var _trim = String.prototype.trim, trim;
+
+  if (_trim) {
+    trim = function (text) {
+      return text == null ? "" : _trim.call(text);
+    }
+  } else {
+    var trimLeft, trimRight;
+
+    // IE doesn't match non-breaking spaces with \s.
+    if ((/\S/).test("\xA0")) {
+      trimLeft = /^[\s\xA0]+/;
+      trimRight = /[\s\xA0]+$/;
+    } else {
+      trimLeft = /^\s+/;
+      trimRight = /\s+$/;
+    }
+
+    trim = function (text) {
+      return text == null ? "" :
+        text.toString().replace(trimLeft, "").replace(trimRight, "");
+    }
+  }
+
+  var escapeMap = {
+    "&": "&",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': '&quot;',
+    "'": '&#39;'
+  };
+
+  function escapeHTML(string) {
+    return String(string).replace(/&(?!\w+;)|[<>"']/g, function (s) {
+      return escapeMap[s] || s;
+    });
+  }
+
+  var regexCache = {};
+  var Renderer = function () {};
 
   Renderer.prototype = {
@@ -18 +63 @@
     context: {},
 
-    render: function(template, context, partials, in_recursion) {
+    render: function (template, context, partials, in_recursion) {
       // reset buffer & set context
-      if(!in_recursion) {
+      if (!in_recursion) {
         this.context = context;
         this.buffer = []; // TODO: make this non-lazy
@@ -26 +71 @@
 
       // fail fast
-      if(!this.includes("", template)) {
-        if(in_recursion) {
+      if (!this.includes("", template)) {
+        if (in_recursion) {
           return template;
         } else {
@@ -35 +80 @@
       }
 
+      // get the pragmas together
       template = this.render_pragmas(template);
+
+      // render the template
       var html = this.render_section(template, context, partials);
-      if(in_recursion) {
-        return this.render_tags(html, context, partials, in_recursion);
-      }
-
-      this.render_tags(html, context, partials, in_recursion);
+
+      // render_section did not find any sections, we still need to render the tags
+      if (html === false) {
+        html = this.render_tags(template, context, partials, in_recursion);
+      }
+
+      if (in_recursion) {
+        return html;
+      } else {
+        this.sendLines(html);
+      }
     },
 
@@ -47 +101 @@
       Sends parsed lines
     */
-    send: function(line) {
-      if(line != "") {
+    send: function (line) {
+      if (line !== "") {
         this.buffer.push(line);
       }
     },
 
+    sendLines: function (text) {
+      if (text) {
+        var lines = text.split("\n");
+        for (var i = 0; i < lines.length; i++) {
+          this.send(lines[i]);
+        }
+      }
+    },
+
     /*
       Looks for %PRAGMAS
     */
-    render_pragmas: function(template) {
+    render_pragmas: function (template) {
       // no pragmas
-      if(!this.includes("%", template)) {
+      if (!this.includes("%", template)) {
         return template;
       }
 
       var that = this;
-      var regex = new RegExp(this.otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" +
-            this.ctag);
-      return template.replace(regex, function(match, pragma, options) {
-        if(!that.pragmas_implemented[pragma]) {
-          throw({message: 
+      var regex = this.getCachedRegex("render_pragmas", function (otag, ctag) {
+        return new RegExp(otag + "%([\\w-]+) ?([\\w]+=[\\w]+)?" + ctag, "g");
+      });
+
+      return template.replace(regex, function (match, pragma, options) {
+        if (!that.pragmas_implemented[pragma]) {
+          throw({message:
             "This implementation of mustache doesn't understand the '" +
             pragma + "' pragma"});
         }
         that.pragmas[pragma] = {};
-        if(options) {
+        if (options) {
           var opts = options.split("=");
           that.pragmas[pragma][opts[0]] = opts[1];
@@ -84 +149 @@
       Tries to find a partial in the curent scope and render it
     */
-    render_partial: function(name, context, partials) {
-      name = this.trim(name);
-      if(!partials || partials[name] === undefined) {
+    render_partial: function (name, context, partials) {
+      name = trim(name);
+      if (!partials || partials[name] === undefined) {
         throw({message: "unknown_partial '" + name + "'"});
       }
-      if(typeof(context[name]) != "object") {
+      if (!context || typeof context[name] != "object") {
         return this.render(partials[name], context, partials, true);
       }
@@ -98 +163 @@
       Renders inverted (^) and normal (#) sections
     */
-    render_section: function(template, context, partials) {
-      if(!this.includes("#", template) && !this.includes("^", template)) {
-        return template;
+    render_section: function (template, context, partials) {
+      if (!this.includes("#", template) && !this.includes("^", template)) {
+        // did not render anything, there were no sections
+        return false;
       }
 
       var that = this;
-      // CSW - Added "+?" so it finds the tighest bound, not the widest
-      var regex = new RegExp(this.otag + "(\\^|\\#)\\s*(.+)\\s*" + this.ctag +
-              "\n*([\\s\\S]+?)" + this.otag + "\\/\\s*\\2\\s*" + this.ctag +
-              "\\s*", "mg");
+
+      var regex = this.getCachedRegex("render_section", function (otag, ctag) {
+        // This regex matches _the first_ section ({{#foo}}{{/foo}}), and captures the remainder
+        return new RegExp(
+          "^([\\s\\S]*?)" +         // all the crap at the beginning that is not {{*}} ($1)
+
+          otag +                    // {{
+          "(\\^|\\#)\\s*(.+)\\s*" + //  #foo (# == $2, foo == $3)
+          ctag +                    // }}
+
+          "\n*([\\s\\S]*?)" +       // between the tag ($2). leading newlines are dropped
+
+          otag +                    // {{
+          "\\/\\s*\\3\\s*" +        //  /foo (backreference to the opening tag).
+          ctag +                    // }}
+
+          "\\s*([\\s\\S]*)$",       // everything else in the string ($4). leading whitespace is dropped.
+
+        "g");
+      });
+
 
       // for each {{#foo}}{{/foo}} section do...
-      return template.replace(regex, function(match, type, name, content) {
-        var value = that.find(name, context);
-        if(type == "^") { // inverted section
-          if(!value || that.is_array(value) && value.length === 0) {
+      return template.replace(regex, function (match, before, type, name, content, after) {
+        // before contains only tags, no sections
+        var renderedBefore = before ? that.render_tags(before, context, partials, true) : "",
+
+        // after may contain both sections and tags, so use full rendering function
+            renderedAfter = after ? that.render(after, context, partials, true) : "",
+
+        // will be computed below
+            renderedContent,
+
+            value = that.find(name, context);
+
+        if (type === "^") { // inverted section
+          if (!value || Array.isArray(value) && value.length === 0) {
             // false or empty list, render it
-            return that.render(content, context, partials, true);
+            renderedContent = that.render(content, context, partials, true);
           } else {
-            return "";
+            renderedContent = "";
           }
-        } else if(type == "#") { // normal section
-          if(that.is_array(value)) { // Enumerable, Let's loop!
-            return that.map(value, function(row) {
-              return that.render(content, that.create_context(row),
-                partials, true);
+        } else if (type === "#") { // normal section
+          if (Array.isArray(value)) { // Enumerable, Let's loop!
+            renderedContent = that.map(value, function (row) {
+              return that.render(content, that.create_context(row), partials, true);
             }).join("");
-          } else if(that.is_object(value)) { // Object, Use it as subcontext!
-            return that.render(content, that.create_context(value),
+          } else if (that.is_object(value)) { // Object, Use it as subcontext!
+            renderedContent = that.render(content, that.create_context(value),
               partials, true);
-          } else if(typeof value === "function") {
+          } else if (typeof value == "function") {
             // higher order section
-            return value.call(context, content, function(text) {
+            renderedContent = value.call(context, content, function (text) {
               return that.render(text, context, partials, true);
             });
-          } else if(value) { // boolean section
-            return that.render(content, context, partials, true);
+          } else if (value) { // boolean section
+            renderedContent = that.render(content, context, partials, true);
           } else {
-            return "";
+            renderedContent = "";
           }
         }
+
+        return renderedBefore + renderedContent + renderedAfter;
       });
     },
@@ -145 +239 @@
       Replace {{foo}} and friends with values from our view
     */
-    render_tags: function(template, context, partials, in_recursion) {
+    render_tags: function (template, context, partials, in_recursion) {
       // tit for tat
       var that = this;
 
-      var new_regex = function() {
-        return new RegExp(that.otag + "(=|!|>|\\{|%)?([^\\/#\\^]+?)\\1?" +
-          that.ctag + "+", "g");
+      var new_regex = function () {
+        return that.getCachedRegex("render_tags", function (otag, ctag) {
+          return new RegExp(otag + "(=|!|>|&|\\{|%)?([^#\\^]+?)\\1?" + ctag + "+", "g");
+        });
       };
 
       var regex = new_regex();
-      var tag_replace_callback = function(match, operator, name) {
+      var tag_replace_callback = function (match, operator, name) {
         switch(operator) {
         case "!": // ignore comments
@@ -166 +261 @@
           return that.render_partial(name, context, partials);
         case "{": // the triple mustache is unescaped
+        case "&": // & operator is an alternative unescape method
           return that.find(name, context);
         default: // escape the value
-          return that.escape(that.find(name, context));
+          return escapeHTML(that.find(name, context));
         }
       };
@@ -174 +270 @@
       for(var i = 0; i < lines.length; i++) {
         lines[i] = lines[i].replace(regex, tag_replace_callback, this);
-        if(!in_recursion) {
+        if (!in_recursion) {
           this.send(lines[i]);
         }
       }
 
-      if(in_recursion) {
+      if (in_recursion) {
         return lines.join("\n");
       }
     },
 
-    set_delimiters: function(delimiters) {
+    set_delimiters: function (delimiters) {
       var dels = delimiters.split(" ");
       this.otag = this.escape_regex(dels[0]);
@@ -190 +286 @@
     },
 
-    escape_regex: function(text) {
+    escape_regex: function (text) {
       // thank you Simon Willison
-      if(!arguments.callee.sRE) {
+      if (!arguments.callee.sRE) {
         var specials = [
           '/', '.', '*', '+', '?', '|',
@@ -208 +304 @@
       from the view object
     */
-    find: function(name, context) {
-      name = this.trim(name);
+    find: function (name, context) {
+      name = trim(name);
 
       // Checks whether a value is thruthy or false or 0
@@ -217 +313 @@
 
       var value;
-      if(is_kinda_truthy(context[name])) {
-        value = context[name];
-      } else if(is_kinda_truthy(this.context[name])) {
-        value = this.context[name];
-      }
-
-      if(typeof value === "function") {
+
+      // check for dot notation eg. foo.bar
+      if (name.match(/([a-z_]+)\./ig)) {
+        var childValue = this.walk_context(name, context);
+        if (is_kinda_truthy(childValue)) {
+          value = childValue;
+        }
+      } else {
+        if (is_kinda_truthy(context[name])) {
+          value = context[name];
+        } else if (is_kinda_truthy(this.context[name])) {
+          value = this.context[name];
+        }
+      }
+
+      if (typeof value == "function") {
         return value.apply(context);
       }
-      if(value !== undefined) {
+      if (value !== undefined) {
         return value;
       }
@@ -233 +338 @@
     },
 
+    walk_context: function (name, context) {
+      var path = name.split('.');
+      // if the var doesn't exist in current context, check the top level context
+      var value_context = (context[path[0]] != undefined) ? context : this.context;
+      var value = value_context[path.shift()];
+      while (value != undefined && path.length > 0) {
+        value_context = value;
+        value = value[path.shift()];
+      }
+      // if the value is a function, call it, binding the correct context
+      if (typeof value == "function") {
+        return value.apply(value_context);
+      }
+      return value;
+    },
+
     // Utility methods
 
     /* includes tag */
-    includes: function(needle, haystack) {
+    includes: function (needle, haystack) {
       return haystack.indexOf(this.otag + needle) != -1;
     },
 
-    /*
-      Does away with nasty characters
-    */
-    escape: function(s) {
-      s = String(s === null ? "" : s);
-      return s.replace(/&(?!\w+;)|["<>\\]/g, function(s) {
-        switch(s) {
-        case "&": return "&amp;";
-        case "\\": return "\\\\";
-        case '"': return '\"';
-        case "<": return "&lt;";
-        case ">": return "&gt;";
-        default: return s;
-        }
-      });
-    },
-
     // by @langalex, support for arrays of strings
-    create_context: function(_context) {
-      if(this.is_object(_context)) {
+    create_context: function (_context) {
+      if (this.is_object(_context)) {
         return _context;
       } else {
         var iterator = ".";
-        if(this.pragmas["IMPLICIT-ITERATOR"]) {
+        if (this.pragmas["IMPLICIT-ITERATOR"]) {
           iterator = this.pragmas["IMPLICIT-ITERATOR"].iterator;
         }
@@ -272 +376 @@
     },
 
-    is_object: function(a) {
+    is_object: function (a) {
       return a && typeof a == "object";
     },
 
-    is_array: function(a) {
-      return Object.prototype.toString.call(a) === '[object Array]';
-    },
-
-    /*
-      Gets rid of leading and trailing whitespace
-    */
-    trim: function(s) {
-      return s.replace(/^\s*|\s*$/g, "");
-    },
-
     /*
       Why, why, why? Because IE. Cry, cry cry.
     */
-    map: function(array, fn) {
+    map: function (array, fn) {
       if (typeof array.map == "function") {
         return array.map(fn);
@@ -301 +394 @@
         return r;
       }
+    },
+
+    getCachedRegex: function (name, generator) {
+      var byOtag = regexCache[this.otag];
+      if (!byOtag) {
+        byOtag = regexCache[this.otag] = {};
+      }
+
+      var byCtag = byOtag[this.ctag];
+      if (!byCtag) {
+        byCtag = byOtag[this.ctag] = {};
+      }
+
+      var regex = byCtag[name];
+      if (!regex) {
+        regex = byCtag[name] = generator(this.otag, this.ctag);
+      }
+
+      return regex;
     }
   };
@@ -306 +418 @@
   return({
     name: "mustache.js",
-    version: "0.3.0",
+    version: "0.4.0",
 
     /*
       Turns a template and view into HTML
     */
-    to_html: function(template, view, partials, send_fun) {
+    to_html: function (template, view, partials, send_fun) {
       var renderer = new Renderer();
-      if(send_fun) {
+      if (send_fun) {
         renderer.send = send_fun;
       }
-      renderer.render(template, view, partials);
-      if(!send_fun) {
+      renderer.render(template, view || {}, partials);
+      if (!send_fun) {
         return renderer.buffer.join("\n");
       }

jazzy-forms/trunk/back/ctrl-forms.php

@@ -11 +11 @@
         $json = stripcslashes($_POST['form']);
         $form = json_decode($json);
-        if(jzzf_set_form($form)) {
+        if($current = jzzf_set_form($form)) {
             $msg = "Form Saved.";
         } else {

jazzy-forms/trunk/back/elements.js

@@ -16 +16 @@
             placeholder.replaceWith(li);
         } else {
-            $('#jzzf_elements_list').append(html);
-            li = $('#jzzf_elements_list li:last-child');
+            li = $(html);
+            $('#jzzf_elements_list').append(li);
         }
         if(collapsed === undefined || collapsed) {
@@ -28 +28 @@
         var counter = this.counter();
         data.counter = counter;
-        data.typeString = $('#jzzf_elements_toolbox_items li[jzzf_type="' + data.type + '"]').text();
+        data.display_title = this.display_title(data.title);
+        data.typeString = $('.jzzf_elements_toolbox_items li[jzzf_type="' + data.type + '"]').text();
         if(data.options) {
             $.each(data.options, function(idx) {
@@ -74 +75 @@
             return false;
         });
+        element.find('.jzzf_element_title').change(function() {
+           element.find('.jzzf_header_title').text(self.display_title($(this).val())); 
+        });
         element.find('.jzzf_option_table tbody').sortable();
         this.bind_options();
@@ -115 +119 @@
     }
     
+    this.display_title = function(title) {
+        if(title.length >= 50) {
+            return title.substring(0, 47) + '...';
+        } else {
+            return title;
+        }
+    }
+    
     this.options_data = function(li) {
         var options = [];

jazzy-forms/trunk/back/gui.css

@@ -28 +28 @@
     margin: 0 4px 0 0px;
     border: 1px solid #ddd;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
     height: 13px;
     z-index: 10;
     background-color: #eee;
+    cursor: pointer;
 }
 
@@ -44 +47 @@
     padding: 20px;
     border: 1px solid #ddd;
-}
-
-#jzzf_elements_toolbox {
+    border-radius: 3px;
+}
+
+.jzzf_elements_toolbox {
     display: block;
     overflow: visible;
-    width: 200px;
+    width: 350px;
     float: left;
     clear: both;
 }
 
-#jzzf_elements_toolbox_items items {
-    padding: 10px;
-}
-
-#jzzf_elements_toolbox_items li {
+.jzzf_elements_toolbox_items {
+    display: block;
+    padding: 10px 10px 4px 10px;
+    overflow: hidden;
+    background: #eee;
+    border-radius: 3px;
+    width: 148px;
+    float: left;
+}
+
+#jzzf_toolbox_input {
+    margin-right: 10px;
+}
+
+#jzzf_toolbox_buttons {
+    margin-bottom: 10px;
+}
+
+.jzzf_elements_toolbox_items li {
     background: #ddd;
     border: 1px solid #ccc;
+    border-radius: 3px;
     padding: 8px;
-    height: 20px;
-    width: 100px;
+    height: 14px;
+    width: 130px;
+    cursor: move;
+}
+
+.jzzf_elements_toolbox_items li:hover {
+    background-color: #e8e8e8;
 }
 
@@ -84 +108 @@
     overflow: hidden;
     background: #eee;
+    border-radius: 3px;
 }
 
@@ -89 +114 @@
     margin: 5px;
     border: 1px solid #ccc;
+    border-radius: 3px;
 }
 
@@ -95 +121 @@
     border-bottom: 1px solid #ddd;
     padding: 8px;
-    height: 20px;
+    height: 14px;
+    cursor: move;
+}
+
+.jzzf_element.jzzf_collapsed .jzzf_element_header {
+    border-bottom: none;
+}
+
+.jzzf_element_header:hover {
+    background-color: #e8e8e8;
 }
 
 .jzzf_element_header .jzzf_element_delete {
+    width: 16px;
+    height: 16px;
+    background: url('img/del.png') no-repeat center;
     float: right;
+}
+
+.jzzf_element_header .jzzf_element_delete:hover {
+    background: url('img/del_hi.png') no-repeat center;
 }
 
@@ -105 +147 @@
     background: #fff;
     padding: 8px 12px;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
+}
+
+.jzzf_element_body li {
+    margin-bottom: 2px;
 }
 
@@ -113 +161 @@
 }
 
+.jzzf_section .jzzf_checkbox_label {
+    width: 400px;
+}
+
 .jzzf_section > ul > li > input[type=checkbox]  {
     margin-right: 12px;
@@ -146 +198 @@
     margin-right: 12px;
 }
+
+.jzzf_type {
+    width: 16px;
+    height: 16px;
+    float: left;
+    padding-right: 10px;
+    background: url('img/u.png') no-repeat center;
+}
+
+.jzzf_type_n { background-image: url('img/n.png'); }
+.jzzf_type_c { background-image: url('img/c.png'); }
+.jzzf_type_r { background-image: url('img/r.png'); }
+.jzzf_type_d { background-image: url('img/d.png'); }
+.jzzf_type_u { background-image: url('img/u.png'); }
+.jzzf_type_f { background-image: url('img/f.png'); }
+.jzzf_type_t { background-image: url('img/t.png'); }
+.jzzf_type_h { background-image: url('img/h.png'); }
+.jzzf_type_m { background-image: url('img/m.png'); }

jazzy-forms/trunk/back/gui.js

@@ -1 +1 @@
 (function($) {
     var form = null;
+    var form_index = 0;
+    var dirty = false;
+    var text_unload = "The current form has unsaved changes.";
+    var text_dirty = text_unload + "\nAre you sure you want to discard them?";
     
     function new_element(type) {
@@ -28 +32 @@
     }
     
-    function bind() {     
-        $('#jzzf_elements_toolbox_items li').click(function() {
+    function warn_unload() {
+        return dirty ? text_unload : null;
+    }
+    
+    function warn_dirty() {
+        if(dirty) {
+            return confirm(text_dirty);
+        } else {
+            return true;
+        }
+    }
+    
+    function mark_dirty() {
+        if(!dirty) {
+            dirty = true;
+            window.onbeforeunload = warn_unload;
+        }
+        return true;
+    }
+    
+    function mark_clean() {
+        if(dirty) {
+            dirty = false;
+            window.onbeforeunload = null;
+        }
+        return true;
+    }
+    
+    function bind() {
+        $('#jzzf_main').delegate('input', 'change', mark_dirty);
+        
+        $('.jzzf_elements_toolbox_items li').click(function() {
             add_element($(this), false);
             return false;
@@ -39 +73 @@
             }
         });
-        $('#jzzf_elements_toolbox_items li').draggable({
+        $('.jzzf_elements_toolbox_items li').draggable({
             connectToSortable: "#jzzf_elements_list",
             helper: "clone",
-            revert: "invalid"
+            revert: "invalid",
+            cursor: "move"
         });
 
@@ -51 +86 @@
                                               
         $('#jzzf_selector').change(function() {
-            set_current_form($('#jzzf_selector').val());
-        });
-        
-        $('#jzzf_form *').delegate('*', 'click change sortupdate', function(event) {
+            if(warn_dirty()) {
+                set_current_form($('#jzzf_selector').val());
+                return true;
+            } else {
+                reset_current_form();
+                return false;
+            }
+        });
+        
+        $('#jzzf_form *, #jzzf_selection *').delegate('*', 'click change sortupdate', function(event) {
             $('#message').hide();
         });
@@ -83 +124 @@
             $('#jzzf_name').val(form.name);
             $('#jzzf_elements_list').html('');
+            if(form.realtime == 1) {
+                $('#jzzf_realtime').attr('checked', 'checked');
+            } else {
+                $('#jzzf_realtime').removeAttr('checked');
+            }
             for(var i=0; i<form.elements.length; i++) {
                 var element = jzzf_element.create(form.elements[i].type)
@@ -108 +154 @@
             "name": $('#jzzf_name').val(),
             "theme": $('#jzzf_default_css').is(':checked'),
+            "realtime": $('#jzzf_realtime').is(':checked'),
             "css": $('#jzzf_css').val(),
             "elements": get_elements()
@@ -114 +161 @@
     
     function save() {
+        window.onbeforeunload = null;
         var form = get_form();
         var serialized = JSON.stringify(form);
@@ -124 +172 @@
         var id_helper = new jzzf_id(jzzf_forms);
         var name = id_helper.suggest_name(title);
-        form = {'title': title, 'name': name, 'elements': [], 'theme': 1};
+        form = {'title': title, 'name': name, 'elements': [], 'theme': 1, 'realtime': true};
         elements = [];
         $('#jzzf_form').show();
@@ -133 +181 @@
     }
     
+    function reset_current_form() {
+        $('#jzzf_selector option:eq(' + form_index + ')').attr('selected', 'selected');
+    }
+    
     function set_current_form(idx) {
+        mark_clean();
         form = jzzf_forms[idx];
+        form_index = idx;
         set_form(form);
     }
@@ -145 +199 @@
     
     function new_form() {
-        form = null;
-        set_form(form);
+        $('#message').hide();
+        if(warn_dirty()) {
+            form = null;
+            set_form(form);            
+        }
     }
     
     $(function() {
+        form_index = $('#jzzf_selector option:selected').index();
         if(jzzf_forms.length == 0) {
             new_form();
         } else {
-            set_current_form(0);
+            set_current_form(form_index);
         }
         bind();

jazzy-forms/trunk/back/id.js

@@ -15 +15 @@
         var idx = 1;
         while(this.column_occupied(name, 'name')) {
-            name = base + '-' + idx;
+            name = base + '_' + idx;
             idx++;
         }

jazzy-forms/trunk/back/tpl-forms.php

@@ -1 @@
-<script id="jzzf_tmpl_common" type="text/html">
+<script id="jzzf_tmpl_common_raw" type="text/html">
 <li class="jzzf_element">
     <input type="hidden" value="{{id}}" class="jzzf_element_id">
     <input type="hidden" value="{{counter}}" class="jzzf_element_counter">
+    <input type="hidden" class="jzzf_element_type" value="{{type}}">
     <div class="jzzf_element_header">
-        <span class="jzzf_type jzzf_type_{{type}}">[{{typeString}}]</span>
-        <span class="jzzf_header_title">{{title}}</span>
-        <a href="#" class="jzzf_element_delete">(x)</a>
+        <div class="jzzf_type jzzf_type_{{type}}"></div>
+        <span class="jzzf_header_title">{{display_title}}</span>
+        <a href="#" class="jzzf_element_delete" title="Delete Element"></a>
     </div>
     <div class="jzzf_element_body">
+</script>
+<script id="jzzf_tmpl_common" type="text/html">
+{{>common_raw}}
         <fieldset>
             <ul class="jzzf_element_parameters">
                 <li>
-                    <input type="hidden" class="jzzf_element_type" value="{{type}}">
                     <label for="jzzf_element_{{counter}}_title">Title</label>
                     <input type="text" id="jzzf_element_{{counter}}_title" class="jzzf_element_title" value="{{title}}">
@@ -78 +81 @@
 {{>common}}
     <fieldset>
-        <legend>Formula</legend>
-        <label for="jzzf_element_{{counter}}_formula">Formula</label>
-        <input type="text" id="jzzf_element_{{counter}}_formula" class="jzzf_element_formula" value="{{formula}}">
+        <ul>
+            <li>
+                <legend>Formula</legend>
+                <label for="jzzf_element_{{counter}}_formula">Formula</label>
+                <input type="text" id="jzzf_element_{{counter}}_formula" class="jzzf_element_formula" value="{{formula}}">
+            </li>
+        </ul>
     </fieldset>
 {{>foot}}
@@ -88 +95 @@
 {{>foot}}
 </script>
+<script id="jzzf_tmpl_t" type="text/html">
+{{>common_raw}}
+    <fieldset>
+        <ul>
+            <li>
+                <label for="jzzf_element_{{counter}}_title">Text</label>
+                <input type="text" id="jzzf_element_{{counter}}_title" class="jzzf_element_title" value="{{title}}">
+            </li>
+        </ul>
+    </fieldset>
+{{>foot}}
+</script>
+<script id="jzzf_tmpl_h" type="text/html">
+{{>common_raw}}
+    <fieldset>
+        <ul>
+            <li>
+                <label for="jzzf_element_{{counter}}_title">Heading</label>
+                <input type="text" id="jzzf_element_{{counter}}_title" class="jzzf_element_title" value="{{title}}">
+            </li>
+        </ul>
+    </fieldset>
+{{>foot}}
+</script>
+<script id="jzzf_tmpl_m" type="text/html">
+{{>common_raw}}
+    <fieldset>
+        <ul>
+            <li>
+                <label for="jzzf_element_{{counter}}_title">HTML code</label>
+                <input type="text" id="jzzf_element_{{counter}}_title" class="jzzf_element_title" value="{{title}}">
+            </li>
+        </ul>
+    </fieldset>
+{{>foot}}
+</script>
+
 <script id="jzzf_tmpl_options" type="text/html">
         <fieldset>
@@ -126 +170 @@
     <select id="jzzf_selector">
 <?php $i=0; foreach($forms as $form) : ?>
-        <option value="<?php echo $i++ ?>"><?php echo esc_attr($form->title) ?></option>
+        <option value="<?php echo $i++ ?>"<?php if($form->id == $current) :?> selected="selected"<?php endif ?>><?php echo esc_attr($form->title) ?></option>
 <?php endforeach; ?>
     </select>
@@ -147 +191 @@
     <div id="jzzf_main">
         <div class="jzzf_section" id="jzzf_section_elements">
-            <div id="jzzf_elements_toolbox">
+            <div class="jzzf_elements_toolbox">
             <div class="jzzf_column_heading" id="jzzf_elements_toolbox_description">Available form elements</div>
-                <ul id="jzzf_elements_toolbox_items">
-                    <li jzzf_type="n">Number Entry</li>
-                    <li jzzf_type="d">Drop-down Menu</li>
-                    <li jzzf_type="r">Radio Buttons</li>
-                    <li jzzf_type="c">Checkbox</li>
-                    <li jzzf_type="f">Output</li>
-                    <li jzzf_type="u">Update Button</li>
+                <ul id="jzzf_toolbox_input" class="jzzf_elements_toolbox_items">
+                    <li jzzf_type="n"><div class="jzzf_type jzzf_type_n"></div>Number Entry</li>
+                    <li jzzf_type="d"><div class="jzzf_type jzzf_type_d"></div>Drop-down Menu</li>
+                    <li jzzf_type="r"><div class="jzzf_type jzzf_type_r"></div>Radio Buttons</li>
+                    <li jzzf_type="c"><div class="jzzf_type jzzf_type_c"></div>Checkbox</li>
+                    <li jzzf_type="f"><div class="jzzf_type jzzf_type_f"></div>Output</li>
+                </ul>
+                <ul id="jzzf_toolbox_buttons" class="jzzf_elements_toolbox_items">
+                    <li jzzf_type="u"><div class="jzzf_type jzzf_type_u"></div>Update Button</li>
+                </ul>
+                <ul id="jzzf_toolbox_text" class="jzzf_elements_toolbox_items">
+                    <li jzzf_type="t"><div class="jzzf_type jzzf_type_t"></div>Text</li>
+                    <li jzzf_type="h"><div class="jzzf_type jzzf_type_h"></div>Heading</li>
+                    <li jzzf_type="m"><div class="jzzf_type jzzf_type_m"></div>Free HTML</li>
                 </ul>
             </div>
@@ -194 +245 @@
                     </p>
                 </li>
-                
+                <li>
+                    <input type="checkbox" id="jzzf_realtime">
+                    <label for="jzzf_realtime" class="jzzf_checkbox_label">Update output elements instantly</label>
+                </li>                
             </ul>
         </div>

jazzy-forms/trunk/core/Parser.php

@@ -4 +4 @@
     try {
         $tokens = jzzf_tokenize($notation);
+        return jzzf_parse_tokens($tokens);
     } catch( Exception $e ) {
         return null;
-    }
-    return jzzf_parse_tokens($tokens);
+    }        
 }
 
 function jzzf_parse_tokens($in) {
-    $tokenizer = new Jzzf_Parser($in);
-    return $tokenizer->output();
+    try {
+        $tokenizer = new Jzzf_Parser($in);
+        return $tokenizer->output();
+    } catch( Exception $e ) {
+        return null;
+    }        
 }
 
@@ -103 +107 @@
                 $result = array_merge($result, $next);
                 $num++;
+            } else {
+                throw new Exception("Closing bracket or comma expected");
             }
         }
@@ -165 +171 @@
             return $this->association();
         }
-        return array();
+        return null;
     }
 }

jazzy-forms/trunk/front/ctrl-shortcode.php

@@ -27 +27 @@
     }
     $graph = jzzf_get_graph($form->elements);
-    $tpl->graph($form, $graph);
+    $tpl->graph(jzzf_form_params($form), $graph);
     $tpl->script($form);
     $tpl->head($form);
-    foreach($form->elements as $element) {
-        $tpl->before($element);
+    for($idx=0; $idx<count($form->elements); $idx++) {
+        $element = $form->elements[$idx];
+        if($idx < count($form->elements)-1) {
+            $ahead = $form->elements[$idx+1];
+        } else {
+            $ahead = null;
+        }
+        $tpl->before($element, $ahead);
+        
         switch($element->type) {
             case 'n':
@@ -54 +61 @@
                 $tpl->update($element);
                 break;
+            case 'h':
+                $tpl->heading($element);
+                break;
+            case 't':
+                $tpl->text($element);
+                break;
+            case 'm':
+                $tpl->html($element);
+                break;
         }
         $tpl->after($element);
@@ -61 +77 @@
     return $output;
 }
+
+function jzzf_form_params($form) {
+    $params = clone $form;
+    unset($params->elements);
+    unset($params->css);    
+    return $params;
+
+}

jazzy-forms/trunk/front/jazzy-forms.js

@@ -1 @@
-function jazzy_forms($, form_id, jzzf_data, jzzf_types, jzzf_dependencies, jzzf_formulas) {
+function jazzy_forms($, form_id, jzzf_data, jzzf_types, jzzf_dependencies, jzzf_formulas, jzzf_params) {
     
     jzzf_precision = Math.pow(10,9);
@@ -24 +24 @@
         for(id in jzzf_types) {
             update(id);
-            switch(jzzf_types[id]) {
-                case 'r':
-                    element(id).find('input:radio').bind('change ready', function() {
-                        update(element_id($(this).parents('.jzzf_radio')));
-                    });
-                    break;
-                default:
-                    element(id).bind('change ready', function() {
-                        update(element_id($(this)));
-                    });
-                    
-            }
-        }
-    }
-
+            if(jzzf_params.realtime) {
+                bind_realtime_update(id);
+            }
+            if(jzzf_types[id] == 'u') {
+                element(id).click(function() {
+                    var id;
+                    for(id in jzzf_types) {
+                        update(id);
+                    }
+                });
+            }
+        }
+    }
+
+    function bind_realtime_update(id) {
+        switch(jzzf_types[id]) {
+        case 'r':
+            element(id).find('input:radio').bind('change ready', function() {
+                update(element_id($(this).parents('.jzzf_radio')));
+            });
+            break;
+        default:
+            element(id).bind('change ready', function() {
+                update(element_id($(this)));
+            });
+        }
+    }
+    
     var just_updated;
     

jazzy-forms/trunk/front/themes/1.css

@@ -21 +21 @@
 }
 
-.jzzf_form .jzzf_element_label {
+.jzzf_form .jzzf_element_label, .jzzf_form .jzzf_element_heading {
     display: block;
     font-weight: bold;
@@ -28 +28 @@
 .jzzf_form .jzzf_element {
     padding-bottom: 1em;
+}
+
+.jzzf_form .jzzf_element_c.jzzf_ahead_c {
+    padding-bottom: inherit;
+}
+
+.jzzf_form .jzzf_element_h {
+    font-weight: bold;
+}
+
+.jzzf_form .jzzf_element_h.jzzf_ahead_c, .jzzf_form .jzzf_element_h.jzzf_ahead_m, .jzzf_form .jzzf_element_h.jzzf_ahead_t {
+    padding-bottom: inherit;
 }
 

jazzy-forms/trunk/front/tmpl-list.php

@@ -23 +23 @@
     
     function css($css) { ?>
-    <style type="text/css">
+    <style type="text/css" scoped="scoped">
         <?php print $css; ?>
 
@@ -36 +36 @@
         jzzf_dependencies_<?php echo $form->id ?> = <?php echo json_encode($dependencies) ?>;
         jzzf_formulas_<?php echo $form->id ?> = <?php echo json_encode($formulas) ?>;
-        jazzy_forms(jQuery, <?php echo $form->id ?>, jzzf_data_<?php echo $form->id ?>, jzzf_types_<?php echo $form->id ?>, jzzf_dependencies_<?php echo $form->id ?>, jzzf_formulas_<?php echo $form->id ?>);
+        jzzf_form_<?php echo $form->id ?> = <?php echo json_encode($form) ?>;
+        jazzy_forms(jQuery, <?php echo $form->id ?>, jzzf_data_<?php echo $form->id ?>, jzzf_types_<?php echo $form->id ?>, jzzf_dependencies_<?php echo $form->id ?>, jzzf_formulas_<?php echo $form->id ?>, jzzf_form_<?php echo $form->id ?>);
     </script>
 <?php
@@ -47 +48 @@
     }
     
-    function before($element) { ?>
-  <li class="jzzf_element">
+    function before($element, $ahead) { ?>
+  <li class="jzzf_element jzzf_element_<?php echo $element->type ?> jzzf_ahead_<?php echo $ahead ? $ahead->type : "end" ?>">
 <?php
     }
@@ -58 +59 @@
     
     function number($element) { ?>
-    <label class="jzzf_number_label jzzf_element_label" for="jzzf_<?php esc_attr_e($element->name) ?>"><?php esc_html_e($element->title) ?></label>
+    <label class="jzzf_number_label jzzf_element_label" for="<?php $this->id($element) ?>"><?php esc_html_e($element->title) ?></label>
     <input type="text" id="<?php $this->id($element) ?>" value="<?php esc_attr_e($element->default) ?>">
 <?php
@@ -108 +109 @@
     }
 
+    function heading($element) { ?>
+        <?php esc_html_e($element->title) ?>
+<?php
+    }
+
+    function text($element) { ?>
+        <?php esc_html_e($element->title) ?>
+<?php
+    }
+
+    function html($element) { ?>
+        <?php echo $element->title ?>
+<?php
+    }
+
+
     function foot($form) { ?>
 </ul>

jazzy-forms/trunk/generated/Basic_Model.php

@@ -8 +8 @@
     $obj->id = intval($obj->id);
     $obj->theme = intval($obj->theme);
+    $obj->realtime = (bool) ($obj->realtime);
             $obj->elements = jzzf_list_element($obj->id);
         }
@@ -21 +22 @@
     $obj->id = intval($obj->id);
     $obj->theme = intval($obj->theme);
+    $obj->realtime = (bool) ($obj->realtime);
         $obj->elements = jzzf_list_element($obj->id);
     }
@@ -33 +35 @@
     $obj->id = intval($obj->id);
     $obj->theme = intval($obj->theme);
+    $obj->realtime = (bool) ($obj->realtime);
         $obj->elements = jzzf_list_element($obj->id);
     }
@@ -41 +44 @@
     global $wpdb;
     if($obj->id) {
-        $query = "UPDATE {$wpdb->prefix}jzzf_form SET `title`=%s,`name`=%s,`theme`=%d,`css`=%s WHERE id=%d";
-        $sql = $wpdb->prepare($query, $obj->title,$obj->name,$obj->theme,$obj->css, $obj->id);
+        $query = "UPDATE {$wpdb->prefix}jzzf_form SET `title`=%s,`name`=%s,`theme`=%d,`css`=%s,`realtime`=%d WHERE id=%d";
+        $sql = $wpdb->prepare($query, $obj->title,$obj->name,$obj->theme,$obj->css,$obj->realtime, $obj->id);
         $result = $wpdb->query($sql);
         $id = $obj->id;
     } else {
-        $query = "INSERT INTO {$wpdb->prefix}jzzf_form (`title`,`name`,`theme`,`css`) VALUES (%s,%s,%d,%s)";
-        $sql = $wpdb->prepare($query, $obj->title,$obj->name,$obj->theme,$obj->css);
+        $query = "INSERT INTO {$wpdb->prefix}jzzf_form (`title`,`name`,`theme`,`css`,`realtime`) VALUES (%s,%s,%d,%s,%d)";
+        $sql = $wpdb->prepare($query, $obj->title,$obj->name,$obj->theme,$obj->css,$obj->realtime);
         $result = $wpdb->query($sql);
         $id = $wpdb->insert_id;
@@ -74 +77 @@
             }
         }
-    }
-    return $result!==false;
+        return $id;
+    }
+    return false;
 }
 function jzzf_delete_form($id) {
@@ -130 +134 @@
     global $wpdb;
     if($obj->id) {
-        $query = "UPDATE {$wpdb->prefix}jzzf_element SET `form`=%d,`order`=%d,`type`=%s,`title`=%s,`name`=%s,`formula`=%s,`value`=%s,`value2`=%s,`default`=%s,`external`=%s,`params`=%s WHERE id=%d";
+        $query = "UPDATE {$wpdb->prefix}jzzf_element SET `form`=%d,`order`=%d,`type`=%s,`title`=%s,`name`=%s,`formula`=%s,`value`=%s,`value2`=%s,`default`=%s,`external`=%d,`params`=%s WHERE id=%d";
         $sql = $wpdb->prepare($query, $obj->form,$obj->order,$obj->type,$obj->title,$obj->name,$obj->formula,$obj->value,$obj->value2,$obj->default,$obj->external,$obj->params, $obj->id);
         $result = $wpdb->query($sql);
         $id = $obj->id;
     } else {
-        $query = "INSERT INTO {$wpdb->prefix}jzzf_element (`form`,`order`,`type`,`title`,`name`,`formula`,`value`,`value2`,`default`,`external`,`params`) VALUES (%d,%d,%s,%s,%s,%s,%s,%s,%s,%s,%s)";
+        $query = "INSERT INTO {$wpdb->prefix}jzzf_element (`form`,`order`,`type`,`title`,`name`,`formula`,`value`,`value2`,`default`,`external`,`params`) VALUES (%d,%d,%s,%s,%s,%s,%s,%s,%s,%d,%s)";
         $sql = $wpdb->prepare($query, $obj->form,$obj->order,$obj->type,$obj->title,$obj->name,$obj->formula,$obj->value,$obj->value2,$obj->default,$obj->external,$obj->params);
         $result = $wpdb->query($sql);
@@ -163 +167 @@
             }
         }
-    }
-    return $result!==false;
+        return $id;
+    }
+    return false;
 }
 function jzzf_delete_element($id) {
@@ -204 +209 @@
     global $wpdb;
     if($obj->id) {
-        $query = "UPDATE {$wpdb->prefix}jzzf_option SET `order`=%d,`element`=%d,`default`=%s,`title`=%s,`name`=%s,`value`=%s WHERE id=%d";
+        $query = "UPDATE {$wpdb->prefix}jzzf_option SET `order`=%d,`element`=%d,`default`=%d,`title`=%s,`name`=%s,`value`=%s WHERE id=%d";
         $sql = $wpdb->prepare($query, $obj->order,$obj->element,$obj->default,$obj->title,$obj->name,$obj->value, $obj->id);
         $result = $wpdb->query($sql);
         $id = $obj->id;
     } else {
-        $query = "INSERT INTO {$wpdb->prefix}jzzf_option (`order`,`element`,`default`,`title`,`name`,`value`) VALUES (%d,%d,%s,%s,%s,%s)";
+        $query = "INSERT INTO {$wpdb->prefix}jzzf_option (`order`,`element`,`default`,`title`,`name`,`value`) VALUES (%d,%d,%d,%s,%s,%s)";
         $sql = $wpdb->prepare($query, $obj->order,$obj->element,$obj->default,$obj->title,$obj->name,$obj->value);
         $result = $wpdb->query($sql);
         $id = $wpdb->insert_id;
     }
-    return $result!==false;
+    return false;
 }
 function jzzf_delete_option($id) {

jazzy-forms/trunk/generated/schema.sql

@@ -1 @@
-CREATE TABLE IF NOT EXISTS {{prefix}}jzzf_form ( id bigint(20) AUTO_INCREMENT, `title` varchar(1024) NOT NULL,`name` varchar(1024) NOT NULL,`theme` int(12) NOT NULL,`css` varchar(1024) NOT NULL, PRIMARY KEY (id) ) {{charset_collate}};
-CREATE TABLE IF NOT EXISTS {{prefix}}jzzf_element ( id bigint(20) AUTO_INCREMENT, `form` bigint(20) NOT NULL,`order` int(12) NOT NULL,`type` varchar(1024) NOT NULL,`title` varchar(1024) NOT NULL,`name` varchar(1024) NOT NULL,`formula` varchar(1024) NOT NULL,`value` varchar(1024) NOT NULL,`value2` varchar(1024) NOT NULL,`default` varchar(1024) NOT NULL,`external` int(1) NOT NULL,`params` varchar(2048) NOT NULL, PRIMARY KEY (id) ) {{charset_collate}};
-CREATE TABLE IF NOT EXISTS {{prefix}}jzzf_option ( id bigint(20) AUTO_INCREMENT, `order` int(12) NOT NULL,`element` bigint(20) NOT NULL,`default` int(1) NOT NULL,`title` varchar(1024) NOT NULL,`name` varchar(1024) NOT NULL,`value` varchar(1024) NOT NULL, PRIMARY KEY (id) ) {{charset_collate}};
+CREATE TABLE IF NOT EXISTS {{prefix}}jzzf_form ( id bigint(20) AUTO_INCREMENT, `title` varchar(1024) NOT NULL, `name` varchar(1024) NOT NULL, `theme` int(12) NOT NULL, `css` varchar(1024) NOT NULL, `realtime` int(1) NOT NULL DEFAULT 1,  PRIMARY KEY (id) ) {{charset_collate}};
+CREATE TABLE IF NOT EXISTS {{prefix}}jzzf_element ( id bigint(20) AUTO_INCREMENT, `form` bigint(20) NOT NULL, `order` int(12) NOT NULL, `type` varchar(1024) NOT NULL, `title` varchar(1024) NOT NULL, `name` varchar(1024) NOT NULL, `formula` varchar(1024) NOT NULL, `value` varchar(1024) NOT NULL, `value2` varchar(1024) NOT NULL, `default` varchar(1024) NOT NULL, `external` int(1) NOT NULL, `params` varchar(2048) NOT NULL,  PRIMARY KEY (id) ) {{charset_collate}};
+CREATE TABLE IF NOT EXISTS {{prefix}}jzzf_option ( id bigint(20) AUTO_INCREMENT, `order` int(12) NOT NULL, `element` bigint(20) NOT NULL, `default` int(1) NOT NULL, `title` varchar(1024) NOT NULL, `name` varchar(1024) NOT NULL, `value` varchar(1024) NOT NULL,  PRIMARY KEY (id) ) {{charset_collate}};

jazzy-forms/trunk/jazzy-forms.php

@@ -4 +4 @@
 Plugin URI: http://www.jazzyforms.com/
 Description: Online form builder
-Version: 0.9.3
+Version: 0.9.4
 Author: Igor Prochazka
 Author URI: http://www.l90r.com/
@@ -27 +27 @@
 ---------------------------------------------------------------------
 */
+
+define(JZZF_VERSION, 0.0904);
 
 define(JZZF_ROOT, WP_PLUGIN_DIR . '/jazzy-forms/');
@@ -67 +69 @@
 function jzzf_activate() {
     global $wpdb;
-    $schema = file( dirname(__FILE__) . '/generated/schema.sql' );
 
     if(!empty($wpdb->charset)) {
@@ -76 +77 @@
         $charset_collate .= " COLLATE $wpdb->collate";
     }
-        
-    foreach($schema as $line) {
+    
+    jzzf_create_tables($charset_collate);
+    jzzf_update($charset_collate);
+}
+
+function jzzf_create_tables($charset_collate) {
+    jzzf_execute_sql('schema.sql', $charset_collate);
+}
+
+function jzzf_execute_sql($filename, $charset_collate) {
+    global $wpdb;
+
+    $file = file( dirname(__FILE__) . '/generated/' . $filename );
+    foreach($file as $line) {
         $sql = trim($line);
         if($sql && $sql[0] != '#') {
@@ -85 +98 @@
         }
     }
+}
+
+function jzzf_update($charset_collate) {
+    $previous = get_option('jzzf_version', 0.0);
+    update_option('jzzf_version', JZZF_VERSION);
+    
+    jzzf_execute_sql('update.sql', $charset_collate);   
 }
 

jazzy-forms/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.2.1
 Tested up to: 3.3.1
-Stable tag: 0.9.3
+Stable tag: 0.9.4
 
 Jazzy Forms is an online form generator that performs instant calculations. It's ideal for inter-active price calculators.
@@ -27 +27 @@
 * Output
 * Update button
+* Text/Heading/HTML
 
 This is an early release. Features like input validation, data collection or Email are still being worked on.
@@ -48 +49 @@
 Simply insert the following shortcode in the post or page you want the form to appear in:
 
-[jazzy form="FORM_ID"]
+`[jazzy form="FORM_ID"]`
 
 Replace FORM_ID with the ID of the form you want to add. The complete shortcode for your form is also displayed on its administration screen in the "General" tab. Copy and paste it from there.
@@ -85 +86 @@
 
 where "base_price", "price", "quantity" and "tax" are IDs of other existing form elements.
+While the author is still working on a proper documentation, you can preview a list of available functions at https://gist.github.com/1779127
 
 = Do you accept donations? =
@@ -103 +105 @@
 
 == Changelog ==
+
+= 0.9.4 =
+* Some GUI polishing
+* Treat quotes correctly on the back-end
+* Avoid crashes/freeze on formulas with unbalanced paranthesis
+* Add extra elements for text, heading and raw HTML
+* Make real-time updating optional
+* Generate valid HTML5 code
 
 = 0.9.3 =