# HG changeset patch # User Anthony Ly # Date 1349885919 -7200 # Node ID a3e60d7addb30f7ba10662ac7ca843bfda9082cb # Parent 16413123bc8cf240733a8d5e335a67e14f68c3d3 ajout des boutons annotations / montage diff -r 16413123bc8c -r a3e60d7addb3 crea/boutons-periplus-al.psd Binary file crea/boutons-periplus-al.psd has changed diff -r 16413123bc8c -r a3e60d7addb3 integration/article.html --- a/integration/article.html Wed Oct 10 15:16:59 2012 +0200 +++ b/integration/article.html Wed Oct 10 18:18:39 2012 +0200 @@ -133,7 +133,7 @@
- +
diff -r 16413123bc8c -r a3e60d7addb3 integration/css/style.css --- a/integration/css/style.css Wed Oct 10 15:16:59 2012 +0200 +++ b/integration/css/style.css Wed Oct 10 18:18:39 2012 +0200 @@ -506,7 +506,7 @@ width: 177px; padding-left: 12px; border-right: 1px solid #e0dde0; - min-height: 200px; + min-height: 250px; } div.article:nth-child(4n+4) div.inner-article{ border-right: none; @@ -556,6 +556,98 @@ div.article div.article-content p.resume{ } + /* annotations */ +div.article div.article-content ul.annotations{ + margin-top: 10px; +} +div.article div.article-content ul.annotations li{ + float: left; + margin-right: 4px; +} +div.article div.article-content ul.annotations li a{ + display: block; + text-decoration: none; +} +div.article div.article-content ul.annotations li a.comment{ + width: 24px; + height: 20px; + background-image: url(../img/article-annotations-comment-sprite.png); + background-repeat: no-repeat; +} +div.article div.article-content ul.annotations li a.comment.number{ + position: relative; + background-position: 0 0; +} +div.article div.article-content ul.annotations li a.comment.number:hover{ + position: relative; + background-position: 0 -20px; +} +div.article div.article-content ul.annotations li a.comment.number span.number-value{ + color: #FFF; + font-size: 9px; + position: absolute; + width: 18px; + height: 11px; + line-height: 11px; + text-align: center; + top: 0; + right: 0; +} +div.article div.article-content ul.annotations li a.comment.add{ + position: relative; + background-position: -25px 0; +} +div.article div.article-content ul.annotations li a.comment.add:hover{ + position: relative; + background-position: -25px -20px; +} +div.article div.article-content ul.annotations li a.value{ + position: relative; + width: 9px; + height: 20px; + display: block; +} +div.article div.article-content ul.annotations li a.value span.inner-value, +div.article div.article-content ul.annotations li a.value span.inner-signe{ + position: absolute; + background-image: url(../img/article-annotations-value-sprite.png); + background-repeat: no-repeat; + display: block; + width: 9px; + height: 100%; + bottom: 0; + left: 0; +} +div.article div.article-content ul.annotations li a.value span.inner-signe{ + background-position: 0 3px; + z-index: 2; +} +div.article div.article-content ul.annotations li a.value.plus span.inner-value{ + background-position: 0 -17px; +} +div.article div.article-content ul.annotations li a.value.plus span.inner-signe{ + background-position: 0 3px; +} +div.article div.article-content ul.annotations li a.value.moins span.inner-value{ + background-position: -9px -17px; +} +div.article div.article-content ul.annotations li a.value.moins span.inner-signe{ + background-position: -9px 3px; +} +div.article div.article-content ul.annotations li a.value.egal span.inner-value{ + background-position: -18px -17px; +} +div.article div.article-content ul.annotations li a.value.egal span.inner-signe{ + background-position: -18px 3px; +} +div.article div.article-content ul.annotations li a.value.unknow span.inner-value{ + background-position: -27px -17px; +} +div.article div.article-content ul.annotations li a.value.unknow span.inner-signe{ + background-position: -27px 3px; +} + + /*pagination*/ div.pagination{ height: 35px; @@ -656,7 +748,32 @@ bottom: 0; right: 0; } - +div.actu div.links ul li{ + float: left; + margin: 0 0 1px 1px; +} +div.actu div.links ul li a{ + display: block; + width: 25px; + height: 25px; + background-color: #007dad; + background-repeat: no-repeat; +} +div.actu div.links ul li a:hover{ + background-color: #4FA3C4; +} +div.actu div.links ul li a.trash{ + background-image: url(../img/home-button-trash.png); + background-position: 6px 4px; +} +div.actu div.links ul li a.file{ + background-image: url(../img/home-button-file.png); + background-position: 4px 6px; +} +div.actu div.links ul li a.comment{ + background-image: url(../img/home-button-comment.png); + background-position: 2px 5px; +} /* FRISE */ div.frise{ diff -r 16413123bc8c -r a3e60d7addb3 integration/gabarit.html --- a/integration/gabarit.html Wed Oct 10 15:16:59 2012 +0200 +++ b/integration/gabarit.html Wed Oct 10 18:18:39 2012 +0200 @@ -12,6 +12,7 @@ + @@ -128,8 +129,11 @@
- -
+
+
+
+
+
@@ -175,6 +179,30 @@ +
@@ -188,7 +216,7 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + tempor incididunt ut labore et dolore magna aliqua.

