Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/css/admin.css

@@ -221,12 +221,10 @@ select {
 
 .box-header {
 	border: none;
-	padding-top: 5px;
 	border-bottom: 1px solid #DEDEDE;
 	border-radius: 3px 3px 0 0;
 	-webkit-border-radius: 3px 3px 0 0;
 	-moz-border-radius: 3px 3px 0 0;
-	height: 12px;
 	min-height: 12px;
 	margin-bottom: 0;
 	cursor: move;
@@ -370,6 +368,7 @@ select {
 
 ul.dashboard-list li {
 	padding: 7px 0;
+	font-size: 14px;
 	list-style: none;
 	border-bottom: 1px solid #EBEBEB;
 	border-top: 1px solid white;

src/main/webapp/resources/view/admin/index.html

@@ -1,300 +1,39 @@
-<!-- 基本信息统计 begin -->
-<div class="sortable row-fluid">
-	<a tooltip="共10人在线" class="well span2 top-block" href="#"> <span
-		class="icon32 icon-red icon-user"></span>
-		<div>注册人员</div>
-		<div>120</div> <span class="notification">10</span>
-	</a> <a tooltip="共200个活跃客户" class="well span2 top-block" href="#"> <span
-		class="icon32 icon-color icon-users"></span>
-		<div>客户</div>
-		<div>300</div> <span class="notification green">200</span>
-	</a> <a tooltip="共30个待回复销售订单" class="well span2 top-block" href="#"> <span
-		class="icon32 icon-color icon-cart"></span>
-		<div>销售订单</div>
-		<div>30,000</div> <span class="notification green">30</span>
-	</a> <a tooltip="共200个活跃供应商" class="well span2 top-block" href="#"> <span
-		class="icon32 icon-color icon-users"></span>
-		<div>供应商</div>
-		<div>400</div> <span class="notification yellow">300</span>
-	</a> <a tooltip="共20个待回复采购订单" class="well span2 top-block" href="#"> <span
-		class="icon32 icon-color icon-cart"></span>
-		<div>采购订单</div>
-		<div>40,000</div> <span class="notification yellow">20</span>
-	</a> <a tooltip="共12条未阅消息" class="well span2 top-block" href="#"> <span
-		class="icon32 icon-color icon-messages"></span>
-		<div>消息</div>
-		<div>25</div> <span class="notification red">12</span>
-	</a>
-</div>
-<!-- 基本信息统计 end -->
-<!-- 采购销售统计 begin -->
-<div class="row-fluid sortable">
-	<!-- 销售统计 begin -->
-	<div class="box span4">
-		<div class="box-header well" data-original-title>
-			<h2>
-				<i class="icon-list"></i> Weekly Stat
-			</h2>
-			<div class="box-icon">
-				<a href="#" class="btn btn-setting btn-round"><i
-					class="icon-cog"></i></a> <a href="#"
-					class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-				<a href="#" class="btn btn-close btn-round"><i
-					class="icon-remove"></i></a>
-			</div>
-		</div>
-		<div class="box-content">
-			<ul class="dashboard-list">
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">92</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">15</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">36</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">45</span> User reviews
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">112</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">31</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">93</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">254</span> User reviews
-				</a></li>
-			</ul>
-		</div>
-	</div>
-	<!-- 销售统计 end -->
-	<!-- 采购统计 begin -->
-	<div class="box span4">
-		<div class="box-header well" data-original-title>
-			<h2>
-				<i class="icon-list"></i> Weekly Stat
-			</h2>
-			<div class="box-icon">
-				<a href="#" class="btn btn-setting btn-round"><i
-					class="icon-cog"></i></a> <a href="#"
-					class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-				<a href="#" class="btn btn-close btn-round"><i
-					class="icon-remove"></i></a>
-			</div>
-		</div>
-		<div class="box-content">
-			<ul class="dashboard-list">
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">92</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">15</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">36</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">45</span> User reviews
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">112</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">31</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">93</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">254</span> User reviews
-				</a></li>
-			</ul>
-		</div>
-	</div>
-	<!-- 采购统计 end -->
-	<!-- 库存统计 begin -->
-	<div class="box span4">
-		<div class="box-header well" data-original-title>
-			<h2>
-				<i class="icon-list"></i> Weekly Stat
-			</h2>
-			<div class="box-icon">
-				<a href="#" class="btn btn-setting btn-round"><i
-					class="icon-cog"></i></a> <a href="#"
-					class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-				<a href="#" class="btn btn-close btn-round"><i
-					class="icon-remove"></i></a>
-			</div>
-		</div>
-		<div class="box-content">
-			<ul class="dashboard-list">
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">92</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">15</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">36</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">45</span> User reviews
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">112</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">31</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">93</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">254</span> User reviews
-				</a></li>
-			</ul>
-		</div>
-	</div>
-	<!-- 库存统计 end -->
-</div>
-<!-- 采购销售统计 end -->
 <!-- 采购销售统计 begin -->
-<div class="row-fluid sortable">
-	<!-- news begin -->
-	<div class="box span4">
-		<div class="box-header well" data-original-title>
-			<h2>
-				<i class="icon-bullhorn"></i> 新闻公告
-			</h2>
-			<div class="box-icon">
-				<a href="#" class="btn btn-minimize btn-round"><i
-					class="icon-chevron-up"></i></a> <a href="#"
-					class="btn btn-close btn-round"><i class="icon-remove"></i></a>
+<div class="row">
+	<div class="col-md-12">
+		<div class="box">
+			<div class="box-header well" data-original-title>
+				<i class="fa fa-rocket"></i> 快速入口
 			</div>
-		</div>
-		<div class="box-content">
 			<div class="box-content">
 				<ul class="dashboard-list">
-					<li><a href="#"> <img class="dashboard-avatar" alt="Usman"
-							src="http://www.gravatar.com/avatar/f0ea51fa1e4fae92608d8affee12f67b.png?s=50"></a>
-						<strong>Name:</strong> <a href="#">Usman </a><br> <strong>Since:</strong>
-						17/05/2012<br> <strong>Status:</strong> <span
-						class="label label-success">Approved</span></li>
-					<li><a href="#"> <img class="dashboard-avatar"
-							alt="Sheikh Heera"
-							src="http://www.gravatar.com/avatar/3232415a0380253cfffe19163d04acab.png?s=50"></a>
-						<strong>Name:</strong> <a href="#">Sheikh Heera </a><br> <strong>Since:</strong>
-						17/05/2012<br> <strong>Status:</strong> <span
-						class="label label-warning">Pending</span></li>
-					<li><a href="#"> <img class="dashboard-avatar"
-							alt="Abdullah"
-							src="http://www.gravatar.com/avatar/46056f772bde7c536e2086004e300a04.png?s=50"></a>
-						<strong>Name:</strong> <a href="#">Abdullah </a><br> <strong>Since:</strong>
-						25/05/2012<br> <strong>Status:</strong> <span
-						class="label label-important">Banned</span></li>
-					<li><a href="#"> <img class="dashboard-avatar"
-							alt="Saruar Ahmed"
-							src="http://www.gravatar.com/avatar/564e1bb274c074dc4f6823af229d9dbb.png?s=50"></a>
-						<strong>Name:</strong> <a href="#">Saruar Ahmed </a><br> <strong>Since:</strong>
-						17/05/2012<br> <strong>Status:</strong> <span
-						class="label label-info">Updates</span></li>
+					<li><a href="#/store/application"> <span
+							class="green">1</span> 店铺审核
+					</a></li>
+					<li><a href="#/audit/crawlTask"> <span
+							class="red">2</span> 器件爬取任务
+					</a></li>
+					<li><a href="#/brandmaintenance"> <span
+							class="blue">3</span> 品牌维护
+					</a></li>
+					<li><a href="#/help/publish"> <span
+							class="yellow">4</span> 帮助中心-发布
+					</a></li>
+					<li><a href="#/search/see"> <span
+							class="green">5</span> 搜索预览
+					</a></li>
+					<li><a href="#/logUsage"> <span
+							class="red">6</span> 用户操作日志
+					</a></li>
+					<li><a href="#/trade/order"> <span
+							class="blue">7</span> 买家订单管理
+					</a></li>
+					<li><a href="#/product/sailingGoods"> <span
+							class="yellow">8</span> 在售中的产品
+					</a></li>
 				</ul>
 			</div>
 		</div>
 	</div>
-	<!-- news end -->
-	<!-- 采购统计 begin -->
-	<div class="box span4">
-		<div class="box-header well" data-original-title>
-			<h2>
-				<i class="icon-list"></i> Weekly Stat
-			</h2>
-			<div class="box-icon">
-				<a href="#" class="btn btn-setting btn-round"><i
-					class="icon-cog"></i></a> <a href="#"
-					class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-				<a href="#" class="btn btn-close btn-round"><i
-					class="icon-remove"></i></a>
-			</div>
-		</div>
-		<div class="box-content">
-			<ul class="dashboard-list">
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">92</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">15</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">36</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">45</span> User reviews
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">112</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">31</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">93</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">254</span> User reviews
-				</a></li>
-			</ul>
-		</div>
-	</div>
-	<!-- 采购统计 end -->
-	<!-- users info begin -->
-	<div class="box span4">
-		<div class="box-header well" data-original-title>
-			<h2>
-				<i class="icon-list"></i> Weekly Stat
-			</h2>
-			<div class="box-icon">
-				<a href="#" class="btn btn-setting btn-round"><i
-					class="icon-cog"></i></a> <a href="#"
-					class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-				<a href="#" class="btn btn-close btn-round"><i
-					class="icon-remove"></i></a>
-			</div>
-		</div>
-		<div class="box-content">
-			<ul class="dashboard-list">
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">92</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">15</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">36</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">45</span> User reviews
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-up"></i> <span
-						class="green">112</span> New Comments
-				</a></li>
-				<li><a href="#"> <i class="icon-arrow-down"></i> <span
-						class="red">31</span> New Registrations
-				</a></li>
-				<li><a href="#"> <i class="icon-minus"></i> <span
-						class="blue">93</span> New Articles
-				</a></li>
-				<li><a href="#"> <i class="icon-comment"></i> <span
-						class="yellow">254</span> User reviews
-				</a></li>
-			</ul>
-		</div>
-	</div>
-	<!-- users info end -->
 </div>
 <!-- 采购销售统计 end -->