Merge remote-tracking branch 'origin/master' into feature-userguide

circle/circle/settings/base.py

@@ -463,3 +463,5 @@ STORE_URL = get_env_variable("STORE_URL", "")
 
 SESSION_COOKIE_NAME = "csessid%x" % (((getnode() // 139) ^
                                       (getnode() % 983)) & 0xffff)
+
+MAX_NODE_RAM = get_env_variable("MAX_NODE_RAM", 1024)

circle/circle/settings/production.py

@@ -70,20 +70,14 @@ SERVER_EMAIL = EMAIL_HOST_USER
 
 ########## CACHE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
-try:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-            'LOCATION': get_env_variable('DJANGO_MEMCACHED'),
-        }
-    }
-except ImproperlyConfigured:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            'LOCATION': SITE_NAME,
-        }
+from urlparse import urlsplit
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': urlsplit(get_env_variable('CACHE_URI')).netloc,
     }
+}
 ########## END CACHE CONFIGURATION
 
 

circle/common/models.py

@@ -420,6 +420,7 @@ create_readable = HumanReadableObject.create
 class HumanReadableException(HumanReadableObject, Exception):
     """HumanReadableObject that is an Exception so can used in except clause.
     """
+
     def __init__(self, level=None, *args, **kwargs):
         super(HumanReadableException, self).__init__(*args, **kwargs)
         if level is not None:
