* 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';

3 files changed, 10 insertions, 7 deletions

diff --git a/97suifangqa/apps/sciblog/managers.py b/97suifangqa/apps/sciblog/managers.py
index ae6beb3..8ec0773 100644
--- a/97suifangqa/apps/sciblog/managers.py
+++ b/97suifangqa/apps/sciblog/managers.py
@@ -10,13 +10,13 @@ class AnnotationManager(models.Manager):
         u'''
         获取段落注释
         '''
-        return self.filter(type = 0)
+        return self.filter(type = self.PARAGRAPH)
 
     def propernouns(self):
         u'''
         获取专有名词
         '''
-        return self.filter(type = 1)
+        return self.filter(type = self.PROPER_NOUN)
     
     def all_json(self, user = AnonymousUser()):
         u'''
diff --git a/97suifangqa/apps/sciblog/models.py b/97suifangqa/apps/sciblog/models.py
index 8c8d0cf..48f8a09 100644
--- a/97suifangqa/apps/sciblog/models.py
+++ b/97suifangqa/apps/sciblog/models.py
@@ -4,10 +4,8 @@ from django.db import models
 from django.contrib import admin
 from django.contrib.auth.models import User
 from utils import get_abstract
-from .managers import *
 
-
-# Create your models here.
+from sciblog.managers import *
 
 
 # SciBlog {{{
@@ -368,6 +366,9 @@ class UserCollection(models.Model):
 # UserCollection }}}
 
 
+## NOTES: should place at the end models
+from sciblog import signals
+
 admin.site.register([
                      Source,
                      Reference,
diff --git a/97suifangqa/apps/sciblog/signals.py b/97suifangqa/apps/sciblog/signals.py
index 03e1968..b2b2ce9 100644
--- a/97suifangqa/apps/sciblog/signals.py
+++ b/97suifangqa/apps/sciblog/signals.py
@@ -2,8 +2,10 @@
 
 from django.db.models.signals import pre_save, m2m_changed
 from django.dispatch import receiver
-from models import SciBlog, BlogAnnotation, ResultContent, Reference, BaseLine,\
-                   ClinicCondition, KnowledgePiece, Guideline, EndPoint
+from sciblog.models import (
+        SciBlog, BlogAnnotation, ResultContent, Reference, BaseLine,
+        ClinicCondition, KnowledgePiece, Guideline, EndPoint
+)
 
 import re