* treat 'apps/utils' as regular django app; which used to store

  general tools for used in other apps
* moved 'templatetags' from 'apps/indicator' to 'apps/utils'
* '.gitignore' to ignore 'fixtures_bak'
* moved js plugins from 'apps/indicator/static/plugins' to
  'staticfiles/plugins'

apps/recommend:
* updated 'recommend.models';
    o commented 'recommend.models.ResearchCombination' (not used)
* implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs';
* added pages 'templates/recommend/add_edit_blog_info.html',
    'add_edit_blog_info_error.html';
    o related css and javascripts files
* added 'tools.py';

* added 'utils/tools.py' for placing generic functions;
* deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak');
* small fixes to 'indicator.models', 'sciblog.models' and
  'sfaccount.views'

* fixed automatically show 'proper_nouns' annotation in blog:
  recovered the line 'import signals' in 'sciblog.models'
* added 'is_ok()' method for 'recommend.models.ResearchConfig';

1 files changed, 305 insertions, 0 deletions

diff --git a/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/slider/slider_options.js b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/slider/slider_options.js
new file mode 100644
index 0000000..f46dbde
--- /dev/null
+++ b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/slider/slider_options.js
@@ -0,0 +1,305 @@
+/*
+ * slider_options.js
+ */
+(function( $ ) {
+
+var element, options;
+
+function handle() {
+	return element.find( ".ui-slider-handle" );
+}
+
+module( "slider: options" );
+
+test( "disabled", function(){
+	expect( 8 );
+	var count = 0;
+
+	element = $( "#slider1" ).slider();
+	element.bind( "slidestart", function() {
+		count++;
+	});
+
+	// enabled
+	ok( !element.hasClass( "ui-slider-disabled" ), "no disabled class" );
+	equal( element.slider( "option", "disabled" ), false , "is not disabled" );
+
+	handle().simulate( "drag", { dx: 10 } );
+	equal( count, 1, "slider moved" );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal( count, 2, "slider moved" );
+
+	// disabled
+	element.slider( "option", "disabled", true );
+	ok( element.hasClass( "ui-slider-disabled" ), "has disabled class" );
+	equal( element.slider( "option", "disabled" ), true, "is disabled" );
+
+	handle().simulate( "drag", { dx: 10 } );
+	equal( count, 2, "slider did not move" );
+
+	handle().simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
+	equal( count, 2, "slider did not move" );
+});
+
+test( "max", function() {
+	expect( 2 );
+	element = $( "<div></div>" );
+
+	options = {
+		max: 37,
+		min: 6,
+		orientation: "horizontal",
+		step: 1,
+		value: 50
+	};
+
+	element.slider( options );
+	ok(element.slider( "option", "value" ) === options.value, "value option is not contained by max" );
+	ok(element.slider( "value" ) === options.max, "value method is contained by max" );
+	element.slider( "destroy" );
+
+});
+
+test( "min", function() {
+	expect( 2 );
+	element = $( "<div></div>" );
+
+	options = {
+		max: 37,
+		min: 6,
+		orientation: "vertical",
+		step: 1,
+		value: 2
+	};
+
+	element.slider( options );
+	ok( element.slider( "option", "value" ) === options.value, "value option is not contained by min" );
+	ok( element.slider( "value" ) === options.min, "value method is contained by min" );
+	element.slider( "destroy" );
+
+});
+
+test( "orientation", function() {
+	expect( 6 );
+	element = $( "#slider1" );
+
+	options = {
+		max: 2,
+		min: -2,
+		orientation: "vertical",
+		value: 1
+	};
+
+	var percentVal = ( options.value - options.min ) / ( options.max - options.min ) * 100;
+
+	element.slider( options ).slider( "option", "orientation", "horizontal" );
+	ok( element.is( ".ui-slider-horizontal" ), "horizontal slider has class .ui-slider-horizontal" );
+	ok( !element.is( ".ui-slider-vertical" ), "horizontal slider does not have class .ui-slider-vertical" );
+	equal( handle()[0].style.left, percentVal + "%", "horizontal slider handle is positioned with left: %" );
+
+	element.slider( "destroy" ) ;
+
+	options = {
+		max: 2,
+		min: -2,
+		orientation: "horizontal",
+		value: -1
+	};
+
+	percentVal = ( options.value - options.min ) / ( options.max - options.min ) * 100;
+
+	element.slider( options ).slider( "option", "orientation", "vertical" );
+	ok( element.is( ".ui-slider-vertical" ), "vertical slider has class .ui-slider-vertical" );
+	ok( !element.is( ".ui-slider-horizontal" ), "vertical slider does not have class .ui-slider-horizontal" );
+	equal( handle()[0].style.bottom, percentVal + "%", "vertical slider handle is positioned with bottom: %" );
+
+	element.slider( "destroy" );
+
+});
+
+//spec: http://wiki.jqueryui.com/Slider#specs
+// value option/method: the value option is not restricted by min/max/step.
+// What is returned by the value method is restricted by min (>=), max (<=), and step (even multiple)
+test( "step", function() {
+	expect( 9 );
+	element = $( "<div></div>" ).slider({
+		min: 0,
+		value: 0,
+		step: 10,
+		max: 100
+	});
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "value", 1 );
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "value", 9 );
+	equal( element.slider( "value" ), 10 );
+
+	element.slider( "value", 11 );
+	equal( element.slider( "value" ), 10 );
+
+	element.slider( "value", 19 );
+	equal( element.slider( "value" ), 20 );
+
+	element = $( "<div></div>" ).slider({
+		min: 0,
+		value: 0,
+		step: 20,
+		max: 100
+	});
+	element.slider( "value", 0 );
+
+	element.slider( "option", "value", 1 );
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "option", "value", 9 );
+	equal( element.slider( "value" ), 0 );
+
+	element.slider( "option", "value", 11 );
+	equal( element.slider( "value" ), 20 );
+
+	element.slider( "option", "value", 19 );
+	equal( element.slider( "value" ), 20 );
+
+	element.slider( "destroy" );
+});
+
+//test( "value", function() {
+//	ok(false, "missing test - untested code is broken code." );
+//});
+
+test( "values", function() {
+	expect( 2 );
+
+	// testing multiple ranges on the same page, the object reference to the values
+	// property is preserved via multiple range elements, so updating options.values
+	// of 1 slider updates options.values of all the others
+	var ranges = $([
+		document.createElement( "div" ),
+		document.createElement( "div" )
+	]).slider({
+		range: true,
+		values: [ 25, 75 ]
+	});
+
+	notStrictEqual(
+		ranges.eq( 0 ).data( "ui-slider" ).options.values,
+		ranges.eq( 1 ).data( "ui-slider" ).options.values,
+		"multiple range sliders should not have a reference to the same options.values array"
+	);
+
+	ranges.eq( 0 ).slider( "values", 0, 10 );
+
+	notEqual(
+		ranges.eq( 0 ).slider( "values", 0 ),
+		ranges.eq( 1 ).slider( "values", 0 ),
+		"the values for multiple sliders should be different"
+	);
+});
+
+test( "range", function() {
+	expect( 27 );
+	var range;
+
+	// min
+	element = $( "<div></div>" ).slider({
+		range: "min",
+		min: 1,
+		max: 10,
+		step: 1
+	});
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range min, one handle" );
+	equal( element.find( ".ui-slider-range-min" ).length, 1, "range min" );
+	element.slider( "destroy" );
+
+	// max
+	element = $( "<div></div>" ).slider({
+		range: "max",
+		min: 1,
+		max: 10,
+		step: 1
+	});
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range max, one handle" );
+	equal( element.find( ".ui-slider-range-max" ).length, 1, "range max" );
+	element.slider( "destroy" );
+
+	// true
+	element = $( "<div></div>" ).slider({
+		range: true,
+		min: 1,
+		max: 10,
+		step: 1
+	});
+
+	range = element.find( ".ui-slider-range" );
+	equal( element.find( ".ui-slider-handle" ).length, 2, "range true, two handles" );
+	ok( !range.is( ".ui-slider-range-min" ), "range true" );
+	ok( !range.is( ".ui-slider-range-max" ), "range true" );
+	element.slider( "destroy" );
+
+	// Change range from min to max
+	element = $( "<div></div>" ).slider({
+		range: "min",
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", "max" );
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from min to max, one handle" );
+	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from min to max" );
+	equal( element.find( ".ui-slider-range-max" ).length, 1, "range switch from min to max" );
+	element.slider( "destroy" );
+
+	// Change range from max to min
+	element = $( "<div></div>" ).slider({
+		range: "max",
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", "min" );
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from max to min, one handle" );
+	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to min" );
+	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from max to min" );
+	element.slider( "destroy" );
+
+	// Change range from max to true
+	element = $( "<div></div>" ).slider({
+		range: "max",
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", true );
+
+	equal( element.find( ".ui-slider-handle" ).length, 2, "range switch from max to true, two handles" );
+	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from max to true" );
+	equal( element.find( ".ui-slider-range-min" ).length, 0, "range switch from max to true" );
+	equal( element.slider( "option", "value" ), 0 , "option value" );
+	equal( element.slider( "value" ), 1 , "value" );
+	deepEqual( element.slider( "option", "values" ), [1, 1], "option values" );
+	deepEqual( element.slider( "values" ), [1, 1], "values" );
+	element.slider( "destroy" );
+
+	// Change range from true to min
+	element = $( "<div></div>" ).slider({
+		range: true,
+		min: 1,
+		max: 10,
+		step: 1
+	}).slider( "option", "range", "min" );
+
+	equal( element.find( ".ui-slider-handle" ).length, 1, "range switch from true to min, one handle" );
+	equal( element.find( ".ui-slider-range-max" ).length, 0, "range switch from true to min" );
+	equal( element.find( ".ui-slider-range-min" ).length, 1, "range switch from true to min" );
+	equal( element.slider( "option", "value" ), 1, "value" );
+	equal( element.slider( "value" ), 1 , "value" );
+	equal( element.slider( "option", "values" ), null, "values" );
+	deepEqual( element.slider( "values" ), [] , "values" );
+	element.slider( "destroy" );
+});
+
+})( jQuery );