From 91fc84fdfef43caca7e91f5376ff073d27552e58 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Tue, 24 Jun 2014 18:18:12 +0200
Subject: [PATCH] dev #14506 display calendar in wall mode
---
.../View/Helper/Article/RenderWall.php | 10 +++--
.../View/Helper/TagArticleInfoEvent.php | 39 ++++++++++++++-----
public/opac/css/global.css | 21 ++++++----
3 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Article/RenderWall.php b/library/ZendAfi/View/Helper/Article/RenderWall.php
index 3fe3bbde0b2..4e8168c1eb5 100644
--- a/library/ZendAfi/View/Helper/Article/RenderWall.php
+++ b/library/ZendAfi/View/Helper/Article/RenderWall.php
@@ -18,16 +18,18 @@
* along with AFI-OPAC 2.0; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class ZendAfi_View_Helper_Article_RenderWall extends ZendAfi_View_Helper_Article_RenderAbstract {
+class ZendAfi_View_Helper_Article_RenderWall extends ZendAfi_View_Helper_Article_RenderAbstract {
public function article_RenderWall($article) {
-
return $this->renderArticle($article, 'article_wrapper');
-
+ }
+ public function renderTitreHeader($article) {
+ return $this->view->tagArticleInfoEvent($article,$this->renderTitre($article));
}
+
public function renderArticleInfo($article) {
- return $this->view->tagArticleInfoEvent($article);
+ return '';
}
diff --git a/library/ZendAfi/View/Helper/TagArticleInfoEvent.php b/library/ZendAfi/View/Helper/TagArticleInfoEvent.php
index 764d78c770d..c09d472bb8e 100644
--- a/library/ZendAfi/View/Helper/TagArticleInfoEvent.php
+++ b/library/ZendAfi/View/Helper/TagArticleInfoEvent.php
@@ -20,8 +20,29 @@
*/
class ZendAfi_View_Helper_TagArticleInfoEvent extends ZendAfi_View_Helper_TagArticleInfo {
- public function tagArticleInfoEvent($article) {
- return $this->tagArticleInfo($article);
+ public function tagArticleInfoEvent($article,$title) {
+ return
+ '<span class="article_info_date">'.
+ $this->renderDateDebut($article).
+ $this->renderHeureDebut($article).
+ $this->renderDateFin($article).
+ $this->renderHeureFin($article).
+ '</span><span class="title">'.$title.'</span>
+ <span class="article_info_others">'.
+ $this->renderBib($article).
+ $this->renderCat($article).
+ $this->renderLocalisation($article).
+ $this->renderTags($article).
+ '</span>';
+
+ }
+
+
+ public function renderItem($html, $class) {
+ return
+ $html
+ ? '<span class="'.$class.'">'.$html.'</span>'
+ : '';
}
@@ -29,12 +50,12 @@ class ZendAfi_View_Helper_TagArticleInfoEvent extends ZendAfi_View_Helper_TagArt
return
$this->renderItem(
$this->view->getHumanDate($article->getEventsDebut(),
- 'd'),
- 'event_start_date_day', $this->view->_('Commence le')).
+ 'd'),
+ 'event_start_date_day').
$this->renderItem(
$this->view->getHumanDate($article->getEventsDebut(),
- 'MMM'),
- 'event_start_date_month', $this->view->_('mois'));
+ 'MMMM'),
+ 'event_start_date_month');
}
@@ -43,11 +64,11 @@ class ZendAfi_View_Helper_TagArticleInfoEvent extends ZendAfi_View_Helper_TagArt
$this->renderItem(
$this->view->getHumanDate($article->getEventsFin(),
'd'),
- 'event_start_date_day', $this->view->_('finit le')).
+ 'event_end_date_day').
$this->renderItem(
$this->view->getHumanDate($article->getEventsFin(),
- 'MMM'),
- 'event_start_date_month', $this->view->_('mois'));
+ 'MMMM'),
+ 'event_end_date_month');
}
}
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 20efba93e26..2e1a6f62d2a 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -1403,10 +1403,6 @@ body.abonne_multimedia-hold-view .actions a {
width: 100%;
}
-.liste_mur .article_wrapper dt.article_info {
-display:none!important
-}
-
.liste_mur .article_wrapper {
float: left;
height: 250px;
@@ -1554,9 +1550,9 @@ display:none!important
.liste_mur .article_wrapper img {
- display: block!important;
- float: none!important;
- width:200px!important;
+ display: inline;
+ clear: both;
+
}
@@ -2766,4 +2762,13 @@ a.loan-export {
.ui-widget {
font: inherit;
-}
\ No newline at end of file
+}
+
+
+.article_info_date span{
+ display:none;
+}
+
+.article_info_others span {
+ display:none;
+}
--
GitLab