#12150

src/main/webapp/admin-link-list.ftl

-<div id="linkTable"></div>
-<div id="linkPagination" class="margin12 right"></div>
+<div>
+    <div id="linkTable"></div>
+    <div id="linkPagination" class="margin12 right"></div>
+</div>
 <div class="clear"></div>
 <table class="form" width="100%" cellpadding="0px" cellspacing="9px">
     <thead>

src/main/webapp/admin-user-list.ftl

-<div id="userTable"></div>
-<div id="userPagination" class="margin12 right"></div>
+<div>
+    <div id="userTable"></div>
+    <div id="userPagination" class="margin12 right"></div>
+</div>
 <div class="clear"></div>
 <table class="form" width="100%" cellpadding="0px" cellspacing="9px">
     <thead>

src/main/webapp/css/default-admin.css

@@ -58,7 +58,7 @@ button.selected {
     background: url("../images/arrows.png") repeat scroll 0 4px transparent;
     float: right;
     height: 20px;
-    margin: 2px 3px 0 0;
+    margin: -3px 5px 0 0;
     width: 18px;
 }
 .ico-arrow-up {
@@ -84,6 +84,18 @@ button.selected {
     padding-bottom: 36px;
 }
 
+#tabsPanel_article-list,
+#tabsPanel_draft-list,
+#tabsPanel_comment-list,
+#tabsPanel_plugin-list,
+#tabsPanel_page-list > div:first-child,
+#tabsPanel_user-list > div:first-child,
+#tabsPanel_link-list > div:first-child{
+    background-color: #FFF;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
 .tip {
     font-weight: bold;
     margin: 0 auto;
@@ -162,6 +174,7 @@ button.selected {
     position: fixed;
     top: 0;
     background-color: #32323a;
+    overflow: auto;
 }
 
 #tabs ul {
@@ -604,74 +617,87 @@ button#submitArticle:hover,
     padding: 12px;
 }
 
-.paginate-paginate div, .paginate-paginate a, .paginate-pageCount{
-    float: left;
-    height: 20px;
-    line-height: 20px;
-    margin: 0 5px;
-    text-decoration: none;
-}
+.paginate-paginate div.button.paginate-page, .paginate-paginate a, .paginate-pageCount,
 .pagination-pages {
-    background: url(../images/icon.png) repeat center bottom;
-    border: 1px solid;
-    border-color: #CCC #BBBBBB #A0A0A0;
-    border-radius: 4px;
-    padding: 0 6px;
+    border: 1px solid #EFF2F7;
+    padding: 6px 12px;
     cursor: pointer;
     float: left;
-    height: 20px;
-    line-height: 20px;
-    margin: 0 5px;
+    line-height: 18px;
+    background: #eee;
+    height: 18px;
+    margin-left: 1px;
+    border-radius: 0;
+    text-decoration: none;
+    color: #333;
 }
 
-.pagination-current-page {
+.pagination-current-page,
+.paginate-pageCount {
     cursor: auto;
-    font-weight: bold;
-    border-color: #BBB;
+}
+
+.paginate-pageCount {
+    margin-left: 10px;
+}
+
+.pagination-current-page,
+.paginate-paginate a:hover,
+.paginate-paginate div.button.paginate-page:hover,
+.pagination-pages:hover {
+    border-color: #2eb4ad;
+    background-color: #2eb4ad;
+    color: #FFF;
+}
+
+.paginate-paginate div.button {
+    padding: 0;
+    float: left;
+    border: 0;
+    background: none;
 }
 
 .paginate-inputPage {
-    height: 14px;
+    height: 26px;
     width: 24px;
+    margin: 0 5px;
 }
 .table-main {
     margin: 0;
     padding: 0;
     position: relative;
 }
+
 .table-main table {
     word-break: break-all;
     word-wrap: break-word;
 }
 
 .table-header {
-    border: 1px solid #D0D0D0;
-    border-bottom: 0px;
-    border-radius: 6px 6px 0 0;
+    border-bottom: 1px solid #ddd;
+    background-color: #fafafa;
+    padding: 15px 0;
 }
 
 .table-header th {
-    height: 34px;
-    line-height: 34px;
+    line-height: 18px;
     text-align: left;
     text-indent: 6px;
-    font-size: 14px;
     font-weight: normal;
-    background: url("../images/icon.png") repeat scroll center bottom #F1F1F1;
 }
 
 .table-main td {
-    border-bottom: 1px solid #D0D0D0;
-    color: #333;
-    padding: 3px 0;
+    border-bottom: 1px solid #ddd;
+    color: #767676;
+    padding: 10px 0;
 }
 
 .table-lineHover .table-hasExpend td {
     border-bottom: 0px;
 }
 .table-heiglight td, .table-lineHover td {
-    background-color: #F3F3F3;
-    border-right-color: #F3F3F3;
+    background-color: #F5F5F5;
+    border-right-color: #F5F5F5;
 }
 .table-expendRow td {
     padding: 0 0 5px 36px;
@@ -680,16 +706,19 @@ button#submitArticle:hover,
     margin-left: 60px;
 }
 .table-expendRow td a {
-    background-color: #999;
-    border-radius: 3px;
-    color: #FFF;
+    padding: 1px 5px;
     font-size: 12px;
-    margin-right: 5px;
-    padding: 1px 6px;
+    line-height: 1.5;
+    border-radius: 3px;
     text-decoration: none;
+    color: #FFF;
+    background-color: #c7cbd6;
+    border-color: #c7cbd6;
 }
+
 .table-expendRow td a:hover {
-    background-color: #BBB;
+    background-color: #b0b5b9;
+    border-color: #b0b5b9;
 }
 .table-center {
     margin: 0 auto;
@@ -724,4 +753,4 @@ button#submitArticle:hover,
     padding: 3px;
     position: absolute;
     z-index: 1;
-}
+}
\ No newline at end of file

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

@@ -236,6 +236,9 @@ $.extend(Admin.prototype, {
                 $(it).find(".ico-arrow-up")[0].className = "ico-arrow-down";
                 $(it).removeClass('tab-current');
             }
+
+            $('#tabs > ul').height('auto');
+            $('#tabs > ul').height($('#tabs > ul').height() + 80);
         });
     },
     /**

src/main/webapp/js/admin/article.js

@@ -308,7 +308,7 @@ admin.article = {
                 }
 
                 $("#tagCheckboxPanel>span").remove("");
-                
+
                 var spans = "";
                 for (var i = 0; i < result.tags.length; i++) {
                     spans += "<span>" + result.tags[i].tagTitle + "</span>";
@@ -383,11 +383,42 @@ admin.article = {
      */
     init: function (fun) {
         this.currentEditorType = Label.editorType;
+
         // Inits Signs.
-        
         $(".signs button").click(function (i) {
-             $(".signs button").removeClass('selected');
-             $(this).addClass('selected');
+            $(".signs button").removeClass('selected');
+            $(this).addClass('selected');
+        });
+
+        // For tag auto-completion
+        $.ajax({// Gets all tags
+            url: latkeConfig.servePath + "/console/tags",
+            type: "GET",
+            cache: false,
+            success: function (result, textStatus) {
+                $("#tipMsg").text(result.msg);
+                if (!result.sc) {
+                    $("#loadMsg").text("");
+                    return;
+                }
+
+                if (0 >= result.tags.length) {
+                    return;
+                }
+
+                var tags = [];
+                for (var i = 0; i < result.tags.length; i++) {
+                    tags.push(result.tags[i].tagTitle);
+                }
+
+                $("#tag").completed({
+                    height: 160,
+                    buttonText: Label.selectLabel,
+                    data: tags
+                });
+
+                $("#loadMsg").text("");
+            }
         });
 
         // submit action
@@ -397,8 +428,8 @@ admin.article = {
             } else {
                 admin.article.add(true);
             }
-        });
-
+        }
+        );
         $("#saveArticle").click(function () {
             if (admin.article.status.id) {
                 admin.article.update(admin.article.status.isArticle);
@@ -416,26 +447,26 @@ admin.article = {
             url: "http://upload.qiniu.com/",
             add: function (e, data) {
                 filename = data.files[0].name;
-                
+
                 data.submit();
             },
             formData: function (form) {
                 var data = form.serializeArray();
-                var ext = filename.substring(filename.lastIndexOf(".") + 1);  
-                
+                var ext = filename.substring(filename.lastIndexOf(".") + 1);
+
                 data.push({name: 'key', value: getUUID() + "." + ext});
                 data.push({name: 'token', value: qiniu.qiniuUploadToken});
-                
+
                 return data;
             },
             done: function (e, data) {
                 var qiniuKey = data.result.key;
                 if (!qiniuKey) {
                     alert("Upload error");
-                    
+
                     return;
                 }
-                
+
                 $('#articleUpload').after('<div id="uploadContent">!<a target="_blank" href="http://' + qiniu.qiniuDomain + qiniuKey + '">[' + filename + ']</a>(http://'
                         + qiniu.qiniuDomain + qiniuKey + ')</div>');
             },
@@ -632,14 +663,15 @@ admin.register.article = {
 
 function getUUID() {
     var d = new Date().getTime();
-    
-    var ret = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        var r = (d + Math.random()*16)%16 | 0;
-        d = Math.floor(d/16);
-        return (c=='x' ? r : (r&0x3|0x8)).toString(16);
+
+    var ret = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = (d + Math.random() * 16) % 16 | 0;
+        d = Math.floor(d / 16);
+        return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
     });
-    
+
     ret = ret.replace(new RegExp("-", 'g'), "");
-    
+
     return ret;
-};
+}
+;

src/main/webapp/js/admin/tablePaginate.js

@@ -59,8 +59,8 @@ $.extend(TablePaginate.prototype, {
             },
             "currentPage": 1,
             "errorMessage": Label.inputErrorLabel,
-            "nextPageText": Label.nextPagePabel,
-            "previousPageText": Label.previousPageLabel,
+            "nextPageText": '>',
+            "previousPageText": '<',
             "goText": Label.gotoLabel,
             "type": "custom",
             "custom": [1],