git-svn-id: https://192.168.57.71/svn/jsgkj@735 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/header.jsp

@@ -15,21 +15,8 @@
 
 <link rel="shortcut icon" href="<%=request.getContextPath()%>/static/images/system.ico" />
 
-
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ace-fonts.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/datepicker.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-timepicker.css">
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/daterangepicker.css">
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-datetimepicker.css">
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-datetimepicker.min.css">
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/font-awesome.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ace.onpage-help.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/jquery-ui.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ui.jqgrid.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-multiselect.css" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ace.css" class="ace-main-stylesheet" id="main-ace-style" />
-<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/js/themes/sunburst.css" />
+<link rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/jqgrid/ui.jqgrid.css" />
+<link rel="stylesheet" href="<%=request.getContextPath()%>/static/css/common/basic.css" />
 
 <link rel="stylesheet" href="<%=request.getContextPath()%>/static/css/common/main.css" />
 

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/scripts.jsp

@@ -12,57 +12,9 @@
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/layer/layer.js"></script>
 
 
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.onpage-help.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.onpage-help.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace-extra.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/bootstrap.js"></script>
+<script src="<%=request.getContextPath()%>/static/js/common/jqgrid/jquery.jqGrid.src.js"></script>
+<script src="<%=request.getContextPath()%>/static/js/common/jqgrid/i18n/grid.locale-cn.js"></script>
 
-<script src="<%=request.getContextPath()%>/ace/assets/js/jquery-ui.custom.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.ui.touch-punch.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.easypiechart.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.sparkline.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/flot/jquery.flot.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/flot/jquery.flot.pie.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/flot/jquery.flot.resize.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jqGrid/jquery.jqGrid.src.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jqGrid/i18n/grid.locale-cn.js"></script>
-
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.scroller.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.colorpicker.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.fileinput.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.typeahead.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.wysiwyg.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.spinner.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.treeview.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.wizard.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.aside.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.ajax-content.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.touch-drag.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.sidebar.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.sidebar-scroll-1.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.submenu-hover.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.widget-box.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.settings.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.settings-rtl.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.settings-skin.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.widget-on-reload.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/bootstrap-multiselect.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.searchbox-autocomplete.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-datepicker.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-timepicker.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/moment.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/daterangepicker.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-datetimepicker.js" charset="UTF-8"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jqBootstrapValidation.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.bootstrap.teninedialog.v3.js"></script>
-
-<script src="<%=request.getContextPath()%>/ace/assets/js/rainbow.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/language/generic.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/language/html.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/language/css.js"></script>
-<script src="<%=request.getContextPath()%>/ace/assets/js/language/javascript.js"></script>
 
 
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/common.js"></script>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/index.jsp

@@ -63,7 +63,7 @@
 	</div>
 	
 	<!--µ¯³öÐÂÔö½çÃæ-->
-	<div id="modal-table" class="modal fade" tabindex="-1">
+	<!-- <div id="modal-table" class="modal fade" tabindex="-1">
 			<div class="modal-dialog" style="width: 700px; height: 500px;">
 				<div class="modal-content">
 					<div class="modal-header no-padding">
@@ -146,6 +146,6 @@
 				</div>
 			</div>
 		</div>
-	</div>
+	</div> -->
 </body>
 </html>