display source

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

js/fulltextsearch.v1.navigation.js

@@ -211,6 +211,9 @@ var nav = {
 		fillDivResult: function (divResult, entry) {
 			divResult.find('#title').text(entry.title);
 			// divResult.find('#score').text(entry.score);
+			if (entry.info.source !== '') {
+				divResult.find('#source').text(entry.info.source);
+			}
 
 			nav.fillDivResultExcepts(divResult, entry);
 
@@ -303,7 +306,7 @@ var nav = {
 			}
 
 			var tmpl = divTemplate.html();
-			tmpl = tmpl.replace(/%%id%%/g, escapeHTML(document.id));
+//			tmpl = tmpl.replace(/%%id%%/g, escapeHTML(document.id));
 
 			var div = $('<div>', {class: 'result_template'});
 			div.html(tmpl).fadeTo(0);
@@ -314,9 +317,13 @@ var nav = {
 
 		generateDivResult: function (entry, divResultContent) {
 			var divResult = $('<div>', {class: 'result_entry'});
+
+			console.log('!!! ' + JSON.stringify(entry.info));
 			divResult.hide();
 			divResult.attr('data-id', entry.id);
 			divResult.attr('data-link', entry.link);
+			divResult.attr('data-source', entry.source);
+			divResult.attr('data-info', JSON.stringify(entry.info));
 			divResult.attr('data-result', JSON.stringify(entry));
 			divResult.append(divResultContent);
 

lib/Model/IndexDocument.php

@@ -490,6 +490,7 @@ class IndexDocument implements \JsonSerializable {
 			'title'        => $this->getTitle(),
 			'link'         => $this->getLink(),
 			'source'       => $this->getSource(),
+			'info'         => $this->getInfoAll(),
 			'tags'         => $this->getTags(),
 			'more'         => $this->getMore(),
 			'excerpts'     => $this->getExcerpts(),

templates/navigate.php

@@ -62,12 +62,12 @@ Util::addStyle(Application::APP_NAME, 'navigate');
 <script id="template_entry" type="text/template">
 	<div class="result_entry_default">
 		<div class="result_entry_left">
-			<div id="title"></div>
-			<div id="line1"></div>
-			<div id="line2"></div>
+			<div id="title">&nbsp;</div>
+			<div id="line1">&nbsp;</div>
+			<div id="line2">&nbsp;</div>
 		</div>
 		<div class="result_entry_right">
-			<div id="info">&nbsp;</div>
+			<div id="source">&nbsp;</div>
 			<div id="score">&nbsp;</div>
 		</div>
 	</div>