媒体版去掉自用分组的菜单，在热点管理处添加

src/main/webapp/WEB-INF/pages/operator/main/ad/zone/create.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>广告位创建</title>
 <link rel="stylesheet" href="${ctx}/assets/css/ace.min.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/zone_advertiser.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/zone_operator.css"/>
 <script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>

src/main/webapp/WEB-INF/pages/operator/main/ad/zone/edit.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>编辑广告位</title>
 <link rel="stylesheet" href="${ctx}/assets/css/ace.min.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/zone_advertiser.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/zone_operator.css"/>
 <script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>

src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/list.ftl

@@ -14,6 +14,8 @@
 			<div id="selectBar_apmac" class="selectBar">
 				<a class="selectBar_change" href="${ctx}/operator/main/ap/apmac/list">热点详情</a>
 				<a href="${ctx}/operator/main/ap/apmac/relationship">场景对应关系</a>
+				<a href="${ctx}/operator/main/ap/apgroup/create">新增自用分组</a>
+				<a href="${ctx}/operator/main/ap/apgroup/edit">自用分组分类</a>
 		    </div>
 		    <div id="navDiv">
 				<ul id="navDiv_ul">

src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/relationship.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>场景对应关系</title>
 <script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/back/apApmac.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/operator/apApmac.js"></script>
 </@override>
 <@override name="body">
 <div id=content_bg>
@@ -11,6 +11,8 @@
 			<div id="selectBar_apmac" class="selectBar">
 				<a href="${ctx}/operator/main/ap/apmac/list">热点详情</a>
 				<a class="selectBar_change" href="${ctx}/operator/main/ap/apmac/relationship">场景对应关系</a>
+				<a href="${ctx}/operator/main/ap/apgroup/create">新增自用分组</a>
+				<a href="${ctx}/operator/main/ap/apgroup/edit">自用分组分类</a>
 		    </div>
 		    <div id="navDiv">
 				<ul id="navDiv_ul">

src/main/webapp/WEB-INF/pages/operator/main/authority/create.ftl

@@ -55,7 +55,6 @@
 					<input class="input-checkbox" type="checkbox" value="153"/><span class="input-checkbox-span">素材审核</span>
 					<input class="input-checkbox" type="checkbox" value="154"/><span class="input-checkbox-span">财务管理</span>
 					<input class="input-checkbox" type="checkbox" value="155"/><span class="input-checkbox-span">热点管理</span>
-					<input class="input-checkbox" type="checkbox" value="157"/><span class="input-checkbox-span">自用分组管理</span>
 				</div>
 				<div id="footBtn">
 					<button class="btn-save" type="submit">保存</button>

src/main/webapp/WEB-INF/pages/operator/main/authority/edit.ftl

@@ -55,7 +55,6 @@
 					<input class="input-checkbox" type="checkbox" value="153"/><span class="input-checkbox-span">素材审核</span>
 					<input class="input-checkbox" type="checkbox" value="154"/><span class="input-checkbox-span">财务管理</span>
 					<input class="input-checkbox" type="checkbox" value="155"/><span class="input-checkbox-span">热点管理</span>
-					<input class="input-checkbox" type="checkbox" value="157"/><span class="input-checkbox-span">自用分组管理</span>
 				</div>
 				<div id="footBtn">
 					<button class="btn-save" type="submit">保存</button>

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

@@ -28,11 +28,6 @@
 			<li><a href="${ctx}/operator/main/ap/apmac/list"><span>热点管理</span></a></li>	
 		</@sec.authorize>
 		
-		
-		<@sec.authorize access="hasAnyRole('ROLE_operator_apgroup,ROLE_MANAGER')">
-			<li><a href="${ctx}/operator/main/ap/apgroup/list"><span>自用分组管理</span></a></li>	
-		</@sec.authorize>	 
-	
 	
 		<@sec.authorize access="hasAnyRole('ROLE_operator_authority,ROLE_MANAGER')">
 			<li><a href="${ctx}/operator/main/authority/list"><span>权限管理</span></a></li>	 
@@ -72,14 +67,11 @@
 		if(path.indexOf("financial") != -1){
 			$("#menu a:eq(4)").addClass("menu_change");
 		};
