diff --git a/application/modules/telephone/views/scripts/recherche/avis.phtml b/application/modules/telephone/views/scripts/recherche/avis.phtml
index 20a64f195b30e27ea2fa5bf0201dc670cbad2c64..a651872bb1c5d29132cf286fe7b1db6a31f72f23 100644
--- a/application/modules/telephone/views/scripts/recherche/avis.phtml
+++ b/application/modules/telephone/views/scripts/recherche/avis.phtml
@@ -7,27 +7,30 @@ $avis_abon = $this->notice->getAvisAbonne();
?>
-<div class="pave">
- <?php
- echo $this->resumeAvis($this->_('Bibliothécaires'), $avis_bib);
-
- echo $this->resumeAvis($this->_('Lecteurs du portail'), $avis_abon);
- ?>
-</div>
-
-
-<div class="pave">
- <?php
- echo '<div>'.$this->_('Avis des bibliothécaires').'</div>';
- foreach ($avis_bib as $avis)
- echo '<div class="fonction">'.$this->enteteAvis($avis).'</div>';
- ?>
-</div>
-
-
-<div class="pave">
- <?php
- echo '<div>'.$this->_('Avis des lecteurs').'</div>';
- foreach ($avis_abon as $avis) echo $this->enteteAvis($avis);
- ?>
-</div>
\ No newline at end of file
+<ul data-role="listview" data-inset="true">
+ <li date-theme="c">
+ <?php
+ echo $this->resumeAvis($this->_('Bibliothécaires'), $avis_bib);
+ echo $this->resumeAvis($this->_('Lecteurs du portail'), $avis_abon);?>
+ </li>
+
+ <li date-theme="c" data-role="list-divider">
+ <?php echo $this->_('Avis des bibliothécaires');?>
+ </li>
+ <?php foreach ($avis_bib as $avis) { ?>
+ <li><?php echo $this->enteteAvis($avis);?></li>
+ <?php } ?>
+<?php if (empty($avis_bib)) { ?>
+<li><?php echo 'Aucun commentaire';?></li>
+<?php } ?>
+
+ <li date-theme="c" data-role="list-divider">
+ <?php echo $this->_('Avis des lecteurs');?>
+ </li>
+ <?php foreach ($avis_abon as $avis) { ?>
+ <li><?php echo $this->enteteAvis($avis);?></li>
+ <?php } ?>
+<?php if (empty($avis_abon)) { ?>
+<li><?php echo 'Aucun commentaire';?></li>
+<?php } ?>
+</ul>
diff --git a/application/modules/telephone/views/scripts/recherche/detail.phtml b/application/modules/telephone/views/scripts/recherche/detail.phtml
index 7d0eee8d3bdb40445d2ae8ecf59d72ca1bf02681..f7b13f69a4b28e45589d31b4bf34b7efb6aa15c7 100644
--- a/application/modules/telephone/views/scripts/recherche/detail.phtml
+++ b/application/modules/telephone/views/scripts/recherche/detail.phtml
@@ -4,9 +4,10 @@ echo $this->toolbar($this->_('Notice détaillée'),
true);
?>
-<div class='pave'>
+<ul data-role="listview" data-inset="true">
+ <li date-theme="c">
<?php
- echo $this->noticeDetaillee($this->notice);
+ echo $this->noticeDetaillee($this->notice);
?>
-</div>
+</li></ul>
diff --git a/application/modules/telephone/views/scripts/recherche/viewnotice.phtml b/application/modules/telephone/views/scripts/recherche/viewnotice.phtml
index 114d0e9d81aeac08130e89d1e3981be54cdc7534..efd89d825513f748d120c57cf9b9f940c7870bb7 100644
--- a/application/modules/telephone/views/scripts/recherche/viewnotice.phtml
+++ b/application/modules/telephone/views/scripts/recherche/viewnotice.phtml
@@ -1,34 +1,25 @@
<?php
echo $this->toolbar($this->_("Recherche"),
- array('action' => 'simple')); ?>
+ array('action' => 'simple')); ?>
-<div class="pave">
- <div class="entete_notice">
+<ul data-role="listview" data-inset="true">
+ <li date-theme="c">
+ <img src="<?php echo $this->notice->getUrlVignette();?>">
+ <h3><?php echo $this->iconeSupport($this->notice->getTypeDoc()) . $this->notice->getTitrePrincipal() ;?></h3>
+ <p><?php echo $this->notice->getAuteurPrincipal();?></p>
+ <p><?php if ($annee = $this->notice->getAnnee())
+ echo $this->_('Année')," : ", $annee;?></p>
+ <p><?php if ($editeur = $this->notice->getEditeur())
+ echo $this->_('Editeur(s)')," : ", $editeur;?></p>
+ </li>
+<?php foreach ($this->actions as $libelle => $action) { ?>
+ <li><?php echo $this->tagAnchor(array('action' => $action['action']),
+ $libelle,
+ isset($action['attribs']) ? $action['attribs'] : array());?>
+ </li>
+<?php } ?>
+</ul>
- <?php
- echo $this->iconeSupport($this->notice->getTypeDoc());
- echo sprintf('<a href="%s"><img src="%s" alt="%s"/></a>',
- $this->url(array('action' => 'grandeimage')),
- $this->notice->getUrlVignette(),
- $this->_('Vignette'));
- echo '<h1>'.$this->notice->getTitrePrincipal().'</h1>';
- echo '<h1>'.$this->notice->getAuteurPrincipal().'</h1>';
-
- if ($editeur = $this->notice->getEditeur())
- echo sprintf('<div>%s : %s</div>', $this->_('Editeur(s)'), $editeur);
-
- if ($annee = $this->notice->getAnnee())
- echo sprintf('<div>%s : %s</div>', $this->_('Année'), $annee);
- ?>
- <div class="clear"></div>
- </div>
-
-<?php
-foreach ($this->actions as $libelle => $action) {
- echo $this->tagAnchor(array('action' => $action['action']),
- '<div class="fonction">'.$libelle.'</div>',
- isset($action['attribs']) ? $action['attribs'] : array());
-}
+<?php
-?>
-</div>
+?>
\ No newline at end of file
diff --git a/library/ZendAfi/View/Helper/Frbr.php b/library/ZendAfi/View/Helper/Frbr.php
index 9c00d56defa7102a00a21f1ad1e9ef4905f5e460..bce96c5ea0e13814d2a5951fe6949841312c2828 100644
--- a/library/ZendAfi/View/Helper/Frbr.php
+++ b/library/ZendAfi/View/Helper/Frbr.php
@@ -20,9 +20,7 @@
*/
class ZendAfi_View_Helper_Frbr extends Zend_View_Helper_HtmlElement{
- const NO_RESULT_MESSAGE = 'Aucun lien n\'a été trouvé';
-
- protected $linksRenderer;
+ protected $linksRenderer;
/**
* Retourne les notices liées
@@ -35,8 +33,11 @@ class ZendAfi_View_Helper_Frbr extends Zend_View_Helper_HtmlElement{
$sourceLinks = $model->getLinksAsSource();
$targetLinks = $model->getLinksAsTarget();
- if (0 == count($sourceLinks) and 0 == count($targetLinks))
- return self::NO_RESULT_MESSAGE;
+ if (0 == count($sourceLinks) and 0 == count($targetLinks)){
+ $noResultMessage = $this->linksRenderer->returnNoResultMessage();
+ return $noResultMessage;
+ }
+
$html = '';
foreach ($this->_getLinksBySourceTypes($sourceLinks) as $label => $links)
@@ -45,11 +46,13 @@ class ZendAfi_View_Helper_Frbr extends Zend_View_Helper_HtmlElement{
foreach ($this->_getLinksByTargetTypes($targetLinks) as $label => $links)
$html .= $this->_getSourceTypeLinks($label, $links);
- if ('' == $html)
- return self::NO_RESULT_MESSAGE;
+ if ('' == $html){
+ $noResultMessage = $this->linksRenderer->returnNoResultMessage();
+ return $noResultMessage;
+ }
- return $html;
- }
+ return $html;}
+
protected function _getLinksBySourceTypes($links) {
@@ -131,5 +134,10 @@ class FrbrNoticesOpacRenderer {
public function renderType($type) {
return '<div class="notice_info_titre">' . $type . '</div>';
}
+
+
+ public function returnNoResultMessage() {
+ return 'Aucun lien n\'a été trouvé';
+ }
}
?>
diff --git a/library/ZendAfi/View/Helper/Telephone/Frbr.php b/library/ZendAfi/View/Helper/Telephone/Frbr.php
index d2138ee5ea5c5f5caa4e220bd907e7c37b83f29d..f52cf544764e49d4c97a10af8ed51dc270107678 100644
--- a/library/ZendAfi/View/Helper/Telephone/Frbr.php
+++ b/library/ZendAfi/View/Helper/Telephone/Frbr.php
@@ -49,6 +49,11 @@ class FrbrNoticesTelephoneRenderer {
public function renderType($type) {
return '<li data-role="list-divider">' . $type . '</li>';
}
+
+
+ public function returnNoResultMessage() {
+ return '<li data-role="list-divider">' . 'Aucun lien n\'a été trouvé' . '</li>';
+ }
}