min css js update；activiti版本库地址修改

jekey · Aug 14, 2013 · c7fa436 · c7fa436
1 parent 8a139f4
commit c7fa436
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 59 deletions.
diff --git a/pom.xml b/pom.xml
@@ -99,8 +99,9 @@
 
 		<repository>
 			<id>activiti-repos</id>
-			<name>Activiti Repository</name>
-			<url>https://maven.alfresco.com/nexus/content/groups/public</url>
+			<name>Activiti Repository</name><!-- 
+			<url>https://maven.alfresco.com/nexus/content/groups/public</url>  -->
+			<url>https://app.camunda.com/nexus/content/groups/public</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>

diff --git a/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp b/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp
@@ -56,7 +56,7 @@
 <body>
 	<div id="importBox" class="hide">
 		<form id="importForm" action="${ctx}/sys/user/import" method="post" enctype="multipart/form-data"
-			style="padding-left:20px;text-align:center;"><br/>
+			style="padding-left:20px;text-align:center;" class="form-search" onsubmit="loading('正在导入，请稍等...');"><br/>
 			<input id="uploadFile" name="file" type="file" style="width:330px"/><br/><br/>　　
 			<input id="btnImportSubmit" class="btn btn-primary" type="submit" value="   导    入   "/>
 			<a href="${ctx}/sys/user/import/template">下载模板</a>

diff --git a/src/main/webapp/static/common/wsize.min.js b/src/main/webapp/static/common/wsize.min.js
diff --git a/src/main/webapp/static/jquery/floatingAd.min.css b/src/main/webapp/static/jquery/floatingAd.min.css
diff --git a/src/main/webapp/static/modules/cms/front/themes/basic/style.min.css b/src/main/webapp/static/modules/cms/front/themes/basic/style.min.css