<feed xmlns='http://www.w3.org/2005/Atom'>
<title>97dev.git/97suifangqa/apps/sciblog, branch master</title>
<subtitle>97suifang website development
</subtitle>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/'/>
<entry>
<title>* merged commits from 'maxwell lou' by time '20131028_09:52';</title>
<updated>2013-10-30T02:16:21+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-10-30T02:16:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=1e4a9c0565c3d2f52ec205ae7627ebfc84278735'/>
<id>1e4a9c0565c3d2f52ec205ae7627ebfc84278735</id>
<content type='text'>
* 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'
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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'
</pre>
</div>
</content>
</entry>
<entry>
<title>* treat 'apps/utils' as regular django app; which used to store</title>
<updated>2013-10-09T07:52:53+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-10-09T07:52:53+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=02afd8a32edb13ea7fc2266ac80092ea15c0930c'/>
<id>02afd8a32edb13ea7fc2266ac80092ea15c0930c</id>
<content type='text'>
  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';
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
  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';
</pre>
</div>
</content>
</entry>
<entry>
<title>* indicator/static/javascripts/card_chart.js:</title>
<updated>2013-10-04T15:56:35+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-10-04T15:56:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=f552b41f4b337e6844f71c29ff177915abbfa417'/>
<id>f552b41f4b337e6844f71c29ff177915abbfa417</id>
<content type='text'>
  improved the display position of 'detail_card_info'
* indicator/templates/indicator/SheetDefault.html:
  destroy 'qtip' when close card

* added new app 'apps/sfaccount'
* implemented 'signup' and 'activate' functions
* implemented async sending activation mail
  (using 'django-celery' and 'redis')
* moved 'registration/*' templates to 'sfaccount/templates'

* implemented 'password_change' function:
  o password_change
  o password_change_done
* implemented 'password_reset' function
  o password_reset
  o password_reset_done
  o password_reset_confirm
  o password_reset_complete
  o re-write 'sfaccount.fomrs.SFPasswordResetForm'
  o re-write 'sfaccount.views.password_reset_view'
* improved 'sfaccount.functional' send mail functions
  o to send 'multipart' mail

* added 'README.txt'

* added app 'apps/recommend':
  for comparing with the SCI papers and then recommending
  most related papers for user.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
  improved the display position of 'detail_card_info'
* indicator/templates/indicator/SheetDefault.html:
  destroy 'qtip' when close card

* added new app 'apps/sfaccount'
* implemented 'signup' and 'activate' functions
* implemented async sending activation mail
  (using 'django-celery' and 'redis')
* moved 'registration/*' templates to 'sfaccount/templates'

* implemented 'password_change' function:
  o password_change
  o password_change_done
* implemented 'password_reset' function
  o password_reset
  o password_reset_done
  o password_reset_confirm
  o password_reset_complete
  o re-write 'sfaccount.fomrs.SFPasswordResetForm'
  o re-write 'sfaccount.views.password_reset_view'
* improved 'sfaccount.functional' send mail functions
  o to send 'multipart' mail

* added 'README.txt'

* added app 'apps/recommend':
  for comparing with the SCI papers and then recommending
  most related papers for user.
</pre>
</div>
</content>
</entry>
<entry>
<title>*** merged changes of front pages ***</title>
<updated>2013-09-20T15:52:59+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-09-20T15:52:59+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=c9da4168874296cf4f5ba71b9a432ceae3c26130'/>
<id>c9da4168874296cf4f5ba71b9a432ceae3c26130</id>
<content type='text'>
* 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;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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;
</pre>
</div>
</content>
</entry>
<entry>
<title>med 'indicator/static/javascripts/load_card.js' to 'card_chart.js</title>
<updated>2013-08-20T23:55:06+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-08-20T23:55:06+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=3ef1e03e4273544cce177ce7fa0e0ab75eded990'/>
<id>3ef1e03e4273544cce177ce7fa0e0ab75eded990</id>
<content type='text'>
* 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 &gt;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()' -&gt; 'IndexDesc: go_library_btn'
* detail_card_info: data table
* Data input/edit form, and validate &amp; submit
* Highcharts xAxis labels problem ??
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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 &gt;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()' -&gt; 'IndexDesc: go_library_btn'
* detail_card_info: data table
* Data input/edit form, and validate &amp; submit
* Highcharts xAxis labels problem ??
</pre>
</div>
</content>
</entry>
<entry>
<title>* improved 'indicator.views.follow_indicator()',</title>
<updated>2013-08-17T16:52:06+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-08-17T16:52:06+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=9d07e8a26657542c98535abb7812d83a98839918'/>
<id>9d07e8a26657542c98535abb7812d83a98839918</id>
<content type='text'>
  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
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
  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
</pre>
</div>
</content>
</entry>
<entry>
<title>* updated 'apps/indicator/templates/indicator/' pages,</title>
<updated>2013-08-14T16:20:55+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-08-14T16:20:55+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=5bcf6aa3b784c81aad353b3cefb433493f05f4a0'/>
<id>5bcf6aa3b784c81aad353b3cefb433493f05f4a0</id>
<content type='text'>
  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!
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
  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!
</pre>
</div>
</content>
</entry>
<entry>
<title>* added 'templates/search/search.html'</title>
<updated>2013-08-13T16:05:31+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-08-13T16:05:31+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=bb095adf76bddc2f6c5925bcdebb52bff75e6578'/>
<id>bb095adf76bddc2f6c5925bcdebb52bff75e6578</id>
<content type='text'>
* 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'
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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'
</pre>
</div>
</content>
</entry>
<entry>
<title>cloned from 'bitbucket', 2013/08/13</title>
<updated>2013-08-13T06:13:24+00:00</updated>
<author>
<name>Alvin Li</name>
<email>liweitianux@gmail.com</email>
</author>
<published>2013-08-13T06:13:24+00:00</published>
<link rel='alternate' type='text/html' href='https://git.liwt.net/97dev.git/commit/?id=9636d4a6767f49384d5c386bc3f1142c88b90613'/>
<id>9636d4a6767f49384d5c386bc3f1142c88b90613</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
