corrections mise en page avec utilisation de jquery.masonry.js

5 files changed, 92 insertions, 107 deletions

diff --git a/css/style.css b/css/style.css
index 6a8b07b2..d53060ec 100644
--- a/css/style.css
+++ b/css/style.css
@@ -47,101 +47,14 @@ header {
     color: #F1F1F1;
 }
 
-footer {
-    text-align: right;
-}
-
-/*** ***/
-/*** GRID DISPLAY ***/
-
 #content {
-    width: 1000px;
+    width: 800px;
     margin: 0 auto;
 }
 
-#entries {
-    -moz-column-count: 4;
-    -moz-column-gap: 20px;
-    -webkit-column-count: 4;
-    -webkit-column-gap: 20px;
-    column-count: 4;
-    column-gap: 20px;
-    width: 1000px;
-}
-
-#entries span.content {
-    display: inline-block;
-    margin-bottom: 0px;
-    width: 100%;
-}
 
-@media only screen and (max-width : 1199px),
-only screen and (max-device-width : 1199px){
-    #entries {
-        -moz-column-count: 5;
-        -moz-column-gap: 20px;
-        -webkit-column-count: 5;
-        -webkit-column-gap: 20px;
-        column-count: 5;
-        column-gap: 20px;
-        width: 1000px;
-    }
-
-    #content {
-        width: 1000px;
-    }
-}
-
-
-@media only screen and (max-width : 999px),
-only screen and (max-device-width : 999px){
-    #entries {
-        -moz-column-count: 4;
-        -moz-column-gap: 15px;
-        -webkit-column-count: 4;
-        -webkit-column-gap: 15px;
-        column-count: 4;
-        column-gap: 15px;
-        width: 800px;
-    }
-
-    #content {
-        width: 800px;
-    }
-}
-
-@media only screen and (max-width : 799px),
-only screen and (max-device-width : 799px){
-    #entries {
-        -moz-column-count: 3;
-        -moz-column-gap: 10px;
-        -webkit-column-count: 3;
-        -webkit-column-gap: 10px;
-        column-count: 3;
-        column-gap: 10px;
-        width: 600px;
-    }
-
-    #content {
-        width: 600px;
-    }
-}
-
-@media only screen and (max-width : 599px),
-only screen and (max-device-width : 599px){
-    #entries {
-        -moz-column-count: 2;
-        -moz-column-gap: 10px;
-        -webkit-column-count: 2;
-        -webkit-column-gap: 10px;
-        column-count: 2;
-        column-gap: 10px;
-        width: 400px;
-    }
-
-    #content {
-        width: 400px;
-    }
+footer {
+    text-align: right;
 }
 
 /*** ***/
@@ -152,32 +65,34 @@ only screen and (max-device-width : 599px){
     cursor: pointer;
 }
 
-#main #entries {
+#main #content {
     margin-top: 20px;
 }
 
-#main #entries .entrie {
+#main .entrie {
     color: rgb(46, 46, 46);
     position:relative;
     background-color: #ffffff;
     padding: 15px;
-    min-height: 6em;
+    min-height: 8em;
     -webkit-border-radius: 2px;
     border-radius: 2px;
     -webkit-box-shadow:  0px 0px 2px -1px #000;
     box-shadow:  0px 0px 2px -1px #000;
-    list-style-type: none;
+    width: 30%;
+    margin: 10px;
+    float: left;
 }
 
-#main #entries .entrie h2 a {
+#main .entrie h2 a {
     text-decoration: none;
 }
 
-#main #entries .entrie h2 a:hover {
+#main .entrie h2 a:hover {
     color: #F5BE00;
 }
 
-#main #entries .entrie .tools {
+#main .entrie .tools {
     position:absolute;
     bottom: 0;
     width: 100%;
@@ -185,7 +100,7 @@ only screen and (max-device-width : 599px){
     margin-left: -20px;
 }
 
-#main #entries .entrie .tools a.tool span {
+#main .entrie .tools a.tool span {
     display: inline-block;
     width: 16px;
     height: 16px;
@@ -238,4 +153,45 @@ body.article {
     text-decoration: none;
 }
 
-/*** ***/
\ No newline at end of file
+/*** ***/
+#main
+{
+    max-width: 60em; /* 960 px */
+    margin: 0 auto;
+}
+    #content
+    {
+        width: 103.125%; /* 990px */
+        overflow: hidden;
+        margin-left: -1.562%; /* 15px */
+        margin-bottom: -1.875em; /* 30px */
+    }
+        .entrie
+        {
+            width: 30.303%; /* 300px */
+            float: left;
+            margin: 0 1.515% 1.875em; /* 15px 30px */
+        }
+
+@media only screen and ( max-width: 40em ) /* 640px */
+{
+    .entrie
+    {
+        width: 46.876%; /* 305px */
+        margin-bottom: 0.938em; /* 15px */
+    }
+}
+@media only screen and ( max-width: 20em ) /* 640px */
+{
+    #content
+    {
+        width: 100%;
+        margin-left: 0;
+    }
+        .entrie
+        {
+            width: 100%;
+            margin-left: 0;
+            margin-right: 0;
+        }
+}
\ No newline at end of file
diff --git a/index.php b/index.php
index abf658a3..27144de3 100755
--- a/index.php
+++ b/index.php
@@ -129,12 +129,11 @@ catch (Exception $e)
                 <li><a style="cursor: move" title="i am a bookmarklet, use me !" href="javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('<?php echo url()?>?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
             </ul>
             <div id="content">
