From 9d07e8a26657542c98535abb7812d83a98839918 Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Sun, 18 Aug 2013 00:52:06 +0800 Subject: * improved 'indicator.views.follow_indicator()', 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 --- 97suifangqa/apps/indicator/static/css/new_delete_index.css | 12 ++++++++++++ 97suifangqa/apps/indicator/static/css/sheet_default.css | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to '97suifangqa/apps/indicator/static/css') diff --git a/97suifangqa/apps/indicator/static/css/new_delete_index.css b/97suifangqa/apps/indicator/static/css/new_delete_index.css index 0eb41d1..b5b161a 100644 --- a/97suifangqa/apps/indicator/static/css/new_delete_index.css +++ b/97suifangqa/apps/indicator/static/css/new_delete_index.css @@ -160,6 +160,18 @@ width: 185px; } +.index_search_error { + margin-top: 3px; +} +.index_search_error .index_error { + float: left; + font-size: 14px; + height: 20px; + line-height: 20px; + color: #4A4A4A; + font-weight: bold; +} + .all_condition .index_all_title { font-weight: bold; font-size: 19px; diff --git a/97suifangqa/apps/indicator/static/css/sheet_default.css b/97suifangqa/apps/indicator/static/css/sheet_default.css index aca021c..15d1a98 100644 --- a/97suifangqa/apps/indicator/static/css/sheet_default.css +++ b/97suifangqa/apps/indicator/static/css/sheet_default.css @@ -153,6 +153,9 @@ .index_card .refer_range .refer_text { margin-right: 5px; } +.index_card .refer_range .refer_value { + margin-right: 5px; +} .index_card .edit_data, .index_card .editing_data { height: 25px; margin-top: 7px; @@ -216,6 +219,10 @@ margin-top: 1px; cursor: pointer; } +.index_card .editing_data .data_unit { + float: left; + margin-right: 8px; +} .index_card .editing_data .cancel_edit_icon { float: right; background:url(../images/cancel_edit.png) no-repeat; @@ -356,4 +363,4 @@ } .move_div_2_left { float: left; -} \ No newline at end of file +} -- cgit v1.2.2