diff --git a/public/css/cards.css b/public/css/cards.css index f107a1611485a3fe96ff55e0a04667d6d868b5dd..7999251bbf75842e3499258f146fa4755355c6fa 100644 --- a/public/css/cards.css +++ b/public/css/cards.css @@ -46,6 +46,8 @@ border-radius: 0 0 2px 2px; background-clip: padding-box; box-sizing: border-box; + border-top: 1px solid rgba(160, 160, 160, 0.2); + } .card .card-content p { margin: 0; diff --git a/public/css/logo-nav.css b/public/css/logo-nav.css index 5074c4b892525df7073861617fee443597ecaac5..6a0592d52c6a8e252ed42581981e25d5f0288c16 100644 --- a/public/css/logo-nav.css +++ b/public/css/logo-nav.css @@ -1,3 +1,4 @@ body { padding-top: 50px; + padding-bottom: 50px; } \ No newline at end of file diff --git a/public/js/main.js b/public/js/main.js index d6498c0b2524ffb82fc51444c36a74a30d807db5..332f368b63e67a110d71e0c50500d0d3110d223d 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -59,18 +59,36 @@ function getEvents(callback) { if(amivcore.authenticated()){ register = "Anmelden"; $('.eventdets').append('<div class="card-content">'+item.description_de+'</div>'); + $(this).masonry('reloadItems').masonry(); } } - addElement('<div class="card"><div class="card-image"><img class="img-responsive" src="'+item.img_banner+'"><date class="datum"><div class="month">'+month[datenum.getMonth()]+'</div><div class="day">'+datenum.getDate()+'</div><div class="starttime">'+datenum.getHours()+':'+minutes+'</div><date-overlay></date-overlay></date><span class="card-title">'+item.title_de+' @ '+item.location+'</span></div><div class="card-content">'+item.description_de+'</div><div class="card-action"><a href="#" target="new_blank">Info</a><a href="#" id="anmeldeSub" target="new_blank" data-toggle="modal" data-target="#anmeldeModal">'+register+'</a><a href="#" target="new_blank">Im Kalender speichern</a></div></div>'); + addElement('<div class="card"><div class="card-image"><img class="img-responsive" src="'+item.img_banner+'"><date class="datum"><div class="month">'+month[datenum.getMonth()]+'</div><div class="day">'+datenum.getDate()+'</div><div class="starttime">'+datenum.getHours()+':'+minutes+'</div><date-overlay></date-overlay></date><span class="card-title">'+item.title_de+' @ '+item.location+'</span></div><div class="card-content" id="eDescription'+item.id+'">'+item.description_de+'</div><div class="card-action"><a href="#" target="new_blank" id="moreInfo" title="'+item.id+'">Info</a><a href="#" id="anmeldeSub" target="new_blank" data-toggle="modal" data-target="#anmeldeModal">'+register+'</a><a href="#" target="new_blank">Im Kalender speichern</a></div></div>'); }); }); - }); + }); + +// Card Info Enfolding + $('#moreInfo').on('click', function(){ + id_event=self.title; + console.log(id_event); + amivcore.events.GET({ + id: $(this).attr('id_event') + }, function(ret) { + curEventData = ret; + console.log(id_event); + $('<div class="card-content"><p>trololo</p></div>').insertAfter('#eDescription'+'id_event'); + }); + }); + + // Eventanmeldung + $('#anmeldeSub').on('click'); + // Login $('#loginSubmit').on('click', function(){ amivcore.login($('#loginUsername').val(), $('#loginPassword').val(), function(ret) { if (ret == true){ - $('.welcomening').append('<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">+amivcore.user()+<span class="caret"></span></a><ul class="dropdown-menu"><li><a href="#">Logout</a></li><li role="separator" class="divider"></li><li><a href="https://intern.amiv.ethz.ch/wiki/">AMIV-Tools</a></li></ul></li>'); + $('.welcomening').append('<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">+amivcore.user({})+<span class="caret"></span></a><ul class="dropdown-menu"><li><a href="#">Logout</a></li><li role="separator" class="divider"></li><li><a href="https://intern.amiv.ethz.ch/wiki/">AMIV-Tools</a></li></ul></li>'); $('.loglogbutton').hide(); } else { @@ -83,5 +101,4 @@ function getEvents(callback) { }); - // Eventanmeldung - $('#anmeldeSub').on('click'); + diff --git a/public/js/masonry.min.js b/public/js/masonry.min.js deleted file mode 100644 index 05c630884a8b8dd14debbd0e2f7c1fec91b52be8..0000000000000000000000000000000000000000 --- a/public/js/masonry.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Masonry PACKAGED v4.0.0 - * Cascading grid layout library - * http://masonry.desandro.com - * MIT License - * by David DeSandro - */ - -!function(t,e){"use strict";"function"==typeof define&&define.amd?define("jquery-bridget/jquery-bridget",["jquery"],function(i){e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("jquery")):t.jQueryBridget=e(t,t.jQuery)}(window,function(t,e){"use strict";function i(i,r,a){function h(t,e,n){var o,r="$()."+i+'("'+e+'")';return t.each(function(t,h){var u=a.data(h,i);if(!u)return void s(i+" not initialized. Cannot call methods, i.e. "+r);var d=u[e];if(!d||"_"==e.charAt(0))return void s(r+" is not a valid method");var c=d.apply(u,n);o=void 0===o?c:o}),void 0!==o?o:t}function u(t,e){t.each(function(t,n){var o=a.data(n,i);o?(o.option(e),o._init()):(o=new r(n,e),a.data(n,i,o))})}a=a||e||t.jQuery,a&&(r.prototype.option||(r.prototype.option=function(t){a.isPlainObject(t)&&(this.options=a.extend(!0,this.options,t))}),a.fn[i]=function(t){if("string"==typeof t){var e=o.call(arguments,1);return h(this,t,e)}return u(this,t),this},n(a))}function n(t){!t||t&&t.bridget||(t.bridget=i)}var o=Array.prototype.slice,r=t.console,s="undefined"==typeof r?function(){}:function(t){r.error(t)};return n(e||t.jQuery),i}),function(t,e){"function"==typeof define&&define.amd?define("ev-emitter/ev-emitter",e):"object"==typeof module&&module.exports?module.exports=e():t.EvEmitter=e()}(this,function(){function t(){}var e=t.prototype;return e.on=function(t,e){if(t&&e){var i=this._events=this._events||{},n=i[t]=i[t]||[];return-1==n.indexOf(e)&&n.push(e),this}},e.once=function(t,e){if(t&&e){this.on(t,e);var i=this._onceEvents=this._onceEvents||{},n=i[t]=i[t]||[];return n[e]=!0,this}},e.off=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){var n=i.indexOf(e);return-1!=n&&i.splice(n,1),this}},e.emitEvent=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){var n=0,o=i[n];e=e||[];for(var r=this._onceEvents&&this._onceEvents[t];o;){var s=r&&r[o];s&&(this.off(t,o),delete r[o]),o.apply(this,e),n+=s?0:1,o=i[n]}return this}},t}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("get-size/get-size",[],function(){return e()}):"object"==typeof module&&module.exports?module.exports=e():t.getSize=e()}(window,function(){"use strict";function t(t){var e=parseFloat(t),i=-1==t.indexOf("%")&&!isNaN(e);return i&&e}function e(){}function i(){for(var t={width:0,height:0,innerWidth:0,innerHeight:0,outerWidth:0,outerHeight:0},e=0;u>e;e++){var i=h[e];t[i]=0}return t}function n(t){var e=getComputedStyle(t);return e||a("Style returned "+e+". Are you running this code in a hidden iframe on Firefox? See http://bit.ly/getsizebug1"),e}function o(){if(!d){d=!0;var e=document.createElement("div");e.style.width="200px",e.style.padding="1px 2px 3px 4px",e.style.borderStyle="solid",e.style.borderWidth="1px 2px 3px 4px",e.style.boxSizing="border-box";var i=document.body||document.documentElement;i.appendChild(e);var o=n(e);r.isBoxSizeOuter=s=200==t(o.width),i.removeChild(e)}}function r(e){if(o(),"string"==typeof e&&(e=document.querySelector(e)),e&&"object"==typeof e&&e.nodeType){var r=n(e);if("none"==r.display)return i();var a={};a.width=e.offsetWidth,a.height=e.offsetHeight;for(var d=a.isBorderBox="border-box"==r.boxSizing,c=0;u>c;c++){var l=h[c],f=r[l],m=parseFloat(f);a[l]=isNaN(m)?0:m}var p=a.paddingLeft+a.paddingRight,g=a.paddingTop+a.paddingBottom,y=a.marginLeft+a.marginRight,v=a.marginTop+a.marginBottom,_=a.borderLeftWidth+a.borderRightWidth,E=a.borderTopWidth+a.borderBottomWidth,z=d&&s,b=t(r.width);b!==!1&&(a.width=b+(z?0:p+_));var x=t(r.height);return x!==!1&&(a.height=x+(z?0:g+E)),a.innerWidth=a.width-(p+_),a.innerHeight=a.height-(g+E),a.outerWidth=a.width+y,a.outerHeight=a.height+v,a}}var s,a="undefined"==typeof console?e:function(t){console.error(t)},h=["paddingLeft","paddingRight","paddingTop","paddingBottom","marginLeft","marginRight","marginTop","marginBottom","borderLeftWidth","borderRightWidth","borderTopWidth","borderBottomWidth"],u=h.length,d=!1;return r}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("matches-selector/matches-selector",e):"object"==typeof module&&module.exports?module.exports=e():t.matchesSelector=e()}(window,function(){"use strict";var t=function(){var t=Element.prototype;if(t.matches)return"matches";if(t.matchesSelector)return"matchesSelector";for(var e=["webkit","moz","ms","o"],i=0;i<e.length;i++){var n=e[i],o=n+"MatchesSelector";if(t[o])return o}}();return function(e,i){return e[t](i)}}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("fizzy-ui-utils/utils",["matches-selector/matches-selector"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("desandro-matches-selector")):t.fizzyUIUtils=e(t,t.matchesSelector)}(window,function(t,e){var i={};i.extend=function(t,e){for(var i in e)t[i]=e[i];return t},i.modulo=function(t,e){return(t%e+e)%e},i.makeArray=function(t){var e=[];if(Array.isArray(t))e=t;else if(t&&"number"==typeof t.length)for(var i=0;i<t.length;i++)e.push(t[i]);else e.push(t);return e},i.removeFrom=function(t,e){var i=t.indexOf(e);-1!=i&&t.splice(i,1)},i.getParent=function(t,i){for(;t!=document.body;)if(t=t.parentNode,e(t,i))return t},i.getQueryElement=function(t){return"string"==typeof t?document.querySelector(t):t},i.handleEvent=function(t){var e="on"+t.type;this[e]&&this[e](t)},i.filterFindElements=function(t,n){t=i.makeArray(t);var o=[];return t.forEach(function(t){if(t instanceof HTMLElement){if(!n)return void o.push(t);e(t,n)&&o.push(t);for(var i=t.querySelectorAll(n),r=0;r<i.length;r++)o.push(i[r])}}),o},i.debounceMethod=function(t,e,i){var n=t.prototype[e],o=e+"Timeout";t.prototype[e]=function(){var t=this[o];t&&clearTimeout(t);var e=arguments,r=this;this[o]=setTimeout(function(){n.apply(r,e),delete r[o]},i||100)}},i.docReady=function(t){"complete"==document.readyState?t():document.addEventListener("DOMContentLoaded",t)},i.toDashed=function(t){return t.replace(/(.)([A-Z])/g,function(t,e,i){return e+"-"+i}).toLowerCase()};var n=t.console;return i.htmlInit=function(e,o){i.docReady(function(){var r=i.toDashed(o),s="data-"+r,a=document.querySelectorAll("["+s+"]"),h=document.querySelectorAll(".js-"+r),u=i.makeArray(a).concat(i.makeArray(h)),d=s+"-options",c=t.jQuery;u.forEach(function(t){var i,r=t.getAttribute(s)||t.getAttribute(d);try{i=r&&JSON.parse(r)}catch(a){return void(n&&n.error("Error parsing "+s+" on "+t.className+": "+a))}var h=new e(t,i);c&&c.data(t,o,h)})})},i}),function(t,e){"function"==typeof define&&define.amd?define("outlayer/item",["ev-emitter/ev-emitter","get-size/get-size"],function(i,n){return e(t,i,n)}):"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter"),require("get-size")):(t.Outlayer={},t.Outlayer.Item=e(t,t.EvEmitter,t.getSize))}(window,function(t,e,i){"use strict";function n(t){for(var e in t)return!1;return e=null,!0}function o(t,e){t&&(this.element=t,this.layout=e,this.position={x:0,y:0},this._create())}function r(t){return t.replace(/([A-Z])/g,function(t){return"-"+t.toLowerCase()})}var s=document.documentElement.style,a="string"==typeof s.transition?"transition":"WebkitTransition",h="string"==typeof s.transform?"transform":"WebkitTransform",u={WebkitTransition:"webkitTransitionEnd",transition:"transitionend"}[a],d=[h,a,a+"Duration",a+"Property"],c=o.prototype=Object.create(e.prototype);c.constructor=o,c._create=function(){this._transn={ingProperties:{},clean:{},onEnd:{}},this.css({position:"absolute"})},c.handleEvent=function(t){var e="on"+t.type;this[e]&&this[e](t)},c.getSize=function(){this.size=i(this.element)},c.css=function(t){var e=this.element.style;for(var i in t){var n=d[i]||i;e[n]=t[i]}},c.getPosition=function(){var t=getComputedStyle(this.element),e=this.layout._getOption("originLeft"),i=this.layout._getOption("originTop"),n=t[e?"left":"right"],o=t[i?"top":"bottom"],r=this.layout.size,s=-1!=n.indexOf("%")?parseFloat(n)/100*r.width:parseInt(n,10),a=-1!=o.indexOf("%")?parseFloat(o)/100*r.height:parseInt(o,10);s=isNaN(s)?0:s,a=isNaN(a)?0:a,s-=e?r.paddingLeft:r.paddingRight,a-=i?r.paddingTop:r.paddingBottom,this.position.x=s,this.position.y=a},c.layoutPosition=function(){var t=this.layout.size,e={},i=this.layout._getOption("originLeft"),n=this.layout._getOption("originTop"),o=i?"paddingLeft":"paddingRight",r=i?"left":"right",s=i?"right":"left",a=this.position.x+t[o];e[r]=this.getXValue(a),e[s]="";var h=n?"paddingTop":"paddingBottom",u=n?"top":"bottom",d=n?"bottom":"top",c=this.position.y+t[h];e[u]=this.getYValue(c),e[d]="",this.css(e),this.emitEvent("layout",[this])},c.getXValue=function(t){var e=this.layout._getOption("horizontal");return this.layout.options.percentPosition&&!e?t/this.layout.size.width*100+"%":t+"px"},c.getYValue=function(t){var e=this.layout._getOption("horizontal");return this.layout.options.percentPosition&&e?t/this.layout.size.height*100+"%":t+"px"},c._transitionTo=function(t,e){this.getPosition();var i=this.position.x,n=this.position.y,o=parseInt(t,10),r=parseInt(e,10),s=o===this.position.x&&r===this.position.y;if(this.setPosition(t,e),s&&!this.isTransitioning)return void this.layoutPosition();var a=t-i,h=e-n,u={};u.transform=this.getTranslate(a,h),this.transition({to:u,onTransitionEnd:{transform:this.layoutPosition},isCleaning:!0})},c.getTranslate=function(t,e){var i=this.layout._getOption("originLeft"),n=this.layout._getOption("originTop");return t=i?t:-t,e=n?e:-e,"translate3d("+t+"px, "+e+"px, 0)"},c.goTo=function(t,e){this.setPosition(t,e),this.layoutPosition()},c.moveTo=c._transitionTo,c.setPosition=function(t,e){this.position.x=parseInt(t,10),this.position.y=parseInt(e,10)},c._nonTransition=function(t){this.css(t.to),t.isCleaning&&this._removeStyles(t.to);for(var e in t.onTransitionEnd)t.onTransitionEnd[e].call(this)},c._transition=function(t){if(!parseFloat(this.layout.options.transitionDuration))return void this._nonTransition(t);var e=this._transn;for(var i in t.onTransitionEnd)e.onEnd[i]=t.onTransitionEnd[i];for(i in t.to)e.ingProperties[i]=!0,t.isCleaning&&(e.clean[i]=!0);if(t.from){this.css(t.from);var n=this.element.offsetHeight;n=null}this.enableTransition(t.to),this.css(t.to),this.isTransitioning=!0};var l="opacity,"+r(d.transform||"transform");c.enableTransition=function(){this.isTransitioning||(this.css({transitionProperty:l,transitionDuration:this.layout.options.transitionDuration}),this.element.addEventListener(u,this,!1))},c.transition=o.prototype[a?"_transition":"_nonTransition"],c.onwebkitTransitionEnd=function(t){this.ontransitionend(t)},c.onotransitionend=function(t){this.ontransitionend(t)};var f={"-webkit-transform":"transform"};c.ontransitionend=function(t){if(t.target===this.element){var e=this._transn,i=f[t.propertyName]||t.propertyName;if(delete e.ingProperties[i],n(e.ingProperties)&&this.disableTransition(),i in e.clean&&(this.element.style[t.propertyName]="",delete e.clean[i]),i in e.onEnd){var o=e.onEnd[i];o.call(this),delete e.onEnd[i]}this.emitEvent("transitionEnd",[this])}},c.disableTransition=function(){this.removeTransitionStyles(),this.element.removeEventListener(u,this,!1),this.isTransitioning=!1},c._removeStyles=function(t){var e={};for(var i in t)e[i]="";this.css(e)};var m={transitionProperty:"",transitionDuration:""};return c.removeTransitionStyles=function(){this.css(m)},c.removeElem=function(){this.element.parentNode.removeChild(this.element),this.css({display:""}),this.emitEvent("remove",[this])},c.remove=function(){return a&&parseFloat(this.layout.options.transitionDuration)?(this.once("transitionEnd",function(){this.removeElem()}),void this.hide()):void this.removeElem()},c.reveal=function(){delete this.isHidden,this.css({display:""});var t=this.layout.options,e={},i=this.getHideRevealTransitionEndProperty("visibleStyle");e[i]=this.onRevealTransitionEnd,this.transition({from:t.hiddenStyle,to:t.visibleStyle,isCleaning:!0,onTransitionEnd:e})},c.onRevealTransitionEnd=function(){this.isHidden||this.emitEvent("reveal")},c.getHideRevealTransitionEndProperty=function(t){var e=this.layout.options[t];if(e.opacity)return"opacity";for(var i in e)return i},c.hide=function(){this.isHidden=!0,this.css({display:""});var t=this.layout.options,e={},i=this.getHideRevealTransitionEndProperty("hiddenStyle");e[i]=this.onHideTransitionEnd,this.transition({from:t.visibleStyle,to:t.hiddenStyle,isCleaning:!0,onTransitionEnd:e})},c.onHideTransitionEnd=function(){this.isHidden&&(this.css({display:"none"}),this.emitEvent("hide"))},c.destroy=function(){this.css({position:"",left:"",right:"",top:"",bottom:"",transition:"",transform:""})},o}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("outlayer/outlayer",["ev-emitter/ev-emitter","get-size/get-size","fizzy-ui-utils/utils","./item"],function(i,n,o,r){return e(t,i,n,o,r)}):"object"==typeof module&&module.exports?module.exports=e(t,require("ev-emitter"),require("get-size"),require("fizzy-ui-utils"),require("./item")):t.Outlayer=e(t,t.EvEmitter,t.getSize,t.fizzyUIUtils,t.Outlayer.Item)}(window,function(t,e,i,n,o){"use strict";function r(t,e){var i=n.getQueryElement(t);if(!i)return void(a&&a.error("Bad element for "+this.constructor.namespace+": "+(i||t)));this.element=i,h&&(this.$element=h(this.element)),this.options=n.extend({},this.constructor.defaults),this.option(e);var o=++d;this.element.outlayerGUID=o,c[o]=this,this._create();var r=this._getOption("initLayout");r&&this.layout()}function s(t){function e(){t.apply(this,arguments)}return e.prototype=Object.create(t.prototype),e.prototype.constructor=e,e}var a=t.console,h=t.jQuery,u=function(){},d=0,c={};r.namespace="outlayer",r.Item=o,r.defaults={containerStyle:{position:"relative"},initLayout:!0,originLeft:!0,originTop:!0,resize:!0,resizeContainer:!0,transitionDuration:"0.4s",hiddenStyle:{opacity:0,transform:"scale(0.001)"},visibleStyle:{opacity:1,transform:"scale(1)"}};var l=r.prototype;return n.extend(l,e.prototype),l.option=function(t){n.extend(this.options,t)},l._getOption=function(t){var e=this.constructor.compatOptions[t];return e&&void 0!==this.options[e]?this.options[e]:this.options[t]},r.compatOptions={initLayout:"isInitLayout",horizontal:"isHorizontal",layoutInstant:"isLayoutInstant",originLeft:"isOriginLeft",originTop:"isOriginTop",resize:"isResizeBound",resizeContainer:"isResizingContainer"},l._create=function(){this.reloadItems(),this.stamps=[],this.stamp(this.options.stamp),n.extend(this.element.style,this.options.containerStyle);var t=this._getOption("resize");t&&this.bindResize()},l.reloadItems=function(){this.items=this._itemize(this.element.children)},l._itemize=function(t){for(var e=this._filterFindItemElements(t),i=this.constructor.Item,n=[],o=0;o<e.length;o++){var r=e[o],s=new i(r,this);n.push(s)}return n},l._filterFindItemElements=function(t){return n.filterFindElements(t,this.options.itemSelector)},l.getItemElements=function(){return this.items.map(function(t){return t.element})},l.layout=function(){this._resetLayout(),this._manageStamps();var t=this._getOption("layoutInstant"),e=void 0!==t?t:!this._isLayoutInited;this.layoutItems(this.items,e),this._isLayoutInited=!0},l._init=l.layout,l._resetLayout=function(){this.getSize()},l.getSize=function(){this.size=i(this.element)},l._getMeasurement=function(t,e){var n,o=this.options[t];o?("string"==typeof o?n=this.element.querySelector(o):o instanceof HTMLElement&&(n=o),this[t]=n?i(n)[e]:o):this[t]=0},l.layoutItems=function(t,e){t=this._getItemsForLayout(t),this._layoutItems(t,e),this._postLayout()},l._getItemsForLayout=function(t){return t.filter(function(t){return!t.isIgnored})},l._layoutItems=function(t,e){if(this._emitCompleteOnItems("layout",t),t&&t.length){var i=[];t.forEach(function(t){var n=this._getItemLayoutPosition(t);n.item=t,n.isInstant=e||t.isLayoutInstant,i.push(n)},this),this._processLayoutQueue(i)}},l._getItemLayoutPosition=function(){return{x:0,y:0}},l._processLayoutQueue=function(t){t.forEach(function(t){this._positionItem(t.item,t.x,t.y,t.isInstant)},this)},l._positionItem=function(t,e,i,n){n?t.goTo(e,i):t.moveTo(e,i)},l._postLayout=function(){this.resizeContainer()},l.resizeContainer=function(){var t=this._getOption("resizeContainer");if(t){var e=this._getContainerSize();e&&(this._setContainerMeasure(e.width,!0),this._setContainerMeasure(e.height,!1))}},l._getContainerSize=u,l._setContainerMeasure=function(t,e){if(void 0!==t){var i=this.size;i.isBorderBox&&(t+=e?i.paddingLeft+i.paddingRight+i.borderLeftWidth+i.borderRightWidth:i.paddingBottom+i.paddingTop+i.borderTopWidth+i.borderBottomWidth),t=Math.max(t,0),this.element.style[e?"width":"height"]=t+"px"}},l._emitCompleteOnItems=function(t,e){function i(){o.dispatchEvent(t+"Complete",null,[e])}function n(){s++,s==r&&i()}var o=this,r=e.length;if(!e||!r)return void i();var s=0;e.forEach(function(e){e.once(t,n)})},l.dispatchEvent=function(t,e,i){var n=e?[e].concat(i):i;if(this.emitEvent(t,n),h)if(this.$element=this.$element||h(this.element),e){var o=h.Event(e);o.type=t,this.$element.trigger(o,i)}else this.$element.trigger(t,i)},l.ignore=function(t){var e=this.getItem(t);e&&(e.isIgnored=!0)},l.unignore=function(t){var e=this.getItem(t);e&&delete e.isIgnored},l.stamp=function(t){t=this._find(t),t&&(this.stamps=this.stamps.concat(t),t.forEach(this.ignore,this))},l.unstamp=function(t){t=this._find(t),t&&t.forEach(function(t){n.removeFrom(this.stamps,t),this.unignore(t)},this)},l._find=function(t){return t?("string"==typeof t&&(t=this.element.querySelectorAll(t)),t=n.makeArray(t)):void 0},l._manageStamps=function(){this.stamps&&this.stamps.length&&(this._getBoundingRect(),this.stamps.forEach(this._manageStamp,this))},l._getBoundingRect=function(){var t=this.element.getBoundingClientRect(),e=this.size;this._boundingRect={left:t.left+e.paddingLeft+e.borderLeftWidth,top:t.top+e.paddingTop+e.borderTopWidth,right:t.right-(e.paddingRight+e.borderRightWidth),bottom:t.bottom-(e.paddingBottom+e.borderBottomWidth)}},l._manageStamp=u,l._getElementOffset=function(t){var e=t.getBoundingClientRect(),n=this._boundingRect,o=i(t),r={left:e.left-n.left-o.marginLeft,top:e.top-n.top-o.marginTop,right:n.right-e.right-o.marginRight,bottom:n.bottom-e.bottom-o.marginBottom};return r},l.handleEvent=n.handleEvent,l.bindResize=function(){t.addEventListener("resize",this),this.isResizeBound=!0},l.unbindResize=function(){t.removeEventListener("resize",this),this.isResizeBound=!1},l.onresize=function(){this.resize()},n.debounceMethod(r,"onresize",100),l.resize=function(){this.isResizeBound&&this.needsResizeLayout()&&this.layout()},l.needsResizeLayout=function(){var t=i(this.element),e=this.size&&t;return e&&t.innerWidth!==this.size.innerWidth},l.addItems=function(t){var e=this._itemize(t);return e.length&&(this.items=this.items.concat(e)),e},l.appended=function(t){var e=this.addItems(t);e.length&&(this.layoutItems(e,!0),this.reveal(e))},l.prepended=function(t){var e=this._itemize(t);if(e.length){var i=this.items.slice(0);this.items=e.concat(i),this._resetLayout(),this._manageStamps(),this.layoutItems(e,!0),this.reveal(e),this.layoutItems(i)}},l.reveal=function(t){this._emitCompleteOnItems("reveal",t),t&&t.length&&t.forEach(function(t){t.reveal()})},l.hide=function(t){this._emitCompleteOnItems("hide",t),t&&t.length&&t.forEach(function(t){t.hide()})},l.revealItemElements=function(t){var e=this.getItems(t);this.reveal(e)},l.hideItemElements=function(t){var e=this.getItems(t);this.hide(e)},l.getItem=function(t){for(var e=0;e<this.items.length;e++){var i=this.items[e];if(i.element==t)return i}},l.getItems=function(t){t=n.makeArray(t);var e=[];return t.forEach(function(t){var i=this.getItem(t);i&&e.push(i)},this),e},l.remove=function(t){var e=this.getItems(t);this._emitCompleteOnItems("remove",e),e&&e.length&&e.forEach(function(t){t.remove(),n.removeFrom(this.items,t)},this)},l.destroy=function(){var t=this.element.style;t.height="",t.position="",t.width="",this.items.forEach(function(t){t.destroy()}),this.unbindResize();var e=this.element.outlayerGUID;delete c[e],delete this.element.outlayerGUID,h&&h.removeData(this.element,this.constructor.namespace)},r.data=function(t){t=n.getQueryElement(t);var e=t&&t.outlayerGUID;return e&&c[e]},r.create=function(t,e){var i=s(r);return i.defaults=n.extend({},r.defaults),n.extend(i.defaults,e),i.compatOptions=n.extend({},r.compatOptions),i.namespace=t,i.data=r.data,i.Item=s(o),n.htmlInit(i,t),h&&h.bridget&&h.bridget(t,i),i},r.Item=o,r}),function(t,e){"function"==typeof define&&define.amd?define(["outlayer/outlayer","get-size/get-size"],e):"object"==typeof module&&module.exports?module.exports=e(require("outlayer"),require("get-size")):t.Masonry=e(t.Outlayer,t.getSize)}(window,function(t,e){var i=t.create("masonry");return i.compatOptions.fitWidth="isFitWidth",i.prototype._resetLayout=function(){this.getSize(),this._getMeasurement("columnWidth","outerWidth"),this._getMeasurement("gutter","outerWidth"),this.measureColumns(),this.colYs=[];for(var t=0;t<this.cols;t++)this.colYs.push(0);this.maxY=0},i.prototype.measureColumns=function(){if(this.getContainerWidth(),!this.columnWidth){var t=this.items[0],i=t&&t.element;this.columnWidth=i&&e(i).outerWidth||this.containerWidth}var n=this.columnWidth+=this.gutter,o=this.containerWidth+this.gutter,r=o/n,s=n-o%n,a=s&&1>s?"round":"floor";r=Math[a](r),this.cols=Math.max(r,1)},i.prototype.getContainerWidth=function(){var t=this._getOption("fitWidth"),i=t?this.element.parentNode:this.element,n=e(i);this.containerWidth=n&&n.innerWidth},i.prototype._getItemLayoutPosition=function(t){t.getSize();var e=t.size.outerWidth%this.columnWidth,i=e&&1>e?"round":"ceil",n=Math[i](t.size.outerWidth/this.columnWidth);n=Math.min(n,this.cols);for(var o=this._getColGroup(n),r=Math.min.apply(Math,o),s=o.indexOf(r),a={x:this.columnWidth*s,y:r},h=r+t.size.outerHeight,u=this.cols+1-o.length,d=0;u>d;d++)this.colYs[s+d]=h;return a},i.prototype._getColGroup=function(t){if(2>t)return this.colYs;for(var e=[],i=this.cols+1-t,n=0;i>n;n++){var o=this.colYs.slice(n,n+t);e[n]=Math.max.apply(Math,o)}return e},i.prototype._manageStamp=function(t){var i=e(t),n=this._getElementOffset(t),o=this._getOption("originLeft"),r=o?n.left:n.right,s=r+i.outerWidth,a=Math.floor(r/this.columnWidth);a=Math.max(0,a);var h=Math.floor(s/this.columnWidth);h-=s%this.columnWidth?0:1,h=Math.min(this.cols-1,h);for(var u=this._getOption("originTop"),d=(u?n.top:n.bottom)+i.outerHeight,c=a;h>=c;c++)this.colYs[c]=Math.max(d,this.colYs[c])},i.prototype._getContainerSize=function(){this.maxY=Math.max.apply(Math,this.colYs);var t={height:this.maxY};return this._getOption("fitWidth")&&(t.width=this._getContainerFitWidth()),t},i.prototype._getContainerFitWidth=function(){for(var t=0,e=this.cols;--e&&0===this.colYs[e];)t++;return(this.cols-t)*this.columnWidth-this.gutter},i.prototype.needsResizeLayout=function(){var t=this.containerWidth;return this.getContainerWidth(),t!=this.containerWidth},i}); \ No newline at end of file diff --git a/public/js/salvattore.min.js b/public/js/salvattore.min.js deleted file mode 100644 index d515c53101f6322bc6ed9006fe8e8157f3e975f6..0000000000000000000000000000000000000000 --- a/public/js/salvattore.min.js +++ /dev/null @@ -1,603 +0,0 @@ -/*! - * Salvattore 1.0.9 by @rnmp and @ppold - * https://github.com/rnmp/salvattore - */ -(function(root, factory) { - if (typeof define === 'function' && define.amd) { - define([], factory); - } else if (typeof exports === 'object') { - module.exports = factory(); - } else { - root.salvattore = factory(); - } -}(this, function() { -/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas, David Knight. Dual MIT/BSD license */ - -if (!window.matchMedia) { - window.matchMedia = function() { - "use strict"; - - // For browsers that support matchMedium api such as IE 9 and webkit - var styleMedia = (window.styleMedia || window.media); - - // For those that don't support matchMedium - if (!styleMedia) { - var style = document.createElement('style'), - script = document.getElementsByTagName('script')[0], - info = null; - - style.type = 'text/css'; - style.id = 'matchmediajs-test'; - - script.parentNode.insertBefore(style, script); - - // 'style.currentStyle' is used by IE <= 8 and 'window.getComputedStyle' for all other browsers - info = ('getComputedStyle' in window) && window.getComputedStyle(style, null) || style.currentStyle; - - styleMedia = { - matchMedium: function(media) { - var text = '@media ' + media + '{ #matchmediajs-test { width: 1px; } }'; - - // 'style.styleSheet' is used by IE <= 8 and 'style.textContent' for all other browsers - if (style.styleSheet) { - style.styleSheet.cssText = text; - } else { - style.textContent = text; - } - - // Test if media query is true or false - return info.width === '1px'; - } - }; - } - - return function(media) { - return { - matches: styleMedia.matchMedium(media || 'all'), - media: media || 'all' - }; - }; - }(); -} - -/*! matchMedia() polyfill addListener/removeListener extension. Author & copyright (c) 2012: Scott Jehl. Dual MIT/BSD license */ -(function(){ - "use strict"; - - // Bail out for browsers that have addListener support - if (window.matchMedia && window.matchMedia('all').addListener) { - return false; - } - - var localMatchMedia = window.matchMedia, - hasMediaQueries = localMatchMedia('only all').matches, - isListening = false, - timeoutID = 0, // setTimeout for debouncing 'handleChange' - queries = [], // Contains each 'mql' and associated 'listeners' if 'addListener' is used - handleChange = function(evt) { - // Debounce - clearTimeout(timeoutID); - - timeoutID = setTimeout(function() { - for (var i = 0, il = queries.length; i < il; i++) { - var mql = queries[i].mql, - listeners = queries[i].listeners || [], - matches = localMatchMedia(mql.media).matches; - - // Update mql.matches value and call listeners - // Fire listeners only if transitioning to or from matched state - if (matches !== mql.matches) { - mql.matches = matches; - - for (var j = 0, jl = listeners.length; j < jl; j++) { - listeners[j].call(window, mql); - } - } - } - }, 30); - }; - - window.matchMedia = function(media) { - var mql = localMatchMedia(media), - listeners = [], - index = 0; - - mql.addListener = function(listener) { - // Changes would not occur to css media type so return now (Affects IE <= 8) - if (!hasMediaQueries) { - return; - } - - // Set up 'resize' listener for browsers that support CSS3 media queries (Not for IE <= 8) - // There should only ever be 1 resize listener running for performance - if (!isListening) { - isListening = true; - window.addEventListener('resize', handleChange, true); - } - - // Push object only if it has not been pushed already - if (index === 0) { - index = queries.push({ - mql : mql, - listeners : listeners - }); - } - - listeners.push(listener); - }; - - mql.removeListener = function(listener) { - for (var i = 0, il = listeners.length; i < il; i++){ - if (listeners[i] === listener){ - listeners.splice(i, 1); - } - } - }; - - return mql; - }; -}()); - -// http://paulirish.com/2011/requestanimationframe-for-smart-animating/ -// http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating - -// requestAnimationFrame polyfill by Erik Möller. fixes from Paul Irish and Tino Zijdel - -// MIT license - -(function() { - "use strict"; - - var lastTime = 0; - var vendors = ['ms', 'moz', 'webkit', 'o']; - for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { - window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame']; - window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] || - window[vendors[x]+'CancelRequestAnimationFrame']; - } - - if (!window.requestAnimationFrame) - window.requestAnimationFrame = function(callback, element) { - var currTime = new Date().getTime(); - var timeToCall = Math.max(0, 16 - (currTime - lastTime)); - var id = window.setTimeout(function() { callback(currTime + timeToCall); }, - timeToCall); - lastTime = currTime + timeToCall; - return id; - }; - - if (!window.cancelAnimationFrame) - window.cancelAnimationFrame = function(id) { - clearTimeout(id); - }; -}()); - -// https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent - -if (typeof window.CustomEvent !== "function") { - (function() { - "use strict"; - function CustomEvent(event, params) { - params = params || { bubbles: false, cancelable: false, detail: undefined }; - var evt = document.createEvent('CustomEvent'); - evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail); - return evt; - } - - CustomEvent.prototype = window.Event.prototype; - - window.CustomEvent = CustomEvent; - })(); -} - -/* jshint laxcomma: true */ -var salvattore = (function (global, document, undefined) { -"use strict"; - -var self = {}, - grids = [], - mediaRules = [], - mediaQueries = [], - add_to_dataset = function(element, key, value) { - // uses dataset function or a fallback for <ie10 - if (element.dataset) { - element.dataset[key] = value; - } else { - element.setAttribute("data-" + key, value); - } - return; - }; - -self.obtainGridSettings = function obtainGridSettings(element) { - // returns the number of columns and the classes a column should have, - // from computing the style of the ::before pseudo-element of the grid. - - var computedStyle = global.getComputedStyle(element, ":before") - , content = computedStyle.getPropertyValue("content").slice(1, -1) - , matchResult = content.match(/^\s*(\d+)(?:\s?\.(.+))?\s*$/) - , numberOfColumns = 1 - , columnClasses = [] - ; - - if (matchResult) { - numberOfColumns = matchResult[1]; - columnClasses = matchResult[2]; - columnClasses = columnClasses? columnClasses.split(".") : ["column"]; - } else { - matchResult = content.match(/^\s*\.(.+)\s+(\d+)\s*$/); - if (matchResult) { - columnClasses = matchResult[1]; - numberOfColumns = matchResult[2]; - if (numberOfColumns) { - numberOfColumns = numberOfColumns.split("."); - } - } - } - - return { - numberOfColumns: numberOfColumns, - columnClasses: columnClasses - }; -}; - - -self.addColumns = function addColumns(grid, items) { - // from the settings obtained, it creates columns with - // the configured classes and adds to them a list of items. - - var settings = self.obtainGridSettings(grid) - , numberOfColumns = settings.numberOfColumns - , columnClasses = settings.columnClasses - , columnsItems = new Array(+numberOfColumns) - , columnsFragment = document.createDocumentFragment() - , i = numberOfColumns - , selector - ; - - while (i-- !== 0) { - selector = "[data-columns] > *:nth-child(" + numberOfColumns + "n-" + i + ")"; - columnsItems.push(items.querySelectorAll(selector)); - } - - columnsItems.forEach(function append_to_grid_fragment(rows) { - var column = document.createElement("div") - , rowsFragment = document.createDocumentFragment() - ; - - column.className = columnClasses.join(" "); - - Array.prototype.forEach.call(rows, function append_to_column(row) { - rowsFragment.appendChild(row); - }); - column.appendChild(rowsFragment); - columnsFragment.appendChild(column); - }); - - grid.appendChild(columnsFragment); - add_to_dataset(grid, 'columns', numberOfColumns); -}; - - -self.removeColumns = function removeColumns(grid) { - // removes all the columns from a grid, and returns a list - // of items sorted by the ordering of columns. - - var range = document.createRange(); - range.selectNodeContents(grid); - - var columns = Array.prototype.filter.call(range.extractContents().childNodes, function filter_elements(node) { - return node instanceof global.HTMLElement; - }); - - var numberOfColumns = columns.length - , numberOfRowsInFirstColumn = columns[0].childNodes.length - , sortedRows = new Array(numberOfRowsInFirstColumn * numberOfColumns) - ; - - Array.prototype.forEach.call(columns, function iterate_columns(column, columnIndex) { - Array.prototype.forEach.call(column.children, function iterate_rows(row, rowIndex) { - sortedRows[rowIndex * numberOfColumns + columnIndex] = row; - }); - }); - - var container = document.createElement("div"); - add_to_dataset(container, 'columns', 0); - - sortedRows.filter(function filter_non_null(child) { - return !!child; - }).forEach(function append_row(child) { - container.appendChild(child); - }); - - return container; -}; - - -self.recreateColumns = function recreateColumns(grid) { - // removes all the columns from the grid, and adds them again, - // it is used when the number of columns change. - - global.requestAnimationFrame(function render_after_css_mediaQueryChange() { - self.addColumns(grid, self.removeColumns(grid)); - var columnsChange = new CustomEvent("columnsChange"); - grid.dispatchEvent(columnsChange); - }); -}; - - -self.mediaQueryChange = function mediaQueryChange(mql) { - // recreates the columns when a media query matches the current state - // of the browser. - - if (mql.matches) { - Array.prototype.forEach.call(grids, self.recreateColumns); - } -}; - - -self.getCSSRules = function getCSSRules(stylesheet) { - // returns a list of css rules from a stylesheet - - var cssRules; - try { - cssRules = stylesheet.sheet.cssRules || stylesheet.sheet.rules; - } catch (e) { - return []; - } - - return cssRules || []; -}; - - -self.getStylesheets = function getStylesheets() { - // returns a list of all the styles in the document (that are accessible). - - var inlineStyleBlocks = Array.prototype.slice.call(document.querySelectorAll("style")); - inlineStyleBlocks.forEach(function(stylesheet, idx) { - if (stylesheet.type !== 'text/css' && stylesheet.type !== '') { - inlineStyleBlocks.splice(idx, 1); - } - }); - - return Array.prototype.concat.call( - inlineStyleBlocks, - Array.prototype.slice.call(document.querySelectorAll("link[rel='stylesheet']")) - ); -}; - - -self.mediaRuleHasColumnsSelector = function mediaRuleHasColumnsSelector(rules) { - // checks if a media query css rule has in its contents a selector that - // styles the grid. - - var i, rule; - - try { - i = rules.length; - } - catch (e) { - i = 0; - } - - while (i--) { - rule = rules[i]; - if (rule.selectorText && rule.selectorText.match(/\[data-columns\](.*)::?before$/)) { - return true; - } - } - - return false; -}; - - -self.scanMediaQueries = function scanMediaQueries() { - // scans all the stylesheets for selectors that style grids, - // if the matchMedia API is supported. - - var newMediaRules = []; - - if (!global.matchMedia) { - return; - } - - self.getStylesheets().forEach(function extract_rules(stylesheet) { - Array.prototype.forEach.call(self.getCSSRules(stylesheet), function filter_by_column_selector(rule) { - // rule.media throws an 'not implemented error' in ie9 for import rules occasionally - try { - if (rule.media && rule.cssRules && self.mediaRuleHasColumnsSelector(rule.cssRules)) { - newMediaRules.push(rule); - } - } catch (e) {} - }); - }); - - // remove matchMedia listeners from the old rules - var oldRules = mediaRules.filter(function (el) { - return newMediaRules.indexOf(el) === -1; - }); - mediaQueries.filter(function (el) { - return oldRules.indexOf(el.rule) !== -1; - }).forEach(function (el) { - el.mql.removeListener(self.mediaQueryChange); - }); - mediaQueries = mediaQueries.filter(function (el) { - return oldRules.indexOf(el.rule) === -1; - }); - - // add matchMedia listeners to the new rules - newMediaRules.filter(function (el) { - return mediaRules.indexOf(el) == -1; - }).forEach(function (rule) { - var mql = global.matchMedia(rule.media.mediaText); - mql.addListener(self.mediaQueryChange); - mediaQueries.push({rule: rule, mql:mql}); - }); - - // swap mediaRules with the new set - mediaRules.length = 0; - mediaRules = newMediaRules; -}; - - -self.rescanMediaQueries = function rescanMediaQueries() { - self.scanMediaQueries(); - Array.prototype.forEach.call(grids, self.recreateColumns); -}; - - -self.nextElementColumnIndex = function nextElementColumnIndex(grid, fragments) { - // returns the index of the column where the given element must be added. - - var children = grid.children - , m = children.length - , lowestRowCount = 0 - , child - , currentRowCount - , i - , index = 0 - ; - for (i = 0; i < m; i++) { - child = children[i]; - currentRowCount = child.children.length + (fragments[i].children || fragments[i].childNodes).length; - if(lowestRowCount === 0) { - lowestRowCount = currentRowCount; - } - if(currentRowCount < lowestRowCount) { - index = i; - lowestRowCount = currentRowCount; - } - } - - return index; -}; - - -self.createFragmentsList = function createFragmentsList(quantity) { - // returns a list of fragments - - var fragments = new Array(quantity) - , i = 0 - ; - - while (i !== quantity) { - fragments[i] = document.createDocumentFragment(); - i++; - } - - return fragments; -}; - - -self.appendElements = function appendElements(grid, elements) { - // adds a list of elements to the end of a grid - - var columns = grid.children - , numberOfColumns = columns.length - , fragments = self.createFragmentsList(numberOfColumns) - ; - - Array.prototype.forEach.call(elements, function append_to_next_fragment(element) { - var columnIndex = self.nextElementColumnIndex(grid, fragments); - fragments[columnIndex].appendChild(element); - }); - - Array.prototype.forEach.call(columns, function insert_column(column, index) { - column.appendChild(fragments[index]); - }); -}; - - -self.prependElements = function prependElements(grid, elements) { - // adds a list of elements to the start of a grid - - var columns = grid.children - , numberOfColumns = columns.length - , fragments = self.createFragmentsList(numberOfColumns) - , columnIndex = numberOfColumns - 1 - ; - - elements.forEach(function append_to_next_fragment(element) { - var fragment = fragments[columnIndex]; - fragment.insertBefore(element, fragment.firstChild); - if (columnIndex === 0) { - columnIndex = numberOfColumns - 1; - } else { - columnIndex--; - } - }); - - Array.prototype.forEach.call(columns, function insert_column(column, index) { - column.insertBefore(fragments[index], column.firstChild); - }); - - // populates a fragment with n columns till the right - var fragment = document.createDocumentFragment() - , numberOfColumnsToExtract = elements.length % numberOfColumns - ; - - while (numberOfColumnsToExtract-- !== 0) { - fragment.appendChild(grid.lastChild); - } - - // adds the fragment to the left - grid.insertBefore(fragment, grid.firstChild); -}; - - -self.registerGrid = function registerGrid (grid) { - if (global.getComputedStyle(grid).display === "none") { - return; - } - - // retrieve the list of items from the grid itself - var range = document.createRange(); - range.selectNodeContents(grid); - - var items = document.createElement("div"); - items.appendChild(range.extractContents()); - - - add_to_dataset(items, 'columns', 0); - self.addColumns(grid, items); - grids.push(grid); -}; - - -self.init = function init() { - // adds required CSS rule to hide 'content' based - // configuration. - - var css = document.createElement("style"); - css.innerHTML = "[data-columns]::before{display:block;visibility:hidden;position:absolute;font-size:1px;}"; - document.head.appendChild(css); - - // scans all the grids in the document and generates - // columns from their configuration. - - var gridElements = document.querySelectorAll("[data-columns]"); - Array.prototype.forEach.call(gridElements, self.registerGrid); - self.scanMediaQueries(); -}; - -self.init(); - -return { - appendElements: self.appendElements, - prependElements: self.prependElements, - registerGrid: self.registerGrid, - recreateColumns: self.recreateColumns, - rescanMediaQueries: self.rescanMediaQueries, - init: self.init, - - // maintains backwards compatibility with underscore style method names - append_elements: self.appendElements, - prepend_elements: self.prependElements, - register_grid: self.registerGrid, - recreate_columns: self.recreateColumns, - rescan_media_queries: self.rescanMediaQueries -}; - -})(window, window.document); - -return salvattore; -})); \ No newline at end of file