97dev.git/97suifangqa/templates/sciblog, branch master

* merged commits from 'maxwell lou' by time '20131028_09:52';

2013-10-30T02:16:21+00:00

* moved 'ValueKind' model from 'recommend/models' to 'indicator/models'
* added field 'type' for 'indicator.models.Indicator'
* added field 'kind' for 'indicator.models.IndicatorRecord',
  'InnateConfine'
* updated methods for models 'Indicator', 'IndicatorRecord',
  'InnateConfine'
* updated views and templates for 'apps/indicator'
* added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py'
* added 'type' field for 'indicator.models.Indicator' in
  'search_indexes.py'
* added a confirm step for 'EditHistoryData' page when delete a record

* removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir
* moved *.json to 'backup' dir
* removed 'apps/managers*.py'
* updated 'indicator/popup/IndexDesc.html'
* created dir 'apps/indicator/obsolete';
* moved 'indicator/forms.py' to dir 'obsolete';
* splitted views related forms.py from 'views.py', and placed in
  'obsolete/views_forms.py'

* loadded newest data into database
* cleaned pervious data files in 'backup' dir
* updated 'README.txt'; added a solution to a redis problem

* added field 'type' of 'indicator.models.Indicator';
  for filtering search results and only returning 'NORMAL_TYPE'

* improved 'indicator.views.follow_indicator()',

2013-08-17T16:52:06+00:00

  renamed to 'indicator_fanduf()' due to name conflict
* finished 'search' function for page indicator NewDeleteIndex.html
* added 'apps/utils/search_tools.py': some tools to process search results
* renamed 'sciblog/templatetags/tools.py' to 'get_range.py'
* added 'format_data()' to indicator.tools': to format data of
  record/confine, make it properly display in html page;
* 'indicator/javascripts/new_delete_index.js':
  added global 'var added_indexes_id' to track the already added indexes
* added 'indicator/templatetags/divisible_by.py' filter to check
  if a number can be extactly divide by another number;
* fixed the 'index_card_fir/index_card_sec' problem of
  'act_card_container' of page 'SheetDefault.html'
* indicator/static/css/new_delete_index.css:
  added 'index_search_error' and 'index_error'

* fixed 'unit.dump' problems in 'indicator.models'
* 'indicator.tools':
  o added 'RI_TYPES', 'RI_WEIGHTS'
  o added 'type' in the return value of 'calc_indicator_weight()'
    and 'recommend_indicator()'
* added field 'followedHistories' in 'indicator.models.UserIndicator'
* moved 'follow_indicator()' and 'unfollow_indicator()' from
  'indicator.views' to 'indicator.tools'

TODO:
* highcharts: draw chart for indicator records;
* add/edit data, and submit (page format design)
* followed indicator submit buttion

* added 'templates/search/search.html'

2013-08-13T16:05:31+00:00

* updated haystack settings
* updated 'static' files settings
* added 'search function' for 'apps/indicator': IndicatorCategory, Indicator
* merged static files of '97suifang-front' by 'mjymjydark'
* merged pages of '97suifang-front' by 'mjymjydark'
* updated pages to use 'django templates syntax' for the static links

TODO:
to fix the 'static links' of 'indicator/static/javascripts/*.js'

cloned from 'bitbucket', 2013/08/13

2013-08-13T06:13:24+00:00