From 875a248aa6043119fcb785c0b18258ad77f8d675 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Fri, 7 Jun 2013 14:34:09 +0000
Subject: [PATCH] Suppression des tables pour les morceaux page notice
---
.gitattributes | 1 +
library/Class/NoticeHtml.php | 159 ++----------------
library/Class/Profil.php | 10 ++
library/ZendAfi/View/Helper/AudioJsPlayer.php | 2 +-
public/admin/js/audiojs/LICENSE | 0
public/admin/js/audiojs/Manifest | 0
public/admin/js/audiojs/README.md | 0
public/admin/js/audiojs/Rakefile | 0
public/admin/js/audiojs/audiojs/audio.js | 0
public/admin/js/audiojs/audiojs/audio.min.js | 0
public/admin/js/audiojs/audiojs/audiojs.as | 0
public/admin/js/audiojs/audiojs/audiojs.swf | Bin
public/admin/js/audiojs/audiojs/audiojs2.swf | Bin
.../js/audiojs/audiojs/player-graphics.gif | Bin
.../audiojs/audiojs/player-graphics_blue.gif | Bin
.../admin/js/audiojs/audiojs/style-dark.css | 0
.../admin/js/audiojs/audiojs/style-light.css | 0
.../admin/js/audiojs/audiojs/vol-graphics.png | Bin
public/admin/js/audiojs/demos/test1.html | 0
public/admin/js/audiojs/demos/test4.html | 0
public/admin/js/audiojs/demos/test6.html | 0
public/admin/js/audiojs/includes/divider.png | Bin
public/admin/js/audiojs/includes/index.css | 0
public/admin/js/audiojs/index.html | 0
public/opac/css/global.css | 14 ++
public/opac/images/bouton/voir_video.png | Bin 0 -> 1159 bytes
public/opac/js/recherche.js | 2 +-
27 files changed, 44 insertions(+), 144 deletions(-)
mode change 100644 => 100755 public/admin/js/audiojs/LICENSE
mode change 100644 => 100755 public/admin/js/audiojs/Manifest
mode change 100644 => 100755 public/admin/js/audiojs/README.md
mode change 100644 => 100755 public/admin/js/audiojs/Rakefile
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/audio.js
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/audio.min.js
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/audiojs.as
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/audiojs.swf
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/audiojs2.swf
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/player-graphics.gif
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/player-graphics_blue.gif
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/style-dark.css
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/style-light.css
mode change 100644 => 100755 public/admin/js/audiojs/audiojs/vol-graphics.png
mode change 100644 => 100755 public/admin/js/audiojs/demos/test1.html
mode change 100644 => 100755 public/admin/js/audiojs/demos/test4.html
mode change 100644 => 100755 public/admin/js/audiojs/demos/test6.html
mode change 100644 => 100755 public/admin/js/audiojs/includes/divider.png
mode change 100644 => 100755 public/admin/js/audiojs/includes/index.css
mode change 100644 => 100755 public/admin/js/audiojs/index.html
create mode 100644 public/opac/images/bouton/voir_video.png
diff --git a/.gitattributes b/.gitattributes
index 624327c7e15..67fe8e54ac8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4233,6 +4233,7 @@ public/opac/images/abonnes/prets.png -text svneol=unset#unset
public/opac/images/abonnes/reservations.png -text svneol=unset#unset
public/opac/images/accessibilite.png -text
public/opac/images/accessibilite_hover.png -text
+public/opac/images/bouton/voir_video.png -text svneol=unset#unset
public/opac/images/box/menu/separ.gif -text
public/opac/images/earth-logo.jpg -text svneol=unset#unset
public/opac/images/epub.png -text svneol=unset#unset
diff --git a/library/Class/NoticeHtml.php b/library/Class/NoticeHtml.php
index 74041868308..1a8d8ca346a 100644
--- a/library/Class/NoticeHtml.php
+++ b/library/Class/NoticeHtml.php
@@ -461,36 +461,35 @@ class Class_NoticeHtml {
// Morceaux docs sonores
//------------------------------------------------------------------------------------------------------
public function getMorceaux($notice,$source) {
+ $video_img = Class_Profil::getCurrentProfil()->getUrlImage('bouton/voir_video.png');
+
$ix= new Class_Indexation();
$html=$this->haut_onglet;
$audio_js_player = new ZendAfi_View_Helper_AudioJsPlayer();
if(!$notice["morceaux"]) return $html.$this->getNonTrouve();
- $html.='<table width="100%">';
- if($source) $html.=sprintf('<tr><td class="notice_info_titre" align="left" colspan="4">%s : %s</td></tr>',
+ if($source) $html.=sprintf('<div class="notice_info_titre">%s : %s</div>',
$this->_translate->_('Source'),
$source);
$volume=0;
- forEach($notice["morceaux"] as $vol)
- {
+ forEach($notice["morceaux"] as $vol) {
$volume++;
if($notice["nombre_volumes"]>1)
- $html.=sprintf('<tr><td class="notice_info_ligne_titre" align="left" colspan="4">%s</td></tr>',
+ $html.=sprintf('<div class="notice_info_ligne_titre">%s</div>',
$this->_translate->_('Volume n° %s', $volume));
+ $html .= '<ul>';
$plage=0;
- forEach($vol as $morceau)
- {
+ forEach($vol as $morceau) {
$plage++;
$img_ecoute="";
// Amazon
- if($notice["asin"])
- {
+ if($notice["asin"]) {
$id_div=$notice["asin"]."_".$volume."_".$plage;
$js_video="chercher_videos('".$id_div."','".addslashes($notice["auteur"])."','".addslashes($morceau["titre"])."')";
$img_video=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" title="%s" alt="%s" />',
- URL_IMG.'bouton/voir_video.gif',
+ $video_img,
$js_video,
$this->_translate->_("Clip vidéo"),
$this->_translate->_('Voir vidéo'));
@@ -500,14 +499,11 @@ class Class_NoticeHtml {
$this->_translate->_("Replier"),
$this->_translate->_("Replier"));
- }
- // autres
- else
- {
+ } else {
$id_div=$notice["id_notice"]."_".$volume."_".$plage;
$js_video="chercher_videos('".$id_div."','".addslashes($notice["auteur"])."','".addslashes($morceau["titre"])."')";
$img_video=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" title="%s" alt="%s" />',
- URL_IMG.'bouton/voir_video.gif',
+ $video_img,
$js_video,
$this->_translate->_("Clip vidéo"),
$this->_translate->_('Voir vidéo') );
@@ -522,138 +518,23 @@ class Class_NoticeHtml {
// Html
if(!$img_ecoute) $img_ecoute=" ";
- $html.='<tr><td class="notice_info_ligne" align="left" width="100%">'.$plage.' : '.$morceau["titre"].'</td><td style="text-align:center">'.$img_ecoute.'</td><td>'.$img_video.'</td><td>'.$close.'</td></tr>';
- $html.='<tr><td colspan="4" style="text-align:center"><div id="'.$id_div.'" rel="video" style="display:none;"></div></td>';
- $html.='</tr>';
+ $html.='<li><div>'.$img_video.$close.'</div><div class="notice_info_ligne">'.$plage.': '.$morceau["titre"].'</div>'.$img_ecoute;
+ $html.='<div id="'.$id_div.'" rel="video" style="display:none"></div>';
+ $html.='</li>';
}
- }
- $html.='</table>';
- return $html;
- }
-
-
- public function getMorceaux2($notice, $source){
-
- $ix= new Class_Indexation();
- $html=$this->haut_onglet;
-
- if(!$notice['morceaux']){
- return $html.$this->getNonTrouve();
+ $html.='</ul>';
}
- $html.='<div class="liste_morceaux">';
- if($source) {
- $html.='<div class="notice_info_titre">'.$this->_translate->_('Source').' : '.$source.'</div>';
- }
-
- $html.=$this->getListeMorceaux($notice, $source);
-
$html.='</div>';
-
return $html;
}
-
- public function getListeMorceaux($notice, $source){
- $html='<ol>';
- $volume=0;
-
- forEach($notice['morceaux'] as $vol){
- $volume++;
- if($notice["nombre_volumes"]>1){
- $html.='<li>'.$this->_translate->_('Volume n°'.$volume).'</li>';
- }
-
- $html.= $this->getMorceauxHtml($notice, $volume, $vol);
- }
- $html.='</ol>';
- return $html;
-
- }
-
-
- public function getMorceauxHtml($notice, $volume, $vol){
- $plage=0;
- $info=[];
- foreach($vol as $morceau){
- $plage++;
-
- if($notice["asin"]){
- $info=$this->getMorceauAmazon($notice, $morceau,$volume,$plage);
- }else{
- $info=$this->getMorceauAutre($notice, $morceau, $volume, $plage);
- }
- $html.= $this->morceauHtml($info, $plage, $morceau);
- }
-
- return $html;
- }
-
-
- public function getMorceauAmazon($notice, $morceau,$volume ,$plage){
- $info=[];
- $id_div=$notice["asin"]."_".$volume."_".$plage;
- $js_video="chercher_videos('".$id_div."','"
- .addslashes($notice["auteur"])."','"
- .addslashes($morceau["titre"])."')";
- $img_video=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" title="%s" alt="%s" />',
- URL_IMG.'bouton/voir_video.gif',
- $js_video,
- $this->_translate->_("Clip vidéo"),
- $this->_translate->_('Voir vidéo'));
- $close=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" alt="%s" title="%s" />',
- URL_IMG.'bouton/contracter.gif',
- "afficher_media('".$id_div."','close','')",
- $this->_translate->_("Replier"),
- $this->_translate->_("Replier"));
-
- return $info = ['id_div' => $id_div,
- 'img_video' => $img_video,
- 'close' => $close];
- }
-
- public function getMorceauAutre($notice, $morceau , $volume, $plage){
- $audio_js_player = new ZendAfi_View_Helper_AudioJsPlayer();
- $id_div=$notice["id_notice"]."_".$volume."_".$plage;
- $js_video="chercher_videos('".$id_div."','"
- .addslashes($notice["auteur"])."','"
- .addslashes($morceau["titre"])."')";
- $img_video=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" title="%s" alt="%s" />',
- URL_IMG.'bouton/voir_video.gif',
- $js_video,
- $this->_translate->_("Clip vidéo"),
- $this->_translate->_('Voir vidéo') );
- $close=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" alt="%s" title="%s" />',
- URL_IMG.'bouton/contracter.gif',
- "afficher_media('".$id_div."','close','')",
- $this->_translate->_("Replier"),
- $this->_translate->_("Replier"));
-
- if (isset($morceau["url_ecoute"])) $img_ecoute = $audio_js_player->audioJsPlayer($morceau["url_ecoute"]);
-
- return $info = ['id_div' => $id_div,
- 'img_video' => $img_video,
- 'close' => $close ,
- 'img_ecoute' => $img_ecoute];
- }
-
-
- public function morceauHtml($info, $plage, $morceau){
-
- if(!$info['img_ecoute']) $info['img_ecoute']=" ";
- $html='<li class="notice_info_ligne">'.$morceau["titre"].'</li><div class="img_ecoute">'.$info['img_ecoute'].'</div><div class="img_video">'.$info['img_video'].'</div><div class="img_close">'.$info['close'].'</div>';
- $html.='<div id="'.$info['id_div'].'" class="morceau_video" rel="video" style="display:none;"></div>';
-
- return $html;
- }
-
//------------------------------------------------------------------------------------------------------
// Bibliographies
//------------------------------------------------------------------------------------------------------
- public function getBibliographie($notices,$auteur)
- {
+ public function getBibliographie($notices,$auteur) {
$html=$this->haut_onglet;
if(!$notices) return $html.$this->getNonTrouve();
$html.='<table cellspacing="0" width="100%">';
@@ -828,13 +709,7 @@ class NoticeReservationRenderer {
/** @return string */
protected function getHoldImage() {
- $img = self::HOLD_IMG;
- $path_img = Class_Profil::getCurrentProfil()->getSkinImagePath($img);
- $url_img = file_exists($path_img)
- ? URL_IMG.self::HOLD_IMG
- : URL_SHARED_IMG.self::HOLD_IMG;
- return $url_img;
-
+ return Class_Profil::getCurrentProfil()->getUrlImage(self::HOLD_IMG);
}
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index 7364b512bb3..8702752a745 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -334,6 +334,16 @@ class Class_Profil extends Storm_Model_Abstract {
}
+ /** @return string */
+ public function getUrlImage($img) {
+ $path_img = $this->getSkinImagePath($img);
+ $url_img = file_exists($path_img)
+ ? URL_IMG.$img
+ : URL_SHARED_IMG.$img;
+ return $url_img;
+ }
+
+
/**
* @return string
*/
diff --git a/library/ZendAfi/View/Helper/AudioJsPlayer.php b/library/ZendAfi/View/Helper/AudioJsPlayer.php
index cb0b1451c01..0ac9417bbcd 100644
--- a/library/ZendAfi/View/Helper/AudioJsPlayer.php
+++ b/library/ZendAfi/View/Helper/AudioJsPlayer.php
@@ -35,7 +35,7 @@ class ZendAfi_View_Helper_AudioJsPlayer extends Zend_View_Helper_HtmlElement {
->addInlineScript(sprintf('audiojs.events.ready(function() {audiojs.createAll(%s);})',
json_encode($options)));
- return '<audio controls="controls"><source src="'.$src.'"></audio>';
+ return '<audio controls="controls"><source src="'.$src.'"></source></audio>';
}
}
diff --git a/public/admin/js/audiojs/LICENSE b/public/admin/js/audiojs/LICENSE
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/Manifest b/public/admin/js/audiojs/Manifest
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/README.md b/public/admin/js/audiojs/README.md
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/Rakefile b/public/admin/js/audiojs/Rakefile
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/audio.js b/public/admin/js/audiojs/audiojs/audio.js
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/audio.min.js b/public/admin/js/audiojs/audiojs/audio.min.js
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/audiojs.as b/public/admin/js/audiojs/audiojs/audiojs.as
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/audiojs.swf b/public/admin/js/audiojs/audiojs/audiojs.swf
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/audiojs2.swf b/public/admin/js/audiojs/audiojs/audiojs2.swf
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/player-graphics.gif b/public/admin/js/audiojs/audiojs/player-graphics.gif
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/player-graphics_blue.gif b/public/admin/js/audiojs/audiojs/player-graphics_blue.gif
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/style-dark.css b/public/admin/js/audiojs/audiojs/style-dark.css
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/style-light.css b/public/admin/js/audiojs/audiojs/style-light.css
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/audiojs/vol-graphics.png b/public/admin/js/audiojs/audiojs/vol-graphics.png
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/demos/test1.html b/public/admin/js/audiojs/demos/test1.html
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/demos/test4.html b/public/admin/js/audiojs/demos/test4.html
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/demos/test6.html b/public/admin/js/audiojs/demos/test6.html
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/includes/divider.png b/public/admin/js/audiojs/includes/divider.png
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/includes/index.css b/public/admin/js/audiojs/includes/index.css
old mode 100644
new mode 100755
diff --git a/public/admin/js/audiojs/index.html b/public/admin/js/audiojs/index.html
old mode 100644
new mode 100755
diff --git a/public/opac/css/global.css b/public/opac/css/global.css
index 68519979752..bb7fd11adef 100644
--- a/public/opac/css/global.css
+++ b/public/opac/css/global.css
@@ -1827,4 +1827,18 @@ button.vodeclic_link + img {
margin:5px;
border:1px solid #C8C8C8;
width: 404px;
+}
+
+
+
+/** morceaux */
+.morceaux ul li>div:first-child {
+ float: right;
+ margin-right: 5px;
+}
+
+
+.morceaux ul li audio,
+.morceaux ul li .audiojs {
+ max-width: 95%;
}
\ No newline at end of file
diff --git a/public/opac/images/bouton/voir_video.png b/public/opac/images/bouton/voir_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..b91f79ec0fc6b06c84510b63f1e718e8bb3d998f
GIT binary patch
literal 1159
zcmV;21bF+2P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3A8^941Z&o#Frh1Qba`
zK~y-)wbfgQomUkH@ZbI}=bV`{$=sTg#2K3wZR;hqskNyAZNXY%TTS~?L`vTTF(~*T
zcmpkg`qF9yQII})2`E*9_)rk)gVI*$n2;8=rm;=qB+axlX=ZX}=G?x$eV7l#7i|R>
zZ1!gD&3~=^-)sL@?%yq-iESt`^gmjt=K_22N!*6<+W$0uf>%(z9pD^O_^J>d#(w-B
zo9NX04`&pK7i<4pvJCITXQcFPoWP&(22SG{AuLDUsnPge9W4A8%%*mGSB8!t;att_
z1A&9sg`4I15{?-RZmwxL_#a`*^02|+P>y%uQ$qF$jpn5G%!F-oEu;QSkp{QKDqhB`
zxEJ3Id;>f18rEyL7Ouu;#rQ=rK3iZz$olqN^Q4b`<&4qJd9j$ZdFC%uzx&c%E0=u)
zM^mzfML{XK2M=I@>@smS1h-%=B~KKYc82vJ4($2B>*n9RCJRG@ZZbM?zCSek{_FkX
zt^<Bpmby5ck|`V$jANeoAg)fyMoNz7nJPwEhRu|WES}7_>ZHtsP}zKAG#r|4PdJy|
z=V!yaA9}=WXHp0gvg~$3!sB=u$1!T=u8qk@BUfcLPea;MieX<hjEsiOm!Is1An)vS
zelAnmchicm{rpEheCH7<9h5gF^UPyK=7v1@vWd=){@y!JraKP(xGd#c9Me}-6I%rs
zEAp&g&37iU#on$t%a6bMP|M6z!{&Ns*Z$J>zrE(B2cN4}&o=eCBQO2-z4m|p86P@u
z#=;NE7_|$G0_*A0(wMW)x19d-xYR7Bhl_Ixn_u{}?r(nm(~XPyy@k|jSbSl^C~fHM
z?b`Xlo>T>E7m~6p^an{yv8uGTfHQ09%Gzy?ed|Vp-b_}cOa0uAEVJ^|v&P=DTf8{v
zSH{XAn+-+zukRhJXxLk|dLftX%T3NDMWdaeiqRD*j_Yr}Af=b$(2<Rv)$WE<-+aW;
zryuh<e?2v0d~#rIecHC^sJSg|J$54)pNz76yS$lcZ%<O4G1hPrPvQPr69#yq+jE1S
zdB6JpjZU9fuzX=wIkqAj^-#)-s5!oA`Ne_$-Gx6KKcE^kbCgBq)|Bi)LkRcd<Cw-j
za4Q}a<6KxedxwqHLI~sXu{Eu!sI@&<J~QV0iFpghu4`PnIA75ZXy7ouE`&FwbOHTZ
zkKYl3PD+m85Kh(ddAqFqyP~<z*mUK}>+MGBw+6}cSPFEC`Uw_sR7$66T2igivnkn)
z1GNgig2_Cy5MtFG4Z4NF#yR5d!4`cb_9wm*YJh8S8CPmh^`WU+aHi^U9qz*luEHPD
z#vEn>t;D1FWq6C4J&hSm)_|$*I7_&`PH4C#N}f}5{C3({j)^)@v#y*5VttD@>-GQ7
Z{t2zOmJ>x(FGT<V002ovPDHLkV1mM>L013(
literal 0
HcmV?d00001
diff --git a/public/opac/js/recherche.js b/public/opac/js/recherche.js
index 3c1318c6fd4..88112581c58 100644
--- a/public/opac/js/recherche.js
+++ b/public/opac/js/recherche.js
@@ -333,7 +333,7 @@ function chercher_videos(sId,sAuteur,sTitre)
$("div[rel='video']").html(sPatience).css('display','none');
sUrl=baseUrl+'/opac/noticeajax/videomorceau?auteur='+sAuteur+'&titre='+sTitre;
$('#'+sId).css('display','block');
- $.get(sUrl, function(data) { $('#'+sId).html(data); });
+// $.get(sUrl, function(data) { $('#'+sId).html(data); });
}
--
GitLab