SONAR-4725 Update style of ui list component to increase the consistency

5 files changed, 41 insertions, 509 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
index 23e5dfb85bd..70625e1b77d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
@@ -41,7 +41,6 @@
     <%= javascript_include_tag 'third-party/underscore-min' %>
     <%= javascript_include_tag 'third-party/backbone-min' %>
     <%= javascript_include_tag 'third-party/jquery.ba-throttle-debounce.min.js' %>
-    <%= javascript_include_tag 'third-party/spin' %>
     <%= javascript_include_tag 'third-party/select2.min' %>
     <%= javascript_include_tag 'third-party/protovis' %>
     <%= javascript_include_tag 'protovis-sonar' %>
diff --git a/sonar-server/src/main/webapp/javascripts/select-list.js b/sonar-server/src/main/webapp/javascripts/select-list.js
index b2cb77dfd8b..ecec843a7f9 100644
--- a/sonar-server/src/main/webapp/javascripts/select-list.js
+++ b/sonar-server/src/main/webapp/javascripts/select-list.js
@@ -52,10 +52,13 @@
   var SelectListItemView = Backbone.View.extend({
     tagName: 'li',
 
-    checkboxTemplate: '<a class="select-list-list-checkbox"></a>',
+    template: function(d) {
+      return  '<input class="select-list-list-checkbox" type="checkbox">' +
+          '<div class="select-list-list-item">' + d + '</div>';
+    },
 
     events: {
-      'click .select-list-list-checkbox': 'toggle'
+      'change .select-list-list-checkbox': 'toggle'
     },
 
     initialize: function(options) {
@@ -64,25 +67,23 @@
     },
 
     render: function() {
-      this.$el.empty()
-          .append(this.checkboxTemplate)
-          .append(this.settings.format(this.model.toJSON()));
+      this.$el.html(this.template(this.settings.format(this.model.toJSON())));
       this.$el.toggleClass('selected', this.model.get('selected'));
-      this.$('.select-list-list-checkbox').attr('title',
-          this.model.get('selected') ?
-              this.settings.tooltips.deselect :
-              this.settings.tooltips.select);
+      this.$('.select-list-list-checkbox')
+          .prop('title',
+              this.model.get('selected') ?
+                  this.settings.tooltips.deselect :
+                  this.settings.tooltips.select)
+          .prop('checked', this.model.get('selected'));
     },
 
     remove: function(postpone) {
       if (postpone) {
         var that = this;
-        setTimeout(function() {
           that.$el.addClass('removed');
           setTimeout(function() {
             Backbone.View.prototype.remove.call(that, arguments);
           }, 500);
-        }, 500);
       } else {
         Backbone.View.prototype.remove.call(this, arguments);
       }
@@ -90,13 +91,9 @@
 
     toggle: function() {
       var selected = this.model.get('selected'),
-          that = this;
+          that = this,
+          url = selected ? this.settings.deselectUrl : this.settings.selectUrl;
 
-      this.$('.select-list-list-checkbox').addClass('with-spinner');
-      new Spinner(this.settings.spinnerSmall)
-          .spin(this.$('.select-list-list-checkbox')[0]);
-
-      var url = selected ? this.settings.deselectUrl : this.settings.selectUrl;
       $.ajax({
           url: url,
           type: 'POST',
@@ -279,14 +276,11 @@
     },
 
     showFetchSpinner: function() {
-      var options = $.extend(this.settings.spinnerBig, {
-        className: 'select-list-spinner'
-      });
-      new Spinner(options).spin(this.$el[0]);
+      this.$listContainer.addClass('loading');
     },
 
     hideFetchSpinner: function() {
-      this.$('.select-list-spinner').remove();
+      this.$listContainer.removeClass('loading');
     },
 
     scroll: function() {
@@ -368,45 +362,7 @@
       deselect: 'Click this to deselect item'
     },
 
-    errorMessage: 'Something gone wrong, try to reload the page and try again.',
-
-    spinnerSmall: {
-      lines: 9, // The number of lines to draw
-      length: 0, // The length of each line
-      width: 2, // The line thickness
-      radius: 4, // The radius of the inner circle
-      corners: 1, // Corner roundness (0..1)
-      rotate: 0, // The rotation offset
-      direction: 1, // 1: clockwise, -1: counterclockwise
-      color: '#4b9fd5', // #rgb or #rrggbb or array of colors
-      speed: 2, // Rounds per second
-      trail: 60, // Afterglow percentage
-      shadow: false, // Whether to render a shadow
-      hwaccel: false, // Whether to use hardware acceleration
-      className: 'spinner', // The CSS class to assign to the spinner
-      zIndex: 2e9, // The z-index (defaults to 2000000000)
-      top: 'auto', // Top position relative to parent in px
-      left: 'auto' // Left position relative to parent in px
-    },
-
-    spinnerBig: {
-      lines: 9, // The number of lines to draw
-      length: 0, // The length of each line
-      width: 6, // The line thickness
-      radius: 16, // The radius of the inner circle
-      corners: 1, // Corner roundness (0..1)
-      rotate: 0, // The rotation offset
-      direction: 1, // 1: clockwise, -1: counterclockwise
-      color: '#4b9fd5', // #rgb or #rrggbb or array of colors
-      speed: 2, // Rounds per second
-      trail: 60, // Afterglow percentage
-      shadow: false, // Whether to render a shadow
-      hwaccel: false, // Whether to use hardware acceleration
-      className: 'spinner', // The CSS class to assign to the spinner
-      zIndex: 2e9, // The z-index (defaults to 2000000000)
-      top: 'auto', // Top position relative to parent in px
-      left: 'auto' // Left position relative to parent in px
-    }
+    errorMessage: 'Something gone wrong, try to reload the page and try again.'
   };
 
 })(jQuery);
diff --git a/sonar-server/src/main/webapp/javascripts/third-party/spin.js b/sonar-server/src/main/webapp/javascripts/third-party/spin.js
deleted file mode 100755
index af1c55f0682..00000000000
--- a/sonar-server/src/main/webapp/javascripts/third-party/spin.js
+++ /dev/null
@@ -1,355 +0,0 @@
-//fgnass.github.com/spin.js#v1.3.2
-
-/**
- * Copyright (c) 2011-2013 Felix Gnass
- * Licensed under the MIT license
- */
-(function(root, factory) {
-
-  /* CommonJS */
-  if (typeof exports == 'object')  module.exports = factory()
-
-  /* AMD module */
-  else if (typeof define == 'function' && define.amd) define(factory)
-
-  /* Browser global */
-  else root.Spinner = factory()
-}
-(this, function() {
-  "use strict";
-
-  var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
-    , animations = {} /* Animation rules keyed by their name */
-    , useCssAnimations /* Whether to use CSS animations or setTimeout */
-
-  /**
-   * 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')
-      , 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', {type : 'text/css'})
-    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('-')
-      , start = 0.01 + i/lines * 100
-      , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
-      , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
-      , 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 + '}' +
-        '}', sheet.cssRules.length)
-
-      animations[name] = 1
-    }
-
-    return name
-  }
-
-  /**
-   * Tries various vendor prefixes and returns the first supported property.
-   */
-  function vendor(el, prop) {
-    var s = el.style
-      , pp
-      , i
-
-    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
-    }
-    if(s[prop] !== undefined) return prop
-  }
-
-  /**
-   * 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
-  }
-
-  /**
-   * Returns the line color from the given string or array.
-   */
-  function getColor(color, idx) {
-    return typeof color == 'string' ? color : color[idx % color.length]
-  }
-
-  // Built-in defaults
-
-  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
-    rotate: 0,            // Rotation offset
-    corners: 1,           // Roundness (0..1)
-    color: '#000',        // #rgb or #rrggbb
-    direction: 1,         // 1: clockwise, -1: counterclockwise
-    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
-    position: 'relative'  // element position
-  }
-
-  /** The constructor */
-  function Spinner(o) {
-    if (typeof this == 'undefined') return new Spinner(o)
-    this.opts = merge(o || {}, Spinner.defaults, defaults)
-  }
-
-  // Global defaults that override the built-ins:
-  Spinner.defaults = {}
-
-  merge(Spinner.prototype, {
-
-    /**
-     * Adds the spinner to the given target element. If this instance is already
-     * spinning, it is automatically removed from its previous target b calling
-     * stop() internally.
-     */
-    spin: function(target) {
-      this.stop()
-
-      var self = this
-        , o = self.opts
-        , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
-        , mid = o.radius+o.length+o.width
-        , ep // element position
-        , 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) : parseInt(o.left, 10) + mid) + 'px',
-          top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid)  + 'px'
-        })
-      }
-
-      el.setAttribute('role', 'progressbar')
-      self.lines(el, self.opts)
-
-      if (!useCssAnimations) {
-        // No CSS animation support, use setTimeout() instead
-        var i = 0
-          , start = (o.lines - 1) * (1 - o.direction) / 2
-          , alpha
-          , fps = o.fps
-          , f = fps/o.speed
-          , ostep = (1-o.opacity) / (f*o.trail / 100)
-          , astep = f/o.lines
-
-        ;(function anim() {
-          i++;
-          for (var j = 0; j < o.lines; j++) {
-            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
-
-            self.opacity(el, j * o.direction + start, alpha, o)
-          }
-          self.timeout = self.el && setTimeout(anim, ~~(1000/fps))
-        })()
-      }
-      return self
-    },
-
-    /**
-     * Stops and removes the Spinner.
-     */
-    stop: function() {
-      var el = this.el
-      if (el) {
-        clearTimeout(this.timeout)
-        if (el.parentNode) el.parentNode.removeChild(el)
-        this.el = undefined
-      }
-      return this
-    },
-
-    /**
-     * Internal method that draws the individual lines. Will be overwritten
-     * in VML fallback mode below.
-     */
-    lines: function(el, o) {
-      var i = 0
-        , start = (o.lines - 1) * (1 - o.direction) / 2
-        , 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+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
-          borderRadius: (o.corners * 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, start + i * o.direction, 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(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
-      }
-      return el
-    },
-
-    /**
-     * Internal method that adjusts the opacity of a single line.
-     * Will be overwritten in VML fallback mode below.
-     */
-    opacity: function(el, i, val) {
-      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
-    }
-
-  })
-
-
-  function initVML() {
-
-    /* Utility function to create a VML tag */
-    function vml(tag, attr) {
-      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
-    }
-
-    // No CSS transforms but VML support, add a CSS rule for VML elements:
-    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
-
-    Spinner.prototype.lines = function(el, o) {
-      var r = o.length+o.width
-        , s = 2*r
-
-      function grp() {
-        return css(
-          vml('group', {
-            coordsize: s + ' ' + s,
-            coordorigin: -r + ' ' + -r
-          }),
-          { width: s, height: s }
-        )
-      }
-
-      var margin = -(o.width+o.length)*2 + 'px'
-        , g = css(grp(), {position: 'absolute', top: margin, left: margin})
-        , i
-
-      function seg(i, dx, filter) {
-        ins(g,
-          ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
-            ins(css(vml('roundrect', {arcsize: o.corners}), {
-                width: r,
-                height: o.width,
-                left: o.radius,
-                top: -o.width>>1,
-                filter: filter
-              }),
-              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
-              vml('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
-      }
-    }
-  }
-
-  var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
-
-  if (!vendor(probe, 'transform') && probe.adj) initVML()
-  else useCssAnimations = vendor(probe, 'animation')
-
-  return Spinner
-
-}));
diff --git a/sonar-server/src/main/webapp/stylesheets/select-list.css b/sonar-server/src/main/webapp/stylesheets/select-list.css
index d0b4b1e6927..998459b7221 100644
--- a/sonar-server/src/main/webapp/stylesheets/select-list.css
+++ b/sonar-server/src/main/webapp/stylesheets/select-list.css
@@ -16,6 +16,10 @@
   box-sizing: border-box;
 }
 
