*** merged changes of front pages ***

* 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;

1 files changed, 6 insertions, 62 deletions

diff --git a/97suifangqa/apps/indicator/static/css/edit_history_data.css b/97suifangqa/apps/indicator/static/css/edit_history_data.css
index 49005be..0209ca7 100644
--- a/97suifangqa/apps/indicator/static/css/edit_history_data.css
+++ b/97suifangqa/apps/indicator/static/css/edit_history_data.css
@@ -126,12 +126,6 @@ input[type="radio"]:checked + label {
 	float: left;
 	position: relative;
 }
-.edit_history_data_content .editing_data .date .datepicker_container .valid {
-	border: 2px solid green;
-}
-.edit_history_data_content .editing_data .date .datepicker_container .invalid {
-	border: 2px solid red;
-}
 .edit_history_data_content .editing_data .date .datepicker {
 	background: #FFFFFF;
 	border: 1px solid #9C9C9C;
@@ -149,6 +143,12 @@ input[type="radio"]:checked + label {
 	right: 8px;
 	cursor: pointer;
 }
+.edit_history_data_content .editing_data .date .datepicker_container .valid {
+	border: 2px solid green;
+}
+.edit_history_data_content .editing_data .date .datepicker_container .invalid {
+	border: 2px solid red;
+}
 .edit_history_data_content .editing_data .data  {
 	height: 26px;
 	line-height: 26px;
@@ -182,62 +182,6 @@ input[type="radio"]:checked + label {
 	padding-bottom: 2px;
 	margin-right: 8px;
 }
-.edit_history_data_content .editing_data .input_container {
-	height: 26px;
-	line-height: 26px;
-	float: left;
-	top: 1px;
-}
-.edit_history_data_content .editing_data .input_container .prompt {
-	margin-right: 8px;
-	float: left;
-}
-.edit_history_data_content .editing_data .input_container input {
-	color: #5C5C5C;
-	background-color: #FFFFFF;
-	border: 1px solid #9C9C9C;
-}
-.edit_history_data_content .editing_data .input_container .error {
-	border: 2px solid red;
-}
-.edit_history_data_content .editing_data .input_container .edit_input_main {
-	width: 42px;
-	height: 17px;
-	line-height: 17px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-.edit_history_data_content .editing_data .input_container .edit_input_sub {
-	width: 17px;
-	height: 17px;
-	line-height: 17px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-}
-.edit_history_data_content .editing_data .add_minus_icon {
-	height: 26px;
-	line-height: 26px;
-	float: left;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	margin-right: 8px;
-}
-.edit_history_data_content .editing_data .add_minus_icon .add_icon {
-	background:url(../images/add.png) no-repeat;
-	width: 15px;
-	height: 11px;
-	border-right: 1px solid #9C9C9C;
-	cursor: pointer;
-}
-.edit_history_data_content .editing_data .add_minus_icon .minus_icon {
-	background:url(../images/minus.png) no-repeat;
-	width: 15px;
-	height: 10px;
-	border-bottom: 1px solid #9C9C9C;
-	border-right: 1px solid #9C9C9C;
-	margin-top: 1px;
-	cursor: pointer;
-}
 .edit_history_data_content .editing_data .data_unit {
 	height: 26px;
 	line-height: 26px;