diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php index d378691b84..2f51860c1d 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php @@ -106,6 +106,7 @@ class RecordController extends Controller ]), "pos" => $record->getNumber(), "title" => str_replace(array('[[em]]', '[[/em]]'), array('', ''), $record->get_title($query, $searchEngine)), + "databox_name" => $record->getDatabox()->get_dbname(), "collection_name" => $record->getCollection()->get_name(), "collection_logo" => $record->getCollection()->getLogo($record->getBaseId(), $this->app), ]); diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 4c84db903e..491c3ad280 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -258,7 +258,7 @@ class record_preview extends record_adapter return $this->title; } - $this->title = collection::getLogo($this->getBaseId(), $this->app) . ' '; + $this->title = ''; switch ($this->env) { diff --git a/resources/www/prod/js/jquery.p4.preview.js b/resources/www/prod/js/jquery.p4.preview.js index 2dd0ae4a37..3d965e9b6f 100644 --- a/resources/www/prod/js/jquery.p4.preview.js +++ b/resources/www/prod/js/jquery.p4.preview.js @@ -180,7 +180,7 @@ function openPreview(event, env, pos, contId, reload) { $('#SPANTITLE').empty().append(data.title); $("#PREVIEWTITLE_COLLLOGO").empty().append(data.collection_logo); - $("#PREVIEWTITLE_COLLNAME").empty().append(data.collection_name); + $("#PREVIEWTITLE_COLLNAME").empty().append(data.databox_name + ' / ' + data.collection_name); setPreview(); diff --git a/resources/www/prod/skins/ui-components/_modal-preview.scss b/resources/www/prod/skins/ui-components/_modal-preview.scss index 925230b781..6756a1b847 100644 --- a/resources/www/prod/skins/ui-components/_modal-preview.scss +++ b/resources/www/prod/skins/ui-components/_modal-preview.scss @@ -16,8 +16,11 @@ cursor: pointer; } -#PREVIEWBOX #PREVIEWTITLE_COLLNAME { - display:none; +#PREVIEWBOX #PREVIEWTITLE_COLLLOGO { + img { + width: 16px; + height: 16px; + } } .PREVIEW_PIC,.PREVIEW_HD {