From d1efcb7fc0bd3b8ecfb4f16cef98fe81687fd46e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 7 Dec 2018 23:24:59 +0300
Subject: cdm: put originally_from into footer

---
 js/Headlines.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'js/Headlines.js')

diff --git a/js/Headlines.js b/js/Headlines.js
index dcb8bdb2d..e2f75297d 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -266,9 +266,9 @@ define(["dojo/_base/declare"], function (declare) {
 			if (App.isCombinedMode()) {
 				row_class += App.getInitParam("cdm_expanded") ? " expanded" : " expandable";
 
-				let originally_from = hl.orig_feed ? `<div>
+				let originally_from = hl.orig_feed ? `<span>
 					${__('Originally from:')} <a target="_blank" rel="noopener noreferrer" href="${hl.orig_feed[1]}">${hl.orig_feed[0]}</a>
-					</div>` : "";
+					</span>` : "";
 
 				let comments = "";
 
@@ -320,8 +320,7 @@ define(["dojo/_base/declare"], function (declare) {
 							<div class="content" onclick="return Headlines.click(event, ${hl.id}, true);">
 								<div id="POSTNOTE-${hl.id}">${hl.note}</div>
 								<div class="content-inner" lang="${hl.lang ? hl.lang : 'en'}"></div>
-								<div class="intermediate">
-									${originally_from}
+								<div class="intermediate">									
 									${hl.enclosures}
 								</div>
 								<div class="footer" onclick="event.stopPropagation()">
@@ -335,7 +334,10 @@ define(["dojo/_base/declare"], function (declare) {
 										${comments}
 									</div>
 									
-									<div class="right">${hl.buttons}</div>
+									<div class="right">
+									 	${originally_from}
+										${hl.buttons}
+									</div>
 								</div>
 							</div>
 						</div>`;
-- 
cgit v1.2.3