Merge branch '0.5.5' of https://github.com/b3log/b3log-solo into 0.5.5

war/src/main/webapp/admin-label.ftl

@@ -56,7 +56,6 @@
         "commentEmailLabel": "${commentEmailLabel}",
         "administratorLabel": "${administratorLabel}",
         "duplicatedEmailLabel": "${duplicatedEmailLabel}",
-        "nameEmptyLabel": "${nameEmptyLabel}",
         "mailInvalidLabel": "${mailInvalidLabel}",
         "mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
         "noSettingLabel": "${noSettingLabel}",
@@ -109,7 +108,8 @@
         "windowSizeLabel": "${windowSizeLabel}",
         "randomArticlesDisplayCntLabel": "${randomArticlesDisplayCntLabel}",
         "relevantArticlesDisplayCntLabel": "${relevantArticlesDisplayCntLabel}",
-        "externalRelevantArticlesDisplayCntLabel": "${externalRelevantArticlesDisplayCntLabel}"
+        "externalRelevantArticlesDisplayCntLabel": "${externalRelevantArticlesDisplayCntLabel}",
+        "nameTooLongLabel": "${nameTooLongLabel}"
     };    
     
     admin.init();

war/src/main/webapp/js/admin/admin.js

@@ -17,7 +17,7 @@
  *  index for admin
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
- * @version 1.0.1.9, Jun 19, 2012
+ * @version 1.0.2.0, Aug 30, 2012
  */
 
 var Admin = function () {
@@ -27,7 +27,7 @@ var Admin = function () {
     '#user-list', '#plugin-list', '#others'];
     // 多用户时，一般用户不能使用的功能
     this.adTools = ['link-list', 'preference', 'file-list', 'page-list',
-    'user-list', 'plugin-list'];
+    'user-list', 'plugin-list', 'others'];
 };
 
 $.extend(Admin.prototype, {    
@@ -221,13 +221,6 @@ $.extend(Admin.prototype, {
                 $(it).find(".ico-arrow-up")[0].className = "ico-arrow-down";
             }
         });
-    /*if (subNav.className === "none") {
-            $(it).find(".ico-arrow-down")[0].className = "ico-arrow-up";
-            subNav.className = "collapsed";
-        } else {
-            $(it).find(".ico-arrow-up")[0].className = "ico-arrow-down";
-            subNav.className = "none";
-        }*/
     },
     
     /*
@@ -239,7 +232,6 @@ $.extend(Admin.prototype, {
             for (var i = 0; i < this.adTools.length; i++) {
                 $("#tabs").tabs("remove", this.adTools[i]);
             }
-            $("#tabs>ul>li").last().remove();
         } else {
             // 当前 tab 属于 Tools 时，设其展开
             for (var j = 0; j < this.tools.length; j++) {

war/src/main/webapp/js/admin/userList.js

@@ -18,7 +18,7 @@
  *
  * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.1.2, May 3, 2012
+ * @version 1.0.1.3, Aug 30, 2012
  */
 
 /* user-list 相关操作 */
@@ -289,9 +289,9 @@ admin.userList = {
         if (!status) {
             status = "";
         }
-
-        if ($("#userName" + status).val().replace(/\s/g, "") === "") {
-            $("#tipMsg").text(Label.nameEmptyLabel);
+        var userName = $("#userName" + status).val().replace(/(^\s*)|(\s*$)/g, "");
+        if (2 > userName.length || userName.length > 20) {
+            $("#tipMsg").text(Label.nameTooLongLabel);
             $("#userName" + status).focus();
         }else if ($("#userEmail" + status).val().replace(/\s/g, "") === "") {
             $("#tipMsg").text(Label.mailCannotEmptyLabel);

war/src/main/webapp/skins/mobile/lang/lang_en_US.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: Mobile skin language configurations(en_US).
-# Version: 1.0.0.2, Feb 25, 2012
+# Version: 1.0.0.3, Aug 30, 2012
 # Author: Liang Ding
 # Author: Liyuan Li
 #
@@ -246,7 +246,6 @@ noCommentLabel=No Comment
 captchaErrorLabel=Captcha Error
 inputErrorLabel=Input Error!
 gotoLabel=Go
-nameEmptyLabel=Username is empty
 passwordEmptyLabel=Password is empty
 blogEmptyLabel=Blogging service is empty
 blogArticleEmptyLabel=Please select articles

war/src/main/webapp/skins/mobile/lang/lang_zh_CN.properties

@@ -16,7 +16,7 @@
 
 #
 # Description: Mobile skin language configurations(zh_CN).
-# Version: 1.0.0.2, Feb 25, 2012
+# Version: 1.0.0.3, Aug 30, 2012
 # Author: Liang Ding
 # Author: Liyuan Li
 #
@@ -252,7 +252,6 @@ noCommentLabel=\u6682\u65e0\u8bc4\u8bba
 captchaErrorLabel=\u9a8c\u8bc1\u7801\u9519\u8bef
 inputErrorLabel=\u8f93\u5165\u9519\u8bef\uff01
 gotoLabel=\u8df3\u8f6c
-nameEmptyLabel=\u59d3\u540d\u4e0d\u80fd\u4e3a\u7a7a\uff01
 passwordEmptyLabel=\u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a\uff01
 blogEmptyLabel=\u8bf7\u9009\u62e9\u535a\u5ba2\u670d\u52a1\uff01
 blogArticleEmptyLabel=\u8bf7\u9009\u62e9\u9700\u8981\u5bfc\u5165\u7684\u6587\u7ae0