WebSVN – eFlore/Applications.eflore-consultation – Path Comparison – / – /trunk/presentations/ Rev 1122 and /trunk/presentations/ Rev 1123

Ignore whitespace Rev 1122 → Rev 1123

 /trunk/presentations/styles/eflore.css
 ,6 → 98,21
 .acceder-outil {
         font-size:0.85em;
 }
+/* @TODO mettre dans commun.css mais line-height déconne */
+.acceder-outil-vert {
+        display:inline-block;
+        line-height: 25px;
+        padding-left: 30px;
+        padding-right: 10px;
+        background:url("/sites/commun/generique/images/graphisme/icone_erable_blanc_vert.png") no-repeat scroll -1px -1px transparent;
+        border-radius: 14px; -moz-border-radius:14px; -webkit-border-radius:14px;
+        color:#6C6865;
+        font-family:helveticaneue;
+        font-size:12px;
+        border: solid #d0d0d0 1px;
+}
 #zone-contenu.acceder-outil.img {
         margin-top:-2px;
         margin-bottom:-2px;
 ,7 → 302,7
 hr.nettoyage{
         clear:both;
         width:0;
-        }
+}
 .debogage, .debogage pre{
         white-space:pre-wrap; white-space:-moz-pre-wrap; white-space:-pre-wrap; white-space:-o-pre-wrap;
 ,7 → 1091,7
         text-align:left;
         padding:0;
 }
-.liste-illustrations{
+.liste-illustrations {
         list-style-type:none;
         padding:0;
 }
 ,6 → 1108,108
 }
+#galerie-organes {
+        width: 648px;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        background-color: #f0f0f0;
+        border-radius: 10px;
+}
+.separator {
+    display: inline-block;
+    width: 10px;
+}
+.liste-illustrations li.organe-moyen {
+        height: 230px;
+        font-size: 13px;
+}
+.liste-illustrations li.caractere-moyen {
+        height: 210px;
+}
+.liste-illustrations li p.absent-organes {
+        height: 193px;
+        width: 196px;
+        margin: 2px 5px 5px;
+        background-position: 50% 50%;
+}
+.liste-illustrations li p.absent-organes a.contribuer {
+        height: 30px;
+        padding-top: 146px;
+}
+.liste-illustrations li.icone-organe {
+        width: 108px;
+        height: auto;
+        padding-top: 5px;
+        padding-bottom: 5px;
+        background-color: #ffffff;
+}
+.liste-illustrations li.icone-organe:first-of-type {
+        border-radius: 10px 0 0 0;
+}
+.liste-illustrations li.icone-organe:last-of-type {
+        border-radius: 0 10px 0 0;
+}
+.liste-illustrations li.icone-organe.active {
+        background-color: #f0f0f0;
+}
+.liste-illustrations li.miniature-organe {
+        width: 105px;
+        height: auto;
+}
+#zone_contenu_corps img.icone-organe {
+        height: 30px;
+        margin: auto;
+        border: none;
+}
+#zone_contenu_corps img.miniature-organe {
+        margin: auto;
+}
+div.onglet-organe {
+    margin: auto;
+    width: 632px;
+}
+div.onglet-organe ul.liste-illustrations {
+        margin-top: 8px;
+}
+.liste-illustrations li p.absent-mini {
+        width: 60px;
+        height: 60px;
+        margin-right: 22px;
+        font-size: .8em;
+        background-image: url("../images/pasdephoto_petit.png");
+}
+.liste-illustrations li p.absent-mini .contribuer {
+        padding-top: 25px;
+}
+#grande-image-organe {
+        margin-bottom: 15px;
+        text-align: center;
+}
+#grande-image-legende {
+        width: 600px;
+        margin: auto;
+        padding-bottom: 5px;
+}
+a.lien-images-organes {
+        opacity: 0.2;
+}
+a.lien-images-organes.fourni {
+        cursor: pointer;
+        opacity: 1;
+}
+a.lien-grande-image-organe {
+        cursor: pointer;
+}
 #illustrations-coste .liste-illustrations li {
         height: 196px;
 }

/trunk/presentations/images/icones_tags/fruit.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/icones_tags/fruit.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/presentations/images/icones_tags/rameau.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/icones_tags/rameau.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/presentations/images/icones_tags/fleur.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/icones_tags/fleur.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/presentations/images/icones_tags/ecorce.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/icones_tags/ecorce.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/presentations/images/icones_tags/port.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/icones_tags/port.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/presentations/images/icones_tags/feuille.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/icones_tags/feuille.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/trunk/presentations/images/pasdephoto_petit.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/presentations/images/pasdephoto_petit.png
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /trunk/presentations/scripts/fiche-synthese.js
 ,6 → 18,7
 var tableauOnglets = Array();
 var nbOngletsInvisibles = 0;
 var ongletSyntheseCharge = true;
