Use spin.js for loaders

couchpotato/core/plugins/movie/static/movie.css

@@ -88,7 +88,7 @@
 				font-weight: bold;
 				margin-bottom: 10px;
 				float: left;
-				width: 50%;
+				width: 90%;
 				transition: all 0.2s linear;
 			}
 				.movies .list_view .info .title, .movies .mass_edit_view .info .title {

couchpotato/core/plugins/movie/static/search.css

@@ -83,10 +83,6 @@
 			left: 346px;
 		}
 
-	.search_form .spinner {
-		background: rgba(92,105,123,0.7) url('../images/spinner.gif') no-repeat 345px 10px;
-	}
-
 	.search_form .results {
 		max-height: 570px;
 		overflow-x: hidden;
@@ -197,3 +193,7 @@
 
 				.movie_result .info h2 span:before { content: "("; }
 				.movie_result .info h2 span:after { content: ")"; }
+
+.search_form .mask {
+	border-radius: 3px;
+}

couchpotato/core/plugins/movie/static/search.js

@@ -47,7 +47,7 @@ Block.Search = new Class({
 			)
 		);
 
-		self.spinner = new Spinner(self.result_container);
+		self.mask = new Element('div.mask').inject(self.result_container).fade('hide');
 
 	},
 
@@ -111,10 +111,14 @@ Block.Search = new Class({
 		var q = self.q();
 		var cache = self.cache[q];
 
-		self.hideResults(false)
+		self.hideResults(false);
 
 		if(!cache){
-			self.spinner.show()
+			self.positionMask().fade('in');
+
+			if(!self.spinner)
+				self.spinner = createSpinner(self.mask);
+
 			self.api_request = Api.request('movie.search', {
 				'data': {
 					'q': q
@@ -132,7 +136,7 @@ Block.Search = new Class({
 	fill: function(q, json){
 		var self = this;
 
-		self.spinner.hide();
+		self.positionMask()
 		self.cache[q] = json
 
 		self.movies = {}
@@ -154,9 +158,23 @@ Block.Search = new Class({
 			rc = self.result_container.getCoordinates();
 
 		self.results.setStyle('max-height', (w.y - rc.top - 50) + 'px')
+		self.mask.hide()
 
 	},
 
+	positionMask: function(){
+		var self = this;
+
+		var s = self.result_container.getSize()
+
+		return self.mask.setStyles({
+			'width': s.x,
+			'height': s.y
+		}).position({
+			'relativeTo': self.result_container
+		})
+	},
+
 	loading: function(bool){
 		this.el[bool ? 'addClass' : 'removeClass']('loading')
 	},
@@ -273,8 +291,6 @@ Block.Search.Item = new Class({
 				'title': self.title_select.get('value'),
 				'profile_id': self.profile_select.get('value')
 			},
-			'useSpinner': true,
-			'spinnerTarget': self.options,
 			'onComplete': function(){
 				self.options.empty();
 				self.options.adopt(

couchpotato/static/scripts/couchpotato.js

@@ -185,21 +185,24 @@ var CouchPotato = new Class({
 	blockPage: function(message, title){
 		var self = this;
 
-		if(!self.mask){
+		var body = $(document.body);
-			var body = $(document.body);
+		self.mask = new Element('div.mask').adopt(
-			self.mask = new Spinner(document.body, {
+			new Element('div').adopt(
-				'message': new Element('div').adopt(
+				new Element('h1', {'text': title || 'Unavailable'}),
-					new Element('h1', {'text': title || 'Unavailable'}),
+				new Element('div', {'text': message || 'Something must have crashed.. check the logs ;)'})
-					new Element('div', {'text': message || 'Something must have crashed.. check the logs ;)'})
+			)
-				)
+		).fade('hide').inject(document.body).fade('in');
-			});
+
-		}
+		createSpinner(self.mask, {
-		self.mask.show();
+			'top': -50
+		});
 	},
 
 	unBlockPage: function(){
 		var self = this;
-		self.mask.hide();
+		self.mask.get('tween').start('opacity', 0).chain(function(){
+			this.element.destroy()
+		});
 	},
 
 	createUrl: function(action, params){
@@ -363,3 +366,22 @@ function randomString(length, extra) {
 
 })();
 
+var createSpinner = function(target, options){
+	var opts = Object.merge({
+		lines: 12,
+		length: 5,
+		width: 4,
+		radius: 9,
+		color: '#fff',
+		speed: 1.9,
+		trail: 53,
+		shadow: false,
+		hwaccel: true,
+		className: 'spinner',
+		zIndex: 2e9,
+		top: 'auto',
+		left: 'auto'
+	}, options);
+
+	return new Spinner(opts).spin(target);
+}

couchpotato/static/scripts/library/spin.js

@@ -0,0 +1,301 @@
+//fgnass.github.com/spin.js#v1.2.4
+(function(window, document, undefined) {
+
+/**
+ * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
+ * Licensed under the MIT license
+ */
+
+  var prefixes = ['webkit', 'Moz', 'ms', 'O']; /* Vendor prefixes */
+  var animations = {}; /* Animation rules keyed by their name */
+  var useCssAnimations;
+
+  /**
+   * Utility function to create elements. If no tag name is given,
+   * a DIV is created. Optionally properties can be passed.
+   */
+  function createEl(tag, prop) {
+    var el = document.createElement(tag || 'div');
+    var n;
+
+    for(n in prop) {
+      el[n] = prop[n];
+    }
+    return el;
+  }
+
+  /**
+   * Appends children and returns the parent.
+   */
+  function ins(parent /* child1, child2, ...*/) {
+    for (var i=1, n=arguments.length; i<n; i++) {
+      parent.appendChild(arguments[i]);
+    }
+    return parent;
+  }
+
+  /**
+   * Insert a new stylesheet to hold the @keyframe or VML rules.
+   */
+  var sheet = function() {
+    var el = createEl('style');
+    ins(document.getElementsByTagName('head')[0], el);
+    return el.sheet || el.styleSheet;
+  }();
+
+  /**
+   * Creates an opacity keyframe animation rule and returns its name.
+   * Since most mobile Webkits have timing issues with animation-delay,
+   * we create separate rules for each line/segment.
+   */
+  function addAnimation(alpha, trail, i, lines) {
+    var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-');
+    var start = 0.01 + i/lines*100;
+    var z = Math.max(1-(1-alpha)/trail*(100-start) , alpha);
+    var prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase();
+    var pre = prefix && '-'+prefix+'-' || '';
+
+    if (!animations[name]) {
+      sheet.insertRule(
+        '@' + pre + 'keyframes ' + name + '{' +
+        '0%{opacity:'+z+'}' +
+        start + '%{opacity:'+ alpha + '}' +
+        (start+0.01) + '%{opacity:1}' +
+        (start+trail)%100 + '%{opacity:'+ alpha + '}' +
+        '100%{opacity:'+ z + '}' +
+        '}', 0);
+      animations[name] = 1;
+    }
+    return name;
+  }
+
+  /**
+   * Tries various vendor prefixes and returns the first supported property.
+   **/
+  function vendor(el, prop) {
+    var s = el.style;
+    var pp;
+    var i;
+
+    if(s[prop] !== undefined) return prop;
+    prop = prop.charAt(0).toUpperCase() + prop.slice(1);
+    for(i=0; i<prefixes.length; i++) {
+      pp = prefixes[i]+prop;
+      if(s[pp] !== undefined) return pp;
+    }
+  }
+
+  /**
+   * Sets multiple style properties at once.
+   */
+  function css(el, prop) {
+    for (var n in prop) {
+      el.style[vendor(el, n)||n] = prop[n];
+    }
+    return el;
+  }
+
+  /**
+   * Fills in default values.
+   */
+  function merge(obj) {
+    for (var i=1; i < arguments.length; i++) {
+      var def = arguments[i];
+      for (var n in def) {
+        if (obj[n] === undefined) obj[n] = def[n];
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * Returns the absolute page-offset of the given element.
+   */
+  function pos(el) {
+    var o = {x:el.offsetLeft, y:el.offsetTop};
+    while((el = el.offsetParent)) {
+      o.x+=el.offsetLeft;
+      o.y+=el.offsetTop;
+    }
+    return o;
+  }
+
+  var defaults = {
+    lines: 12,            // The number of lines to draw
+    length: 7,            // The length of each line
+    width: 5,             // The line thickness
+    radius: 10,           // The radius of the inner circle
+    color: '#000',        // #rgb or #rrggbb
+    speed: 1,             // Rounds per second
+    trail: 100,           // Afterglow percentage
+    opacity: 1/4,         // Opacity of the lines
+    fps: 20,              // Frames per second when using setTimeout()
+    zIndex: 2e9,          // Use a high z-index by default
+    className: 'spinner', // CSS class to assign to the element
+    top: 'auto',          // center vertically
+    left: 'auto'          // center horizontally
+  };
+
+  /** The constructor */
+  var Spinner = function Spinner(o) {
+    if (!this.spin) return new Spinner(o);
+    this.opts = merge(o || {}, Spinner.defaults, defaults);
+  };
+
+  Spinner.defaults = {};
+  Spinner.prototype = {
+    spin: function(target) {
+      this.stop();
+      var self = this;
+      var o = self.opts;
+      var el = self.el = css(createEl(0, {className: o.className}), {position: 'relative', zIndex: o.zIndex});
+      var mid = o.radius+o.length+o.width;
+      var ep; // element position
+      var tp; // target position
+
+      if (target) {
+        target.insertBefore(el, target.firstChild||null);
+        tp = pos(target);
+        ep = pos(el);
+        css(el, {
+          left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : o.left+mid) + 'px',
+          top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : o.top+mid)  + 'px'
+        });
+      }
+
+      el.setAttribute('aria-role', 'progressbar');
+      self.lines(el, self.opts);
+
+      if (!useCssAnimations) {
+        // No CSS animation support, use setTimeout() instead
+        var i = 0;
+        var fps = o.fps;
+        var f = fps/o.speed;
+        var ostep = (1-o.opacity)/(f*o.trail / 100);
+        var astep = f/o.lines;
+
+        !function anim() {
+          i++;
+          for (var s=o.lines; s; s--) {
+            var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity);
+            self.opacity(el, o.lines-s, alpha, o);
+          }
+          self.timeout = self.el && setTimeout(anim, ~~(1000/fps));
+        }();
+      }
+      return self;
+    },
+    stop: function() {
+      var el = this.el;
+      if (el) {
+        clearTimeout(this.timeout);
+        if (el.parentNode) el.parentNode.removeChild(el);
+        this.el = undefined;
+      }
+      return this;
+    },
+    lines: function(el, o) {
+      var i = 0;
+      var seg;
+
+      function fill(color, shadow) {
+        return css(createEl(), {
+          position: 'absolute',
+          width: (o.length+o.width) + 'px',
+          height: o.width + 'px',
+          background: color,
+          boxShadow: shadow,
+          transformOrigin: 'left',
+          transform: 'rotate(' + ~~(360/o.lines*i) + 'deg) translate(' + o.radius+'px' +',0)',
+          borderRadius: (o.width>>1) + 'px'
+        });
+      }
+      for (; i < o.lines; i++) {
+        seg = css(createEl(), {
+          position: 'absolute',
+          top: 1+~(o.width/2) + 'px',
+          transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
+          opacity: o.opacity,
+          animation: useCssAnimations && addAnimation(o.opacity, o.trail, i, o.lines) + ' ' + 1/o.speed + 's linear infinite'
+        });
+        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}));
+        ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')));
+      }
+      return el;
+    },
+    opacity: function(el, i, val) {
+      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val;
+    }
+  };
+
+  /////////////////////////////////////////////////////////////////////////
+  // VML rendering for IE
+  /////////////////////////////////////////////////////////////////////////
+
+  /**
+   * Check and init VML support
+   */
+  !function() {
+    var s = css(createEl('group'), {behavior: 'url(#default#VML)'});
+    var i;
+
+    if (!vendor(s, 'transform') && s.adj) {
+
+      // VML support detected. Insert CSS rules ...
+      for (i=4; i--;) sheet.addRule(['group', 'roundrect', 'fill', 'stroke'][i], 'behavior:url(#default#VML)');
+
+      Spinner.prototype.lines = function(el, o) {
+        var r = o.length+o.width;
+        var s = 2*r;
+
+        function grp() {
+          return css(createEl('group', {coordsize: s +' '+s, coordorigin: -r +' '+-r}), {width: s, height: s});
+        }
+
+        var margin = -(o.width+o.length)*2+'px';
+        var g = css(grp(), {position: 'absolute', top: margin, left: margin});
+
+        var i;
+
+        function seg(i, dx, filter) {
+          ins(g,
+            ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
+              ins(css(createEl('roundrect', {arcsize: 1}), {
+                  width: r,
+                  height: o.width,
+                  left: o.radius,
+                  top: -o.width>>1,
+                  filter: filter
+                }),
+                createEl('fill', {color: o.color, opacity: o.opacity}),
+                createEl('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
+              )
+            )
+          );
+        }
+
+        if (o.shadow) {
+          for (i = 1; i <= o.lines; i++) {
+            seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)');
+          }
+        }
+        for (i = 1; i <= o.lines; i++) seg(i);
+        return ins(el, g);
+      };
+      Spinner.prototype.opacity = function(el, i, val, o) {
+        var c = el.firstChild;
+        o = o.shadow && o.lines || 0;
+        if (c && i+o < c.childNodes.length) {
+          c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild;
+          if (c) c.opacity = val;
+        }
+      };
+    }
+    else {
+      useCssAnimations = vendor(s, 'animation');
+    }
+  }();
+
+  window.Spinner = Spinner;
+
+})(window, document);

couchpotato/static/style/main.css

@@ -84,7 +84,7 @@ a:hover { color: #f3f3f3; }
 
 .content {
 	clear:both;
-	padding: 80px 10px 10px;
+	padding: 80px 0 10px;
 }
 
 .footer {
@@ -117,7 +117,16 @@ form {
 body > .spinner, .mask{
 	background: rgba(0,0,0, 0.9);
 	z-index: 100;
+	text-align: center;
 }
+	body > .mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		padding: 200px;
+	}
 
 .button {
     background: #5082bc url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpi/v//vwMTAwPDfzjBgMpFI/7hFSOT9Y8qRuF3JLoHAQIMAHYtMmRA+CugAAAAAElFTkSuQmCC") repeat-x;
@@ -155,7 +164,7 @@ body > .spinner, .mask{
 /*** Navigation ***/
 .header {
 	background: #4e5969;
-	padding:10px;
+	padding: 10px 0;
 	height: 80px;
 	position: fixed;
 	margin: 0;
@@ -175,7 +184,7 @@ body > .spinner, .mask{
 }
 	.header .navigation {
 		display: inline-block;
-		width: 66.7%;
+		width: 67.2%;
 	}
 	.header .navigation ul {
 		margin: 0;

couchpotato/templates/_desktop.html

@@ -20,6 +20,7 @@
 		<script type="text/javascript" src="{{ url_for('web.static', filename='scripts/library/form_replacement/form_selectoption.js') }}"></script>
 		<script type="text/javascript" src="{{ url_for('web.static', filename='scripts/library/question.js') }}"></script>
 		<script type="text/javascript" src="{{ url_for('web.static', filename='scripts/library/scrollspy.js') }}"></script>
+		<script type="text/javascript" src="{{ url_for('web.static', filename='scripts/library/spin.js') }}"></script>
 
 		<script type="text/javascript" src="{{ url_for('web.static', filename='scripts/couchpotato.js') }}"></script>
 		<script type="text/javascript" src="{{ url_for('web.static', filename='scripts/api.js') }}"></script>