* 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, 79 insertions, 0 deletions

diff --git a/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/draggable/draggable_test_helpers.js b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/draggable/draggable_test_helpers.js
new file mode 100644
index 0000000..b365055
--- /dev/null
+++ b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/draggable/draggable_test_helpers.js
@@ -0,0 +1,79 @@
+TestHelpers.draggable = {
+	// TODO: remove the unreliable offset hacks
+	unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0,
+	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
+	unreliableContains: (function(){
+		var element = $( "<div>" );
+		return $.contains( element[ 0 ].ownerDocument, element[ 0 ] );
+	})(),
+	testDrag: function( el, handle, dx, dy, expectedDX, expectedDY, msg ) {
+		var offsetAfter, actual, expected,
+			offsetBefore = el.offset();
+
+		$( handle ).simulate( "drag", {
+			dx: dx,
+			dy: dy
+		});
+		offsetAfter = el.offset();
+
+		actual = { left: offsetAfter.left, top: offsetAfter.top };
+		expected = { left: offsetBefore.left + expectedDX, top: offsetBefore.top + expectedDY };
+
+		msg = msg ? msg + "." : "";
+		deepEqual( actual, expected, "dragged[" + dx + ", " + dy + "] " + msg );
+	},
+	shouldMove: function( el, why ) {
+		TestHelpers.draggable.testDrag( el, el, 50, 50, 50, 50, why );
+	},
+	shouldNotMove: function( el, why ) {
+		TestHelpers.draggable.testDrag( el, el, 50, 50, 0, 0, why );
+	},
+	testScroll: function( el, position ) {
+		var oldPosition = $( "#main" ).css( "position" );
+		$( "#main" ).css( "position", position);
+		TestHelpers.draggable.shouldMove( el, position + " parent" );
+		$( "#main" ).css( "position", oldPosition );
+	},
+	restoreScroll: function( what ) {
+		if( what ) {
+			$( document ).scrollTop( 0 ).scrollLeft( 0 );
+		} else {
+			$( "#main" ).scrollTop( 0 ).scrollLeft( 0 );
+		}
+	},
+	setScroll: function( what ) {
+		if( what ) {
+			// TODO: currently, the draggable interaction doesn't properly account for scrolled pages,
+			// uncomment the line below to make the tests fail that should when the page is scrolled
+			// $( document ).scrollTop( 100 ).scrollLeft( 100 );
+		} else {
+			$( "#main" ).scrollTop( 100 ).scrollLeft( 100 );
+		}
+	},
+	border: function( el, side ) {
+		return parseInt( el.css( "border-" + side + "-width" ), 10 ) || 0;
+	},
+	margin: function( el, side ) {
+		return parseInt( el.css( "margin-" + side ), 10 ) || 0;
+	},
+	move: function( el, x, y ) {
+		$( el ).simulate( "drag", {
+			dx: x,
+			dy: y
+		});
+	},
+	trackMouseCss : function( el ) {
+		el.bind( "drag", function() {
+			el.data( "last_dragged_cursor", $( "body" ).css( "cursor" ) );
+		});
+	},
+	trackAppendedParent : function( el ) {
+		// TODO: appendTo is currently ignored if helper is original (see #7044)
+		el.draggable( "option", "helper", "clone" );
+
+		// Get what parent is at time of drag
+		el.bind( "drag", function(e,ui) {
+			el.data( "last_dragged_parent", ui.helper.parent()[ 0 ] );
+		});
+	}
+};
\ No newline at end of file