* indicator/static/javascripts/card_chart.js:

  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.

1 files changed, 18 insertions, 2 deletions

diff --git a/97suifangqa/apps/indicator/static/javascripts/card_chart.js b/97suifangqa/apps/indicator/static/javascripts/card_chart.js
index 92a91c0..ef2eb24 100644
--- a/97suifangqa/apps/indicator/static/javascripts/card_chart.js
+++ b/97suifangqa/apps/indicator/static/javascripts/card_chart.js
@@ -92,6 +92,22 @@ $(document).ready(function(){
         // update 'detail_card_id'
         detail_card_id = $(this).closest(".index_card").attr("id").replace('index_card_', '');
         var card = $("#index_card_"+detail_card_id);
+        // determine the position to show the 'detail_card'
+        var pos_to_insertafter = null;
+        if (card.hasClass("index_card_sec")) {
+            // this card in on the right
+            pos_to_insertafter = card;
+        }
+        else if (card.nextAll(".index_card_sec").length) {
+            // this card is on the left
+            pos_to_insertafter = card.nextAll(".index_card_sec").first();
+        }
+        else {
+            // this card is the last card
+            pos_to_insertafter = card.nextAll(".act_card_container");
+        }
+        // move 'detail_card_info' div
+        $(".detail_card_info").insertAfter(pos_to_insertafter);
         // check if this card has data (class "record_empty")
         if (card.hasClass("record_empty")) {
             $(".detail_card_info").hide();
@@ -142,7 +158,7 @@ $(document).ready(function(){
                 getdata_type, getdata_num,
                 begin_date_str, end_date_str
         );
-        $(".act_card_container").addClass("move_div_2_left");
+        //$(".act_card_container").addClass("move_div_2_left");
         return false;
     });
 
@@ -215,7 +231,7 @@ $(document).ready(function(){
         //初始化详细卡片id
         detail_card_id = "-1";
         //添加删除div位置初始化
-        $(".act_card_container").removeClass("move_div_2_left");
+        //$(".act_card_container").removeClass("move_div_2_left");
         return false;
     });
 });