From 51a6793b913da59567f9f3a22e7668f5920431b6 Mon Sep 17 00:00:00 2001 From: Hermann <blumh@student.ethz.ch> Date: Sun, 27 May 2018 19:00:28 +0200 Subject: [PATCH] show tables for userdetails in new style --- src/users/viewUser.js | 49 ++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/src/users/viewUser.js b/src/users/viewUser.js index b6a9b7d..d2ba885 100644 --- a/src/users/viewUser.js +++ b/src/users/viewUser.js @@ -1,4 +1,5 @@ import m from 'mithril'; +import {Â Card, Toolbar, ToolbarTitle, Button } from 'polythene-mithril'; import ItemView from '../views/itemView'; import TableView from '../views/tableView'; import SelectList from '../views/selectList'; @@ -73,20 +74,40 @@ export default class UserView extends ItemView { m('td.detail-descriptor', config.keyDescriptors[key]), m('td', this.data[key] ? this.data[key] : ''), ]))), - m('h2', 'Memberships'), m('br'), - this.groupchoice ? groupSelect : '', - m(TableView, { - controller: this.groupmemberships, - keys: ['group.name', 'expiry'], - titles: ['groupname', 'expiry'], - onAdd: () => { this.groupchoice = true; }, - }), - m('h2', 'Signups'), m('br'), - m(TableView, { - controller: this.eventsignups, - keys: ['event.title_de'], - titles: ['event'], - }), + m('div.viewcontainer', [ + m('div.viewcontainercolumn', m(Card, { + style: { height: '300px', 'margin-bottom': '20px' }, + content: m('div', [ + m(Toolbar, { compact: true }, [ + m(ToolbarTitle, { text: 'Event Signups' }), + ]), + m(TableView, { + controller: this.eventsignups, + keys: ['event.title_de'], + titles: ['event'], + }), + ]), + })), + m('div.viewcontainercolumn', m(Card, { + style: { height: '300px', 'margin-bottom': '10px' }, + content: m('div', [ + this.groupchoice ? groupSelect : '', + m(Toolbar, { compact: true }, [ + m(ToolbarTitle, { text: 'Group Memberships' }), + m(Button, { + className: 'blue-button', + label: 'add', + events: { onclick: () => { this.groupchoice = true; } }, + }), + ]), + m(TableView, { + controller: this.groupmemberships, + keys: ['group.name', 'expiry'], + titles: ['groupname', 'expiry'], + }), + ]), + })), + ]), ]); } } -- GitLab