5 files changed, 82 insertions, 20 deletions

diff --git a/public/assets/js/lib/views/details/commentform.js b/public/assets/js/lib/views/details/commentform.js
new file mode 100644
index 0000000..30671f2
--- /dev/null
+++ b/public/assets/js/lib/views/details/commentform.js
@@ -0,0 +1,33 @@
+var CommentForm = FormView.extend({
+  
+  el: "#comment_form",
+  
+  events: {
+  },
+  
+  action: "/api/thread/1/comment",
+  
+  initialize: function(){
+    this.__super__.initialize.call(this)
+    this.template = this.$(".template").html()
+    this.$comment = this.$("[name=comment]")
+  },
+  
+  load: function(thread){
+    this.action = "/api/thread/" + thread.id + "/comment"
+  },
+  
+  validate: function(){
+    var errors = []
+    var comment = $("[name=comment]").val()
+    if (! comment || ! comment.length) {
+      errors.push("Please enter a comment.")
+    }
+    return errors.length ? errors : null
+  },
+
+  success: function(comment){
+    this.prependComment(comment)
+    this.$("[name=comment]").val("")
+  }
+})
\ No newline at end of file
diff --git a/public/assets/js/lib/views/details/index.js b/public/assets/js/lib/views/details/index.js
index 554c475..cd8045a 100644
--- a/public/assets/js/lib/views/details/index.js
+++ b/public/assets/js/lib/views/details/index.js
@@ -6,11 +6,14 @@ var DetailsView = View.extend({
   action: "/api/thread/",
   keywordAction: "/api/keyword/",
   
+  
   initialize: function(opt){
     this.comments = new CommentsView ({ parent: this })
     this.files = new FilesView ({ parent: this })
     this.gallery = new GalleryView ({ parent: this })
+    this.form = new CommentForm ({ parent: this })
     this.threadbox = new ThreadBox ({ parent: this })
+    this.metadataTemplate = $(".metadata_template").html()
   },
   
   load: function(id){
@@ -19,7 +22,18 @@ var DetailsView = View.extend({
   },
   
   populate: function(data){
-    $("h1").html(data.thread.title)
+    var thread = data.thread
+    $("h1").html(thread.title)
+    var datetime = verbose_date(thread.createdate, true)
+    var age = get_age(thread.lastmodified, true)
+    var t = this.metadataTemplate
+                .replace(/{{ username }}/g, thread.username)
+                .replace(/{{ date }}/g, datetime[0])
+                .replace(/{{ time }}/g, datetime[1])
+                .replace(/{{ active }}/g, age + " ago")
+                .replace(/{{ views }}/g, thread.viewed + " view" + courtesy_s(thread.viewed))
+    $(".metadata").html(t)
+    this.form.load(data.thread)
     this.comments.load(data.comments)
     this.files.load(data.files)
     this.gallery.load(data.files)
diff --git a/public/assets/js/lib/views/index/hootbox.js b/public/assets/js/lib/views/index/hootbox.js
index 4a23d32..cdd3eb0 100644
--- a/public/assets/js/lib/views/index/hootbox.js
+++ b/public/assets/js/lib/views/index/hootbox.js
@@ -33,24 +33,18 @@ var HootBox = FormView.extend({
     var $el = $( this.parse(comment) )
     this.$hoots.append($el)
   },
-  
+
   validate: function(){
     var errors = []
-    if (! this.$comment.val()) {
-      errors.push("no comment")
-      return errors
+    var comment = $("[name=comment]").val()
+    if (! comment || ! comment.length) {
+      errors.push("Please enter a comment.")
     }
-    return null
-  },
-  
-  beforeSend: function(){
-    this.$comment.val("")
+    return errors.length ? errors : null
   },
-  
-  showErrors: function(){
-  },
-  
-  success: function(data){
-    this.prependComment(data.comment)
+
+  success: function(comment){
+    this.prependComment(comment)
+    this.$("[name=comment]").val("")
   }
 })
\ No newline at end of file
diff --git a/public/assets/js/lib/views/index/index.js b/public/assets/js/lib/views/index/index.js
index a1e8af5..d66ea1c 100644
--- a/public/assets/js/lib/views/index/index.js
+++ b/public/assets/js/lib/views/index/index.js
@@ -8,7 +8,7 @@ var IndexView = View.extend({
   initialize: function(opt){
     // opt.parent = parent
     this.hootbox = new HootBox ({ parent: this })
-    this.threadbox = new ThreadBox ({ parent: this })
+    this.threadbox = new ThreadBox ({ parent: this, latest: true })
     this.lastlog = new LastLog ({ parent: this })
     this.load()
   },
diff --git a/public/assets/js/lib/views/index/threadbox.js b/public/assets/js/lib/views/index/threadbox.js
index 0475382..8d8cb02 100644
--- a/public/assets/js/lib/views/index/threadbox.js
+++ b/public/assets/js/lib/views/index/threadbox.js
@@ -12,13 +12,30 @@ var ThreadBox = View.extend({
   
   load: function(data){
     if (data.keyword) {
-      var $row = this.parseKeyword(data.keyword)
-      this.$el.append($row)
+      this.appendKeyword(data.keyword)
+      data.threads.forEach(this.appendThread.bind(this))
+    }
+    else if (this.options.latest) {
+      data.threads.sort( (a,b) => {
+        return b.lastmodified - a.lastmodified
+      }).slice(0, 50).forEach(this.appendThread.bind(this))
+    }
+    else {
+      var keywords = {}
+      data.threads.forEach((thread) => {
+        var keyword = thread.keyword || '__unsorted'
+        keywords[keyword] = keywords[keyword] || []
+        keywords[keyword].push(thread)
+      })
+      Object.keys(keywords).sort().forEach((keyword) => {
+        this.appendKeyword({ keyword })
+        keywords[keyword].forEach(this.appendThread.bind(this))
+      })
     }
-    data.threads.forEach(this.appendThread.bind(this))
   },
   
   parse: function(thread){
+    if (thread.comment_count === undefined) return ""
     var views = hush_views(thread.viewed)
     var size = hush_size(thread.size)
     var comments = hush_null(thread.comment_count, "c")
@@ -65,4 +82,8 @@ var ThreadBox = View.extend({
     this.$el.append($row)
   },
 
+  appendKeyword: function(keyword){
+    var $row = $( this.parseKeyword(keyword) )
+    this.$el.append($row)
+  },
 })