Browse Source

媒体样式修改

tony.qu 9 years ago
parent
commit
ba6c0c6a21

+ 4 - 4
src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/edit.ftl

@@ -117,7 +117,7 @@
 						<ul id="main_cnul" style="margin-left:80px;">
 							<li class="select_box" id="cnul_box">
 								<span id="cnul_span">${wifi.cn!}</span>
-								<ul class="son_ul" id="cn_son_ul" style="left:-25px;"></ul>
+								<ul class="son_ul" id="cn_son_ul" style="left:-25px;margin-left:25px;"></ul>
 							</li>
 						</ul>
 						<input type="hidden" name="cn" id="cn" value="${wifi.cn!}">
@@ -129,7 +129,7 @@
 						<ul id="main_cnCityul" style="margin-left:80px;">
 							<li class="select_box" id="cnCityul_box">
 								<span id="cnCityul_span">${wifi.cnCity!}</span>
-								<ul class="son_ul" id="cnCityul_son_ul" style="left:-25px;"></ul>
+								<ul class="son_ul" id="cnCityul_son_ul" style="left:-25px;margin-left:25px;"></ul>
 							</li>
 						</ul>
 						<input type="hidden" name="cnCity" id="cnCity" value="${wifi.cnCity!}">
@@ -157,11 +157,11 @@
 					
 					<div class="control-group" id="placeul_selectdiv">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>场景:</label>
-						<span class="spanVaildate" style="margin-left:250px;"></span>
+						<span class="spanVaildate" style="margin-left:250px;margin-left:25px;"></span>
 						<ul id="main_placeul" style="margin-left:80px;">
 							<li class="select_box" id="placeul_box">
 								<span id="placeul_span">${wifi.place!}</span>
-								<ul class="son_ul" id="placeul_son_ul" style="left:-25px;"></ul>
+								<ul class="son_ul" id="placeul_son_ul" style="left:-25px;margin-left:25px;"></ul>
 							</li>
 						</ul>
 						<input type="hidden" name="place" id="place" value="${wifi.place!}">

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

@@ -40,7 +40,7 @@
 			});
 			
 			//复选框按钮
-			$('#tablefig th input:checkbox').live("click", function() {
+			$('.tablefig th input:checkbox').live("click", function() {
 				var that = this;
 				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
 					this.checked = that.checked;

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

@@ -75,7 +75,7 @@
 						</div>
 				    </div>
 					<div id="account-table" style="margin-top:0px;">
-						<table border="1" id="tablefig">
+						<table border="1" id="tablefig" style="width:30%;margin-left:1px;">
 							<thead>
 								<tr>
 									<th class="td1" style="width:5%">场景</th>

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

@@ -163,7 +163,7 @@
 					<div class="control-group" id="ensurePassword-div">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码:</label>
 						<span id="ensurePassword-span"><input tabindex="3" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/1/0"></span>
-						<input id="input-password" autocomplete="off" type="checkbox"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">显示密码</span><span class="spanVaildate"></span>
+						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px;"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">显示密码</span><span class="spanVaildate"></span>
 					</div>
 					
 					<div class="control-group">
@@ -178,8 +178,8 @@
 					
 					<div class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态:</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
+						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span class="lbl" ></span><span>开启</span></label> 
+						<label class="form-align-radio" style="margin-left: 130px; margin-top: -40px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl"></span><span>暂停</span></label>
 					</div>
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">

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

@@ -8,12 +8,15 @@
 	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
-	<style>
+	<style type="text/css">
 		.spanVaildate{
 			margin-left:20px;
 			color:red;
 			position: absolute;
 		}
+		.size3{
+		    margin-top:-3px;
+		}
 	</style>
 	
 	<script type="text/javascript" >
@@ -158,7 +161,7 @@
 					<div class="control-group">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>确认密码:</label>
 						<span id="ensurePassword-span"><input tabindex="2" class="input-text" autocomplete="off" id="ensurePassword" name="ensurePassword" type="password" value="" verify="unspecial/100/0/0" disabled="true"></span>
-						<input id="input-password" autocomplete="off" type="checkbox"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">修改密码</span><span class="spanVaildate"></span>
+						<input id="input-password" autocomplete="off" type="checkbox" style="margin-top:9px;"><span class="lbl" style="position:absolute;margin:2px 5px 0 -15px;"></span><span id="input-password-span" style="margin-left:5px;">修改密码</span><span class="spanVaildate"></span>
 					</div>
 					
 					<div class="control-group">
@@ -173,8 +176,8 @@
 					
 					<div class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态:</label>
-						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
+						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1"><span class="lbl" ></span><span>开启</span></label> 
+						<label class="form-align-radio" style="margin-left: 130px; margin-top: -40px;"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0"><span class="lbl" ></span><span>暂停</span></label>
 					</div>
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">

+ 7 - 0
src/main/webapp/WEB-INF/pages/operator/main/dashboard.ftl

@@ -105,6 +105,13 @@ $(function () {
 	}
 });
 </script>
+<style tyle="text/css">
+#quickJump{
+   display:inline-block;
+   margin-top:20px;
+   margin-left:25px;
+}
+</style>
 </@override>
 
 <@override name="body">

+ 3 - 3
src/main/webapp/assets/css/ap-apmac.css

@@ -12,7 +12,7 @@
 #handler{
 	height:14px;
 	padding:20px 0;
-	margin-left:-7px;
+	margin-left:45px;
 	
 }
 #handler ul .active1{
@@ -23,7 +23,7 @@
 }
 #handler ul .size2{
 	float:left;
-	margin: 0 0 0 10px;
+	margin: 2px 0 0 10px;
 }
 #handler ul .divider2{
 	float:left;
@@ -347,7 +347,7 @@
 
 #pageDiv{
 	float:right;
-	margin:20px 30px 0 0px;
+	margin:20px 80px 0 0px!important;
 }
 
 #tablefig{

+ 2 - 5
src/main/webapp/assets/css/authority.css

@@ -10,6 +10,7 @@
 	margin-top:20px;
 }
 #content{
+	margin:0px;
 	padding-top:1px;
 }
 
@@ -501,8 +502,4 @@ span.input-checkbox-span{
 #selectConditionBar a:hover{
 	border-bottom-color: #36aeea;
 }
-/*webback閲岄潰鐨別nd*/
-
-#uploadTable .ace-file-input label span{
-	height:27px;
-}
+/*webback閲岄潰鐨別nd*/