merging changes

demos/editable/js/editable.js

@@ -35,7 +35,7 @@ Ox.load('UI', {debug: true}, function() {
         country: ['France'],
         director: ['Jean-Luc Godard'],
         language: ['French', 'English'],
-        runtime: 5400,
+        runtime: '90 min',
         title: 'Deux ou trois choses que je sais d\'elle',
         year: '1967'
     };
@@ -72,17 +72,17 @@ Ox.load('UI', {debug: true}, function() {
             .css({float: 'left', margin: '1px 0 0 1px'})
             .append(
                 $('<div>')
-                    .css({float: 'left'})
+                    .css({float: 'left', fontWeight: 'bold'})
                     .html((i ? '; ' : '') + Ox.toTitleCase(key) + ':&nbsp;')
             )
             .appendTo($div);
         Ox.Editable({
                 format: function(value) {
-                    return value ? (
+                    return (value ? (
                         Ox.isArray(data[key]) ? value.split(', ').map(function(value) {
                             return '<a href="/?find=' + value + '">' + value + '</a>'
                         }).join(', ') : value
-                    ) : 'unknown';
+                    ) : 'unknown');// + (i == 3 ? '' : ';');
                 },
                 value: Ox.isArray(data[key]) ? data[key].join(', ') : data[key]
             })
@@ -92,16 +92,20 @@ Ox.load('UI', {debug: true}, function() {
             .appendTo($div_);
     });
 
-    $div = $('<div>')
-        .css({clear: 'both'})
-        .appendTo($box.$element);
 
+    $div = $('<div>').css({clear: 'both', marginTop: '16px', textAlign: 'justify'}).appendTo($box.$element);
     Ox.Editable({
             format: function(value) {
-                return value ? Ox.parseHTML(value) : 'No description'
+                return '<span style="font-weight: bold">Keywords:</span> '
+                    + value.split(', ').map(function(value) {
+                        return '<a href="/?find=' + value + '">' + value + '</a>'
+                    }).join(', ')
             },
             type: 'textarea',
-            value: 'foo bar\nfoo bar'
+            value: 'Sex, Crime, Car, Spoiler in Keywords, Genre in Keywords, Director Cameo, One Or More Meta Keywords',
+            width: 512
+        })
+        .css({
         })
         .appendTo($div);