TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-28 21:33:24 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1919 from ErisDS/date-display

Browse Source 
Publish date and time display fix
This commit is contained in:
Hannah Wolfe 2014-01-12 19:52:55 -08:00
commit 47391db105
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/client/views/post-settings.js
View File

@ -30,7 +30,7 @@
pubDate = this.model ? this.model.get('published_at') : 'Not Published',
$pubDateEl = this.$('.post-setting-date'),
$postSettingSlugEl = this.$('.post-setting-slug'),
publishedDateFormat = 'DD MMM YY HH:mm';
publishedDateFormat = 'DD MMM YY @ HH:mm';
$postSettingSlugEl.val(slug);
@ -143,7 +143,7 @@
e.preventDefault();
var self = this,
parseDateFormats = ['DD MMM YY HH:mm', 'DD MMM YYYY HH:mm', 'DD/MM/YY HH:mm', 'DD/MM/YYYY HH:mm', 'DD-MM-YY HH:mm', 'DD-MM-YYYY HH:mm'],
displayDateFormat = 'DD MMM YY HH:mm',
displayDateFormat = 'DD MMM YY @ HH:mm',
errMessage = '',
pubDate = self.model.get('published_at'),
pubDateEl = e.currentTarget,
@ -184,7 +184,7 @@
// Validate new Published date
if (!newPubDateMoment.isValid()) {
errMessage = 'Published Date must be a valid date with format: DD MMM YY HH:mm (e.g. 6 Dec 14 15:00)';
errMessage = 'Published Date must be a valid date with format: DD MMM YY @ HH:mm (e.g. 6 Dec 14 @ 15:00)';
}
if (newPubDateMoment.diff(new Date(), 'h') > 0) {