Merge remote-tracking branch 'origin/test' into test

application/index/view/notice/index.html

@@ -207,7 +207,7 @@
 						<label for="inputEmail3" class="col-sm-3 control-label">标题：</label>
 						<div class="col-sm-9">
 							<input type="text" class="form-control btn6" name="user_name" id="announcement_title" placeholder="请输入标题">
-							<span class="use-span text-danger">（20字以内，显示在首页列表）</span>
+							<span class="use-span text-danger">（50字以内，显示在首页列表）</span>
 						</div>
 					</div>
 					

public/resource/js/notice.js

@@ -319,21 +319,21 @@ define (['doT', 'text!temp/notice_template_tpl.html','ckfinder','ckfinderStart',
                 $("#announcement_title").focus();
                 return ;
             }
-            if (params.title.length > 20) {
-                alert('标题字数20以内');
-                $("#announcement_title").focus();
-                return ;
-            }
+//          if (params.title.length > 20) {
+//              alert('标题字数20以内');
+//              $("#announcement_title").focus();
+//              return ;
+//          }
             if (params.content == '') {
                 alert('内容不能为空');
                 $("#announcement_content").focus();
                 return ;
             }
-             if (params.content.length > 250) {
-                alert('公告内容字数250以内');
-                $("#announcement_content").focus();
-                return ;
-            }
+//           if (params.content.length > 250) {
+//              alert('公告内容字数250以内');
+//              $("#announcement_content").focus();
+//              return ;
+//          }
             $.ajax ({
                 url: '/index/addNotice',
                 type: 'POST',