From 7f53375c67e0e99d24b8876d184f265a120a2ce7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 23 Nov 2017 13:40:19 +0100
Subject: [PATCH 1/4] More padding for question box

---
 client/talk-plugin-questionbox/QuestionBox.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/talk-plugin-questionbox/QuestionBox.css b/client/talk-plugin-questionbox/QuestionBox.css
index cb9902ade..b8df1f228 100644
--- a/client/talk-plugin-questionbox/QuestionBox.css
+++ b/client/talk-plugin-questionbox/QuestionBox.css
@@ -13,6 +13,8 @@
   min-height: 50px;
   display: flex;
   border-radius: 3px;
+  padding-right: 40px;
+  box-sizing: border-box;
 }
 
 .icon {
@@ -67,4 +69,4 @@
 .hidden  {
   visibility: hidden;
   display: none;
-}
\ No newline at end of file
+}

From 9359bfc322a986f24b4cc7502bb5999246f0b765 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 23 Nov 2017 20:09:16 +0100
Subject: [PATCH 2/4] Fix styling bug in firefox

---
 .../Configure/components/StreamSettings.css   |  3 ++
 .../Configure/components/StreamSettings.js    | 34 ++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.css b/client/coral-admin/src/routes/Configure/components/StreamSettings.css
index 5ddd46bd2..628192de6 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.css
@@ -53,3 +53,6 @@
 
 
 
+.autoCloseWrapper {
+  display: flex;
+}
diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index 9c05711cb..ffaeed63b 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -180,22 +180,24 @@ class StreamSettings extends React.Component {
           onCheckbox={this.updateAutoClose}
           title={t('configure.close_after')}
         >
-          <Textfield
-            type='number'
-            pattern='[0-9]+'
-            style={{width: 50}}
-            onChange={this.updateClosedTimeout}
-            value={getTimeoutAmount(settings.closedTimeout)}
-            label={t('configure.closed_comments_label')} />
-          <div className={styles.configTimeoutSelect}>
-            <SelectField
-              label="comments closed time window"
-              value={getTimeoutMeasure(settings.closedTimeout)}
-              onChange={this.updateClosedTimeoutMeasure}>
-              <Option value={'hours'}>{t('configure.hours')}</Option>
-              <Option value={'days'}>{t('configure.days')}</Option>
-              <Option value={'weeks'}>{t('configure.weeks')}</Option>
-            </SelectField>
+          <div className={styles.autoCloseWrapper}>
+            <Textfield
+              type='number'
+              pattern='[0-9]+'
+              style={{width: 50}}
+              onChange={this.updateClosedTimeout}
+              value={getTimeoutAmount(settings.closedTimeout)}
+              label={t('configure.closed_comments_label')} />
+            <div className={styles.configTimeoutSelect}>
+              <SelectField
+                label="comments closed time window"
+                value={getTimeoutMeasure(settings.closedTimeout)}
+                onChange={this.updateClosedTimeoutMeasure}>
+                <Option value={'hours'}>{t('configure.hours')}</Option>
+                <Option value={'days'}>{t('configure.days')}</Option>
+                <Option value={'weeks'}>{t('configure.weeks')}</Option>
+              </SelectField>
+            </div>
           </div>
         </ConfigureCard>
         {/* the above card should be the last one if at all possible because of z-index issues with the selects */}

From 37f3c1110420ebfa7685c4a2bd2c7ba7d12e1282 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 24 Nov 2017 12:29:29 +0100
Subject: [PATCH 3/4] Fix radiogroup not working properly in ff

---
 .../src/routes/Stories/components/Stories.js          |  4 ++--
 yarn.lock                                             | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/routes/Stories/components/Stories.js b/client/coral-admin/src/routes/Stories/components/Stories.js
index 866defde4..933237ab9 100644
--- a/client/coral-admin/src/routes/Stories/components/Stories.js
+++ b/client/coral-admin/src/routes/Stories/components/Stories.js
@@ -48,7 +48,7 @@ class Stories extends Component {
           <div className={styles.optionHeader}>{t('streams.filter_streams')}</div>
           <div className={styles.optionDetail}>{t('streams.stream_status')}</div>
           <RadioGroup
-            name='status filter'
+            name='statusFilter'
             value={filter}
             childContainer='div'
             onChange={onSettingChange('filter')}
@@ -60,7 +60,7 @@ class Stories extends Component {
           </RadioGroup>
           <div className={styles.optionHeader}>{t('streams.sort_by')}</div>
           <RadioGroup
-            name='sort by'
+            name='sortBy'
             value={asc}
             childContainer='div'
             onChange={onSettingChange('asc')}
diff --git a/yarn.lock b/yarn.lock
index 7996e549f..882cf3e29 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7360,7 +7360,7 @@ react-mdl-selectfield@^0.2.0:
     react-dom "^15.3.1"
     react-mdl "^1.7.1"
 
-react-mdl@^1.7.1, react-mdl@^1.7.2:
+react-mdl@^1.7.1:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/react-mdl/-/react-mdl-1.10.3.tgz#f783e26a5eea4154a32129ab2562c09d5eeacf0d"
   dependencies:
@@ -7369,6 +7369,15 @@ react-mdl@^1.7.1, react-mdl@^1.7.2:
     lodash.isequal "^4.4.0"
     prop-types "^15.5.0"
 
+react-mdl@^1.7.2:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/react-mdl/-/react-mdl-1.11.0.tgz#7e07ee1009dd9b358b616dc400ff2ae1845a2e67"
+  dependencies:
+    clamp "^1.0.1"
+    classnames "^2.2.3"
+    lodash.isequal "^4.4.0"
+    prop-types "^15.5.0"
+
 react-paginate@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/react-paginate/-/react-paginate-5.0.0.tgz#b5c12191ea81adc6d4d1b339b805e81841eaa8ea"

From ec2bf3cb7f38c244e788927463d668eb7c2ee7e5 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 24 Nov 2017 12:41:18 +0100
Subject: [PATCH 4/4] Sort by publication_date

---
 routes/api/assets/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index 165b2cd99..d7cc86438 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -38,7 +38,7 @@ router.get('/', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, nex
 
   const {
     value = '',
-    field = 'created_at',
+    field = 'publication_date',
     page = 1,
     asc = 'false',
     filter = 'all',
@@ -46,9 +46,10 @@ router.get('/', authorization.needed('ADMIN', 'MODERATOR'), async (req, res, nex
   } = req.query;
 
   try {
+    const order = (asc === 'true') ? 1 : -1;
 
     const queryOpts = {
-      sort: {[field]: (asc === 'true') ? 1 : -1},
+      sort: {[field]: order, 'created_at': order},
       skip: (page - 1) * limit,
       limit
     };