diff --git a/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml b/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml index 9a14b4eab4b3265e5a7258bb6a65192f993c3e82..9980cb32c92ff8218e6030ea7bdd2d14341ded23 100644 --- a/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml +++ b/application/modules/admin/views/scripts/modules/recherche_viewnotice.phtml @@ -65,8 +65,8 @@ $codif = Class_Codification::getInstance(); </table> </fieldset> - <?php echo $this->unimarcZoneConfig('Zones de liens',$this->preferences, 'links_zones', $this->links_errors); ?> - <?php echo $this->unimarcZoneConfig('Zones de vignette',$this->preferences, 'thumbnail_fields', $this->thumbs_errors); ?> + <?php echo $this->unimarcZoneConfig($this->_('Zones de liens'),$this->preferences, 'links_zones', $this->links_errors); ?> + <?php echo $this->unimarcZoneConfig($this->_('Zones de vignette'),$this->preferences, 'thumbnail_fields', $this->thumbs_errors); ?> <fieldset> <legend><?php echo $this->_('Dépouillements');?></legend> diff --git a/library/Class/Notice/Thumbnail/ProviderAbstract.php b/library/Class/Notice/Thumbnail/ProviderAbstract.php index 5ae07208515182045fd9fbec4b61dff5a1d81f89..33af12f8bff757d81e068612018703c20778de95 100644 --- a/library/Class/Notice/Thumbnail/ProviderAbstract.php +++ b/library/Class/Notice/Thumbnail/ProviderAbstract.php @@ -64,7 +64,7 @@ abstract class Class_Notice_Thumbnail_ProviderAbstract { } - public function writeImageCache($record, $url) { + public function writeImageCache($url) { return $url; } diff --git a/library/Class/Notice/Thumbnail/ProviderCloud.php b/library/Class/Notice/Thumbnail/ProviderCloud.php index fb798bd8a9200e2e0f4bfa050f8b1f713c0059f4..25a66a2ee53536a75a41ca41fece4b88bfdff3f4 100644 --- a/library/Class/Notice/Thumbnail/ProviderCloud.php +++ b/library/Class/Notice/Thumbnail/ProviderCloud.php @@ -23,8 +23,8 @@ abstract class Class_Notice_Thumbnail_ProviderCloud extends Class_Notice_Thumbnail_ProviderAbstract { - public function writeImageCache($record, $url) { - $nom_fic = 'notice_' . $record->getId().".jpg"; + public function writeImageCache($url) { + $nom_fic = 'notice_' . $this->record->getId().".jpg"; $path = $this->_getPath($nom_fic); try { if ($this->_filesystem->fileExists($path)==false) { diff --git a/library/Class/WebService/Vignette.php b/library/Class/WebService/Vignette.php index a7410097e6f403af2a0516273aa3820251823a64..c18164d0cbd232d11661d4fe9c287eed6e655d74 100644 --- a/library/Class/WebService/Vignette.php +++ b/library/Class/WebService/Vignette.php @@ -116,7 +116,7 @@ class Class_WebService_Vignette extends Class_WebService_Abstract { /** download and save image at given url */ public function writeImageCache($notice, $url) { - return $this->getThumbnailProviderFor($notice)->writeImageCache($notice, $url); + return $this->getThumbnailProviderFor($notice)->writeImageCache($url); } diff --git a/library/ZendAfi/View/Helper/UnimarcZoneConfig.php b/library/ZendAfi/View/Helper/UnimarcZoneConfig.php index aa803aa16bdfff94c2d9d995c89c10477152e923..a5b5eb4d0f681611bafbbb41d717a38ecf0dc5f9 100644 --- a/library/ZendAfi/View/Helper/UnimarcZoneConfig.php +++ b/library/ZendAfi/View/Helper/UnimarcZoneConfig.php @@ -27,7 +27,7 @@ class ZendAfi_View_Helper_UnimarcZoneConfig extends ZendAfi_View_Helper_BaseHelp public function unimarcZoneConfig($title,$preferences,$preference_field, $errors) { if ($preference_field == 'thumbnail_fields') $this->unimarc_type='thumbnails'; - $content = $this->_tag('legend', $this->_($title)); + $content = $this->_tag('legend', $title); $content .= $this->displayErrors($errors); $content .= $this->renderMultiInput($preferences,$preference_field); return $this->_tag('fieldset', $content);