* finished modifying 'PM_TYPE' record for 'EditHistoryData' page

 * synced '97suifang-front'

 TODO:
 * to merge changes of '97suifang-front'

1 files changed, 121 insertions, 23 deletions

diff --git a/97suifang-front/assets/css/sheet_default.css b/97suifang-front/assets/css/sheet_default.css
index aca021c..996ee08 100644
--- a/97suifang-front/assets/css/sheet_default.css
+++ b/97suifang-front/assets/css/sheet_default.css
@@ -1,10 +1,106 @@
+#login_container {
+	float: left;
+	position: relative;
+	width: 865px;
+	height: 85px;
+	margin-left: 490px;
+}
+.logged-in {
+	float: right;
+	margin-top: 26px;
+	right: 16px;
+	width: 160px;
+}
+#login.logged-in .user-name, #login.logged-in .user-level, #login.logged-in .user-photo, #login.logged-in .drop-down-menu-button {
+    vertical-align: bottom;
+}
+#login.logged-in .user-photo {
+	position: relative;
+	top: 2px;
+	display: none;
+}
+#login.logged-in .user-level {
+    font-size: 1em;
+    line-height: 1em;
+    padding: 0.05em 0.25em 0.05em 0.2em;
+    display: none;
+}
+.green-block {
+    background-color: #7BB81B;
+    color: #FFFFFF;
+}
+.number-block {
+    border-radius: 3px 3px 3px 3px;
+    font-family: "Courier New","DejaVu Sans Mono",monospace,sans-serif,"STHeiti","WenQuanYi Micro Hei","Microsoft YaHei",SimSun,sans-serif;
+    text-align: center;
+    width: 1.3em;
+}
+#login.logged-in .drop-down-area {
+    cursor: pointer;
+}
+#login.logged-in .user-name {
+    font-size: 1.14286em;
+    font-weight: bold;
+    line-height: 1em;
+}
+#login.logged-in .drop-down-menu {
+    background-color: #FFFFFF;
+    border: 1px solid #C9C9C9;
+    border-radius: 2px 2px 2px 2px;
+    box-shadow: 0 0 10px rgba(85, 85, 85, 0.5);
+    color: #000000;
+    display: none;
+    margin-top: 10px;
+    position: absolute;
+    z-index: 999;
+    width: 168px;
+    height: 91px;
+}
+#login.logged-in .drop-down-menu .text-pointer {
+    background: url("../images/login-menu-popup-pointer.png") no-repeat scroll 0 0 transparent;
+    height: 8px;
+    left: 100px;
+    margin-left: -10px;
+    position: absolute;
+    top: -8px;
+    width: 20px;
+}
+#login.logged-in .drop-down-menu ul {
+    margin: 0;
+    padding: 0;
+    list-style: none outside none;
+}
+#login.logged-in .drop-down-menu ul li {
+    border-bottom: 1px solid #EFEFEF;
+    padding: 2px;
+}
+#login.logged-in .drop-down-menu ul li a {
+    border-radius: 2px 2px 2px 2px;
+    color: inherit;
+    display: block;
+    padding-bottom: 0.2em;
+    padding-left: 1em;
+    padding-top: 0.2em;
+    text-decoration: none;
+    width: 150px;
+}
+#login.logged-in .drop-down-menu ul li.last {
+    border-bottom: medium none;
+}
+#login.logged-in .drop-down-menu.open {
+    display: block;
+}
+
+
 #right_container {
-	width: 596px;
+	width: 696px;
 	float: left;
-	margin-left: 457px;
+	position: absolute;
+	margin : 85px 0 0 490px;
+	padding-bottom: 50px;
 }
 #index_status_container {
-	width: 596px;
+	width: 696px;
 }
 .index_title {
 	color: #4a4a4a;
@@ -31,7 +127,7 @@
 	cursor: pointer;
 }
 .detail_card_info {
-	width: 562px;
+	width: 662px;
 	border: 1px solid #CACACA;
 	position: relative;
 	float: left;
@@ -61,10 +157,10 @@
 .detail_card_info .search_data_div {
 	margin-top: 9px;
 	margin-bottom: 17px;
-	width: 562px;
+	width: 662px;
 }
 .detail_card_info .search_data_div input[type='button'] {
-	width: 80px;
+	width: 100px;
 	height: 23px;
 	line-height: 23px;
 	float: left;
@@ -83,13 +179,13 @@
 	float: right;
 }
 .detail_card_info .search_data_div .end_date_container {
-	margin-left: 10px;
+	margin-left: 25px;
 }
 .detail_card_info .search_data_div .datepicker_container .datepicker {
 	background: #FFFFFF;
 	border: 1px solid #9C9C9C;
 	color: #B9B9B9;
-	width: 107px;
+	width: 117px;
 	height: 17px;
 	line-height: 17px;
 	position: relative;
@@ -126,8 +222,8 @@
 	line-height: 24px;
 }
 .index_card {
-	width: 278px;
-	height: 375px;
+	width: 328px;
+	height: 434px;
 	border: 1px solid #CACACA;
 	margin-top: 9px;
 	border-radius: 2px;
@@ -155,7 +251,7 @@
 }
 .index_card .edit_data, .index_card .editing_data {
 	height: 25px;
-	margin-top: 7px;
+	margin-top: 25px;
 }
 .index_card .edit_data .explain_icon {
 	margin-right: 2px;
@@ -234,7 +330,7 @@
 .index_card .refresh_data {
 	height: 23px;
 	line-height: 23px;
-	margin-top: 3px;
+	margin-top: 15px;
 }
 .index_card .refresh_data .refresh_text {
 	float: left;
@@ -251,7 +347,7 @@
 	width: 148px;
 	height: 23px;
 	position: relative;
-	margin-top: 3px;
+	margin-top: 15px;
 	display: none;
 }
 .index_card .select_date .datepicker {
@@ -275,13 +371,13 @@
 	height: 85px;
 	width: 85px;
 	float: left;
-	margin: 40px 0 0 95px;
+	margin: 45px 0 0 135px;
 	cursor: pointer;
 }
 .index_card .edit_icon_container .curve_icon {
 	background: url("../images/curve.png") no-repeat;
 	height: 125px;
-	width: 97px;
+	width: 105px;
 	float: left;
 }
 .index_card .edit_text {
@@ -289,15 +385,17 @@
 	text-align: center;
 	height: 20px;
 	line-height: 20px;
-	margin-top: 11px;
+	margin-top: 20px;
 	margin-bottom: 100px;
 }
 .index_card .chart {
 	height: 230px;
+	margin-top: 10px;
 }
 .index_card .card_bottom {
 	height: 30px;
-	width: 596px;
+	position: absolute;
+	bottom: 0;
 }
 .index_card .card_bottom .understand_index, .index_card .card_bottom .simulation_sheet, .index_card .card_bottom .detail_history {
 	float: left;
@@ -308,10 +406,10 @@
 	text-decoration: none;
 }
 .index_card .card_bottom .understand_index {
-	width: 99px;
+	width: 120px;
 }
 .index_card .card_bottom .simulation_sheet {
-	width: 96px;
+	width: 115px;
 }
 .index_card .card_delete {
 	background: url('../images/closed.png') no-repeat;
@@ -334,13 +432,13 @@
 	cursor: pointer;
 }
 .act_card_container {
-	width: 293px;
+	width: 343px;
 	height: 380px;
 }
 .act_card{
-	width: 290px;
-	height: 96px;
-	line-height: 96px;
+	width: 340px;
+	height: 118px;
+	line-height: 118px;
 	text-align: center;
 	border: 2px dashed #A0A0A0;
 	margin-top: 9px;