-		if(path.indexOf("ap/apmac") != -1){
+		if((path.indexOf("ap/apmac") != -1) || (path.indexOf("ap/apgroup") != -1)){
 			$("#menu a:eq(5)").addClass("menu_change");
 		};
-		if(path.indexOf("ap/apgroup") != -1){
-			$("#menu a:eq(6)").addClass("menu_change");
-		};
 		if(path.indexOf("authority") != -1){
-			$("#menu a:eq(7)").addClass("menu_change");
+			$("#menu a:eq(6)").addClass("menu_change");
 		};
 	});
 </script>

src/main/webapp/assets/css/common.css

@@ -1057,88 +1057,4 @@ table.tableApmac td{
 	height:40px;
 	border:none;
 	border-top:thin solid #b9c5d9;
-}
-
-/**** 后台热点管理-新增数据场景 ****/
-#place_top{
-	padding:20px 0;
-	display:inline-block;
-	border-bottom: thin solid #b9c5d9;
-	height:305px;
-	width:100%;
-}
-
-#place_sort{
-	padding:20px 0;
-	display:inline-block;
-	width:100%;
-}
-
-#place_top .place_label,#place_sort .place_label{
-	font-weight: bold;
-	margin-bottom:20px;
-}
-
-#place_top .place_left{
-	float:left;
-	border-right: thin solid #b9c5d9;
-	width:52%;
-	height:325px;
-	overflow:auto;
-}
-
-#place_top .place_right{
-	float:right;
-	width:45%;
-	height:325px;
-	overflow:auto;
-}
-
-#place_top .place_left .input-checkboxsDiv,.place_right .input-radiosDiv,#place_bottom .input-checkboxsDiv{
-	clear:both;
-	padding-top:15px;
-}
-
-#place_top .single_div,#place_bottom .single_div,#place_sort .single_div,#place_bottom .single_div{
-	padding:5px 0;
-	float: left;
-	width: 130px;
-}
-
-#place_top .single_div span.single_div_span,#place_bottom .single_div span.single_div_span,#place_sort .single_div span.single_div_span{
-    margin-left: 5px;
-}
-
-#place_btnDiv{
-	clear:both;
-	float:right;
-	margin:20px;
-}
-
-#place_bottom{
-	display:inline-block;
-	width:100%;
-}
-
-#place_sort .place_left{
-	float:left;
-	width:52%;
-	border-right: thin solid #b9c5d9;
-}
-
-#place_sort .place_right{
-	float:right;
-	width:45%;
-}
-
-#place_sort .place_left .input-checkboxsDiv{
-	clear:both;
-}
-
-#place_sort #searchValueDiv,#place_sort #pageDiv-other{
-	margin-right:20px;
-}
-
-#place_sort #pageDiv-other{
-	padding-top:20px;
 }

src/main/webapp/assets/css/zone_advertiser.css → src/main/webapp/assets/css/zone_operator.css