@@ -450,6 +451,7 @@ def humanize_exception(message, exception=None, level=None, **params):
     ...
     Welcome!
     """
+
     Ex = type("HumanReadable" + type(exception).__name__,
               (HumanReadableException, type(exception)),
               exception.__dict__)

circle/dashboard/fixtures/test-vm-fixture.json

@@ -1382,7 +1382,7 @@
     "pw": "ads", 
     "time_of_suspend": null, 
     "ram_size": 200, 
-    "priority": 4, 
+    "priority": 10, 
     "active_since": null, 
     "template": null, 
     "access_method": "nx", 
@@ -1412,7 +1412,7 @@
     "pw": "ads", 
     "time_of_suspend": null, 
     "ram_size": 200, 
-    "priority": 4, 
+    "priority": 10, 
     "active_since": null, 
     "template": null, 
     "access_method": "nx", 
@@ -1518,7 +1518,7 @@
     "ram_size": 1024, 
     "modified": "2014-01-24T00:58:19.654Z", 
     "system": "bubuntu", 
-    "priority": 20, 
+    "priority": 10, 
     "access_method": "ssh", 
     "raw_data": "", 
     "arch": "x86_64", 

circle/dashboard/static/dashboard/dashboard.css

@@ -186,42 +186,6 @@ html {
   text-decoration: none !important;
 }
 
-.slider {
-    display: inline-block;
-}
-.slider .track {
-    height: 20px;
-    top: 50%;
-}
-.slider > .dragger, .slider > .dragger:hover {
-    border-radius: 0px;
-    -moz-border-radius: 0px;
-    -webkit-border-radius: 0px;
-    width: 8px;
-    height: 24px;
-    margin-top: -12px!important;
-    text-shadow: 0 1px 0 #fff;
-    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
-    background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
-    background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
-    background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-    background-repeat: repeat-x;
-    border-color: #2d6ca2;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
-}
-.slider > .dragger:hover {
-    background-color: #3071a9;
-    background-image: none;
-    border-color: #2d6ca2;
-}
-
-.slider > .highlight-track {
-    height: 20px;
-    top: 50%;
-}
-.slider + .output {
-
-}
 .rule-table tr >:nth-child(1) {
     text-align: right;
 }
@@ -848,3 +812,54 @@ textarea[name="list-new-namelist"] {
 #show-all-activities-container {
   margin: 20px 0 0 10px;
 }
+
+#vm-details-resources-form {
+  margin-top: 15px;
+}
+
+#vm-details-resources-form .row, .resources-sliders .row {
+  margin-bottom: 15px;
+}
+
+#vm-create-disk-add-form {
+  max-width: 450px;
+  margin-top: 15px;
+}
+
+.vm-create-template {
+  max-width: 800px;
+  border: 1px solid black;
+  border-bottom: none;
+}
+
+.vm-create-template-list .vm-create-template:last-child {
+  border-bottom: 1px solid black;
+}
+
+.vm-create-template-summary {
+  padding: 15px;
+  cursor: pointer;
+}
+
+.vm-create-template:nth-child(odd) .vm-create-template-summary {
+  background: #F5F5F5;
+}
+
+.vm-create-template-list .vm-create-template-summary:hover {
+  background: #D2D2D2;
+}
+
+.vm-create-template-details {
+  border-top: 1px dashed #D3D3D3;
+  padding: 15px;
+}
+
+.vm-create-template-details ul {
+  list-style: none;
+  padding: 0 15px;
+}
+
+.vm-create-template-details li {
+  border-bottom: 1px dotted #aaa;
+  padding: 5px 0px;
+}

circle/dashboard/static/dashboard/dashboard.js

@@ -435,28 +435,63 @@ function compareVmByFav(a, b) {
     return a.pk < b.pk ? -1 : 1; 
 }
 
+$(document).on('shown.bs.tab', 'a[href="#resources"]', function (e) {
+  $(".cpu-priority-input").trigger("change");
+  $(".cpu-count-input, .ram-input").trigger("input");
+})
+
 function addSliderMiscs() {
-  $('.vm-slider').each(function() {  
-    $("<span>").addClass("output").html($(this).val()).insertAfter($(this));
-  });                                                                   
-                                                                            
-  $('.vm-slider').slider()                                              
-  .on('slide', function(e) {                                            
-    $(this).val(e.value);
-    $(this).parent('div').nextAll("span").html(e.value)                 
+  // set max values based on inputs
+  var cpu_count_range = "0, " + $(".cpu-count-input").prop("max");
+  var ram_range = "0, " + $(".ram-input").prop("max");
+  $(".cpu-count-slider").data("slider-range", cpu_count_range);
+  $(".ram-slider").data("slider-range", ram_range);
+
+  $(".vm-slider").simpleSlider();
+  $(".cpu-priority-slider").bind("slider:changed", function (event, data) {
+    var value = data.value + 0;
+
+    $('.cpu-priority-input option[value="' + value + '"]').attr("selected", "selected");
   });
 
-  refreshSliders();
-}
+  $(".cpu-priority-input").change(function() {
+    var val = $(":selected", $(this)).val();
+    $(".cpu-priority-slider").simpleSlider("setValue", val);
+  });
+
+  $(".cpu-count-slider").bind("slider:changed", function (event, data) {
+    var value = data.value + 0;
+    $(".cpu-count-input").val(parseInt(value));
+  });
 
-// ehhh
-function refreshSliders() {
-  $('.vm-slider').each(function() {
-    $(this).val($(this).slider().data('slider').getValue());
-    $(this).parent('div').nextAll("span").html($(this).val());
+  $(".cpu-count-input").bind("input", function() {
+    var val = parseInt($(this).val());
+    if(!val) return;
+    $(".cpu-count-slider").simpleSlider("setValue", val);
   });
+  
+
+  var ram_fire = false;
+  $(".ram-slider").bind("slider:changed", function (event, data) {
+    if(ram_fire) {
+      ram_fire = false;
+      return;
+    }
+
+    var value = data.value + 0;
+    $(".ram-input").val(value);
+  });
+
+  $(".ram-input").bind("input", function() {
+    var val = $(this).val();
+    ram_fire = true;
+    $(".ram-slider").simpleSlider("setValue", parseInt(val));
+  });
+  $(".cpu-priority-input").trigger("change");
+  $(".cpu-count-input, .ram-input").trigger("input");
 }
 
+
 /* deletes the VM with the pk
  * if dir is true, then redirect to the dashboard landing page
  * else it adds a success message */

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/.gitignore

-node_modules/
-*.zip
-gh-pages
\ No newline at end of file

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/README.md

-jQuery Simple Slider: Unobtrusive Numerical Slider
-==================================================
-
-SimpleSlider is a jQuery plugin for turning your text inputs into draggable 
-numerical sliders.
-
-It has no external dependencies other than jQuery, and you don't need to write
-a single line of JavaScript to get it to work.
-
-
-How to Use
------------
-
-Include the javascript file in your page:
-
-    <script src="simple-slider.js"></script>
-    
-Turn your text input into a slider:
-
-    <input type="text" data-slider="true">
-
-
-Documentation, Features and Demos
----------------------------------
-Full details and documentation can be found on the project page here:
-
-<http://loopj.com/jquery-simple-slider/>
\ No newline at end of file

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/demo.html

-<html>
-<head>
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-
-  <script src="js/simple-slider.js"></script>
-
-  <link href="css/simple-slider.css" rel="stylesheet" type="text/css" />
-  <link href="css/simple-slider-volume.css" rel="stylesheet" type="text/css" />
-
-  <!-- These styles are only used for this page, not required for the slider -->
-  <style>
-  body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
-  [class^=slider] { display: inline-block; margin-bottom: 30px; }
-  .output { color: #888; font-size: 14px; padding-top: 1px; margin-left: 5px; vertical-align: top;}
-  h1 { font-size: 20px; }
-  h2 { clear: both; margin: 0; margin-bottom: 5px; font-size: 16px; }
-  p { font-size: 15px; margin-bottom: 30px; }
-  h2:first-of-type { margin-top: 0; }
-  </style>
-</head>
-
-<body>
-  <h1>jQuery Simple Slider Examples</h1>
-  <p>
-    Here are a few examples of the functionality available in Simple Slider.
-  </p>
-
-
-  <h2>Basic Example</h2>
-  <input type="text" data-slider="true">
-
-  <h2>Basic Example (Themed)</h2>
-  <input type="text" data-slider="true" data-slider-theme="volume">
-
-  <h2>Predefined Value</h2>
-  <input type="text" value="0.2" data-slider="true">
-
-  <h2>Steps</h2>
-  <input type="text" data-slider="true" data-slider-step="0.1">
-
-  <h2>Range</h2>
-  <input type="text" data-slider="true" data-slider-range="10,1000">
-
-  <h2>Range &amp; Steps</h2>
-  <input type="text" data-slider="true" data-slider-range="100,500" data-slider-step="100">
-
-  <h2>Range, Steps &amp; Snap</h2>
-  <input type="text" data-slider="true" data-slider-range="100,500" data-slider-step="100" data-slider-snap="true">
-
-  <h2>Predefined List of Values</h2>
-  <input type="text" data-slider="true" data-slider-values="0,100,500,800,2000">
-
-  <h2>Predefined List &amp; Snap</h2>
-  <input type="text" data-slider="true" data-slider-values="0,100,500,800,2000" data-slider-snap="true">
-
-  <h2>Predefined List, Equal Steps &amp; Snap</h2>
-  <input type="text" data-slider="true" data-slider-values="0,100,500,800,2000" data-slider-equal-steps="true" data-slider-snap="true">
-
-  <h2>Highlighted</h2>
-  <input type="text" data-slider="true" value="0.8" data-slider-highlight="true">
-
-  <h2>Highlighted (Themed)</h2>
-  <input type="text" data-slider="true" value="0.4" data-slider-highlight="true" data-slider-theme="volume">
-
-  <script>
-  $("[data-slider]")
-    .each(function () {
-      var input = $(this);
-      $("<span>")
-        .addClass("output")
-        .insertAfter($(this));
-    })
-    .bind("slider:ready slider:changed", function (event, data) {
-      $(this)
-        .nextAll(".output:first")
-          .html(data.value.toFixed(3));
-    });
-  </script>
-</body>
-</html>

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/grunt.js

-module.exports = function(grunt) { 
-  grunt.initConfig({
-    pkg: '<json:package.json>',
-
-    meta: {
-      banner:
-        '/*\n' + 
-        ' * <%= pkg.title || pkg.name %>: <%= pkg.description %>\n' +
-        ' * Version <%= pkg.version %>\n' + 
-        ' *\n' +
-        ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> (<%= pkg.author.url %>)\n' +
-        ' *\n' +
-        ' * Licensed under the <%= pkg.licenses[0].type %> license (<%= pkg.licenses[0].url %>)\n' +
-        ' *\n' + 
-        ' */\n'
-    },
-
-    coffee: {
-      compile: {
-        files: {
-          'js/<%= pkg.name %>.js': 'js/*.coffee'
-        },
-
-        options: {
-          bare: true
-        }
-      }
-    },
-
-    watch: {
-      coffee: {
-        files: ['js/*.coffee'],
-        tasks: 'coffee growl:coffee'
-      }
-    },
-
-    growl: {
-      coffee: {
-        title: 'CoffeeScript',
-        message: 'Compiled successfully'
-      }
-    },
-
-    min: {
-      dist: {
-        src: ['<banner:meta.banner>', 'js/<%= pkg.name %>.js'],
-        dest: 'js/<%= pkg.name %>.min.js'
-      }
-    },
-    
-    compress: {
-      zip: {
-        files: {
-          "<%= pkg.name %>-<%= pkg.version %>.zip": ["js/**", "demo.html", "README.md"]
-        }
-      }
-    }
-  });
-
-  // Lib tasks.
-  grunt.loadNpmTasks('grunt-contrib');
-  grunt.loadNpmTasks('grunt-growl');
-
-  // Default task.
-  grunt.registerTask('build', 'coffee min');
-  grunt.registerTask('serve', 'server watch:coffee');
-  grunt.registerTask('default', 'build');
-};
\ No newline at end of file

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/js/simple-slider.min.js

-/*
- * jQuery Simple Slider: Unobtrusive Numerical Slider
- * Version 1.0.0
- *
- * Copyright (c) 2013 James Smith (http://loopj.com)
- *
- * Licensed under the MIT license (http://mit-license.org/)
- *
- */
-
-var __slice=[].slice,__indexOf=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};(function(e,t){var n;return n=function(){function t(t,n){var r,i=this;this.input=t,this.defaultOptions={animate:!0,snapMid:!1,classPrefix:null,classSuffix:null,theme:null,highlight:!1},this.settings=e.extend({},this.defaultOptions,n),this.settings.theme&&(this.settings.classSuffix="-"+this.settings.theme),this.input.hide(),this.slider=e("<div>").addClass("slider"+(this.settings.classSuffix||"")).css({position:"relative",userSelect:"none",boxSizing:"border-box"}).insertBefore(this.input),this.input.attr("id")&&this.slider.attr("id",this.input.attr("id")+"-slider"),this.track=this.createDivElement("track").css({width:"100%"}),this.settings.highlight&&(this.highlightTrack=this.createDivElement("highlight-track").css({width:"0"})),this.dragger=this.createDivElement("dragger"),this.slider.css({minHeight:this.dragger.outerHeight(),marginLeft:this.dragger.outerWidth()/2,marginRight:this.dragger.outerWidth()/2}),this.track.css({marginTop:this.track.outerHeight()/-2}),this.settings.highlight&&this.highlightTrack.css({marginTop:this.track.outerHeight()/-2}),this.dragger.css({marginTop:this.dragger.outerWidth()/-2,marginLeft:this.dragger.outerWidth()/-2}),this.track.mousedown(function(e){return i.trackEvent(e)}),this.settings.highlight&&this.highlightTrack.mousedown(function(e){return i.trackEvent(e)}),this.dragger.mousedown(function(e){if(e.which!==1)return;return i.dragging=!0,i.dragger.addClass("dragging"),i.domDrag(e.pageX,e.pageY),!1}),e("body").mousemove(function(t){if(i.dragging)return i.domDrag(t.pageX,t.pageY),e("body").css({cursor:"pointer"})}).mouseup(function(t){if(i.dragging)return i.dragging=!1,i.dragger.removeClass("dragging"),e("body").css({cursor:"auto"})}),this.pagePos=0,this.input.val()===""?(this.value=this.getRange().min,this.input.val(this.value)):this.value=this.nearestValidValue(this.input.val()),this.setSliderPositionFromValue(this.value),r=this.valueToRatio(this.value),this.input.trigger("slider:ready",{value:this.value,ratio:r,position:r*this.slider.outerWidth(),el:this.slider})}return t.prototype.createDivElement=function(t){var n;return n=e("<div>").addClass(t).css({position:"absolute",top:"50%",userSelect:"none",cursor:"pointer"}).appendTo(this.slider),n},t.prototype.setRatio=function(e){var t;return e=Math.min(1,e),e=Math.max(0,e),t=this.ratioToValue(e),this.setSliderPositionFromValue(t),this.valueChanged(t,e,"setRatio")},t.prototype.setValue=function(e){var t;return e=this.nearestValidValue(e),t=this.valueToRatio(e),this.setSliderPositionFromValue(e),this.valueChanged(e,t,"setValue")},t.prototype.trackEvent=function(e){if(e.which!==1)return;return this.domDrag(e.pageX,e.pageY,!0),this.dragging=!0,!1},t.prototype.domDrag=function(e,t,n){var r,i,s;n==null&&(n=!1),r=e-this.slider.offset().left,r=Math.min(this.slider.outerWidth(),r),r=Math.max(0,r);if(this.pagePos!==r)return this.pagePos=r,i=r/this.slider.outerWidth(),s=this.ratioToValue(i),this.valueChanged(s,i,"domDrag"),this.settings.snap?this.setSliderPositionFromValue(s,n):this.setSliderPosition(r,n)},t.prototype.setSliderPosition=function(e,t){t==null&&(t=!1);if(t&&this.settings.animate){this.dragger.animate({left:e},200);if(this.settings.highlight)return this.highlightTrack.animate({width:e},200)}else{this.dragger.css({left:e});if(this.settings.highlight)return this.highlightTrack.css({width:e})}},t.prototype.setSliderPositionFromValue=function(e,t){var n;return t==null&&(t=!1),n=this.valueToRatio(e),this.setSliderPosition(n*this.slider.outerWidth(),t)},t.prototype.getRange=function(){return this.settings.allowedValues?{min:Math.min.apply(Math,this.settings.allowedValues),max:Math.max.apply(Math,this.settings.allowedValues)}:this.settings.range?{min:parseFloat(this.settings.range[0]),max:parseFloat(this.settings.range[1])}:{min:0,max:1}},t.prototype.nearestValidValue=function(t){var n,r,i,s;return i=this.getRange(),t=Math.min(i.max,t),t=Math.max(i.min,t),this.settings.allowedValues?(n=null,e.each(this.settings.allowedValues,function(){if(n===null||Math.abs(this-t)<Math.abs(n-t))return n=this}),n):this.settings.step?(r=(i.max-i.min)/this.settings.step,s=Math.floor((t-i.min)/this.settings.step),(t-i.min)%this.settings.step>this.settings.step/2&&s<r&&(s+=1),s*this.settings.step+i.min):t},t.prototype.valueToRatio=function(e){var t,n,r,i,s,o,u,a;if(this.settings.equalSteps){a=this.settings.allowedValues;for(i=o=0,u=a.length;o<u;i=++o){t=a[i];if(typeof n=="undefined"||n===null||Math.abs(t-e)<Math.abs(n-e))n=t,r=i}return this.settings.snapMid?(r+.5)/this.settings.allowedValues.length:r/(this.settings.allowedValues.length-1)}return s=this.getRange(),(e-s.min)/(s.max-s.min)},t.prototype.ratioToValue=function(e){var t,n,r,i,s;return this.settings.equalSteps?(s=this.settings.allowedValues.length,i=Math.round(e*s-.5),t=Math.min(i,this.settings.allowedValues.length-1),this.settings.allowedValues[t]):(n=this.getRange(),r=e*(n.max-n.min)+n.min,this.nearestValidValue(r))},t.prototype.valueChanged=function(t,n,r){var i;if(t.toString()===this.value.toString())return;return this.value=t,i={value:t,ratio:n,position:n*this.slider.outerWidth(),trigger:r,el:this.slider},this.input.val(t).trigger(e.Event("change",i)).trigger("slider:changed",i)},t}(),e.extend(e.fn,{simpleSlider:function(){var t,r,i;return i=arguments[0],t=2<=arguments.length?__slice.call(arguments,1):[],r=["setRatio","setValue"],e(this).each(function(){var s,o;return i&&__indexOf.call(r,i)>=0?(s=e(this).data("slider-object"),s[i].apply(s,t)):(o=i,e(this).data("slider-object",new n(e(this),o)))})}}),e(function(){return e("[data-slider]").each(function(){var t,n,r,i;return t=e(this),r={},n=t.data("slider-values"),n&&(r.allowedValues=function(){var e,t,r,s;r=n.split(","),s=[];for(e=0,t=r.length;e<t;e++)i=r[e],s.push(parseFloat(i));return s}()),t.data("slider-range")&&(r.range=t.data("slider-range").split(",")),t.data("slider-step")&&(r.step=t.data("slider-step")),r.snap=t.data("slider-snap"),r.equalSteps=t.data("slider-equal-steps"),t.data("slider-theme")&&(r.theme=t.data("slider-theme")),t.attr("data-slider-highlight")&&(r.highlight=t.data("slider-highlight")),t.data("slider-animate")!=null&&(r.animate=t.data("slider-animate")),t.simpleSlider(r)})})})(this.jQuery||this.Zepto,this);
\ No newline at end of file

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/package.json

-{
-  "name"            : "simple-slider",
-  "title"           : "jQuery Simple Slider",
-  "description"     : "Unobtrusive Numerical Slider",
-  "version"         : "1.0.0",
-  "homepage"        : "http://loopj.com/jquery-simple-slider",
-  "keywords"        : [],
-  "author"          : {
-    "name"  : "James Smith",
-    "email" : "james@loopj.com",
-    "url"   : "http://loopj.com"
-  },
-  "repository" : {
-    "type" : "git",
-    "url"  : "https://github.com/loopj/jquery-simple-slider.git"
-  },
-  "bugs" : {
-    "url" : "https://github.com/loopj/jquery-simple-slider/issues"
-  },
-  "licenses": [{
-    "type": "MIT",
-    "url" : "http://mit-license.org/"
-  }],
-  "devDependencies" : {
-    "grunt" : "0.3.x",
-    "grunt-contrib": "0.2.x",
-    "grunt-growl": "git://github.com/loopj/grunt-growl.git#master"
-  },
-  "scripts": {
-    "test": "grunt"
-  }
-}
\ No newline at end of file

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/css/simple-slider.css → circle/dashboard/static/dashboard/loopj-jquery-simple-slider/css/simple-slider.css

@@ -53,3 +53,50 @@
 	border-color: #496805;
 }
 
+
+
+.slider {
+    display: inline-block;
+}
+.slider .track {
+    height: 20px;
+    top: 50%;
+}
+.slider > .dragger, .slider > .dragger:hover {
+    border-radius: 0px;
+    -moz-border-radius: 0px;
+    -webkit-border-radius: 0px;
+    width: 8px;
+    height: 24px;
+    margin-top: -12px!important;
+    text-shadow: 0 1px 0 #fff;
+    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
+    background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
+    background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
+    background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+    background-repeat: repeat-x;
+    border-color: #2d6ca2;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+}
+.slider > .dragger:hover {
+    background-color: #3071a9;
+    background-image: none;
+    border-color: #2d6ca2;
+}
+
+.slider > .highlight-track {
+    height: 20px;
+    top: 50%;
+}
+.slider + .output {
+
+}
+
+.slider > .track, .slider > .highlight-track {
+border-radius: 5px;
+}
+
+/* review this later */
+.slider {
+  width: 100%;
+}

circle/dashboard/static/dashboard/loopj-jquery-simple-slider-fa64f59/js/simple-slider.js → circle/dashboard/static/dashboard/loopj-jquery-simple-slider/js/simple-slider.js

 /*
  jQuery Simple Slider
 
- Copyright (c) 2012 James Smith (http://loopj.com)
+ Copyright (c) 2012, 2013 James Smith (http://loopj.com)
+ Copyright (c) 2013 Maarten van Grootel (http://maatenvangrootel.nl)
+ Copyright (c) 2013 Nathan Hunzaker (http://natehunzaker.com)
+ Copyright (c) 2013 Erik J. Nedwidek (http://github.com/nedwidek)
 
  Licensed under the MIT license (http://mit-license.org/)
 */
@@ -23,8 +26,12 @@ var __slice = [].slice,
         classPrefix: null,
         classSuffix: null,
         theme: null,
-        highlight: false
+        highlight: false,
+        showScale: false
       };
+      if(typeof options == 'undefined') {
+        options = this.loadDataOptions();
+      }
       this.settings = $.extend({}, this.defaultOptions, options);
       if (this.settings.theme) {
         this.settings.classSuffix = "-" + this.settings.theme;
@@ -106,6 +113,20 @@ var __slice = [].slice,
       }
       this.setSliderPositionFromValue(this.value);
       ratio = this.valueToRatio(this.value);
+      if (this.settings.showScale) {
+        this.scale = this.createDivElement("scale");
+        this.minScale = this.createSpanElement("min-scale", this.scale);
+        this.maxScale = this.createSpanElement("max-scale", this.scale);
+
+        range = this.getRange();
+
+        this.minScale.html(range.min);
+        this.maxScale.html(range.max);
+
+        this.scale.css('marginTop', function(index, currentValue) {
+            return (parseInt(currentValue, 10)  + this.previousSibling.offsetHeight / 2) + 'px';
+        });
+      }
       this.input.trigger("slider:ready", {
         value: this.value,
         ratio: ratio,
@@ -114,6 +135,44 @@ var __slice = [].slice,
       });
     }
 
+    SimpleSlider.prototype.loadDataOptions = function() {
+      var options = {};
+      allowedValues = this.input.data("slider-values");
+      if (allowedValues) {
+        options.allowedValues = (function() {
+          var _i, _len, _ref, _results;
+          _ref = allowedValues.split(",");
+          _results = [];
+          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+            x = _ref[_i];
+            _results.push(parseFloat(x));
+          }
+          return _results;
+        })();
+      }
+      if (this.input.data("slider-range")) {
+        options.range = this.input.data("slider-range").split(",");
+      }
+      if (this.input.data("slider-step")) {
+        options.step = this.input.data("slider-step");
+      }
+      options.snap = this.input.data("slider-snap");
+      options.equalSteps = this.input.data("slider-equal-steps");
+      if (this.input.data("slider-theme")) {
+        options.theme = this.input.data("slider-theme");
+      }
+      if (this.input.attr("data-slider-highlight")) {
+        options.highlight = this.input.data("slider-highlight");
+      }
+      if (this.input.data("slider-animate") != null) {
+        options.animate = this.input.data("slider-animate");
+      }
+      if (this.input.data("slider-showscale") != null) {
+        options.showScale = this.input.data("slider-showscale");
+      }
+      return options;
+    }
+
     SimpleSlider.prototype.createDivElement = function(classname) {
       var item;
       item = $("<div>").addClass(classname).css({
@@ -125,6 +184,12 @@ var __slice = [].slice,
       return item;
     };
 
+    SimpleSlider.prototype.createSpanElement = function(classname, parent) {
+      var item;
+      item = $("<span>").addClass(classname).appendTo(parent);
+      return item;
+    };
+
     SimpleSlider.prototype.setRatio = function(ratio) {
       var value;
       ratio = Math.min(1, ratio);
@@ -322,42 +387,14 @@ var __slice = [].slice,
       });
     }
   });
+  
+  /*
   return $(function() {
     return $("[data-slider]").each(function() {
       var $el, allowedValues, settings, x;
       $el = $(this);
-      settings = {};
-      allowedValues = $el.data("slider-values");
-      if (allowedValues) {
-        settings.allowedValues = (function() {
-          var _i, _len, _ref, _results;
-          _ref = allowedValues.split(",");
-          _results = [];
-          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            x = _ref[_i];
-            _results.push(parseFloat(x));