aboutsummaryrefslogtreecommitdiff
path: root/lib/render-msg.js
diff options
context:
space:
mode:
Diffstat (limited to 'lib/render-msg.js')
-rw-r--r--lib/render-msg.js45
1 files changed, 28 insertions, 17 deletions
diff --git a/lib/render-msg.js b/lib/render-msg.js
index 51d094e..1af0b34 100644
--- a/lib/render-msg.js
+++ b/lib/render-msg.js
@@ -92,8 +92,8 @@ RenderMsg.prototype.wrap = function (content, cb) {
var self = this
var channel = this.c.channel ? '#' + this.c.channel : ''
var done = multicb({pluck: 1, spread: true})
- done()(null, h('tr.msg-row',
- h('td.msg-left',
+ done()(null, [h('tr.msg-row',
+ h('td.msg-left', {rowspan: 2},
h('div', this.render.avatarImage(this.msg.value.author, done())),
h('div', this.render.idLink(this.msg.value.author, done())),
this.recpsLine(done())
@@ -107,20 +107,17 @@ RenderMsg.prototype.wrap = function (content, cb) {
h('code', h('a.ssb-id',
{href: this.toUrl(this.msg.key)}, this.msg.key)),
channel ? [' ', h('a', {href: this.toUrl(channel)}, channel)] : ''),
- this.issues(done()),
- content),
- h('td.msg-right',
+ this.issues(done())),
+ h('td.msg-right', h('form', {method: 'post', action: '/vote'},
this.msg.rel ? [this.msg.rel, ' '] : '',
- this.msg.key ? h('form', {method: 'post', action: '/vote'},
- h('div', h('a', {href: this.toUrl(this.msg.key) + '?raw'}, 'raw')),
- h('input', {type: 'hidden', name: 'recps',
- value: this.recpsIds().join(',')}),
- h('input', {type: 'hidden', name: 'link', value: this.msg.key}),
- h('input', {type: 'hidden', name: 'value', value: 1}),
- h('input', {type: 'submit', name: 'expression', value: 'dig'})
- ) : ''
- )
- ))
+ this.msg.key ? [
+ h('a', {href: this.toUrl(this.msg.key) + '?raw'}, 'raw'), ' ',
+ this.voteFormInner('dig')
+ ] : ''
+ ))
+ ), h('tr',
+ h('td.msg-content', {colspan: 2}, content)
+ )])
done(cb)
}
@@ -141,8 +138,13 @@ RenderMsg.prototype.wrapMini = function (content, cb) {
href: this.msg.key ? this.toUrl(this.msg.key) : undefined
}, htime(date)), ' ',
content),
- h('td.msg-right',
- h('a', {href: this.toUrl(this.msg.key) + '?raw'}, 'raw'))
+ h('td.msg-right', h('form', {method: 'post', action: '/vote'},
+ this.msg.rel ? [this.msg.rel, ' '] : '',
+ this.msg.key ? [
+ h('a', {href: this.toUrl(this.msg.key) + '?raw'}, 'raw'), ' ',
+ this.voteFormInner('dig')
+ ] : ''
+ ))
))
done(cb)
}
@@ -162,6 +164,15 @@ RenderMsg.prototype.recpsIds = function () {
: []
}
+RenderMsg.prototype.voteFormInner = function (expression) {
+ return [
+ h('input', {type: 'hidden', name: 'recps',
+ value: this.recpsIds().join(',')}),
+ h('input', {type: 'hidden', name: 'link', value: this.msg.key}),
+ h('input', {type: 'hidden', name: 'value', value: 1}),
+ h('input', {type: 'submit', name: 'expression', value: expression})]
+}
+
RenderMsg.prototype.message = function (raw, cb) {
if (raw) return this.raw(cb)
if (typeof this.c === 'string') return this.encrypted(cb)