aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* * improved 'indicator.views.follow_indicator()',Alvin Li2013-08-1823-565/+1087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* * updated 'indicator/templates/indicator/NewDeleteIndex.html':Alvin Li2013-08-164-290/+111
| | | | | | | o page_condition: "all", "category", "search" o make use of django templates to generate contents * updated 'indicator.views': GET, POST methods for NewDeleteIndex page * indicator.search_indexes: changed 'categories' to 'categories_id'
* solr/conf/schema.xml: changed 'categories' to 'categories_id'Alvin Li2013-08-161-1/+1
|
* * updated 'indicator.views' for front pagesAlvin Li2013-08-159-437/+681
| | | | | | * use 'render' instead of 'render_to_response' * updated 'indicator/templates/indicator/NewDeleteIndex.html' to show all indicators and followed indicators
* * updated 'apps/indicator/templates/indicator/' pages,Alvin Li2013-08-1524-470/+680
| | | | | | | | | | extends "base.html", make use of the django template system * added 'static_url', 'indicator_url' js variables * implemented the AJAX function for 'apps/indicator/templates/' pages TODO: * finish 'indicator.views': get_card_data_chart(), get_card_data_table() * link the front pages with the django models, forms and search!
* updated git index (previously deleted files)Alvin Li2013-08-147-170/+0
|
* * added 'templates/search/search.html'Alvin Li2013-08-1480-26/+10048
| | | | | | | | | | | | * 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'
* added '97suifang-front'Alvin Li2013-08-1366-0/+9711
|
* added 'isuifang_solr'Alvin Li2013-08-13267-0/+31661
|
* cloned from 'bitbucket', 2013/08/13Alvin Li2013-08-13471-0/+53129
|
* Initial commitAlvin Li2013-08-122-0/+27