+.select-list-list-container.loading .select-list-list {
+  display: none;
+}
+
 .select-list-list {
   overflow-x: hidden;
 }
@@ -24,30 +28,12 @@
     position: relative;
     display: block;
     margin-top: -1px;
-    padding: 5px 10px 5px 30px;
+    padding: 5px 10px;
     border-top: 1px solid #e0e0e0;
     color: #404040;
     transition: all 0.3s ease;
   }
 
-  .select-list-list > li.selected {
-    background-color: #e9f8fd;
-  }
-
-  .select-list-list > li.selected > .select-list-list-checkbox:before {
-    border-color: #4b9fd5;
-    background-color: #4b9fd5;
-    filter: alpha(opacity=100);
-    opacity: 1;
-  }
-
-  .select-list-list > li.selected > .select-list-list-checkbox:hover:before {
-    border-color: #4b9fd5;
-    background-color: #4b9fd5;
-    filter: alpha(opacity=60);
-    opacity: 0.6;
-  }
-
   .select-list-list > li.removed {
     -webkit-transform: translateX(100%);
        -moz-transform: translateX(100%);
@@ -57,65 +43,27 @@
   }
 
 .select-list-list-checkbox {
-  position: absolute;
-  top: 0; left: 0; bottom: 0;
-  width: 26px;
-  cursor: pointer;
-}
-
-.select-list-list-checkbox.with-spinner {
-
-}
-
-.select-list-list-checkbox.with-spinner:before {
-  display: none;
-  visibility: hidden;
-}
-
-.select-list-list-checkbox:before {
-  content: ' ';
-  position: absolute;
-  display: block;
-  top: 50%; left: 8px;
-  width: 5px;
-  height: 5px;
-  margin-top: -3px;
-  border: 1px solid #c5c5c5;
-  border-radius: 20px;
-  background-color: transparent;
-  filter: alpha(opacity=40);
-  opacity: 0.4;
-  cursor: pointer;
-  transition: all 0.3s ease;
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: 10px;
 }
 