-                <ul id="entries">
                 <?php
                 foreach ($entries as $entry)
                 {
                     ?>
-                    <li id="entry-<?php echo $entry['id']; ?>" class="entrie mb2">
+                    <div id="entry-<?php echo $entry['id']; ?>" class="entrie mb2">
                         <span class="content">
                             <h2 class="h6-like">
                                 <a href="readityourself.php?url=<?php echo urlencode($entry['url']); ?>"><?php echo $entry['title']; ?>
@@ -145,17 +144,33 @@ catch (Exception $e)
                                 <a href="?action=delete&id=<?php echo $entry['id']; ?>" title="toggle delete" onclick="return confirm('Are you sure?')" class="tool delete"><span></span></a>
                             </div>
                         </span>
-                    </li>
+                    </div>
                 <?php
                 }
                 ?>
-                </ul>
             </div>
         </div>
         <footer class="mr2 mt3 smaller">
             <p>download poche on <a href="http://github.com/nicosomb/github">github</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
         </footer>
         <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
+        <script type="text/javascript" src="js/jquery.masonry.min.js"></script>
         <script type="text/javascript" src="js/poche.js"></script>
+        <script type="text/javascript">
+            $( window ).load( function()
+            {
+                var columns    = 3,
+                    setColumns = function() { columns = $( window ).width() > 640 ? 3 : $( window ).width() > 320 ? 2 : 1; };
+
+                setColumns();
+                $( window ).resize( setColumns );
+
+                $( '#content' ).masonry(
+                {
+                    itemSelector: '.entrie',
+                    columnWidth:  function( containerWidth ) { return containerWidth / columns; }
+                });
+            });
+        </script>
     </body>
 </html>
