From c9da4168874296cf4f5ba71b9a432ceae3c26130 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Fri, 20 Sep 2013 23:52:59 +0800 Subject: *** merged changes of front pages *** * merged changes from '97suifang-front' by mjymjydark; and modified to work with django * finished 'editing_data' div of 'SheetDefault' for add new record * added 'indicator.views.ajax_add_record()' *** search *** * improved 'search' function of 'NewDeleteIndex' page; employ AJAX to load search results; * added 'indicator.views.search_indicators()' *** recommend indicator *** * improved the functions of 'recommend_indicator' * added 'sciblog.models.UserCollection' to record the collection information for each user * improved 'sciblog.views.add_user_to_m2m()' to work with 'UserCollection' * added field 'lastRecommendTime' in 'indicator.models.UserIndicator' * updated 'indicator.views.indicator_status' against 'recommend_indicator' *** qtip2 for recommended indicator *** * added 'qtip2' tooltip for recommended indicator card * added '97suifang' qtip css (qtip-sf) * added tooltip for 'add record' when return error (SheetDefault page); * improved the style of 'collection_btn' and 'go_library_btn' of IndexDesc page; --- 97suifangqa/apps/indicator/static/images/curve.png | Bin 1443 -> 1483 bytes .../apps/indicator/static/images/gradient_bar.png | Bin 0 -> 2444 bytes .../apps/indicator/static/images/icon_down.png | Bin 0 -> 3133 bytes .../static/images/login-menu-popup-pointer.png | Bin 0 -> 299 bytes 97suifangqa/apps/indicator/static/images/search.PNG | Bin 0 -> 525 bytes .../apps/indicator/static/images/userPhoto.jpg | Bin 0 -> 2965 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 97suifangqa/apps/indicator/static/images/gradient_bar.png create mode 100644 97suifangqa/apps/indicator/static/images/icon_down.png create mode 100644 97suifangqa/apps/indicator/static/images/login-menu-popup-pointer.png create mode 100644 97suifangqa/apps/indicator/static/images/search.PNG create mode 100644 97suifangqa/apps/indicator/static/images/userPhoto.jpg (limited to '97suifangqa/apps/indicator/static/images') diff --git a/97suifangqa/apps/indicator/static/images/curve.png b/97suifangqa/apps/indicator/static/images/curve.png index 309f262..8464391 100644 Binary files a/97suifangqa/apps/indicator/static/images/curve.png and b/97suifangqa/apps/indicator/static/images/curve.png differ diff --git a/97suifangqa/apps/indicator/static/images/gradient_bar.png b/97suifangqa/apps/indicator/static/images/gradient_bar.png new file mode 100644 index 0000000..4e2bbb9 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/gradient_bar.png differ diff --git a/97suifangqa/apps/indicator/static/images/icon_down.png b/97suifangqa/apps/indicator/static/images/icon_down.png new file mode 100644 index 0000000..b3685d2 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/icon_down.png differ diff --git a/97suifangqa/apps/indicator/static/images/login-menu-popup-pointer.png b/97suifangqa/apps/indicator/static/images/login-menu-popup-pointer.png new file mode 100644 index 0000000..9728ea7 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/login-menu-popup-pointer.png differ diff --git a/97suifangqa/apps/indicator/static/images/search.PNG b/97suifangqa/apps/indicator/static/images/search.PNG new file mode 100644 index 0000000..303f228 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/search.PNG differ diff --git a/97suifangqa/apps/indicator/static/images/userPhoto.jpg b/97suifangqa/apps/indicator/static/images/userPhoto.jpg new file mode 100644 index 0000000..a9a8380 Binary files /dev/null and b/97suifangqa/apps/indicator/static/images/userPhoto.jpg differ -- cgit v1.2.2