aboutsummaryrefslogtreecommitdiffstats
path: root/97suifangqa/apps/indicator/static/css
diff options
context:
space:
mode:
authorAlvin Li <liweitianux@gmail.com>2013-08-21 07:55:06 +0800
committerAlvin Li <liweitianux@gmail.com>2013-08-21 07:55:06 +0800
commit3ef1e03e4273544cce177ce7fa0e0ab75eded990 (patch)
treebdce02e1e308dd040918de95ecce9b8254c3fc65 /97suifangqa/apps/indicator/static/css
parent9d07e8a26657542c98535abb7812d83a98839918 (diff)
download97dev-3ef1e03e4273544cce177ce7fa0e0ab75eded990.tar.bz2
med 'indicator/static/javascripts/load_card.js' to 'card_chart.js
* 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 ??
Diffstat (limited to '97suifangqa/apps/indicator/static/css')
-rw-r--r--97suifangqa/apps/indicator/static/css/index_desc.css16
-rw-r--r--97suifangqa/apps/indicator/static/css/new_delete_index.css27
-rw-r--r--97suifangqa/apps/indicator/static/css/sheet_default.css14
-rw-r--r--97suifangqa/apps/indicator/static/css/sidebar.css4
4 files changed, 54 insertions, 7 deletions
diff --git a/97suifangqa/apps/indicator/static/css/index_desc.css b/97suifangqa/apps/indicator/static/css/index_desc.css
index ab042d4..c5adbc8 100644
--- a/97suifangqa/apps/indicator/static/css/index_desc.css
+++ b/97suifangqa/apps/indicator/static/css/index_desc.css
@@ -31,15 +31,27 @@
line-height: 20px;
color: #4A4A4A;
font-size: 14px;
- letter-spacing: 1px;
overflow: auto;
}
+.index_desc_content .not_found {
+ color: #4A4A4A;
+ line-height: 22px;
+ font-size: 16px;
+ text-align: left;
+}
.collection {
background-color: #F7F7F7;
height: 38px;
line-height: 38px;
+ font-size: 16px;
text-align: center;
cursor: pointer;
+ border: 1px solid #CCCCCC;
+ border-radius: 3px;
+ border-shadow: 0 0 2px white;
+}
+.collection:hover {
+ background-color: #EAEAEA;
}
.go_library {
padding-top: 8px;
@@ -53,4 +65,4 @@
padding-right: 5px;
padding-bottom: 2px;
padding-top: 2px;
-} \ No newline at end of file
+}
diff --git a/97suifangqa/apps/indicator/static/css/new_delete_index.css b/97suifangqa/apps/indicator/static/css/new_delete_index.css
index b5b161a..f26430d 100644
--- a/97suifangqa/apps/indicator/static/css/new_delete_index.css
+++ b/97suifangqa/apps/indicator/static/css/new_delete_index.css
@@ -202,3 +202,30 @@
border-bottom: 1px solid #BFBFBF;
height: 24px;
}
+
+.link_container {
+ width: 596px;
+ height: 39px;
+ margin: 10px 0; /* top/bottom: 10px; left/right: 0 */
+}
+
+.link_container .status_link {
+ width: 594px;
+ height: 37px;
+ line-height: 37px;
+ border: 1px solid #B5B5B5;
+ border-radius: 2px;
+ /* background-color: #F7F7F7; */
+ background-color: #F3F3F1;
+ text-align: center;
+}
+
+.link_container .status_link a {
+ color: #4A4A4A;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 19px;
+ letter-spacing: 1px;
+ cursor: pointer;
+}
+
diff --git a/97suifangqa/apps/indicator/static/css/sheet_default.css b/97suifangqa/apps/indicator/static/css/sheet_default.css
index 15d1a98..8f9e001 100644
--- a/97suifangqa/apps/indicator/static/css/sheet_default.css
+++ b/97suifangqa/apps/indicator/static/css/sheet_default.css
@@ -41,12 +41,17 @@
}
.detail_card_info .card_title {
height: 32px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #CACACA;
+}
+.detail_card_info .card_title .title {
+ height: 32px;
line-height: 32px;
color: #4b4a48;
font-weight: bold;
font-size: 18px;
- padding-bottom: 10px;
- border-bottom: 1px solid #CACACA;
+ float: left;
}
.detail_card_info .card_title .collapse_btn {
width: 80px;
@@ -69,7 +74,7 @@
line-height: 23px;
float: left;
}
-.detail_card_info .search_data_div .recent_two_week {
+.detail_card_info .search_data_div .shift_date {
margin-left: 4px;
}
.detail_card_info .search_data_div .unselected {
@@ -101,6 +106,9 @@
top: 2px;
right: 8px;
}
+.detail_card_info .chart {
+ height: 400px;
+}
.detail_card_info .table_div table {
margin-bottom: 0;
}
diff --git a/97suifangqa/apps/indicator/static/css/sidebar.css b/97suifangqa/apps/indicator/static/css/sidebar.css
index 39a6ce0..185145a 100644
--- a/97suifangqa/apps/indicator/static/css/sidebar.css
+++ b/97suifangqa/apps/indicator/static/css/sidebar.css
@@ -179,7 +179,7 @@
#compare_container .compare_btn {
border: 1px solid #7da625;
width: 380px;
- height: 37px;
+ height: 38px;
border-radius: 3px;
margin-top: 8px;
}
@@ -203,4 +203,4 @@
#compare_container .logo_container {
margin-top: 30px;
text-align: center;
-} \ No newline at end of file
+}