Merge lp:~xzcvczx/dmedia/dmedia-bng-fixup into lp:dmedia

[xzcvczx]

Cleaned up browser code, specifically in metadata information section so that there is a variable number of elements

[Jason Gerard DeRose (jderose)]

Looks good, thanks!

review: Approve

=== modified file 'ui/dmedia.js'
--- ui/dmedia.js	2013-01-16 15:29:28 +0000
+++ ui/dmedia.js	2013-01-27 15:26:18 +0000
@@ -638,23 +638,24 @@
             this.player.src = null;
             return;
         }
+
         this.player.src = 'dmedia:' + id;
         this.player.play();
         this.tagger.reset();
         this.tags.innerHTML = null;
         this.project.db.get($bind(this.on_doc, this), id);
+        $('clip_title').placeholder = null;
+        $('clip_title').value = null;
+
+        while ($('metadata').firstChild) 
+            $('metadata').removeChild($('metadata').firstChild );
     },
 
     on_doc: function(req) {
         this.doc = req.read();
 
         $('clip_title').placeholder = this.doc.name;
-        if (this.doc.title) {
-            $('clip_title').value = this.doc.title;
-        } 
-        else {
-            $('clip_title').value = '';
-        }
+        if (this.doc.title) $('clip_title').value = this.doc.title;
 
         if (this.doc.media == 'video') {
             var resolution = this.doc.width + 'x' + this.doc.height;
@@ -662,9 +663,9 @@
             var fps = Math.round((framerate.num/framerate.denom)*100)/100;
             var length = format_time(this.doc.duration.seconds);
 
-            $('metadata_1').textContent = length;
-            $('metadata_2').textContent = resolution;
-            $('metadata_3').textContent = fps + ' fps';
+            $('metadata').appendChild($el('p',{'class':'metadata', 'textContent':length}));
+            $('metadata').appendChild($el('p',{'class':'metadata', 'textContent':resolution}));
+            $('metadata').appendChild($el('p',{'class':'metadata', 'textContent':fps + ' fps'}));
         }
         
         var keys = Object.keys(this.doc.tags);

=== modified file 'ui/index.html'
--- ui/index.html	2013-01-16 15:29:28 +0000
+++ ui/index.html	2013-01-27 15:26:18 +0000
@@ -66,14 +66,11 @@
         <div id="browser_main" class="hide">
             <div id="screen"><video id="player"></div>
             <div id="east" class="grid_row">
-                <div id="info" class="grid_row">
-                    <form id="clip_title_form">
-                        <input id="clip_title" class="grid_3"></input>
-                    </form>
-                    <p id="metadata_1" class="metadata"></p>
-                    <p id="metadata_2" class="metadata"></p>
-                    <p id="metadata_3" class="metadata"></p>
-                </div>
+                <form id="clip_title_form">
+                    <input id="clip_title" class="grid_3"></input>
+                </form>
+                    <div id="metadata" class="grid_3 grid_row">
+                    </div>
                 <form id="tag_form">
                 <div id="tag_block" class="grid_row">
                 <div id="add_tag" class="grid_2 grid_cell">