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

diff --git a/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/button/button_options.js b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/button/button_options.js
new file mode 100644
index 0000000..e1931a5
--- /dev/null
+++ b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/button/button_options.js
@@ -0,0 +1,117 @@
+/*
+ * button_options.js
+ */
+(function($) {
+
+module("button: options");
+
+test("disabled, explicit value", function() {
+	expect( 4 );
+	$("#radio01").button({ disabled: false });
+	deepEqual(false, $("#radio01").button("option", "disabled"),
+		"disabled option set to false");
+	deepEqual(false, $("#radio01").prop("disabled"), "element is disabled");
+
+	$("#radio02").button({ disabled: true });
+	deepEqual(true, $("#radio02").button("option", "disabled"),
+		"disabled option set to true");
+	deepEqual(true, $("#radio02").prop("disabled"), "element is not disabled");
+});
+
+test("disabled, null", function() {
+	expect( 4 );
+	$("#radio01").button({ disabled: null });
+	deepEqual(false, $("#radio01").button("option", "disabled"),
+		"disabled option set to false");
+	deepEqual(false, $("#radio01").prop("disabled"), "element is disabled");
+
+	$("#radio02").prop("disabled", true).button({ disabled: null });
+	deepEqual(true, $("#radio02").button("option", "disabled"),
+		"disabled option set to true");
+	deepEqual(true, $("#radio02").prop("disabled"), "element is not disabled");
+});
+
+test("text false without icon", function() {
+	expect( 1 );
+	$("#button").button({
+		text: false
+	});
+	ok( $("#button").is(".ui-button-text-only:not(.ui-button-icon-only)") );
+
+	$("#button").button("destroy");
+});
+
+test("text false with icon", function() {
+	expect( 1 );
+	$("#button").button({
+		text: false,
+		icons: {
+			primary: "iconclass"
+		}
+	});
+	ok( $("#button").is(".ui-button-icon-only:not(.ui-button-text):has(span.ui-icon.iconclass)") );
+
+	$("#button").button("destroy");
+});
+
+test("label, default", function() {
+	expect( 2 );
+	$("#button").button();
+	deepEqual( $("#button").text(), "Label" );
+	deepEqual( $( "#button").button( "option", "label" ), "Label" );
+
+	$("#button").button("destroy");
+});
+
+test("label", function() {
+	expect( 2 );
+	$("#button").button({
+		label: "xxx"
+	});
+	deepEqual( $("#button").text(), "xxx" );
+	deepEqual( $("#button").button( "option", "label" ), "xxx" );
+
+	$("#button").button("destroy");
+});
+
+test("label default with input type submit", function() {
+	expect( 2 );
+	deepEqual( $("#submit").button().val(), "Label" );
+	deepEqual( $("#submit").button( "option", "label" ), "Label" );
+});
+
+test("label with input type submit", function() {
+	expect( 2 );
+	var label = $("#submit").button({
+		label: "xxx"
+	}).val();
+	deepEqual( label, "xxx" );
+	deepEqual( $("#submit").button( "option", "label" ), "xxx" );
+});
+
+test("icons", function() {
+	expect( 1 );
+	$("#button").button({
+		text: false,
+		icons: {
+			primary: "iconclass",
+			secondary: "iconclass2"
+		}
+	});
+	ok( $("#button").is(":has(span.ui-icon.ui-button-icon-primary.iconclass):has(span.ui-icon.ui-button-icon-secondary.iconclass2)") );
+
+	$("#button").button("destroy");
+});
+
+test( "#5295 - button does not remove hoverstate if disabled" , function() {
+	expect( 1 );
+	var btn = $("#button").button();
+	btn.hover( function() {
+		btn.button( "disable" );
+	});
+	btn.trigger( "mouseenter" );
+	btn.trigger( "mouseleave" );
+	ok( !btn.is( ".ui-state-hover") );
+});
+
+})(jQuery);