diff --git a/app/assets/javascripts/discourse/templates/share.js.handlebars b/app/assets/javascripts/discourse/templates/share.js.handlebars index 7b18aa94098..7a1d5f738ea 100644 --- a/app/assets/javascripts/discourse/templates/share.js.handlebars +++ b/app/assets/javascripts/discourse/templates/share.js.handlebars @@ -1,4 +1,9 @@

{{view.title}}

+ +{{#if date}} + {{rawDate date}} +{{/if}} +
{{#each shareLinks}} diff --git a/app/assets/javascripts/discourse/views/share_view.js b/app/assets/javascripts/discourse/views/share_view.js index ea406c72ef3..45b1c734763 100644 --- a/app/assets/javascripts/discourse/views/share_view.js +++ b/app/assets/javascripts/discourse/views/share_view.js @@ -57,8 +57,9 @@ Discourse.ShareView = Discourse.View.extend({ $shareLink = $('#share-link'); var url = $currentTarget.data('share-url'); var postNumber = $currentTarget.data('post-number'); - // Relative urls + var date = $currentTarget.children().data('time'); + // Relative urls if (url.indexOf("/") === 0) { url = window.location.protocol + "//" + window.location.host + url; } @@ -82,8 +83,11 @@ Discourse.ShareView = Discourse.View.extend({ left: "" + x + "px", top: "" + y + "px" }); + shareView.set('controller.link', url); shareView.set('controller.postNumber', postNumber); + shareView.set('controller.date', date); + return false; }); @@ -102,5 +106,3 @@ Discourse.ShareView = Discourse.View.extend({ } }); - - diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index d9f608d58a8..8f2d0c5704c 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -635,15 +635,20 @@ iframe { width: 365px; margin-left: -4px; - h3 { - margin: 5px 0; - } + h3 { + margin: 5px 0; + float: left; + } - input[type=text] { - font-size: 16px; - width: 92%; - margin-bottom: 10px; - } + .date { + float: right; + margin: 5px; + } + + input[type=text] { + font-size: 16px; + margin-bottom: 10px; + } } .post-select {