Merge branch 'master' of gitlab.cloudcross.net:ssp/ssp_web

src/main/webapp/WEB-INF/pages/advertiser/main/public-head.ftl

@@ -14,8 +14,8 @@
 		<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report"><span>数据报表</span></a></li>
 		<li><a href="${ctx}/advertiser/main/ad/banner-template"><span>创意中心</span></a></li>
 		<li><a href="${ctx}/advertiser/main/code-site/list"><span>代码中心</span></a></li>
-		<li><a href="${ctx}/advertiser/main/authority/list"><span>账号管理</span></a></li>
-		<li><a href="${ctx}/advertiser/main/ad/adv-balance/list"><span>财务管理</span></a></li>	  			
+		<li><a href="${ctx}/advertiser/main/ad/adv-balance/list"><span>财务管理</span></a></li>	
+		<li><a href="${ctx}/advertiser/main/authority/list"><span>账号管理</span></a></li>  			
 	</ul>	
 	<div id="divselect" >
             <div id="opa">    	

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/back/main/public-head.ftl

@@ -10,8 +10,8 @@
 		<li><a href="${ctx}/back/main/ad/operator/operator-report"><span>媒体数据报表</span></a></li>
 		<li><a href="${ctx}/back/main/audit/audit-banner"><span>审核</span></a></li>
 		<li><a href="${ctx}/back/main/finance/finance-management"><span>财务管理</span></a></li>
-		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>
-		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>	  			
+		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>	
+		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>  			
 	</ul>	
 	<div id="divselect" >
 	        <div id="opa">
@@ -48,10 +48,10 @@
 			$("#top .nav li a:eq(4)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("client-account") != -1){
-			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
+			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("authority") != -1){
-			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
+			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
 		};
 	});
 </script>

src/main/webapp/assets/css/newforwebback.css

@@ -90,4 +90,7 @@
 #tableList button {
 
     width: 85px !important;
+}
+#chartDivs{
+	width:98%;
 }