diff --git a/js/jquery.masonry.min.js b/js/jquery.masonry.min.js
new file mode 100644
index 00000000..57c081c6
--- /dev/null
+++ b/js/jquery.masonry.min.js
@@ -0,0 +1,10 @@
+/**
+ * jQuery Masonry v2.1.08
+ * A dynamic layout plugin for jQuery
+ * The flip-side of CSS Floats
+ * http://masonry.desandro.com
+ *
+ * Licensed under the MIT license.
+ * Copyright 2012 David DeSandro
+ */
+(function(e,t,n){"use strict";var r=t.event,i;r.special.smartresize={setup:function(){t(this).bind("resize",r.special.smartresize.handler)},teardown:function(){t(this).unbind("resize",r.special.smartresize.handler)},handler:function(e,t){var n=this,s=arguments;e.type="smartresize",i&&clearTimeout(i),i=setTimeout(function(){r.dispatch.apply(n,s)},t==="execAsap"?0:100)}},t.fn.smartresize=function(e){return e?this.bind("smartresize",e):this.trigger("smartresize",["execAsap"])},t.Mason=function(e,n){this.element=t(n),this._create(e),this._init()},t.Mason.settings={isResizable:!0,isAnimated:!1,animationOptions:{queue:!1,duration:500},gutterWidth:0,isRTL:!1,isFitWidth:!1,containerStyle:{position:"relative"}},t.Mason.prototype={_filterFindBricks:function(e){var t=this.options.itemSelector;return t?e.filter(t).add(e.find(t)):e},_getBricks:function(e){var t=this._filterFindBricks(e).css({position:"absolute"}).addClass("masonry-brick");return t},_create:function(n){this.options=t.extend(!0,{},t.Mason.settings,n),this.styleQueue=[];var r=this.element[0].style;this.originalStyle={height:r.height||""};var i=this.options.containerStyle;for(var s in i)this.originalStyle[s]=r[s]||"";this.element.css(i),this.horizontalDirection=this.options.isRTL?"right":"left";var o=this.element.css("padding-"+this.horizontalDirection),u=this.element.css("padding-top");this.offset={x:o?parseInt(o,10):0,y:u?parseInt(u,10):0},this.isFluid=this.options.columnWidth&&typeof this.options.columnWidth=="function";var a=this;setTimeout(function(){a.element.addClass("masonry")},0),this.options.isResizable&&t(e).bind("smartresize.masonry",function(){a.resize()}),this.reloadItems()},_init:function(e){this._getColumns(),this._reLayout(e)},option:function(e,n){t.isPlainObject(e)&&(this.options=t.extend(!0,this.options,e))},layout:function(e,t){for(var n=0,r=e.length;n<r;n++)this._placeBrick(e[n]);var i={};i.height=Math.max.apply(Math,this.colYs);if(this.options.isFitWidth){var s=0;n=this.cols;while(--n){if(this.colYs[n]!==0)break;s++}i.width=(this.cols-s)*this.columnWidth-this.options.gutterWidth}this.styleQueue.push({$el:this.element,style:i});var o=this.isLaidOut?this.options.isAnimated?"animate":"css":"css",u=this.options.animationOptions,a;for(n=0,r=this.styleQueue.length;n<r;n++)a=this.styleQueue[n],a.$el[o](a.style,u);this.styleQueue=[],t&&t.call(e),this.isLaidOut=!0},_getColumns:function(){var e=this.options.isFitWidth?this.element.parent():this.element,t=e.width();this.columnWidth=this.isFluid?this.options.columnWidth(t):this.options.columnWidth||this.$bricks.outerWidth(!0)||t,this.columnWidth+=this.options.gutterWidth,this.cols=Math.floor((t+this.options.gutterWidth)/this.columnWidth),this.cols=Math.max(this.cols,1)},_placeBrick:function(e){var n=t(e),r,i,s,o,u;r=Math.ceil(n.outerWidth(!0)/this.columnWidth),r=Math.min(r,this.cols);if(r===1)s=this.colYs;else{i=this.cols+1-r,s=[];for(u=0;u<i;u++)o=this.colYs.slice(u,u+r),s[u]=Math.max.apply(Math,o)}var a=Math.min.apply(Math,s),f=0;for(var l=0,c=s.length;l<c;l++)if(s[l]===a){f=l;break}var h={top:a+this.offset.y};h[this.horizontalDirection]=this.columnWidth*f+this.offset.x,this.styleQueue.push({$el:n,style:h});var p=a+n.outerHeight(!0),d=this.cols+1-c;for(l=0;l<d;l++)this.colYs[f+l]=p},resize:function(){var e=this.cols;this._getColumns(),(this.isFluid||this.cols!==e)&&this._reLayout()},_reLayout:function(e){var t=this.cols;this.colYs=[];while(t--)this.colYs.push(0);this.layout(this.$bricks,e)},reloadItems:function(){this.$bricks=this._getBricks(this.element.children())},reload:function(e){this.reloadItems(),this._init(e)},appended:function(e,t,n){if(t){this._filterFindBricks(e).css({top:this.element.height()});var r=this;setTimeout(function(){r._appended(e,n)},1)}else this._appended(e,n)},_appended:function(e,t){var n=this._getBricks(e);this.$bricks=this.$bricks.add(n),this.layout(n,t)},remove:function(e){this.$bricks=this.$bricks.not(e),e.remove()},destroy:function(){this.$bricks.removeClass("masonry-brick").each(function(){this.style.position="",this.style.top="",this.style.left=""});var n=this.element[0].style;for(var r in this.originalStyle)n[r]=this.originalStyle[r];this.element.unbind(".masonry").removeClass("masonry").removeData("masonry"),t(e).unbind(".masonry")}},t.fn.imagesLoaded=function(e){function u(){e.call(n,r)}function a(e){var n=e.target;n.src!==s&&t.inArray(n,o)===-1&&(o.push(n),--i<=0&&(setTimeout(u),r.unbind(".imagesLoaded",a)))}var n=this,r=n.find("img").add(n.filter("img")),i=r.length,s="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",o=[];return i||u(),r.bind("load.imagesLoaded error.imagesLoaded",a).each(function(){var e=this.src;this.src=s,this.src=e}),n};var s=function(t){e.console&&e.console.error(t)};t.fn.masonry=function(e){if(typeof e=="string"){var n=Array.prototype.slice.call(arguments,1);this.each(function(){var r=t.data(this,"masonry");if(!r){s("cannot call methods on masonry prior to initialization; attempted to call method '"+e+"'");return}if(!t.isFunction(r[e])||e.charAt(0)==="_"){s("no such method '"+e+"' for masonry instance");return}r[e].apply(r,n)})}else this.each(function(){var n=t.data(this,"masonry");n?(n.option(e||{}),n._init()):t.data(this,"masonry",new t.Mason(e,this))});return this}})(window,jQuery);
\ No newline at end of file
diff --git a/js/poche.js b/js/poche.js
index 6751920a..42958e83 100644
--- a/js/poche.js
+++ b/js/poche.js
@@ -6,11 +6,15 @@ function toggle_favorite(element,id) {
     });
 }
 
-
 function toggle_archive(id) {
-    $('#entry-'+id).toggle();
+    /*$('#entry-'+id).toggle();*/
     $.ajax ({
         url: "process.php?action=toggle_archive",
         data:{id:id}
     });
-}
+    var obj = $('#entry-'+id);
+    $('#content').masonry('remove',obj);
+
+    $('#content').masonry('reloadItems');
+    $('#content').masonry('reload');
+}
\ No newline at end of file
diff --git a/tpl/footer.html b/tpl/footer.html
index 43af7d71..8cdda21c 100755
--- a/tpl/footer.html
+++ b/tpl/footer.html
@@ -1,3 +1,3 @@
         <footer class="mr2 mt3 smaller">
-            <p><a href="https://twitter.com/getpoche" title="follow us on twitter">Follow @getpoche on twitter</a></p>
+            <p>download poche on <a href="http://github.com/nicosomb/github">github</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
         </footer>