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

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

10 files changed, 0 insertions, 0 deletions

diff --git a/97suifangqa/staticfiles/images/back_main.jpg b/97suifangqa/staticfiles/images/back_main.jpg
index ee4f950..74e9128 100644
--- a/97suifangqa/staticfiles/images/back_main.jpg
+++ b/97suifangqa/staticfiles/images/back_main.jpg
diff --git a/97suifangqa/staticfiles/images/card-bg-blue.png b/97suifangqa/staticfiles/images/card-bg-blue.png
index 51d9a4a..d0ef1af 100644
--- a/97suifangqa/staticfiles/images/card-bg-blue.png
+++ b/97suifangqa/staticfiles/images/card-bg-blue.png
diff --git a/97suifangqa/staticfiles/images/card-bg-blue_bak.png b/97suifangqa/staticfiles/images/card-bg-blue_bak.png
new file mode 100644
index 0000000..51d9a4a
--- /dev/null
+++ b/97suifangqa/staticfiles/images/card-bg-blue_bak.png
diff --git a/97suifangqa/staticfiles/images/card-bg-green.png b/97suifangqa/staticfiles/images/card-bg-green.png
index 5e58ccd..ff991eb 100644
--- a/97suifangqa/staticfiles/images/card-bg-green.png
+++ b/97suifangqa/staticfiles/images/card-bg-green.png
diff --git a/97suifangqa/staticfiles/images/card-bg-green_bak.png b/97suifangqa/staticfiles/images/card-bg-green_bak.png
new file mode 100644
index 0000000..5e58ccd
--- /dev/null
+++ b/97suifangqa/staticfiles/images/card-bg-green_bak.png
diff --git a/97suifangqa/staticfiles/images/card-bg-grey.png b/97suifangqa/staticfiles/images/card-bg-grey.png
index ce16bcc..8962144 100644
--- a/97suifangqa/staticfiles/images/card-bg-grey.png
+++ b/97suifangqa/staticfiles/images/card-bg-grey.png
diff --git a/97suifangqa/staticfiles/images/card-bg-grey_bak.png b/97suifangqa/staticfiles/images/card-bg-grey_bak.png
new file mode 100644
index 0000000..ce16bcc
--- /dev/null
+++ b/97suifangqa/staticfiles/images/card-bg-grey_bak.png
diff --git a/97suifangqa/staticfiles/images/logo-overlay-white.png b/97suifangqa/staticfiles/images/logo-overlay-white.png
index 99b5b31..8aa0d54 100644
--- a/97suifangqa/staticfiles/images/logo-overlay-white.png
+++ b/97suifangqa/staticfiles/images/logo-overlay-white.png
diff --git a/97suifangqa/staticfiles/images/slilogo-white.png b/97suifangqa/staticfiles/images/slilogo-white.png
new file mode 100644
index 0000000..a779cc5
--- /dev/null
+++ b/97suifangqa/staticfiles/images/slilogo-white.png
diff --git a/97suifangqa/staticfiles/images/slilogo.png b/97suifangqa/staticfiles/images/slilogo.png
index e50c568..39ace36 100644
--- a/97suifangqa/staticfiles/images/slilogo.png
+++ b/97suifangqa/staticfiles/images/slilogo.png