@@ -1,323 +1,323 @@
-
-.space{
-	height:5px;
-	padding:55px;
-	color:white
-	width:100%;
-	
-}
-.star{
-	color:#4bb4eb;
-}
-
-body{
-	color:#4C637B;
-}
-#created_ops .add_all, #created_ops .clear_all{
-	margin-left:9px;
-	width: 90px;
-	height: 35px;
-	color:#36AEEA!important;
-  	font-size:12px;
-  	border:1px solid #36AEEA;
-   	border-radius:5px!important;
-	cursor: pointer;
-	background-color: #ffffff;
-}
-#created_ops .choose_ops label.label1{	
-	width: 90px;
-	height: 35px;
-	line-height:35px;
-	text-align: center;
-	color:#4C637B;
-}
-
-#created_ops .opsdiv_control{
-	margin-top:-30px;
-	margin-left:100px;
-}
-#created_ops .choose_ops label.invalid{
-	margin-left:5px;
-	color: red;
-}
-#created_ops .choose_ops input[type="radio"],input[type="checkbox"]{
-	display: none;
-}
-
-#created_ops .choose_ops .scene_control input[type="checkbox"] + label{
-	margin-top:10px;
-	
-}
-#created_ops .choose_ops input[type="radio"] + label{
-	display: inline-block;	
-	border:solid #d5dee8 1px;
-	margin-left:10px;
-	cursor: pointer;
-}
-
-#created_ops .choose_ops input[type="radio"]:checked + label{
-	background-color: #4C637B;
-	color: #fff;
-}
-
-#created_ops .choose_ops input[type="checkbox"] + label{
-	display: inline-block;	
-	border:solid #d5dee8 1px;
-	margin-left:20px;
-	cursor: pointer;
-}
-
-#created_ops .choose_ops input[type="checkbox"]:checked + label{
-	background-color: #4C637B;
-	color: #fff;
-}
-
-.input_control{
-	margin-left: 20px;
-	width: 296px;
-	height: 41px;
-	margin-top:10px;
-	text-align: center;
-	color:#4C637B;
-}
-
-.invalid{
-	color:red;
-	margin-left:5px;
-	position:relative;
-	top:5px;		
-}
-
-span.help_inline{
-	height:30px;
-	line-height:30px;
-	margin-left:10px;
-}
-
-.choose_ops ul{
-	width:530px;
-	border-top: solid #d5dee8 1px;
-	border-left: solid #d5dee8 1px;
-	float:left;			
-}
-
-#all_industry span,#all_industry li,#blacklist span,#blacklist li{
-	float:left;
-	width: 19.81%;
-	height: 35px;
-	line-height: 35px;
-	text-align: center;
-	border-right:solid #d5dee8 1px;
-	border-bottom:solid #d5dee8 1px;
-
-}
-
-#all_industry span.ul_title,#blacklist span.ul_title{
-	width: 530px;
-	height: 60px;
-	line-height: 60px;
-	text-align: center;
-	padding:0px;
-}
-
-#all_industry{
-	margin-left:100px;
-}
-
-#all_industry li{
-	cursor: pointer;
-}
-
-#blacklist{
-	margin-left:20px;	
-}
-
-#blacklist  input.movedel,#web_blacklist  input.movedel{
-	float: right;
-	border:none;
-	width: 20px;
-	height: 20px;
-	background-image: url(../images/delete.png);
-	cursor: pointer;	
-}
-
-#ops_lastul{
-	clear: both;
-	position: relative;
-	top:25px;
-}
-
-#ops_lastul input{
-	position: relative;
-    left:0px;
-    color:#4C637B; 
-   
-}
-#ops_lastul input.input_control{
-	height:41px;
-}
-
-
-#web_blacklist{
-	margin: 25px 20px 20px 110px;
-	width: 88%;	
-	height:auto;
-}
-
-#web_blacklist li{
-	width:19.9%;
-	height: 35px;
-	line-height: 35px;
-	float: left;
-	text-align: center;
-	border-right:solid #d5dee8 1px;
-	border-bottom:solid #d5dee8 1px;
-	
-}
-
-#creat_okbutton{
-	clear:both;
-	height:80px;
-	vertical-align: bottom;
-	margin-left: 100px;
-	padding-top:20px;
-}
-
-#creat_okbutton button{
-	
-}
-
-#creat_okbutton .saveinfo{
-	width: 119px;
-	height: 38px;
-	border: none;
-	border-radius: 5px;
-	color: #fff;
-	background:#67ba2f;	
-	cursor: pointer;	
-}
-
-#creat_okbutton .cancelinfo{
-	width: 119px;
-	height: 38px;
-	border: none;
-	border-radius: 5px;
-	color: #fff;
-	background: #36aeea;
-	margin-left: 18px;
-	cursor: pointer;
-}
-
-#handler{
-	margin:20px 0 20px 1px;
-	height:14px;
-	line-height:14px;
-}
-#handler ul .active1{
-	float:left;
-}
-#handler ul .size1{
-	float:left;
-}
-#handler ul .size2{
-	float:left;
-	margin:0px 10px 0px 10px;
-}
-#handler ul .divider2{
-	float:left;
-	margin:0px 10px 0px 10px;
-}
-
-#handler li a{
-	text-decoration: none;
-	color:#0088CC;
-	font-size:14px;
-}
-
-#created_ops .choose_ops{
-    line-height: 30px;
-    margin-bottom:20px;
-}
-
-#created_ops .choose_ops input[type="text"]{
-	border: 1px solid #d5dadf;
-    border-radius: 5px !important;
-    font-size: 12px;
-    height: 25px;
-    line-height: 25px;
-    padding-left: 20px;
-    width: 300px;
-    margin-left:10px;
-}
-.file {
-    position: relative;
-    display: inline-block;
-   	color:#36AEEA!important;
-   	font-size:12px;
- 	border:1px solid #36AEEA;
-   	border-radius:5px!important;
-    color: #36aeea;
-    text-decoration: none;
-    text-indent: 0;
-    line-height: 32px;
-    width:90px;
-    text-align: center;
-    top:-40px;
-    left:100px;
-    cursor: pointer;
-
- }
- .file:hover{
- 	text-decoration: none;
- }
-
-#uploadfilestr{
-	width:50px;
-	height:30px;
-	border: 1px solid #36aeea;
-    background-color: #36aeea;
-    color:#ffffff;
-}
-
-#enlarge_images{
-	position:absolute;
-	display:none;
-	z-index:9999;
-	border:5px solid #f4f4f4;
-}
-#choose_ops_name{
-	clear: both; 
-	margin-left: 0px; 
-	padding-top: 15px;
-}
-#picture{
-	clear: both; 
-	float: left; 
-	margin-top: -35px; 
-	margin-left: 90px;
-}
-#pull{
-	margin-left:230px;
-	margin-top:-50px;
-	position: absolute;
-}
-#style_A{
-	display:inline-block;
-	margin-left:13px;
-}
-#fileurl_a{
-	clear: both; 
-	margin-left: 15px;
-}
-#click{
-	display:inline-block;
-}
-#imgspan_pic{
-	position: absolute; 
-	margin-left: 500px; 
-	margin-top: -60px;
-}
-#filepicture_picture{
-	margin-left: 70px; 
-	margin-top: -35px;
-}
+
+.space{
+	height:5px;
+	padding:55px;
+	color:white
+	width:100%;
+	
+}
+.star{
+	color:#4bb4eb;
+}
+
+body{
+	color:#4C637B;
+}
+#created_ops .add_all, #created_ops .clear_all{
+	margin-left:9px;
+	width: 90px;
+	height: 35px;
+	color:#36AEEA!important;
+  	font-size:12px;
+  	border:1px solid #36AEEA;
+   	border-radius:5px!important;
+	cursor: pointer;
+	background-color: #ffffff;
+}
+#created_ops .choose_ops label.label1{	
+	width: 90px;
+	height: 35px;
+	line-height:35px;
+	text-align: center;
+	color:#4C637B;
+}
+
+#created_ops .opsdiv_control{
+	margin-top:-30px;
+	margin-left:100px;
+}
+#created_ops .choose_ops label.invalid{
+	margin-left:5px;
+	color: red;
+}
+#created_ops .choose_ops input[type="radio"],input[type="checkbox"]{
+	display: none;
+}
+
+#created_ops .choose_ops .scene_control input[type="checkbox"] + label{
+	margin-top:10px;
+	
+}
+#created_ops .choose_ops input[type="radio"] + label{
+	display: inline-block;	
+	border:solid #d5dee8 1px;
+	margin-left:10px;
+	cursor: pointer;
+}
+
+#created_ops .choose_ops input[type="radio"]:checked + label{
+	background-color: #4C637B;
+	color: #fff;
+}
+
+#created_ops .choose_ops input[type="checkbox"] + label{
+	display: inline-block;	
+	border:solid #d5dee8 1px;
+	margin-left:20px;
+	cursor: pointer;
+}
+
+#created_ops .choose_ops input[type="checkbox"]:checked + label{
+	background-color: #4C637B;
+	color: #fff;
+}
+
+.input_control{
+	margin-left: 20px;
+	width: 296px;
+	height: 41px;
+	margin-top:10px;
+	text-align: center;
+	color:#4C637B;
+}
+
+.invalid{
+	color:red;
+	margin-left:5px;
+	position:relative;
+	top:5px;		
+}
+
+span.help_inline{
+	height:30px;
+	line-height:30px;
+	margin-left:10px;
+}
+
+.choose_ops ul{
+	width:530px;
+	border-top: solid #d5dee8 1px;
+	border-left: solid #d5dee8 1px;
+	float:left;			
+}
+
+#all_industry span,#all_industry li,#blacklist span,#blacklist li{
+	float:left;
+	width: 19.81%;
+	height: 35px;
+	line-height: 35px;
+	text-align: center;
+	border-right:solid #d5dee8 1px;
+	border-bottom:solid #d5dee8 1px;
+
+}
+
+#all_industry span.ul_title,#blacklist span.ul_title{
+	width: 530px;
+	height: 60px;
+	line-height: 60px;
+	text-align: center;
+	padding:0px;
+}
+
+#all_industry{
+	margin-left:100px;
+}
+
+#all_industry li{
+	cursor: pointer;
+}
+
+#blacklist{
+	margin-left:20px;	
+}
+
+#blacklist  input.movedel,#web_blacklist  input.movedel{
+	float: right;
+	border:none;
+	width: 20px;
+	height: 20px;
+	background-image: url(../images/delete.png);
+	cursor: pointer;	
+}
+
+#ops_lastul{
+	clear: both;
+	position: relative;
+	top:25px;
+}
+
+#ops_lastul input{
+	position: relative;
+    left:0px;
+    color:#4C637B; 
+   
+}
+#ops_lastul input.input_control{
+	height:41px;
+}
+
+
+#web_blacklist{
+	margin: 25px 20px 20px 110px;
+	width: 88%;	
+	height:auto;
+}
+
+#web_blacklist li{
+	width:19.9%;
+	height: 35px;
+	line-height: 35px;
+	float: left;
+	text-align: center;
+	border-right:solid #d5dee8 1px;
+	border-bottom:solid #d5dee8 1px;
+	
+}
+
+#creat_okbutton{
+	clear:both;
+	height:80px;
+	vertical-align: bottom;
+	margin-left: 100px;
+	padding-top:20px;
+}
+
+#creat_okbutton button{
+	
+}
+
+#creat_okbutton .saveinfo{
+	width: 119px;
+	height: 38px;
+	border: none;
+	border-radius: 5px;
+	color: #fff;
+	background:#67ba2f;	
+	cursor: pointer;	
+}
+
+#creat_okbutton .cancelinfo{
+	width: 119px;
+	height: 38px;
+	border: none;
+	border-radius: 5px;
+	color: #fff;
+	background: #36aeea;
+	margin-left: 18px;
+	cursor: pointer;
+}
+
+#handler{
+	margin:20px 0 20px 1px;
+	height:14px;
+	line-height:14px;
+}
+#handler ul .active1{
+	float:left;
+}
+#handler ul .size1{
+	float:left;
+}
+#handler ul .size2{
+	float:left;
+	margin:0px 10px 0px 10px;
+}
+#handler ul .divider2{
+	float:left;
+	margin:0px 10px 0px 10px;
+}
+
+#handler li a{
+	text-decoration: none;
+	color:#0088CC;
+	font-size:14px;
+}
+
+#created_ops .choose_ops{
+    line-height: 30px;
+    margin-bottom:20px;
+}
+
+#created_ops .choose_ops input[type="text"]{
+	border: 1px solid #d5dadf;
+    border-radius: 5px !important;
+    font-size: 12px;
+    height: 25px;
+    line-height: 25px;
+    padding-left: 20px;
+    width: 300px;
+    margin-left:10px;
+}
+.file {
+    position: relative;
+    display: inline-block;
+   	color:#36AEEA!important;
+   	font-size:12px;
+ 	border:1px solid #36AEEA;
+   	border-radius:5px!important;
+    color: #36aeea;
+    text-decoration: none;
+    text-indent: 0;
+    line-height: 32px;
+    width:90px;
+    text-align: center;
+    top:-40px;
+    left:100px;
+    cursor: pointer;
+
+ }
+ .file:hover{
+ 	text-decoration: none;
+ }
+
+#uploadfilestr{
+	width:50px;
+	height:30px;
+	border: 1px solid #36aeea;
+    background-color: #36aeea;
+    color:#ffffff;
+}
+
+#enlarge_images{
+	position:absolute;
+	display:none;
+	z-index:9999;
+	border:5px solid #f4f4f4;
+}
+#choose_ops_name{
+	clear: both; 
+	margin-left: 0px; 
+	padding-top: 15px;
+}
+#picture{
+	clear: both; 
+	float: left; 
+	margin-top: -35px; 
+	margin-left: 90px;
+}
+#pull{
+	margin-left:230px;
+	margin-top:-50px;
+	position: absolute;
+}
+#style_A{
+	display:inline-block;
+	margin-left:13px;
+}
+#fileurl_a{
+	clear: both; 
+	margin-left: 15px;
+}
+#click{
+	display:inline-block;
+}
+#imgspan_pic{
+	position: absolute; 
+	margin-left: 500px; 
+	margin-top: -60px;
+}
+#filepicture_picture{
+	margin-left: 70px; 
+	margin-top: -35px;
+}