aboutsummaryrefslogtreecommitdiffstats
path: root/97suifangqa/apps/indicator/static/plugins/thickbox
Commit message (Collapse)AuthorAgeFilesLines
* * treat 'apps/utils' as regular django app; which used to storeAlvin Li2013-10-097-476/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | general tools for used in other apps * moved 'templatetags' from 'apps/indicator' to 'apps/utils' * '.gitignore' to ignore 'fixtures_bak' * moved js plugins from 'apps/indicator/static/plugins' to 'staticfiles/plugins' apps/recommend: * updated 'recommend.models'; o commented 'recommend.models.ResearchCombination' (not used) * implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs'; * added pages 'templates/recommend/add_edit_blog_info.html', 'add_edit_blog_info_error.html'; o related css and javascripts files * added 'tools.py'; * added 'utils/tools.py' for placing generic functions; * deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak'); * small fixes to 'indicator.models', 'sciblog.models' and 'sfaccount.views' * fixed automatically show 'proper_nouns' annotation in blog: recovered the line 'import signals' in 'sciblog.models' * added 'is_ok()' method for 'recommend.models.ResearchConfig';
* * added latest full package of 'jquery-ui' plugin, v1.10.3;Alvin Li2013-08-225-14/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | * improved 'thickbox' plugin to use 'jquery-1.9.x'; * upgraded 'SheetDefault.html', 'NewDeleteIndex.html' and other pages to use 'jquery-1.9.x'; * improved 'IndexDesc.html' to deal with the problem of no related annotation found; * 'indicator.tools.get_record()' added param 'number', and updated the format of return data; * added 'get_num_record()' and 'get_num_record_std()' to 'indicator.tools'; * improved 'indicator.views.ajax_get_card_data_chart()', now can get data by 'num' or by 'date'; * improved 'indicator.views.ajax_get_card_data_table()', to provide the needed data requested from 'detail_card'; * improved js function 'chart_getdata_draw()' in 'SheetDefault.html'; * 'card_chart.js': renamed 'redraw_chart()' to 'detail_chart_getdata_draw()', and updated to get data by type; * updated 'table' of 'detail_card' in 'SheetDefault.html'; * improved js function 'get_card_data_table()' for providing and displaying record data in 'detail_card' table. TODO: * add/delete/edit record data
* med 'indicator/static/javascripts/load_card.js' to 'card_chart.jsAlvin Li2013-08-212-421/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * set Highcharts global options in 'card_chart.js' * 'indicator/templates/indicator/SheetDefault.html': added js function 'chart_getdata_draw()' to draw chart for card * improved 'indicator.views.ajax_get_card_data_chart()' * implemented drawing chart for 'FLOAT_TYPE' and 'RANGE_TYPE' indicators * added datetime plugin 'momentjs': 'indicator/static/plugins/moment/', version 2.1.0 * 'indicator/templates/indicator/NewDeleteIndex.html': added link button to goto 'indicator_status' SheetDefault.html page * added option 'useHTML: true' for Highcharts; improved the display style of ylabels, if value >9999, then show in exponential notation * improved drawing of 'detail_chart', and the 'detail_card_info' * moved js global var to 'SheetDefault.html'; renamed var 'card_detail_id' to 'detail_card_id' * fixed js local variables problem; added 'var' keyword * added check of 'date' for 'indicator.models.IndicatorRecord' * ThickBox: removed param 'no1_title' from thickbox popup page's url placed the param 'card_id' before 'TB_iframe' * changed to use 'ANNOTATION_TYPES' for 'sciblog.models.BlogAnnotation' * improved 'indicator/templates/indicator/popup/IndexDesc.html' improved 'indicator.views.indicator_indexdesc()' * added 'sympy' to 'env/requirements.pip' TODO: * BlogAnnotation: 'get_absolute_url()' -> 'IndexDesc: go_library_btn' * detail_card_info: data table * Data input/edit form, and validate & submit * Highcharts xAxis labels problem ??
* * added 'templates/search/search.html'Alvin Li2013-08-143-0/+421
* 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'