Index: ssts-web/src/main/webapp/networkdisk/addFile.jsp
===================================================================
diff -u -r15869 -r17419
--- ssts-web/src/main/webapp/networkdisk/addFile.jsp	(.../addFile.jsp)	(revision 15869)
+++ ssts-web/src/main/webapp/networkdisk/addFile.jsp	(.../addFile.jsp)	(revision 17419)
@@ -7,7 +7,7 @@
 <title>创建文件</title>
 <script type="text/javascript" src="<c:url value="/js/common.js"/>"></script>
 <%@ include file="/common/includeUploadFilesJSAndCSS.jsp"%>
-<%--<script type="text/JavaScript" src="${ctx }/js/jquery-easyui/jquery-1.8.2.min.js"></script>--%>
+<script type="text/JavaScript" src="${ctx}/js/jquery-easyui/jquery-1.8.2.min.js"></script>
 <link rel="stylesheet" href="${ctx}/styles/main.css" type="text/css" />
 <link rel="stylesheet" href="${themeLocation}/styles/main.css" type="text/css" />
 <link rel="stylesheet" type="text/css" href="${ctx}/styles/tabs.css" />
@@ -24,14 +24,14 @@
 YAHOO.example.init = function() {
     var tabView = new YAHOO.widget.TabView();
 
-    
+
     YAHOO.util.Event.onContentReady('top-stories', function() {
         var modules = YAHOO.util.Dom.getElementsByClassName('mod', 'div', this);
-        
+
         YAHOO.util.Dom.batch(modules, function(module) {
             tabView.addTab( new YAHOO.widget.Tab({
                 label: module.getElementsByTagName('h3')[0].innerHTML,
-                contentEl: YAHOO.util.Dom.getElementsByClassName('bd', 
+                contentEl: YAHOO.util.Dom.getElementsByClassName('bd',
                         'div', module)[0]
             }));
             YAHOO.util.Dom.setStyle(module, 'display', 'none'); /* hide modules */
@@ -50,24 +50,23 @@
 	function checkSubmit() {
 	   if (bCancel){
 	       return false;
-	   } else {
+	   }
+	   else {
 	    bCancel=true;
-        if (isFieldNotNull(document.getElementById("name"),
-                '请填写文件名称！') == false) {
+//        if (isFieldNotNull(document.getElementById("name"), '请填写文件名称！') == false) {
+//            bCancel=false;
+//            return false;
+//        }
+        if (isFieldNotNull(document.getElementById("administratorsForDisplay"), '请选择管理员！') == false) {
             bCancel=false;
             return false;
         }
-        if (isFieldNotNull(document.getElementById("administratorsForDisplay"),
-                '请选择管理员！') == false) {
-            bCancel=false;
-            return false;
-        }
 		if (document.getElementById("remark").value.Trim().length>100) {
 			alert("备注字数不能多于100个字符！");
 			bCancel=false;
             return false;
         }
-        return true;
+		   return true;
 	   }
 	}
 
@@ -79,8 +78,8 @@
 <c:if test="${not empty AddFileForm.id}">
 	  	<%
 	  	// TODO:需要判断是否有编辑的权限
-	  	request.setAttribute("isEditAuthority", true); 
-	  	
+	  	request.setAttribute("isEditAuthority", true);
+
 	  	%>
 </c:if>
 <c:if test="${empty AddFileForm.id}">
@@ -98,7 +97,7 @@
 </authz:authorize>
 <div id="from_title">
   <ul>
-	<li><img class="accessories_iamge" src="${ctx }/images/column.gif">当前位置--<c:if test="${not empty isEditAuthority  && isEditAuthority}"><c:if test="${ not empty param.id}">修改文件</c:if><c:if test="${ empty param.id}">增加文件</c:if></c:if><c:if test="${empty isEditAuthority  || !isEditAuthority}">查看文件</c:if></li> 
+	<li><img class="accessories_iamge" src="${ctx }/images/column.gif">当前位置--<c:if test="${not empty isEditAuthority  && isEditAuthority}"><c:if test="${ not empty param.id}">修改文件</c:if><c:if test="${ empty param.id}">增加文件</c:if></c:if><c:if test="${empty isEditAuthority  || !isEditAuthority}">查看文件</c:if></li>
   </ul>
 </div>
 
@@ -113,7 +112,7 @@
 		<input type="hidden" name="folderKeyId" value="${param.folderKeyId}"/>
 	<c:if test="${not empty isEditAuthority && isEditAuthority}">
 	<input onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('submitBtn','','${ctx}/images/submit_BtImg.gif',1)" src="${ctx }/images/submit_BtImg1.gif" type="image" name="submitBtn" id="submitBtn" value="提交" onClick="javascript:return checkSubmit();"/>
-	</c:if> 
+	</c:if>
 	</li>
 	<li>
 	<a href="${ctx}/knowledge/view.do?moduleId=${param.moduleId }&parentId=${param.folderKeyId}" ><img class="from_toolbar_image" src="${ctx }/images/btn_return.gif" >返回</a>
@@ -192,9 +191,9 @@
 				  </tr>
 				  <tr>
 				    <td colspan="4" width="730" style="word-break:break-all;" style="padding-top:10px;" class="table_td_text">
-				      <th:attach poObjectName="${fileSubClassName}" enableEditField='${(not empty isEditAuthority  && isEditAuthority )? "true" : "false"  }' tipMsg="提示：上传视频推荐使用mp4格式"></th:attach>
+						<th:attach poObjectName="${fileSubClassName}" enableEditField='${(not empty isEditAuthority  && isEditAuthority )? "true" : "false"  }' tipMsg="提示：上传视频推荐使用mp4格式(大小不能超过${attachFiLeMaxSize / 1024 / 1024}MB)"></th:attach>
 				    </td>
-			      </tr>				  
+			      </tr>
 				</table>
 				</td>
 			  </tr>
@@ -204,10 +203,18 @@
 </div>
 </div>
 
-</form:form> 
+</form:form>
 </div>
 <script>
 	var moduleId = '${param.moduleId}';
+	var errorTip = '${tips}';
+	if (!isUndefinedOrNullOrEmpty(errorTip)){
+		alert(errorTip);
+	}
+	if ($.browser.version > 8 || $.browser.mozilla){
+		$('#attach_0').removeClass("file");
+    }
+
 </script>
 </body>
 </html>