+var ongletIllustrationsCharge = false;
 /** Classe Module
 * Définit un module de type portlet
 ,7 → 490,7
                         $("#zone_onglets").tabs('select', 0);
                 }
         });
         gererEvenementsWiki();
         gererEvenementsPliage();
         gererClicIllustrationsFiche();
 ,6 → 506,79
         redimensionnerOnglets();
 });
+// À la fin du chargement de l'onglet Illustrations
+$(document).on('ongletIllustrationsCharge', function() {
+        if (ongletIllustrationsCharge == false) {
+                ongletIllustrationsCharge = true;
+                $('a.lien-images-organes.fourni').live('click', afficherOngletOrgane);
+                $('a.lien-grande-image-organe').live('click', afficherGrandeImageOrgane);
+                //afficherOngletOrgane(null, 'fleur');
+        }
+});
+// Affiche les n images ayant le plus de votes, pour l'organe $tag
+function afficherOngletOrgane(e, tag) {
+        var onglets = $('div.onglet-organe'),
+                contenu = $('#galerie-organes-contenu'),
+                organeOnglet;
+        if (tag === undefined) {
+                tag = $(this).data('tag')
+        }
+        if ($(this).parent().hasClass('active')) { // replier
+                $(this).parent().removeClass('active')
+                contenu.hide();
+                return false;
+        }
+        onglets.each(function() {
+                organeOnglet = $(this).data('tag');
+                var li = $('a.lien-images-organes[data-tag="' + organeOnglet + '"]').parent();
+                if (organeOnglet == tag) {
+                        $(this).show();
+                        li.addClass('active');
+                } else {
+                        $(this).hide();
+                        li.removeClass('active');
+                }
+        });
+        contenu.show();
+        var premierLienGrandeImage = $('div.onglet-organe:visible').find('a.lien-grande-image-organe').first(),
+                grandeImage = $('#grande-image-organe').find('img');
+        premierLienGrandeImage.trigger('click');
+        grandeImage.show('fast');
+        return false;
+}
+// Affiche en grand sous les miniatures l'image d'organe sur laquelle on a cliqué
+function afficherGrandeImageOrgane() {
+        var grandeImage = $('#grande-image-organe').find('img'),
+                source = $(this).find('img').attr('src');
+        source = source.replace('CRX2S', 'L'); // @FIXME cracra
+        grandeImage.attr('src', source);
+        // métadonnées
+        var metadonnees = ['id-image', 'titre', 'description', 'localisation', 'auteur'],
+                clef;
+        for (var i = 0; i < metadonnees.length; i++) {
+                clef = metadonnees[i];
+                $('#grande-image-legende-' + clef).html($(this).data(clef));
+        }
+        $('#grande-image-legende-date').html(formaterDateVersFrancais($(this).data('date')));
+        $('#grande-image-legende-id-destinataire').attr('href', 'http://localhost/eflore/applications/eflore-consultation/popup.php?module=popup-contact&amp;action=form&amp;referentiel=bdtfx&amp;id_destinataire=' +
+                $(this).data('id-destinataire') + '&amp;id_img=' + $(this).data('id-image'));
+}
+// transforme une date du type "2012-04-06" en "06 avril 2012"
+function formaterDateVersFrancais(date) {
+        var mois = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
+                amj_hms = date.split(' '),
+                amj = amj_hms[0].split('-');
+        return amj[2] + ' ' + mois[parseInt(amj[1]) - 1] + ' ' + amj[0];
+}
 function redimensionnerOnglets() {
         var largeurTotale = $('#zone_onglets').width();
 ,11 → 604,15
         }
 }
+// ouvre le popup de galerie lors d'un clic sur l'illustration dans la fiche synthèse
 function gererClicIllustrationsFiche() {
         $('.illustration_cel').live('click', function() {
                 var url_image = $(this).attr('src');
                 var titre = $('.nomenclature').first().text();
-                var url = urlPopup+"?module=popup-galerie&action=fiche&num_nom="+$(this).attr('data-num-nom')+"&titre="+encodeURIComponent(titre)+"&url_image="+encodeURIComponent(url_image)+"&referentiel="+REFERENTIEL;;
+                //var url = urlPopup+"?module=popup-galerie&action=fiche&num_nom="+$(this).attr('data-num-nom')+"&titre="+encodeURIComponent(titre)+"&url_image="+encodeURIComponent(url_image)+"&referentiel="+REFERENTIEL;
+                var url = urlPopup+"?module=popup-galerie-organes&action=fiche&num_nom="+$(this).attr('data-num-nom')+"&titre="+encodeURIComponent(titre)+"&url_image="+encodeURIComponent(url_image)+"&referentiel="+REFERENTIEL;
+                //alert(url);
+                //return false;
                 window.open(url, $(this).attr('data-num-nom'), 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=no, width='+(400)+', height='+(375));
         });

Subversion Repositories eFlore/Applications.eflore-consultation

Compare Revisions

Ignore whitespace Rev 1122 → Rev 1123