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

diff --git a/97suifangqa/apps/indicator/static/plugins/qtip2/jquery.qtip.css b/97suifangqa/apps/indicator/static/plugins/qtip2/jquery.qtip.css
deleted file mode 100644
index 82bc096..0000000
--- a/97suifangqa/apps/indicator/static/plugins/qtip2/jquery.qtip.css
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * qTip2 - Pretty powerful tooltips - v2.1.1
- * http://qtip2.com
- *
- * Copyright (c) 2013 Craig Michael Thompson
- * Released under the MIT, GPL licenses
- * http://jquery.org/license
- *
- * Date: Thu Jul 11 2013 02:03 GMT+0100+0100
- * Plugins: tips modal viewport svg imagemap ie6
- * Styles: basic css3
- */
-.qtip{
-	position: absolute;
-	left: -28000px;
-	top: -28000px;
-	display: none;
-
-	max-width: 280px;
-	min-width: 50px;
-	
-	font-size: 10.5px;
-	line-height: 12px;
-
-	direction: ltr;
-
-	box-shadow: none;
-	padding: 0;
-}
-
-	.qtip-content{
-		position: relative;
-		padding: 5px 9px;
-		overflow: hidden;
-
-		text-align: left;
-		word-wrap: break-word;
-	}
-
-	.qtip-titlebar{
-		position: relative;
-		padding: 5px 35px 5px 10px;
-		overflow: hidden;
-
-		border-width: 0 0 1px;
-		font-weight: bold;
-	}
-
-	.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }
-
-	/* Default close button class */
-	.qtip-close{
-		position: absolute;
-		right: -9px; top: -9px;
-
-		cursor: pointer;
-		outline: medium none;
-
-		border-width: 1px;
-		border-style: solid;
-		border-color: transparent;
-	}
-
-		.qtip-titlebar .qtip-close{
-			right: 4px; top: 50%;
-			margin-top: -9px;
-		}
-	
-		* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */
-
-		.qtip-titlebar .ui-icon,
-		.qtip-icon .ui-icon{
-			display: block;
-			text-indent: -1000em;
-			direction: ltr;
-		}
-
-		.qtip-icon, .qtip-icon .ui-icon{
-			-moz-border-radius: 3px;
-			-webkit-border-radius: 3px;
-			border-radius: 3px;
-			text-decoration: none;
-		}
-
-			.qtip-icon .ui-icon{
-				width: 18px;
-				height: 14px;
-
-				line-height: 14px;
-				text-align: center;
-				text-indent: 0;
-				font: normal bold 10px/13px Tahoma,sans-serif;
-
-				color: inherit;
-				background: transparent none no-repeat -100em -100em;
-			}
-
-/* Applied to 'focused' tooltips e.g. most recently displayed/interacted with */
-.qtip-focus{}
-
-/* Applied on hover of tooltips i.e. added/removed on mouseenter/mouseleave respectively */
-.qtip-hover{}
-
-/* Default tooltip style */
-.qtip-default{
-	border-width: 1px;
-	border-style: solid;
-	border-color: #F1D031;
-
-	background-color: #FFFFA3;
-	color: #555;
-}
-
-	.qtip-default .qtip-titlebar{
-		background-color: #FFEF93;
-	}
-
-	.qtip-default .qtip-icon{
-		border-color: #CCC;
-		background: #F1F1F1;
-		color: #777;
-	}
-	
-	.qtip-default .qtip-titlebar .qtip-close{
-		border-color: #AAA;
-		color: #111;
-	}
-
-
-
-/*! Light tooltip style */
-.qtip-light{
-	background-color: white;
-	border-color: #E2E2E2;
-	color: #454545;
-}
-
-	.qtip-light .qtip-titlebar{
-		background-color: #f1f1f1;
-	}
-
-
-/*! Dark tooltip style */
-.qtip-dark{
-	background-color: #505050;
-	border-color: #303030;
-	color: #f3f3f3;
-}
-
-	.qtip-dark .qtip-titlebar{
-		background-color: #404040;
-	}
-
-	.qtip-dark .qtip-icon{
-		border-color: #444;
-	}
-
-	.qtip-dark .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/*! Cream tooltip style */
-.qtip-cream{
-	background-color: #FBF7AA;
-	border-color: #F9E98E;
-	color: #A27D35;
-}
-
-	.qtip-cream .qtip-titlebar{
-		background-color: #F0DE7D;
-	}
-
-	.qtip-cream .qtip-close .qtip-icon{
-		background-position: -82px 0;
-	}
-
-
-/*! Red tooltip style */
-.qtip-red{
-	background-color: #F78B83;
-	border-color: #D95252;
-	color: #912323;
-}
-
-	.qtip-red .qtip-titlebar{
-		background-color: #F06D65;
-	}
-
-	.qtip-red .qtip-close .qtip-icon{
-		background-position: -102px 0;
-	}
-
-	.qtip-red .qtip-icon{
-		border-color: #D95252;
-	}
-
-	.qtip-red .qtip-titlebar .ui-state-hover{
-		border-color: #D95252;
-	}
-
-
-/*! Green tooltip style */
-.qtip-green{
-	background-color: #CAED9E;
-	border-color: #90D93F;
-	color: #3F6219;
-}
-
-	.qtip-green .qtip-titlebar{
-		background-color: #B0DE78;
-	}
-
-	.qtip-green .qtip-close .qtip-icon{
-		background-position: -42px 0;
-	}
-
-
-/*! Blue tooltip style */
-.qtip-blue{
-	background-color: #E5F6FE;
-	border-color: #ADD9ED;
-	color: #5E99BD;
-}
-
-	.qtip-blue .qtip-titlebar{
-		background-color: #D0E9F5;
-	}
-
-	.qtip-blue .qtip-close .qtip-icon{
-		background-position: -2px 0;
-	}
-
-
-
-.qtip-shadow{
-	-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-	-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-	box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-}
-
-/* Add rounded corners to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE9+, Safari 2+ */
-.qtip-rounded,
-.qtip-tipsy,
-.qtip-bootstrap{
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.qtip-rounded .qtip-titlebar{
-	-moz-border-radius: 4px 4px 0 0;
-	-webkit-border-radius: 4px 4px 0 0;
-	border-radius: 4px 4px 0 0;
-}
-
-/* Youtube tooltip style */
-.qtip-youtube{
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-	
-	-webkit-box-shadow: 0 0 3px #333;
-	-moz-box-shadow: 0 0 3px #333;
-	box-shadow: 0 0 3px #333;
-
-	color: white;
-	border-width: 0;
-
-	background: #4A4A4A;
-	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,black));
-	background-image: -webkit-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -moz-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -ms-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -o-linear-gradient(top,#4A4A4A 0,black 100%);
-}
-
-	.qtip-youtube .qtip-titlebar{
-		background-color: #4A4A4A;
-		background-color: rgba(0,0,0,0);
-	}
-	
-	.qtip-youtube .qtip-content{
-		padding: .75em;
-		font: 12px arial,sans-serif;
-		
-		filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);
-		-ms-filter: "progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);";
-	}
-
-	.qtip-youtube .qtip-icon{
-		border-color: #222;
-	}
-
-	.qtip-youtube .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/* jQuery TOOLS Tooltip style */
-.qtip-jtools{
-	background: #232323;
-	background: rgba(0, 0, 0, 0.7);
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#717171), to(#232323));
-	background-image: -moz-linear-gradient(top, #717171, #232323);
-	background-image: -webkit-linear-gradient(top, #717171, #232323);
-	background-image: -ms-linear-gradient(top, #717171, #232323);
-	background-image: -o-linear-gradient(top, #717171, #232323);
-
-	border: 2px solid #ddd;
-	border: 2px solid rgba(241,241,241,1);
-
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-
-	-webkit-box-shadow: 0 0 12px #333;
-	-moz-box-shadow: 0 0 12px #333;
-	box-shadow: 0 0 12px #333;
-}
-
-	/* IE Specific */
-	.qtip-jtools .qtip-titlebar{
-		background-color: transparent;
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)";
-	}
-	.qtip-jtools .qtip-content{
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)";
-	}
-
-	.qtip-jtools .qtip-titlebar,
-	.qtip-jtools .qtip-content{
-		background: transparent;
-		color: white;
-		border: 0 dashed transparent;
-	}
-
-	.qtip-jtools .qtip-icon{
-		border-color: #555;
-	}
-
-	.qtip-jtools .qtip-titlebar .ui-state-hover{
-		border-color: #333;
-	}
-
-
-/* Cluetip style */
-.qtip-cluetip{
-	-webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-	-moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-	box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-
-	background-color: #D9D9C2;
-	color: #111;
-	border: 0 dashed transparent;
-}
-
-	.qtip-cluetip .qtip-titlebar{
-		background-color: #87876A;
-		color: white;
-		border: 0 dashed transparent;
-	}
-	
-	.qtip-cluetip .qtip-icon{
-		border-color: #808064;
-	}
-	
-	.qtip-cluetip .qtip-titlebar .ui-state-hover{
-		border-color: #696952;
-		color: #696952;
-	}
-
-
-/* Tipsy style */
-.qtip-tipsy{
-	background: black;
-	background: rgba(0, 0, 0, .87);
-
-	color: white;
-	border: 0 solid transparent;
-
-	font-size: 11px;
-	font-family: 'Lucida Grande', sans-serif;
-	font-weight: bold;
-	line-height: 16px;
-	text-shadow: 0 1px black;
-}
-
-	.qtip-tipsy .qtip-titlebar{
-		padding: 6px 35px 0 10px;
-		background-color: transparent;
-	}
-
-	.qtip-tipsy .qtip-content{
-		padding: 6px 10px;
-	}
-	
-	.qtip-tipsy .qtip-icon{
-		border-color: #222;
-		text-shadow: none;
-	}
-
-	.qtip-tipsy .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/* Tipped style */
-.qtip-tipped{
-	border: 3px solid #959FA9;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-
-	background-color: #F9F9F9;
-	color: #454545;
-
-	font-weight: normal;
-	font-family: serif;
-}
-
-	.qtip-tipped .qtip-titlebar{
-		border-bottom-width: 0;
-
-		color: white;
-		background: #3A79B8;
-		background-image: -webkit-gradient(linear, left top, left bottom, from(#3A79B8), to(#2E629D));
-		background-image: -webkit-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -moz-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -ms-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -o-linear-gradient(top, #3A79B8, #2E629D);
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)";
-	}
-
-	.qtip-tipped .qtip-icon{
-		border: 2px solid #285589;
-		background: #285589;
-	}
-
-		.qtip-tipped .qtip-icon .ui-icon{
-			background-color: #FBFBFB;
-			color: #555;
-		}
-
-
-/**
- * Twitter Bootstrap style.
- *
- * Tested with IE 8, IE 9, Chrome 18, Firefox 9, Opera 11.
- * Does not work with IE 7.
- */
-.qtip-bootstrap{
-	/** Taken from Bootstrap body */
-	font-size: 14px;
-	line-height: 20px;
-	color: #333333;
-
-	/** Taken from Bootstrap .popover */
-	padding: 1px;
-	background-color: #ffffff;
-	border: 1px solid #ccc;
-	border: 1px solid rgba(0, 0, 0, 0.2);
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	border-radius: 6px;
-	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	-webkit-background-clip: padding-box;
-	-moz-background-clip: padding;
-	background-clip: padding-box;
-}
-
-	.qtip-bootstrap .qtip-titlebar{
-		/** Taken from Bootstrap .popover-title */
-		padding: 8px 14px;
-		margin: 0;
-		font-size: 14px;
-		font-weight: normal;
-		line-height: 18px;
-		background-color: #f7f7f7;
-		border-bottom: 1px solid #ebebeb;
-		-webkit-border-radius: 5px 5px 0 0;
-		-moz-border-radius: 5px 5px 0 0;
-		border-radius: 5px 5px 0 0;
-	}
-
-		.qtip-bootstrap .qtip-titlebar .qtip-close{
-			/**
-			 * Overrides qTip2:
-			 * .qtip-titlebar .qtip-close{
-			 *   [...]
-			 *   right: 4px;
-			 *   top: 50%;
-			 *   [...]
-			 *   border-style: solid;
-			 * }
-			 */
-			right: 11px;
-			top: 45%;
-			border-style: none;
-		}
-
-	.qtip-bootstrap .qtip-content{
-		/** Taken from Bootstrap .popover-content */
-		padding: 9px 14px;
-	}
-
-	.qtip-bootstrap .qtip-icon{
-		/**
-		 * Overrides qTip2:
-		 * .qtip-default .qtip-icon {
-		 *   border-color: #CCC;
-		 *   background: #F1F1F1;
-		 *   color: #777;
-		 * }
-		 */
-		background: transparent;
-	}
-
-		.qtip-bootstrap .qtip-icon .ui-icon{
-			/**
-			 * Overrides qTip2:
-			 * .qtip-icon .ui-icon{
-			 *   width: 18px;
-			 *   height: 14px;
-			 * }
-			 */
-			width: auto;
-			height: auto;
-
-			/* Taken from Bootstrap .close */
-			float: right;
-			font-size: 20px;
-			font-weight: bold;
-			line-height: 18px;
-			color: #000000;
-			text-shadow: 0 1px 0 #ffffff;
-			opacity: 0.2;
-			filter: alpha(opacity=20);
-		}
-
-		.qtip-bootstrap .qtip-icon .ui-icon:hover{
-			/* Taken from Bootstrap .close:hover */
-			color: #000000;
-			text-decoration: none;
-			cursor: pointer;
-			opacity: 0.4;
-			filter: alpha(opacity=40);
-		}
-
-
-/* IE9 fix - removes all filters */
-.qtip:not(.ie9haxors) div.qtip-content,
-.qtip:not(.ie9haxors) div.qtip-titlebar{
-	filter: none;
-	-ms-filter: none;
-}
-
-
-
-.qtip .qtip-tip{
-	margin: 0 auto;
-	overflow: hidden;
-	z-index: 10;
-	
-}
-
-	/* Opera bug #357 - Incorrect tip position
-	https://github.com/Craga89/qTip2/issues/367 */
-	x:-o-prefocus, .qtip .qtip-tip{
-		visibility: hidden;
-	}
-
-	.qtip .qtip-tip,
-	.qtip .qtip-tip .qtip-vml,
-	.qtip .qtip-tip canvas{
-		position: absolute;
-
-		color: #123456;
-		background: transparent;
-		border: 0 dashed transparent;
-	}
-	
-	.qtip .qtip-tip canvas{ top: 0; left: 0; }
-
-	.qtip .qtip-tip .qtip-vml{
-		behavior: url(#default#VML);
-		display: inline-block;
-		visibility: visible;
-	}
-
-#qtip-overlay{
-	position: fixed;
-	left: -10000em;
-	top: -10000em;
-}
-
-	/* Applied to modals with show.modal.blur set to true */
-	#qtip-overlay.blurs{ cursor: pointer; }
-
-	/* Change opacity of overlay here */
-	#qtip-overlay div{
-		position: absolute;
-		left: 0; top: 0;
-		width: 100%; height: 100%;
-
-		background-color: black;
-
-		opacity: 0.7;
-		filter:alpha(opacity=70);
-		-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	}
-
-
-
-.qtipmodal-ie6fix{
-	position: absolute !important;
-}
\ No newline at end of file