' + row.cid + '',
row.subscribers,
htmlescape(striptags(row.description) || ''),
- '' + _('Edit') + '' ]
+ ' ' + _('Edit') + '' ]
)
});
});
@@ -254,7 +255,7 @@ router.post('/ajax/:id', (req, res) => {
} else {
return htmlescape(cRow.value || '');
}
- })).concat(statuses[row.status]).concat(row.created && row.created.toISOString ? '' + row.created.toISOString() + '' : 'N/A').concat('' + _('Edit') + ''))
+ })).concat(config.views.lists.statuscolored ? '' + statuses[row.status] + '' : statuses[row.status]).concat(row.created && row.created.toISOString ? '' + row.created.toISOString() + '' : 'N/A').concat('' + _('Edit') + ''))
});
});
});
@@ -312,6 +313,7 @@ router.get('/view/:id', passport.csrfProtection, (req, res) => {
list.csrfToken = req.csrfToken();
list.customFields = fieldList.filter(field => field.visible);
list.customSort = list.customFields.length ? ',' + list.customFields.map(() => '0').join(',') : '';
+ list.statusColored = config.views.lists.statuscolored;
list.showSubscriptions = req.query.tab === 'subscriptions' || !req.query.tab;
list.showImports = req.query.tab === 'imports';
@@ -387,14 +389,27 @@ router.get('/subscription/:id/edit/:cid', passport.csrfProtection, (req, res) =>
fieldList = [];
}
+ let statuses = [_('Unknown'), _('Subscribed'), _('Unsubscribed'), _('Bounced'), _('Complained')];
+
subscription.list = list;
subscription.csrfToken = req.csrfToken();
subscription.customFields = fields.getRow(fieldList, subscription, false, true);
subscription.useEditor = true;
+ subscription.createdDate = moment(subscription.created).format('lll');
+ subscription.modifiedDate = moment(subscription.statusChange).format('lll');
+
+ subscription.statusTitle = statuses[subscription.status];
subscription.isSubscribed = subscription.status === 1;
subscription.isBounced = subscription.status === 3;
+ let country = {};
+ if (subscription.optInCountry) {
+ country.name = getName(subscription.optInCountry);
+ country.code = subscription.optInCountry.toLowerCase();
+ }
+ subscription.country = country;
+
let tzfound = false;
subscription.timezones = moment.tz.names().map(tz => {
let selected = false;
diff --git a/views/layout.hbs b/views/layout.hbs
index 73eff28a..8aad8a19 100644
--- a/views/layout.hbs
+++ b/views/layout.hbs
@@ -147,7 +147,7 @@
diff --git a/views/lists/subscription/edit.hbs b/views/lists/subscription/edit.hbs
index a1db3a24..1cb20de3 100644
--- a/views/lists/subscription/edit.hbs
+++ b/views/lists/subscription/edit.hbs
@@ -41,12 +41,28 @@