@@ -200,6 +228,31 @@ + +
@@ -223,6 +276,30 @@ + @@ -236,7 +313,7 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + tempor incididunt ut labore et dolore magna aliqua.

@@ -248,6 +325,31 @@ + +
@@ -271,6 +373,30 @@ + @@ -284,7 +410,7 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + tempor incididunt ut labore et dolore magna aliqua.

@@ -296,6 +422,31 @@ + +
@@ -319,6 +470,30 @@ + @@ -332,7 +507,7 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + tempor incididunt ut labore et dolore magna aliqua.

@@ -344,9 +519,35 @@ + +
+ @@ -398,6 +599,7 @@ + diff -r 16413123bc8c -r a3e60d7addb3 integration/home.html --- a/integration/home.html Wed Oct 10 15:16:59 2012 +0200 +++ b/integration/home.html Wed Oct 10 18:18:39 2012 +0200 @@ -12,6 +12,7 @@ + @@ -128,8 +129,11 @@
- -
+
+
+
+
+
@@ -161,7 +165,11 @@

Affaires Bettecourt

- +
    +
    • +
    • +
    • +
@@ -172,7 +180,11 @@

Affaires Bettecourt

- +
    +
    • +
    • +
    • +
@@ -184,7 +196,11 @@

Affaires Bettecourt

- +
    +
    • +
    • +
    • +
@@ -195,7 +211,11 @@

Affaires Bettecourt

- +
    +
    • +
    • +
    • +
@@ -206,7 +226,11 @@

Affaires Bettecourt

- +
    +
    • +
    • +
    • +
@@ -217,7 +241,11 @@

Affaires Bettecourt

- +
    +
    • +
    • +
    • +
@@ -268,6 +296,7 @@ + diff -r 16413123bc8c -r a3e60d7addb3 integration/img/article-annotations-comment-sprite.png Binary file integration/img/article-annotations-comment-sprite.png has changed diff -r 16413123bc8c -r a3e60d7addb3 integration/img/article-annotations-value-sprite.png Binary file integration/img/article-annotations-value-sprite.png has changed diff -r 16413123bc8c -r a3e60d7addb3 integration/img/home-button-comment.png Binary file integration/img/home-button-comment.png has changed diff -r 16413123bc8c -r a3e60d7addb3 integration/img/home-button-file.png Binary file integration/img/home-button-file.png has changed diff -r 16413123bc8c -r a3e60d7addb3 integration/img/home-button-trash.png Binary file integration/img/home-button-trash.png has changed diff -r 16413123bc8c -r a3e60d7addb3 integration/js/main.js --- a/integration/js/main.js Wed Oct 10 15:16:59 2012 +0200 +++ b/integration/js/main.js Wed Oct 10 18:18:39 2012 +0200 @@ -120,15 +120,19 @@ $(".voile-right").width(widthFrise-valSlider2); }, slide: function( event, ui ) { - //if(ui.values[1]-ui.values[ 0 ]!= diffSlide){ - // return false; - - //} + + /*//bloquer les curseur + if(ui.values[1]-ui.values[ 0 ]!= diffSlide){ + return false; + } + */ $(".voile-left").width(ui.values[ 0 ]); $(".voile-right").width(widthFrise-ui.values[ 1 ]); }, change: function( event, ui ){ - //console.log("change") + //ici on récup les valeurs après un slide + var value1 = ui.values[ 0 ]; + var value2 = ui.values[ 1 ]; } });