piwik siteId

zzlui · Oct 12, 2015 · 7a9ef45 · 7a9ef45
1 parent eaec655
commit 7a9ef45
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/app/zzlbox.js b/app/zzlbox.js
@@ -36,7 +36,7 @@ var ZZLBox = function() {
 
     if(window.DEBUG) {
         // disable cache in DEBUG mode
-        window.URIREV = Math.random();
+        // window.URIREV = Math.random();
     }
 
     // save plugins/views/models/collections for later using

diff --git a/index.html b/index.html
@@ -7,10 +7,10 @@
 
     <script type="text/javascript">
         // debug mode doesn't show error dialog and throw all errors into console
-        //var DEBUG = true;
+        var DEBUG = false;
         // URIREV added for every ajax-request, this allow to force reset cache
         // Math.random() will used for debug mode
-        var URIREV = 11;
+        var URIREV = 12;
     </script>
 
     <script type="text/javascript" src="/lib/CFInstall.min.js?r10"></script>
@@ -81,7 +81,7 @@
             //var u="https://zzlbox.com/";
             var u="/";
             _paq.push(['setTrackerUrl', u+'pwk/php']);
-            _paq.push(['setSiteId', 2]);
+            _paq.push(['setSiteId', 51669663]);
             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
             g.type='text/javascript'; 
             g.async=true; g.defer=true; 

diff --git a/plugins/file.media/plugin.js b/plugins/file.media/plugin.js
@@ -133,7 +133,9 @@ ZZLBox.Plugins.FileMedia = ZZLBox.Plugin.extend({
 
         if(support == 0) {
             return;
-        } else if(support < count && fileset) {
+        } 
+
+        if(support < count && fileset) {
             warn = '<div class="info" style="' +
                             'position: absolute; width: 300px; margin-top: 50px; margin-right: -20px;">' +
                             __('media.supportwarn', support, count) + '</div>';
@@ -183,6 +185,7 @@ ZZLBox.Plugins.FileMedia = ZZLBox.Plugin.extend({
                             success: function(fileset, tree) {
                                 that.addMediaList(fileset);
                             }
+
                         });
                     }
                 })

diff --git a/plugins/file.video/plugin.js b/plugins/file.video/plugin.js
@@ -20,7 +20,7 @@ ZZLBox.Plugins.FileVideo = ZZLBox.Plugin.extend({
 
     fileset: function(item, model, file) {
         // ensure that we have video file (not audio or image)
-        if(parseInt(file.bitrate) > 0 && parseInt(file.width) > 0) {
+        if(file.ct.indexOf('video') == 0) {
             $('<span />').html(', ' + file.width + 'x' + file.height).appendTo(item);
         }
     }

diff --git a/plugins/fileset/plugin.js b/plugins/fileset/plugin.js
@@ -64,21 +64,36 @@ ZZLBox.Plugins.Fileset = ZZLBox.Plugin.extend({
                     .append('<ul />')
                     .data('folder', v)
                     //.append(folder(v));
-
+                    //
                 var actel = $('<span />').addClass('fileset-actions-folder').css({
                     display: 'inline-block',
                     position: 'relative',
                     margin: '-100px -5px -100px 5px',
                     'top': '4px'
-                }).hide().appendTo(el.children('span').css({
+                }).appendTo(el.children('span').css({
                     display: 'inline-block',
                     position: 'relative'
                 }).hover(function() {
                     //actel.toggle();
-                    actel.css('display', 'inline-block');
+                    // actel.css('display', 'inline-block');
                 }, function(){
-                    actel.css('display', 'none');
+                    // actel.css('display', 'none');
                 }));
+
+                // var actel = $('<span />').addClass('fileset-actions-folder').css({
+                //     display: 'inline-block',
+                //     position: 'relative',
+                //     margin: '-100px -5px -100px 5px',
+                //     'top': '4px'
+                // }).hide().appendTo(el.children('span').css({
+                //     display: 'inline-block',
+                //     position: 'relative'
+                // }).hover(function() {
+                //     //actel.toggle();
+                //     actel.css('display', 'inline-block');
+                // }, function(){
+                //     actel.css('display', 'none');
+                // }));
                 zzlbox.plugins.hook('fileset-actions-folder', actel, model, v.allfiles, v);
             });
 
@@ -100,9 +115,9 @@ ZZLBox.Plugins.Fileset = ZZLBox.Plugin.extend({
                             .appendTo(el);
 
                 // additional info
-                var addons = $('<div class="addons" />').appendTo(el).toggle(addonsStatus != 'hide');
+                var addons = $('<div class="addons" />').appendTo(el);//.toggle(addonsStatus != 'hide');
 
-                el.toggleClass('addons-on-hover', addonsStatus == 'hover');
+                // el.toggleClass('addons-on-hover', addonsStatus == 'hover');
 
                 /*if(addonsStatus == 'hover') {
                     // can't make this via CSS