Changeset 25980

Timestamp:

Dec 17, 2013, 4:43:38 PM (11 years ago)

Author:

Miklfe

Message:

 

Location:

extensions/Float

Files:

• Thumbs.db (added)
• images/Thumbs.db (added)
• js/masonry.js (added)
• js/masonry.min.js (deleted)
• local_head.tpl (modified) (1 diff)
• template/index.tpl (deleted)
• template/mainpage_categories.tpl (modified) (4 diffs)
• template/thumbnails.tpl (modified) (3 diffs)
• theme.css (modified) (3 diffs)
• themeconf.inc.php (modified) (1 diff)

extensions/Float/local_head.tpl

@@ -1 @@
-        <!--[if lt IE 8]>
-                <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/elegant/fix-ie7.css">
-        <![endif]-->
-        
-{combine_script id='jquery.masonry.min' require='jquery' path='themes/Float/js/masonry.min.js' load='footer'}
+{combine_script id='jquery.masonry.min' require='jquery' path='themes/Float/js/masonry.js' load='footer'}

extensions/Float/template/mainpage_categories.tpl

@@ +1 @@
+{define_derivative name='derivative_params' type='xsmall'}
 {html_style}
-
 {if $derivative_params->max_width() > 600}
 .thumbLegend {ldelim}font-size: 130%}
@@ -14 +14 @@
 <div class="thumbContent">
 
-<div id="container" >
+<div id="container">
 
 {foreach from=$category_thumbnails item=cat name=cat_loop}
-        <div class="box photo colMainpage">
-        <li class="{if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
+        <div class="box {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
                 <div class="thumbnailCategory">
                         <div class="illustration">
@@ -44 +43 @@
                         </div>
                 </div>
-        </li>
         </div>
 {/foreach}
@@ -51 +49 @@
 </div>
 {footer_script require='jquery'}{literal}
-                        window.onload = function() {
-                          var wall1 = new Masonry( document.getElementById('container'), {
-                                gutterWidth: 10,
-                                isFitWidth: true,
-                          });
-                                var wall2 = new Masonry( document.getElementById('containerThumb'), {
-                                gutterWidth: 10,
-                                isFitWidth: true,
-                          });
+  $(function(){
 
-                        };
+    var $container = $('#container');
+  
+    $container.imagesLoaded( function(){
+      $container.masonry({
+        itemSelector : '.box',
+                isFitWidth: true
+      });
+    });
+  
+  });
 {/literal}{/footer_script}
 </div>

extensions/Float/template/thumbnails.tpl

@@ +1 @@
+{define_derivative name='derivative_params' type='xsmall'}
 {if !empty($thumbnails)}{strip}
 
@@ -41 +42 @@
 
 <div class="thumbContent">
-<div id="containerThumb" class="clearfix">
+<div id="containerThumb">
 
 {foreach from=$thumbnails item=thumbnail}
@@ -90 +91 @@
 </div>          
 {footer_script require='jquery'}{literal}
-                        window.onload = function() {
-                          var wall1 = new Masonry( document.getElementById('container'), {
-                                gutterWidth: 10,
-                                isFitWidth: true
-                          });
-                                var wall2 = new Masonry( document.getElementById('containerThumb'), {
-                                gutterWidth: 10,
-                                isFitWidth: true
-                          });
+  $(function(){
 
-                        };
+    var $container = $('#containerThumb');
+  
+    $container.imagesLoaded( function(){
+      $container.masonry({
+        itemSelector : '.box',
+                isFitWidth: true
+      });
+    });
+  
+  });
 {/literal}{/footer_script}
 </div>

extensions/Float/theme.css

@@ -50 +50 @@
 ul#topnav #loger ul li a:hover,ul#topnav .sub ul li a:hover,ul#topnav .sub #menuTagCloud div a:hover,ul#topnav .liSub dt a:hover{color:#c2c2c2}
 #topnav .liSub{background:none}
-#topnav .sub, #topnav #loger{top:35px;border-radius:0;box-shadow:5px 5px 20px #000;background:rgba(0, 0, 0, 0.8)}
-ul#topnav .sub ul li,ul#topnav #loger ul li,ul#topnav .sub #menuTagCloud div{border:none}
+ul#topnav li .sub, ul#topnav li #loger{top:35px;border-radius:0;box-shadow:5px 5px 20px #000;background:rgba(0, 0, 0, 0.95)}
+ul#topnav .sub ul li,ul#topnav #loger ul li,ul#topnav .sub #menuTagCloud div{border:1px solid #2c2c2c}
 ul#topnav .sub ul li a,ul#topnav #loger ul li a{background:none}
 ul#topnav .sub ul li a:hover,ul#topnav .sub #menuTagCloud div a:hover{color:#c2c2c2}
@@ -65 +65 @@
 #go INPUT[type=submit]:active{color:#c2c2c2;background:-moz-linear-gradient(center top , #555555, #2C2C2C);box-shadow:1px 1px 1px #000 inset,0px 1px 0px rgba(255,255,255,0.4)}
 
-
 /*======================================================Panel======================================================*/
 .panel .switchBox{top:60px}
@@ -71 +70 @@
 
 /*======================================================Vanilla======================================================*/
-#container,#containerThumb{padding:5px;margin-bottom:20px;clear:both;margin-left:auto;margin-right:auto}
-.box li{list-style: none outside none}
-.box img{display:block;margin-left:auto;margin-right:auto}
-.col img{width:100%}
+
+/*.box {
+  margin: 5px;
+  padding: 5px;
+  background: #D8D5D2;
+  font-size: 11px;
+  line-height: 1.4em;
+  float: left;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}*/
+
+.box img{
+  display: block;
+  width: 100%;
+}
+
+.rtl .box {
+  float: right;
+  text-align: right; 
+  direction: rtl;
+}
+
+#container,#containerThumb { margin: 0 auto; }
+

extensions/Float/themeconf.inc.php

@@ -2 +2 @@
 /*
 Theme Name: Float
-Version: auto
+Version: 1.3.0
 Description: Piwigo theme.
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=642