From 1e4a9c0565c3d2f52ec205ae7627ebfc84278735 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 30 Oct 2013 10:16:21 +0800 Subject: * merged commits from 'maxwell lou' by time '20131028_09:52'; * 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' --- 97suifangqa/staticfiles/images/back_main.jpg | Bin 2119980 -> 2618253 bytes 97suifangqa/staticfiles/images/card-bg-blue.png | Bin 6099 -> 8304 bytes .../staticfiles/images/card-bg-blue_bak.png | Bin 0 -> 6099 bytes 97suifangqa/staticfiles/images/card-bg-green.png | Bin 6220 -> 8708 bytes .../staticfiles/images/card-bg-green_bak.png | Bin 0 -> 6220 bytes 97suifangqa/staticfiles/images/card-bg-grey.png | Bin 5945 -> 7981 bytes .../staticfiles/images/card-bg-grey_bak.png | Bin 0 -> 5945 bytes .../staticfiles/images/logo-overlay-white.png | Bin 8201 -> 25201 bytes 97suifangqa/staticfiles/images/slilogo-white.png | Bin 0 -> 6832 bytes 97suifangqa/staticfiles/images/slilogo.png | Bin 8219 -> 7307 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 97suifangqa/staticfiles/images/card-bg-blue_bak.png create mode 100644 97suifangqa/staticfiles/images/card-bg-green_bak.png create mode 100644 97suifangqa/staticfiles/images/card-bg-grey_bak.png create mode 100644 97suifangqa/staticfiles/images/slilogo-white.png (limited to '97suifangqa/staticfiles/images') diff --git a/97suifangqa/staticfiles/images/back_main.jpg b/97suifangqa/staticfiles/images/back_main.jpg index ee4f950..74e9128 100644 Binary files a/97suifangqa/staticfiles/images/back_main.jpg and b/97suifangqa/staticfiles/images/back_main.jpg differ diff --git a/97suifangqa/staticfiles/images/card-bg-blue.png b/97suifangqa/staticfiles/images/card-bg-blue.png index 51d9a4a..d0ef1af 100644 Binary files a/97suifangqa/staticfiles/images/card-bg-blue.png and b/97suifangqa/staticfiles/images/card-bg-blue.png differ 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 Binary files /dev/null and b/97suifangqa/staticfiles/images/card-bg-blue_bak.png differ diff --git a/97suifangqa/staticfiles/images/card-bg-green.png b/97suifangqa/staticfiles/images/card-bg-green.png index 5e58ccd..ff991eb 100644 Binary files a/97suifangqa/staticfiles/images/card-bg-green.png and b/97suifangqa/staticfiles/images/card-bg-green.png differ 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 Binary files /dev/null and b/97suifangqa/staticfiles/images/card-bg-green_bak.png differ diff --git a/97suifangqa/staticfiles/images/card-bg-grey.png b/97suifangqa/staticfiles/images/card-bg-grey.png index ce16bcc..8962144 100644 Binary files a/97suifangqa/staticfiles/images/card-bg-grey.png and b/97suifangqa/staticfiles/images/card-bg-grey.png differ 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 Binary files /dev/null and b/97suifangqa/staticfiles/images/card-bg-grey_bak.png differ diff --git a/97suifangqa/staticfiles/images/logo-overlay-white.png b/97suifangqa/staticfiles/images/logo-overlay-white.png index 99b5b31..8aa0d54 100644 Binary files a/97suifangqa/staticfiles/images/logo-overlay-white.png and b/97suifangqa/staticfiles/images/logo-overlay-white.png differ diff --git a/97suifangqa/staticfiles/images/slilogo-white.png b/97suifangqa/staticfiles/images/slilogo-white.png new file mode 100644 index 0000000..a779cc5 Binary files /dev/null and b/97suifangqa/staticfiles/images/slilogo-white.png differ diff --git a/97suifangqa/staticfiles/images/slilogo.png b/97suifangqa/staticfiles/images/slilogo.png index e50c568..39ace36 100644 Binary files a/97suifangqa/staticfiles/images/slilogo.png and b/97suifangqa/staticfiles/images/slilogo.png differ -- cgit v1.2.2