diff options
| author | Xavier Priour <xavier.priour@bubblyware.com> | 2015-11-13 19:17:09 +0100 |
|---|---|---|
| committer | Xavier Priour <xavier.priour@bubblyware.com> | 2015-11-14 01:41:02 +0100 |
| commit | dd0a6e1a8223cbb80ea940985dc9706d468ed72c (patch) | |
| tree | 61f1a68933f9806853244e1599f67a917eb58352 /client/components | |
| parent | f6f41270de1b5a2d3ff6aa4ca7d433915dd29bd9 (diff) | |
| download | wekan-dd0a6e1a8223cbb80ea940985dc9706d468ed72c.tar.gz wekan-dd0a6e1a8223cbb80ea940985dc9706d468ed72c.tar.bz2 wekan-dd0a6e1a8223cbb80ea940985dc9706d468ed72c.zip | |
Import members: board import
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/import/import.jade | 5 | ||||
| -rw-r--r-- | client/components/import/import.js | 5 | ||||
| -rw-r--r-- | client/components/import/import.styl | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/client/components/import/import.jade b/client/components/import/import.jade index 0f53e4d2..74b6ca13 100644 --- a/client/components/import/import.jade +++ b/client/components/import/import.jade @@ -8,7 +8,7 @@ template(name="importPopup") if membersMapping div a.show-mapping - | {{_ 'show-mapping'}} + | {{_ 'import-show-user-mapping'}} input.primary.wide(type="submit" value="{{_ 'import'}}") template(name="mapMembersPopup") @@ -35,7 +35,8 @@ template(name="mapMembersPopup") template(name="mapMembersAddPopup") .select-member - p Hello world + p + | {{_ 'import-user-select'}} .js-map-member +esInput(index="users") ul.pop-over-list diff --git a/client/components/import/import.js b/client/components/import/import.js index b42fcc5d..9de649f2 100644 --- a/client/components/import/import.js +++ b/client/components/import/import.js @@ -29,13 +29,12 @@ const ImportPopup = BlazeComponent.extendComponent({ }, onShowMapping(evt) { - // todo xxx make it work - currently we don't find the text - // this._storeText(evt); + this._storeText(evt); Popup.open('mapMembers')(evt); }, _storeText(evt) { - const dataJson = $(evt.currentTarget).find('.js-import-json').val(); + const dataJson = this.$('.js-import-json').val(); Session.set('import.text', dataJson); return dataJson; }, diff --git a/client/components/import/import.styl b/client/components/import/import.styl index 4934cbcc..3c6cfdf3 100644 --- a/client/components/import/import.styl +++ b/client/components/import/import.styl @@ -1,8 +1,9 @@ .map-members + .mapping:first-of-type + border-top: solid 1px #999 .mapping - margin-bottom: 10px - margin-top: 10px - border-bottom: solid + padding: 10px 0 + border-bottom: solid 1px #999 .source display: inline-block width: 80% @@ -11,3 +12,6 @@ width: 35px .member float: none + +a.show-mapping + text-decoration underline |