git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@852 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/index.css

@@ -144,10 +144,10 @@ a {
 	border-color: #56a022;
 }
 
-.btn-info.btn-line:hover{
+.btn-info.btn-line:hover {
 	background-color: #56a022;
-  	color: #fff;
-  	border-color: #56a022;
+	color: #fff;
+	border-color: #56a022;
 }
 
 /*dropdown*/
@@ -248,7 +248,7 @@ a {
 }
 
 .line-charts {
-	padding-bottom: 10px;	
+	padding-bottom: 10px;
 }
 
 .line-charts [ac-chart] {
@@ -285,7 +285,7 @@ a {
 	margin-left: 15px !important;
 }
 
-.list-menu>li{
+.list-menu>li {
 	padding: 5px 5px 5px 15px;
 	position: relative;
 	border-bottom: 1px dotted #eee;
@@ -293,8 +293,8 @@ a {
 
 .list-menu>li:before {
 	position: absolute;
-  	left: 0;
-  	top: -2px;
+	left: 0;
+	top: -2px;
 	content: ".";
 	font-size: 16px;
 	font-weight: bold;
@@ -571,8 +571,8 @@ a {
 
 .body:before,.body:after {
 	content: " ";
-  	display: table;
-  	clear: both;
+	display: table;
+	clear: both;
 }
 
 .body>.left {
@@ -975,20 +975,23 @@ a {
 	margin-left: 20px;
 	color: #eee
 }
-@media (min-width: 1100px) {
-  .right {
-  	width: 930px;
-  }
+
+@media ( min-width : 1100px) {
+	.right {
+		width: 930px;
+	}
 }
-@media (min-width: 1024px) {
-  .right {
-  	width: 810px;
-  }
+
+@media ( min-width : 1024px) {
+	.right {
+		width: 810px;
+	}
 }
-@media (min-width: 910px) {
-  .right {
-  	width: 760px;
-  }
+
+@media ( min-width : 910px) {
+	.right {
+		width: 760px;
+	}
 }
 /*footer*/
 #footer {
@@ -1111,16 +1114,16 @@ a {
 }
 
 .headerline {
-  	font-size: 24px;
-  	font-family: Microsoft YaHei,SimHei,Verdana;
-  	font-weight: 500;
-  	line-height: 22px;
-  	margin: 25px 0 25px -15px;
-  	clear: both;
-  	zoom: 1;
-  	border-top: 1px solid #eee;
-  	position: relative;
-  	font-size: 18px;
+	font-size: 24px;
+	font-family: Microsoft YaHei, SimHei, Verdana;
+	font-weight: 500;
+	line-height: 22px;
+	margin: 25px 0 25px -15px;
+	clear: both;
+	zoom: 1;
+	border-top: 1px solid #eee;
+	position: relative;
+	font-size: 18px;
 }
 
 .headerline .index {
@@ -1128,13 +1131,13 @@ a {
 	top: -12px;
 	left: 0;
 	width: 25px;
-  	height: 24px;
-  	line-height: 24px;
-  	background: #56a022;
-  	color: #fff;
-  	text-align: center;
-  	border-radius: 0 2px 2px 0;
-  	z-index: 2;
+	height: 24px;
+	line-height: 24px;
+	background: #56a022;
+	color: #fff;
+	text-align: center;
+	border-radius: 0 2px 2px 0;
+	z-index: 2;
 }
 
 .headerline .content {
@@ -1142,9 +1145,19 @@ a {
 	top: -12px;
 	left: 25px;
 	line-height: 24px;
-  	padding: 0 15px 0 10px;
-  	background: #fff;
-  	z-index: 2;
+	padding: 0 15px 0 10px;
+	background: #fff;
+	z-index: 2;
+}
+
+.headerline .center {
+	position: absolute;
+	top: -12px;
+	left: 40%; 
+	line-height : 24px;
+	padding: 0 15px;
+	background: #fff;
+	z-index: 2;
 }
 
 .headerline .end {
@@ -1152,12 +1165,12 @@ a {
 	top: -12px;
 	right: 0;
 	line-height: 24px;
-  	padding-left: 15px;
-  	background: #fff;
-  	z-index: 2;
+	padding-left: 15px;
+	background: #fff;
+	z-index: 2;
 }
 /*account*/
-.resource-container {
+.resource-container,.role-container {
 	padding: 15px;
 }
 
@@ -1191,6 +1204,47 @@ a {
 	color: #999;
 }
 
+.resource-container>.resource-item {
+	position: relative;
+	padding-bottom: 15px;
+}
+
+.resource-container>.resource-item>.simple-list {
+	display: none;
+}
+
+.resource-container>.resource-item.active>.simple-list {
+	display: block;
+}
+
+.role-container>.default-role {
+	width: 930px;
+	height: 150px;
+}
+
+.role-container>.default-role>.item {
+	float: left;
+	width: 306px;
+	height: 150px;
+	padding-top: 24px;
+	border-right: 1px dashed #ededed;
+}
+
+.role-container>.default-role>.item>.icon{
+  	margin-left: 20px;
+  	float: left;
+  	width: 100px;
+  	height: 100px;
+  	line-height: 100px;
+  	text-align: center;
+  	margin-top: 5px;
+  	color: #56a022;
+  	font-size: 52px;
+  	border-radius: 50%;
+ 	-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
+  	box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
+  	background-color: #f3f3f4;
+}
 /*attach*/
 .global_icon {
 	background: url("../img/merge/full_ico.png") no-repeat bottom right;
@@ -1310,13 +1364,13 @@ a {
 }
 
 .row.row-sm {
-  margin-left: -5px;
-  margin-right: -5px;
+	margin-left: -5px;
+	margin-right: -5px;
 }
 
-.row-sm [class*="col-"]{
-  padding-left: 5px;
-  padding-right: 5px;
+.row-sm [class*="col-"] {
+	padding-left: 5px;
+	padding-right: 5px;
 }
 /*data view*/
 .condition {
@@ -1387,31 +1441,31 @@ a {
 }
 
 .events dd {
-  	position: relative;
-  	border-left: 1px solid #e1e3e6;
-  	padding-bottom: 45px;
+	position: relative;
+	border-left: 1px solid #e1e3e6;
+	padding-bottom: 45px;
 }
 
 .events dd:first-child {
-  	margin-top: -40px;
-  	padding-top: 40px;
+	margin-top: -40px;
+	padding-top: 40px;
 }
 
 .events dd:last-child {
-  padding-bottom: 0;
-  border-color: transparent;
+	padding-bottom: 0;
+	border-color: transparent;
 }
 
 .events dd .year,.events dd .date {
-  	position: absolute;
-  	left: -148px;
-  	top: 0;
-  	width: 120px;
-  	height: 25px;
-  	line-height: 25px;
-  	font-size: 16px;
-  	color: #9ea9c0;
-  	text-align: right;
+	position: absolute;
+	left: -148px;
+	top: 0;
+	width: 120px;
+	height: 25px;
+	line-height: 25px;
+	font-size: 16px;
+	color: #9ea9c0;
+	text-align: right;
 }
 
 .events dd .year {
@@ -1420,24 +1474,24 @@ a {
 }
 
 .events dd .year .character {
-  	font-size: 16px;
-  	margin-left: 2px;
+	font-size: 16px;
+	margin-left: 2px;
 }
 
 .events dd:first-child .year {
-  	margin-top: 40px;
+	margin-top: 40px;
 }
 
 .events dd .icon {
-  	position: absolute;
-  	left: -18px;
-  	top: -5px;
-  	border: 5px solid #fff;
-  	width: 35px;
-  	height: 35px;
-  	border-radius: 8px;
-  	text-align: center;
-  	background: #e5e5e5;
+	position: absolute;
+	left: -18px;
+	top: -5px;
+	border: 5px solid #fff;
+	width: 35px;
+	height: 35px;
+	border-radius: 8px;
+	text-align: center;
+	background: #e5e5e5;
 }
 
 .events dd .icon.year-icon {
@@ -1445,38 +1499,38 @@ a {
 }
 
 .events dd:first-child .icon {
-  	margin-top: 40px;
+	margin-top: 40px;
 }
 
-.events dd .icon i{
+.events dd .icon i {
 	line-height: 25px;
-  	font-size: 16px;
-  	color: #c2c2c2;
+	font-size: 16px;
+	color: #c2c2c2;
 }
 
 .events dd .event {
-  	padding-top: 12px;
+	padding-top: 12px;
 }
 
 .events dd .event .event_tit-wrapper {
-  	height: 25px;
-  	line-height: 25px;
-  	font-size: 16px;
-  	border-top: 1px solid #e1e3e6;
+	height: 25px;
+	line-height: 25px;
+	font-size: 16px;
+	border-top: 1px solid #e1e3e6;
 }
 
 .events dd .event .event_tit-wrapper .event_tit {
-  	position: relative;
-  	top: -13px;
-  	margin-left: 35px;
-  	padding-left: 5px;
-  	background: #fff;
+	position: relative;
+	top: -13px;
+	margin-left: 35px;
+	padding-left: 5px;
+	background: #fff;
 }
 
 .events dd .event .event_cnt {
-  	margin: -6px 0 0 40px;
-  	font-size: 14px;
-  	color: #999;
+	margin: -6px 0 0 40px;
+	font-size: 14px;
+	color: #999;
 }
 
 .events dd .event a {
@@ -1484,24 +1538,24 @@ a {
 }
 
 .events dd .event {
-  	padding-top: 12px;
+	padding-top: 12px;
 }
 
 .table-default .header {
 	background: #f5f5f5;
 	border-top: 1px solid #e8e8e8;
-  	border-bottom: 1px solid #e8e8e8;
-  	-webkit-box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
+	border-bottom: 1px solid #e8e8e8;
+	-webkit-box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
 	box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
 }
 
 .table-default .header>th {
-  	padding: 10px;
-  	text-align: center;
+	padding: 10px;
+	text-align: center;
 }
 
-.table-hover > tbody > tr:hover {
-  	background-color: #d0e9c6;
+.table-hover>tbody>tr:hover {
+	background-color: #d0e9c6;
 	-webkit-transition: all 0.15s ease-in-out;
 	-moz-transition: all 0.15s ease-in-out;
 	transition: all 0.15s ease-in-out;

src/main/webapp/resources/js/index/app.js

@@ -2144,6 +2144,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	
 	app.controller('ResourceCtrl', function($scope, AccountResource){
 		AccountResource.getAll({}, function(data){
+			if(data && data.length > 0) {
+				data[0].$open = true;
+			}
 			$scope.resources = data;
 		});
 	});

src/main/webapp/resources/tpl/index/account/resource.html

@@ -1,9 +1,12 @@
 <div class="block resource-container">
-	<div ng-repeat="resource in resources track by resource.id">
+	<div ng-repeat="resource in resources track by resource.id" class="resource-item" ng-class="{'active': resource.$open}">
 		<div class="headerline">
-			<div class="index" ng-bind="$index+1"></div>
-			<div class="content" ng-bind="::resource.name"></div>
-			<div class="end text-simple f12" ng-bind="::resource.desc"></div>
+			<div class="index f14" ng-bind="$index+1"></div>
+			<div class="content f14" ng-bind="::resource.name"></div>
+			<div class="center text-default f12" ng-bind="::resource.desc"></div>
+			<div class="end">
+				<a class="btn btn-default btn-sm text-simple" ng-click="resource.$open=!resource.$open">{{resource.$open ? '收拢' : '展开'}}</a>
+			</div>
 		</div>
 		<ul class="list-unstyled list-inline simple-list">
 			<li ng-repeat="item in resource.items track by item.id">

src/main/webapp/resources/tpl/index/account/role.html

@@ -1 +1,13 @@
-角色分配
+<div class="block role-container">
+	<div class="default-role">
+		<div class="item">
+			<div class="icon"><i class="fa fa-user-md"></i></div>
+		</div>
+		<div class="item">
+			<div class="icon"><i class="fa fa-male"></i></div>
+		</div>
+		<div class="item">
+			<div class="icon"><i class="fa fa-street-view"></i></div>
+		</div>
+	</div>
+</div>