Commit 03a6385a authored by Ghislain Loas's avatar Ghislain Loas

Merge branch 'dev#99489_magasin_de_themes_bases_sur_bootstrap' into 'master'

on theme store

See merge request !3418
parents c3134f6f 4e1e27b8
Pipeline #9653 passed with stage
in 42 minutes and 3 seconds
...@@ -47,17 +47,17 @@ class Admin_TemplateController extends ZendAfi_Controller_Action { ...@@ -47,17 +47,17 @@ class Admin_TemplateController extends ZendAfi_Controller_Action {
public function tryAction() { public function tryAction() {
if(!$template = (new Class_Template_Loader)->find($this->_getParam('template'))) { if(!$template = (new Class_Template_Loader)->find($this->_getParam('template'))) {
$this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le template')); $this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le thème'));
return $this->_redirectToIndex(); return $this->_redirectToIndex();
} }
if(!$profile = Class_Profil::find($this->_getParam('on'))) { if(!$profile = Class_Profil::find($this->_getParam('on'))) {
$this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le template')); $this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le thème'));
return $this->_redirectToIndex(); return $this->_redirectToIndex();
} }
if(!$id_profile = $template->tryOn($profile)) { if(!$id_profile = $template->tryOn($profile)) {
$this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le template')); $this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le thème'));
return $this->_redirectToIndex(); return $this->_redirectToIndex();
} }
...@@ -81,7 +81,7 @@ class Admin_TemplateController extends ZendAfi_Controller_Action { ...@@ -81,7 +81,7 @@ class Admin_TemplateController extends ZendAfi_Controller_Action {
public function applyAction() { public function applyAction() {
if(!$this->view->template = (new Class_Template_Loader)->find($this->_getParam('template'))) { if(!$this->view->template = (new Class_Template_Loader)->find($this->_getParam('template'))) {
$this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le template')); $this->_helper->notify($this->_('Une erreur c\'est produite. Vous ne pouvez pas tester le thème'));
return $this->_redirectToIndex(); return $this->_redirectToIndex();
} }
......
...@@ -1512,6 +1512,14 @@ class AbonneController extends ZendAfi_Controller_Action { ...@@ -1512,6 +1512,14 @@ class AbonneController extends ZendAfi_Controller_Action {
return $this->_redirectClose($this->_getReferer()); return $this->_redirectClose($this->_getReferer());
} }
if ($this->_user->canAccessBackend()) {
(new Class_User_Settings($this->_user))->setProfileImage($image->getPath());
$this->_user->save();
$this->_helper->notify($this->_('Votre image de profil a bien été modifiée.'));
return $this->_redirectClose($this->_getReferer());
}
$allowed_paths = explode(';', Class_AdminVar::getValueOrDefault('USER_PROFILE_IMAGES')); $allowed_paths = explode(';', Class_AdminVar::getValueOrDefault('USER_PROFILE_IMAGES'));
$allowed_images = []; $allowed_images = [];
......
...@@ -112,10 +112,6 @@ class NoticeAjaxController extends ZendAfi_Controller_Action { ...@@ -112,10 +112,6 @@ class NoticeAjaxController extends ZendAfi_Controller_Action {
$html = $this->view->Notice_Exemplaires($exemplaires, $nb_notices_oeuvre, $display); $html = $this->view->Notice_Exemplaires($exemplaires, $nb_notices_oeuvre, $display);
if (!empty($html))
Class_ScriptLoader::getInstance()
->addJQueryReady("$('.document_items').removeClass('d-none'); $('.document_items').removeClass('disabled'); $('.document_items').removeClass('text-black-50'); ");
$this->_sendResponseWithScripts($html); $this->_sendResponseWithScripts($html);
} }
...@@ -590,18 +586,9 @@ class NoticeAjaxController extends ZendAfi_Controller_Action { ...@@ -590,18 +586,9 @@ class NoticeAjaxController extends ZendAfi_Controller_Action {
$html = array_filter($html); $html = array_filter($html);
if (!empty($html)) return empty($html)
Class_ScriptLoader::getInstance() ? $this->_sendResponse('')
->addJQueryReady("$('.document_media').removeClass('d-none'); $('.document_media').removeClass('disabled'); $('.document_media').removeClass('text-black-50'); "); : $this->_sendResponseWithScripts($this->view->grid(implode($html)));
$html = array_map(function($content)
{
return $this->view->div(['class' => 'col-12 mb-3 p-0'],
$content);
},
$html);
$this->_sendResponseWithScripts($this->view->grid(implode($html)));
} }
...@@ -611,9 +598,6 @@ class NoticeAjaxController extends ZendAfi_Controller_Action { ...@@ -611,9 +598,6 @@ class NoticeAjaxController extends ZendAfi_Controller_Action {
if (!$author = Class_CodifAuteur::findWithFullName($this->notice->getAuteurPrincipal())) if (!$author = Class_CodifAuteur::findWithFullName($this->notice->getAuteurPrincipal()))
return $this->_sendResponse(''); return $this->_sendResponse('');
Class_ScriptLoader::getInstance()
->addJQueryReady("$('.document_author').removeClass('d-none'); $('.document_author').removeClass('disabled'); $('.document_author').removeClass('text-black-50'); ");
$author_description = new Class_CodifAuteur_Description($author); $author_description = new Class_CodifAuteur_Description($author);
$this->_sendResponseWithScripts($this->view->renderAuthor($author_description)); $this->_sendResponseWithScripts($this->view->renderAuthor($author_description));
} }
......
...@@ -410,10 +410,8 @@ class Class_AvisNotice extends Storm_Model_Abstract { ...@@ -410,10 +410,8 @@ class Class_AvisNotice extends Storm_Model_Abstract {
} }
public function getLoginOrFullName() { public function getNomAff() {
return ($user = $this->getUser()) return $this->getAuthorName();
? $user->getLoginOrFullName()
: '';
} }
......
...@@ -1272,6 +1272,7 @@ class Class_Notice extends Storm_Model_Abstract { ...@@ -1272,6 +1272,7 @@ class Class_Notice extends Storm_Model_Abstract {
->setId(substr($facet, 1)) ->setId(substr($facet, 1))
->setLabel($label) ->setLabel($label)
->setTitle($title) ->setTitle($title)
->setFacetCode(substr($facet, 0, 1))
->setUrlParams(['controller' => 'recherche', ->setUrlParams(['controller' => 'recherche',
'action' => 'simple', 'action' => 'simple',
......
...@@ -42,8 +42,9 @@ class ZendAfi_Controller_Plugin_Printer_SearchResult ...@@ -42,8 +42,9 @@ class ZendAfi_Controller_Plugin_Printer_SearchResult
protected function _getManyPrinterConfig() { protected function _getManyPrinterConfig() {
$model_fusion = Class_ModeleFusion::getFusionForStrategyAndProfilOrDefault(Class_ModeleFusion::RECORDS_TEMPLATE, if (!$model_fusion = Class_ModeleFusion::getFusionForStrategyAndProfilOrDefault(Class_ModeleFusion::RECORDS_TEMPLATE,
Class_Profil::getCurrentProfil()); Class_Profil::getCurrentProfil()))
return parent::_getPrinterConfig();
if (!$ids = (new Class_RecordSelection())->values()) if (!$ids = (new Class_RecordSelection())->values())
$ids = $this->_helper->searchRecords()->fetchAllRecordsIds(); $ids = $this->_helper->searchRecords()->fetchAllRecordsIds();
......
...@@ -26,13 +26,13 @@ class ZendAfi_Controller_Plugin_ResourceDefinition_Template extends ZendAfi_Cont ...@@ -26,13 +26,13 @@ class ZendAfi_Controller_Plugin_ResourceDefinition_Template extends ZendAfi_Cont
'model' => ['class' => 'Class_Template', 'model' => ['class' => 'Class_Template',
'name' => 'template'], 'name' => 'template'],
'messages' => ['successful_save' => $this->_('Template sauvegardée'), 'messages' => ['successful_save' => $this->_('Thème sauvegardée'),
'successful_add' => $this->_('Template ajoutée'), 'successful_add' => $this->_('Thème ajoutée'),
'successful_delete' => $this->_('Template supprimée')], 'successful_delete' => $this->_('Thème supprimée')],
'actions' => ['add' => ['title' => $this->_('Nouveau Template')], 'actions' => ['add' => ['title' => $this->_('Nouveau thème')],
'edit' => ['title' => $this->_('Paramétrer le template %s')], 'edit' => ['title' => $this->_('Paramétrer le thème %s')],
'index' => ['title' => $this->_('Templates')]], 'index' => ['title' => $this->_('Thèmes')]],
'form_class_name' => 'ZendAfi_Form_Configuration_Template' 'form_class_name' => 'ZendAfi_Form_Configuration_Template'
]; ];
......
...@@ -146,13 +146,13 @@ class ZendAfi_View_Helper_Admin_FrontNavEntries extends ZendAfi_View_Helper_Base ...@@ -146,13 +146,13 @@ class ZendAfi_View_Helper_Admin_FrontNavEntries extends ZendAfi_View_Helper_Base
'template' => Class_Template::current()->getId()], 'template' => Class_Template::current()->getId()],
null, null,
true), true),
$this->_('Configuration du template') . $this->_('Configuration du thème') .
$this->view->tagImg(Class_Admin_Skin::current() $this->view->tagImg(Class_Admin_Skin::current()
->getIconUrl('icons', ->getIconUrl('icons',
'image_cache')), 'image_cache')),
[ [
'class' => 'menu_admin_front_anchor', 'class' => 'menu_admin_front_anchor',
'title' => $this->_('Configurer le template ' . Class_Template::current()->getTitle()), 'title' => $this->_('Configurer le thème ' . Class_Template::current()->getTitle()),
'data-popup' => 'true']); 'data-popup' => 'true']);
$actions [] = $this->view->tagAnchor($this->view->url(['module' => 'admin', $actions [] = $this->view->tagAnchor($this->view->url(['module' => 'admin',
......
...@@ -142,8 +142,8 @@ class ZendAfi_View_Helper_TagCriteresRecherche extends ZendAfi_View_Helper_BaseH ...@@ -142,8 +142,8 @@ class ZendAfi_View_Helper_TagCriteresRecherche extends ZendAfi_View_Helper_BaseH
} }
public function htmlAppend($text,$attribs=[]) { public function htmlAppend($text, $attribs = []) {
$this->_html .= $this->_tag('div', $text,$attribs ); $this->_html .= $this->_tag('div', $text, $attribs );
return $this; return $this;
} }
......
...@@ -22,13 +22,15 @@ ...@@ -22,13 +22,15 @@
class ZendAfi_View_Helper_TagSelectRecord extends ZendAfi_View_Helper_BaseHelper { class ZendAfi_View_Helper_TagSelectRecord extends ZendAfi_View_Helper_BaseHelper {
public function tagSelectRecord($record) { public function tagSelectRecord($record) {
$checked = (new Class_RecordSelection())->includes($record);
$url = Class_url::relative(['module' => 'opac', $url = Class_url::relative(['module' => 'opac',
'controller' => 'records', 'controller' => 'records',
'action' => 'select-toggle', 'action' => 'select-toggle',
'id' => $record->getId()]); 'id' => $record->getId()]);
return $this->_renderCheckbox($record, $url, (new Class_RecordSelection())->includes($record));
}
protected function _renderCheckbox($record, $url, $checked) {
return $this->view->formCheckbox('select_record_' . $record->getId(), return $this->view->formCheckbox('select_record_' . $record->getId(),
$record->getId(), $record->getId(),
['title' => $this->_('Sélectionner "%s" pour impression, export ou sauvegarde', ['title' => $this->_('Sélectionner "%s" pour impression, export ou sauvegarde',
...@@ -53,6 +55,11 @@ class ZendAfi_View_Helper_TagSelectRecord extends ZendAfi_View_Helper_BaseHelper ...@@ -53,6 +55,11 @@ class ZendAfi_View_Helper_TagSelectRecord extends ZendAfi_View_Helper_BaseHelper
.'})'); .'})');
$record_count = (new Class_RecordSelection())->count(); $record_count = (new Class_RecordSelection())->count();
return $this->_renderSelectionActions($criteria, $record_count);
}
protected function _renderSelectionActions($criteria, $record_count) {
return $this->_tag('div', return $this->_tag('div',
$this->_tag('a', $this->_tag('a',
$this->_('Sélection : ') $this->_('Sélection : ')
......
...@@ -87,6 +87,7 @@ div:hover > .img_as_background { ...@@ -87,6 +87,7 @@ div:hover > .img_as_background {
} }
i:first-child, i:first-child,
.widget.rech_simple .dropdown-menu i:first-child,
.card-link + .card-link, .card-link + .card-link,
.badge, .badge,
p > i { p > i {
...@@ -450,7 +451,7 @@ label[data-name=note] ~ div label.multi-element-label + br { ...@@ -450,7 +451,7 @@ label[data-name=note] ~ div label.multi-element-label + br {
color: inherit; color: inherit;
} }
.badge { .badge.record_facets {
text-transform: lowercase; text-transform: lowercase;
} }
...@@ -458,7 +459,7 @@ label[data-name=note] ~ div label.multi-element-label + br { ...@@ -458,7 +459,7 @@ label[data-name=note] ~ div label.multi-element-label + br {
text-transform: capitalize; text-transform: capitalize;
} }
::first-letter { #site_web_wrapper ::first-letter {
text-transform: uppercase; text-transform: uppercase;
} }
...@@ -492,7 +493,7 @@ header.col { ...@@ -492,7 +493,7 @@ header.col {
.card-img-top > .card-columns, .card-img-top > .card-columns,
.img-thumbnail > .card-columns { .img-thumbnail > .card-columns {
column-gap: 0.05rem; column-gap: 2%;
column-count: 3; column-count: 3;
} }
...@@ -741,4 +742,28 @@ dl.row { ...@@ -741,4 +742,28 @@ dl.row {
.description dd a + a { .description dd a + a {
display: block; display: block;
}
.search_extensions {
display: flex;
flex-direction: column;
}
form.form input[type="checkbox"] {
margin-left: 0;
}
input[id^="select_record"] {
position: unset;
margin-left: 0;
pointer-events: none;
cursor: pointer;
}
input[id^="select_record"] + * {
cursor: pointer;
}
.dropdown-menu select {
min-width: 1px;
} }
\ No newline at end of file
(function ( $ ) { (function ( $ ) {
$.fn.masonry = function () { $.fn.masonry = function () {
var html = $(this); var html = $(this);
var all_items = initAllItems();
var masonry_events = ['load', 'resize'];
masonry_events.forEach( function(event) {
window.addEventListener(event, resizeAllMasonryItems);
});
var resizeMasonryItem = function(item) { var resizeMasonryItem = function(item) {
var grid = html.find('.masonry')[0]; var grid = html.find('.masonry')[0];
...@@ -22,16 +16,6 @@ ...@@ -22,16 +16,6 @@
var resizeAllMasonryItems = function() { var resizeAllMasonryItems = function() {
if ( ! allItems.length)
allItems = initAllItems();
for(var i=0; i > allItems.length; i++){
resizeMasonryItem(allItems[i]);
}
}
function initAllItems() {
var items = $(html).find('.masonry-brick').each(function() { var items = $(html).find('.masonry-brick').each(function() {
imagesLoaded( $(this), function(instance) { imagesLoaded( $(this), function(instance) {
var item = instance.elements[0]; var item = instance.elements[0];
...@@ -39,5 +23,12 @@ ...@@ -39,5 +23,12 @@
} ); } );
}); });
} }
var masonry_events = ['load', 'resize'];
masonry_events.forEach( function(event) {
window.addEventListener(event, resizeAllMasonryItems);
});
resizeAllMasonryItems();
}; };
} (jQuery)); } (jQuery));
...@@ -31,7 +31,7 @@ class Intonation_Library_FormCustomizer_Widget_Default extends Intonation_Librar ...@@ -31,7 +31,7 @@ class Intonation_Library_FormCustomizer_Widget_Default extends Intonation_Librar
->addElement('checkbox', ->addElement('checkbox',
$this->_template->withNameSpace('show_content'), $this->_template->withNameSpace('show_content'),
['label' => $this->_('Décorer le contenu'), ['label' => $this->_('Encadrer le contenu'),
'value' => 1]) 'value' => 1])
->addElement('checkbox', ->addElement('checkbox',
......
...@@ -41,6 +41,8 @@ class Intonation_Library_ProfilePatcher extends Class_Template_ProfilePatcher { ...@@ -41,6 +41,8 @@ class Intonation_Library_ProfilePatcher extends Class_Template_ProfilePatcher {
protected function _upgradeProfile() { protected function _upgradeProfile() {
Class_ModeleFusion::generateDefaults(new ZendAfi_Controller_Action_Helper_View);
$label = $this->_('Tags bibliothèque'); $label = $this->_('Tags bibliothèque');
if ( ! Class_CustomField_Meta::findFirstBy(['label' => $label])) { if ( ! Class_CustomField_Meta::findFirstBy(['label' => $label])) {
......
...@@ -33,12 +33,9 @@ class Intonation_Library_Record_DigitalResources { ...@@ -33,12 +33,9 @@ class Intonation_Library_Record_DigitalResources {
public function render() { public function render() {
if (!$content = $this->_getHtml()) return ($content = $this->_getHtml())
return ''; ? $content
: '';
Class_ScriptLoader::getInstance()
->addJQueryReady("$('.document_items').removeClass('d-none'); $('.document_items').removeClass('disabled'); $('.document_items').removeClass('text-black-50'); ");
return $content;
} }
......
...@@ -84,70 +84,4 @@ class Intonation_Library_Record_Items { ...@@ -84,70 +84,4 @@ class Intonation_Library_Record_Items {
return $this->_findItems($ids); return $this->_findItems($ids);
} }
public function renderExemplaires($notice_ids, $nb_notices_oeuvre, $display) {
$exemplaires = $this->_loadExemplaire(["id_notice" => $notice_ids]);
foreach($exemplaires as $exemplaire)
$exemplaire->updateAvailabilityAndLocationFromSIGB()
->save();
foreach(Class_Notice::findAllBy(['id_notice' => $notice_ids]) as $notice)
$notice->updateFacetsFromExemplaires()
->save();
$exemplaires = (new Class_CommSigb())->getDispoExemplaires($exemplaires);
$html = $this->view->Notice_Exemplaires($exemplaires, $nb_notices_oeuvre, $display);
if (!empty($html))
Class_ScriptLoader::getInstance()
->addJQueryReady("$('.document_items').removeClass('d-none'); $('.document_items').removeClass('disabled'); $('.document_items').removeClass('text-black-50'); ");
$this->_sendResponseWithScripts($html);
}
public function resourcesAction() {
return $this->notice->isRessourceNumerique()
? $this->_forward('resnumeriques')
: $this->_forward('exemplaires');
}
public function resnumeriquesAction() {
if ($viewer = (new Class_Notice_Numel($this->notice))->getViewer())
return $this->_sendResponseWithScripts($viewer->renderOn($this->view));
$html = $add_album_tag = '';
if (1 == Class_AdminVar::isBibNumEnabled()
&& Class_Users::isCurrentUserAdmin())
$add_album_tag = $this->view
->tagAnchor($this->view->url(['module' => 'admin',
'controller' => 'album',
'action' => 'link_album_to',
'id_notice' => $this->id_notice],
null, true),
$this->_('Créer un album'),
['class' => 'link_album',
'data-popup' => 'true']);
$html .= $this->view->renderAlbum($this->notice->getAlbum());
$html .= $this->view->recordAlbums($this->notice);
if ('' == $html)
$html = sprintf('<p>%s</p>', $this->view->_('Aucune ressource correspondante'));
$html = $add_album_tag . $html;
if (!empty($html))
Class_ScriptLoader::getInstance()
->addJQueryReady("$('.document_items').removeClass('d-none'); $('.document_items').removeClass('disabled'); $('.document_items').removeClass('text-black-50'); ");
$this->_sendResponseWithScripts($html);
}
} }
...@@ -168,6 +168,7 @@ class Intonation_Library_Settings extends Intonation_System_Abstract { ...@@ -168,6 +168,7 @@ class Intonation_Library_Settings extends Intonation_System_Abstract {
'no-selection' => 'class far fa-heart', 'no-selection' => 'class far fa-heart',
'like' => 'class fas fa-heart text-danger', 'like' => 'class fas fa-heart text-danger',
'dislike' => 'class far fa-heart', 'dislike' => 'class far fa-heart',
'suggest' => 'class fas fa-hand-holding-heart',
'subscription' => 'class fas fa-euro-sign', 'subscription' => 'class fas fa-euro-sign',
'card-number' => 'class fas fa-barcode', 'card-number' => 'class fas fa-barcode',
'read-document' => 'class far fa-arrow-alt-circle-right', 'read-document' => 'class far fa-arrow-alt-circle-right',
......
...@@ -55,7 +55,7 @@ class Intonation_Library_View_Wrapper_Article extends Intonation_Library_View_Wr ...@@ -55,7 +55,7 @@ class Intonation_Library_View_Wrapper_Article extends Intonation_Library_View_Wr
protected function _getMainLinkTitle() { protected function _getMainLinkTitle() {
if ($author = $this->getSecondaryTitle()) if ($author = $this->getSecondaryTitle())
return $this->_('Lire l\'article "%s" écrit par "%s"', return $this->_('Lire l\'article %s écrit par %s',
$this->getMainTitle(), $this->getMainTitle(),
$author); $author);
......
<?php <?php
/** /**
* Copyright (c) 2012-2018, Agence Française Informatique (AFI). All rights reserved. * Copyright (c) 2012-2018, Agence Française Informatique (AFI). All rights reserved.
* *
* BOKEH is free software; you can redistribute it and/or modify * BOKEH is free software; you can redistribute it and/or modify
* it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
...@@ -37,8 +37,7 @@ class Intonation_Library_View_Wrapper_Item extends Intonation_Library_View_Wrapp ...@@ -37,8 +37,7 @@ class Intonation_Library_View_Wrapper_Item extends Intonation_Library_View_Wrapp
'library') 'library')
. $this->_view->tag('span', $dispo, ['class' => 'align-middle d-inline text-left']), . $this->_view->tag('span', $dispo, ['class' => 'align-middle d-inline text-left']),
['title' => $dispo, ['class' => ($this->_model->isDisponible(true)
'class' => ($this->_model->isDisponible(true)
? 'text-success' ? 'text-success'
: 'text-danger')]); : 'text-danger')]);
} }
...@@ -75,18 +74,21 @@ class Intonation_Library_View_Wrapper_Item extends Intonation_Library_View_Wrapp ...@@ -75,18 +74,21 @@ class Intonation_Library_View_Wrapper_Item extends Intonation_Library_View_Wrapp
public function getSecondaryLink() { public function getSecondaryLink() {
$secondary_title = $this->getSecondaryTitle(); $secondary_title = $this->getSecondaryTitle();
$striped_secondary_title = strtolower(strip_tags($secondary_title));
$title = ($hold_link = $this->_model->getHoldLink()) $title = ($hold_link = $this->_model->getHoldLink())
? $this->_('Réserver un exemplaire du document: %s', $this->_model->getTitrePrincipal()) ? $this->_('Réserver un exemplaire du document: %s, l\'exemplaire est %s',
: $this->_('Réservation non disponible, l\'exemplaire est %s.', strtolower(strip_tags($secondary_title))); $this->_model->getTitrePrincipal(),
$striped_secondary_title)
: $this->_('Réservation non disponible, l\'exemplaire est %s.', $striped_secondary_title);
$text = $hold_link $text = $hold_link
? $this->_('Réserver') ? $this->_view->tag('span', $this->_('Réserver'), ['class' => 'align-middle'])
: $this->_('Non réservable'); : $this->_view->tag('span', $this->_('Non réservable'), ['class' => 'align-middle text-black-50']);
return new Intonation_Library_Link(['Url' => $hold_link, return new Intonation_Library_Link(['Url' => $hold_link,
'Class' => $hold_link ? '' : 'text-black-50', 'Text' => $secondary_title,
'Text' => $text, 'TextHold' => $text,
'Title' => $title, 'Title' => $title,
'Popup' => true]); 'Popup' => true]);
} }
...@@ -164,10 +166,11 @@ class Intonation_Library_View_Wrapper_Item extends Intonation_Library_View_Wrapp ...@@ -164,10 +166,11 @@ class Intonation_Library_View_Wrapper_Item extends Intonation_Library_View_Wrapp
public function getActions() { public function getActions() {
if (!$link = $this->getSecondaryLink()) $action = $this
return []; ->getSecondaryLink()
->setImage($this->getSecondaryIco());
return [$link->setImage($this->getSecondaryIco())]; $action->setText($action->getTextHold());
return [$action];
} }
......
...@@ -42,7 +42,7 @@ class Intonation_Library_View_Wrapper_Library_RichContent_ProArticles extends In ...@@ -42,7 +42,7 @@ class Intonation_Library_View_Wrapper_Library_RichContent_ProArticles extends In