-.select-list-list-checkbox:hover:before {
-  border-color: #4b9fd5;
-  background-color: #4b9fd5;
-  filter: alpha(opacity=80);
-  opacity: 0.8;
+.select-list-list-item {
+  display: inline-block;
+  vertical-align: middle;
 }
 
 .select-list-control {
-  height: 30px;
+  height: 27px;
 }
 
 .select-list-check-control {
   float: left;
 }
 
-.select-list-check-control.disabled .select-list-control-button {
-  background: transparent;
-  border-color: #aaa;
-  color: #aaa;
-}
-
-.select-list-check-control.disabled .select-list-control-button.active {
-  background-color: #f5fdff;
-}
-
-.select-list-check-control.disabled .select-list-control-button.active:before {
-  display: none;
+.select-list-check-control.disabled {
+  filter: alpha(opacity=60);
+  opacity: 0.6;
 }
 
 .select-list-control-button {
@@ -124,9 +72,8 @@
   display: inline-block;
   vertical-align: middle;
   width: 110px;
-  height: 30px;
-  line-height: 30px;
-  line-height: 28px\9;
+  height: 27px;
+  line-height: 25px;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   border: 1px solid #bfbfbf;
@@ -136,26 +83,13 @@
 }
 
 .select-list-control-button:hover {
-  background-color: #e9f8fd;
-}
-
-.select-list-control-button[name=selected]:before {
-  content: ' ';
-  display: inline-block;
-  vertical-align: top;
-  width: 5px;
-  height: 5px;
-  margin: 11px 8px 0 0;
-  border: 1px solid #4b9fd5;
-  border-radius: 20px;
-  background-color: #4b9fd5;
+  background-color: #f6f6f6;
 }
 
 .select-list-control-button:active,
 .select-list-control-button.active {
   z-index: 2;
-  background-color: #e9f8fd;
-  border-color: #4b9fd5;
+  background-color: #efefef;
 }
 
 .select-list-control-button + .select-list-control-button {
@@ -166,13 +100,13 @@
 .select-list-search-control {
   position: relative;
   float: right;
-  height: 30px;
+  height: 27px;
 }
 
 .select-list-search-control input {
   width: 170px;
   height: 100%;
-  line-height: 30px\9;
+  line-height: 27px\9;
   padding: 0 40px 0 10px;
   border: 1px solid #bfbfbf;
   -moz-box-sizing: border-box;
@@ -183,7 +117,6 @@
 .select-list-search-control input:focus {
   outline: none;
   box-shadow: none;
-  border-color: #4b9fd5;
 }
 
 .select-list-search-control input::-ms-clear {
@@ -194,9 +127,9 @@
   position: absolute;
   top: 2px;
   right: 2px;
-  width: 26px;
-  height: 26px;
-  line-height: 26px;
+  width: 23px;
+  height: 23px;
+  line-height: 24px;
   background-color: #e0e0e0;
   color: #fff;
   cursor: pointer;
diff --git a/sonar-server/wro.xml b/sonar-server/wro.xml
index f3925a8a795..7830258752b 100644
--- a/sonar-server/wro.xml
+++ b/sonar-server/wro.xml
@@ -22,7 +22,6 @@
     <js>/javascripts/third-party/underscore-min.js</js>
     <js>/javascripts/third-party/backbone-min.js</js>
     <js>/javascripts/third-party/jquery.ba-throttle-debounce.min.js</js>
-    <js>/javascripts/third-party/spin.js</js>
     <js>/javascripts/third-party/select2.min.js</js>
 
     <js>/javascripts/protovis-sonar.js</js>