hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

#PHRAS-382 #time 3h

Browse Source
This commit is contained in:
Jean-Yves Gaulier
2015-02-03 15:52:39 +01:00
parent 21054d3849
commit 7185b031fb
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Controller/Prod/Records.php
View File

@@ -191,7 +191,9 @@ class Records implements ControllerProviderInterface
'record' => $record 'record' => $record
)), )),
"pos" => $record->get_number(), "pos" => $record->get_number(),
"title" => str_replace(array('[[em]]', '[[/em]]'), array('<em>', '</em>'), $record->get_title($query, $searchEngine)) "title" => str_replace(array('[[em]]', '[[/em]]'), array('<em>', '</em>'), $record->get_title($query, $searchEngine)),
"collection_name" => $record->get_collection()->get_name(),
"collection_logo" => $record->get_collection()->getLogo($record->get_base_id(), $app)
)); ));
} }

2
lib/classes/record/preview.php
View File

@@ -288,7 +288,7 @@ class record_preview extends record_adapter
switch ($this->env) { switch ($this->env) {
case "RESULT": case "RESULT":
$this->title .= sprintf( $this->title = sprintf(
_('preview:: resultat numero %s '), '<span id="current_result_n">' . ($this->number + 1) _('preview:: resultat numero %s '), '<span id="current_result_n">' . ($this->number + 1)
. '</span> : ' . '</span> : '
); );

8
templates/web/prod/index.html.twig
View File

@@ -941,7 +941,13 @@
<div class="PNB" style="right:180px;"> <div class="PNB" style="right:180px;">
<div id="PREVIEWTITLE" style="height:55px;bottom:auto;" class="PNB"> <div id="PREVIEWTITLE" style="height:55px;bottom:auto;" class="PNB">
<div class="PNB10 ui-corner-top" id='PREVIEWTITLEWRAPPER'> <div class="PNB10 ui-corner-top" id='PREVIEWTITLEWRAPPER'>
<span id="SPANTITLE" class="PNB10"> </span> <div style="padding-top: 0px; padding-left: 5px;">
<span id="PREVIEWTITLE_COLLLOGO"> </span>
&nbsp;
<span id="PREVIEWTITLE_COLLNAME"> </span>
&nbsp;
<span id="SPANTITLE"> </span>
</div>
</div> </div>
</div> </div>
<div class="PNB" style="top:55px;"> <div class="PNB" style="top:55px;">

5
www/include/jquery.p4.preview.js
View File

@@ -147,7 +147,10 @@ function openPreview(env, pos, contId, reload) {
$('#PREVIEWBOX img.record.zoomable').draggable(); $('#PREVIEWBOX img.record.zoomable').draggable();
} }
setTitle(data.title); $('#SPANTITLE').empty().append(data.title);
$("#PREVIEWTITLE_COLLLOGO").empty().append(data.collection_logo);
$("#PREVIEWTITLE_COLLNAME").empty().append(data.collection_name);
setPreview(); setPreview();
if (env != 'RESULT') { if (env != 'RESULT') {