diff --git a/public/templates/albums/list.html b/public/templates/albums/list.html index ae81d77b..bff99077 100644 --- a/public/templates/albums/list.html +++ b/public/templates/albums/list.html @@ -1,3 +1,3 @@
- +
diff --git a/public/templates/directives/albums-list.html b/public/templates/directives/albums-list.html index 0da8e4dd..45daef3b 100644 --- a/public/templates/directives/albums-list.html +++ b/public/templates/directives/albums-list.html @@ -7,9 +7,12 @@ - - {{::album.title}} - + + + {{::album.title}} + {{::album.user.name}} + + favorite {{::album.stats.favourites}} diff --git a/public/templates/directives/playlists-list.html b/public/templates/directives/playlists-list.html index 59bcd933..fe803de4 100644 --- a/public/templates/directives/playlists-list.html +++ b/public/templates/directives/playlists-list.html @@ -1,21 +1,23 @@ - +
+
+ No playlists found… +
+ + + + + + + + {{::playlist.title}} + {{::playlist.user.name}} + + + + favorite {{::playlist.stats.favourites}} + comment {{::playlist.stats.comments}} + file_download {{::playlist.stats.downloads}} + + + +
diff --git a/public/templates/playlists/list.html b/public/templates/playlists/list.html index 76615fb0..8fdece34 100644 --- a/public/templates/playlists/list.html +++ b/public/templates/playlists/list.html @@ -1,3 +1,3 @@
- +
diff --git a/resources/assets/scripts/app/directives/albums-list.coffee b/resources/assets/scripts/app/directives/albums-list.coffee index a9b3a83a..0e9d73ca 100644 --- a/resources/assets/scripts/app/directives/albums-list.coffee +++ b/resources/assets/scripts/app/directives/albums-list.coffee @@ -40,6 +40,5 @@ module.exports = angular.module('ponyfm').directive 'pfmAlbumsList', () -> $scope.smSize = '20' $scope.xsSize = '50' - console.log $scope.size $scope.auth = auth.data ] diff --git a/resources/assets/scripts/app/directives/playlists-list.coffee b/resources/assets/scripts/app/directives/playlists-list.coffee index 49269646..4cf024c9 100644 --- a/resources/assets/scripts/app/directives/playlists-list.coffee +++ b/resources/assets/scripts/app/directives/playlists-list.coffee @@ -20,10 +20,25 @@ module.exports = angular.module('ponyfm').directive 'pfmPlaylistsList', () -> templateUrl: '/templates/directives/playlists-list.html' scope: playlists: '=playlists', - class: '@class' + class: '@class', + size: '@size' controller: [ '$scope', 'auth' ($scope, auth) -> + if typeof $scope.size == 'undefined' + $scope.size = 'large' + + if $scope.size == 'small' + $scope.lgSize = '20' + $scope.mdSize = '33' + $scope.smSize = '50' + $scope.xsSize = '100' + else + $scope.lgSize = '15' + $scope.mdSize = '' + $scope.smSize = '20' + $scope.xsSize = '50' + $scope.auth = auth.data ] diff --git a/resources/assets/scripts/base/modernizr.js b/resources/assets/scripts/base/modernizr.js new file mode 100644 index 00000000..09badd67 --- /dev/null +++ b/resources/assets/scripts/base/modernizr.js @@ -0,0 +1,3 @@ +/*! modernizr 3.3.1 (Custom Build) | MIT * + * https://modernizr.com/download/?-cssfilters-setclasses !*/ +!function(e,n,t){function r(e,n){return typeof e===n}function s(){var e,n,t,s,o,i,a;for(var l in C)if(C.hasOwnProperty(l)){if(e=[],n=C[l],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length))for(t=0;td;d++)if(h=e[d],v=j.style[h],a(h,"-")&&(h=l(h)),j.style[h]!==t){if(o||r(s,"undefined"))return f(),"pfx"==n?h:!0;try{j.style[h]=s}catch(g){}if(j.style[h]!=v)return f(),"pfx"==n?h:!0}return f(),!1}function v(e,n,t,s,o){var i=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+E.join(i+" ")+i).split(" ");return r(n,"string")||r(n,"undefined")?h(a,n,s,o):(a=(e+" "+T.join(i+" ")+i).split(" "),u(a,n,t))}function y(e,n,r){return v(e,t,t,n,r)}var g=[],C=[],S={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=S,Modernizr=new Modernizr;var w=n.documentElement,_="svg"===w.nodeName.toLowerCase(),x=S._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):["",""];S._prefixes=x;var b="CSS"in e&&"supports"in e.CSS,P="supportsCSS"in e;Modernizr.addTest("supports",b||P);var z="Moz O ms Webkit",E=S._config.usePrefixes?z.split(" "):[];S._cssomPrefixes=E;var T=S._config.usePrefixes?z.toLowerCase().split(" "):[];S._domPrefixes=T;var N={elem:i("modernizr")};Modernizr._q.push(function(){delete N.elem});var j={style:N.elem.style};Modernizr._q.unshift(function(){delete j.style}),S.testAllProps=v,S.testAllProps=y,Modernizr.addTest("cssfilters",function(){if(Modernizr.supports)return y("filter","blur(2px)");var e=i("a");return e.style.cssText=x.join("filter:blur(2px); "),!!e.style.length&&(n.documentMode===t||n.documentMode>9)}),s(),o(g),delete S.addTest,delete S.addAsyncTest;for(var k=0;k