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

war/src/main/resources/lang_en_US.properties

@@ -348,8 +348,11 @@ duplicatedPermalinkLabel=Duplicated permalink!
 invalidPermalinkFormatLabel=Invalid permalink format!
 duplicatedEmailLabel=Duplicated email!
 refreshAndRetryLabel=Please refresh and try again!
-editorLeaveLabel=Content is not null, Do you leave\uff1f
-editorPostLabel=Content is not null, Do you clear\uff1f
+editorLeaveLabel=Content is not null, Do you leave?
+editorPostLabel=Content is not null, Do you clear?
+registerSoloUserLabel=Register Solo User
+registerLabel=Register
+changeRoleLabel=Change Role
 ####
 confirmRemoveLabel=Are You Remove
 confirmInitLabel=Are You Sure?
@@ -372,6 +375,3 @@ helloWorld.content=<p>Welcome to \
 <span style="color: orangered; font-weight: bold;">Solo</span></a>\
 . This is your first post. Edit or delete it, then start blogging!</p>
 helloWorld.comment.content=Hi, this is a comment. _esc_enter_88250_To delete a comment, just log in and view the post's comments. There you will have the option to delete them.
\ No newline at end of file
-registerSoloUser=Register Solo User
-registerLabel=Register
-changeUserRole=Change Role
\ No newline at end of file

war/src/main/resources/lang_zh_CN.properties

@@ -350,6 +350,9 @@ duplicatedEmailLabel=\u90ae\u4ef6\u5730\u5740\u91cd\u590d\uff01
 refreshAndRetryLabel=\u8bf7\u5237\u65b0\u91cd\u8bd5\uff01
 editorLeaveLabel=\u7f16\u8f91\u5668\u4e2d\u8fd8\u6709\u5185\u5bb9\uff0c\u662f\u5426\u79bb\u5f00\uff1f
 editorPostLabel=\u7f16\u8f91\u5668\u4e2d\u8fd8\u6709\u5185\u5bb9\uff0c\u662f\u5426\u6e05\u7a7a\uff1f
+registerSoloUserLabel=\u6ce8\u518c Solo \u7528\u6237
+registerLabel=\u6ce8\u518c
+changeRoleLabel=\u6539\u53d8\u89d2\u8272
 ####
 confirmRemoveLabel=\u662f\u5426\u5220\u9664
 confirmInitLabel=\u786e\u5b9a\u8fdb\u884c\u521d\u59cb\u5316\u5417\uff1f
@@ -372,6 +375,3 @@ helloWorld.content=<p>\u6b22\u8fce\u4f7f\u7528 \
 <span style="color: orangered; font-weight: bold;">Solo</span></a>\
 \u3002\u8fd9\u662f\u7cfb\u7edf\u81ea\u52a8\u751f\u6210\u7684\u6f14\u793a\u6587\u7ae0\u3002\u7f16\u8f91\u6216\u8005\u5220\u9664\u5b83\uff0c\u7136\u540e\u5f00\u59cb\u60a8\u7684\u535a\u5ba2\uff01</p>
 helloWorld.comment.content=\u60a8\u597d\uff0c\u8fd9\u662f\u4e00\u6761\u8bc4\u8bba\u3002_esc_enter_88250_\u8981\u5220\u9664\u8bc4\u8bba\uff0c\u8bf7\u5148\u767b\u5f55\uff0c\u7136\u540e\u518d\u67e5\u770b\u8fd9\u7bc7\u6587\u7ae0\u7684\u8bc4\u8bba\u3002\u5728\u90a3\u91cc\uff0c\u60a8\u53ef\u4ee5\u770b\u5230\u7f16\u8f91\u6216\u8005\u5220\u9664\u8bc4\u8bba\u7684\u9009\u9879\u3002
\ No newline at end of file
-registerSoloUser=\u6ce8\u518c Solo \u7528\u6237
-registerLabel=\u6ce8\u518c
-changeUserRole=\u6539\u53d8\u89d2\u8272
\ No newline at end of file

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

@@ -112,7 +112,9 @@
         "externalRelevantArticlesDisplayCntLabel": "${externalRelevantArticlesDisplayCntLabel}",
         "nameTooLongLabel": "${nameTooLongLabel}",
         "navLabel": "${navLabel}",
-        "userLabel": "${userLabel}"
+        "userLabel": "${userLabel}",
+        "changeRoleLabel": "${changeRoleLabel}",
+        "visitorUserLabel": "${visitorUserLabel}"
     };    
     
     admin.init();

war/src/main/webapp/css/default-init.css

@@ -39,7 +39,9 @@ body {
 }
 
 h2 {  
-    background: linear-gradient(#F9F9F9, #ECECEC) repeat scroll 0 0 transparent;
+	background-color:#ECECEC;
+    background-image:linear-gradient(#F9F9F9, #ECECEC);
+    background-repeat:repeat-x;
     border-radius: 4px 4px 0 0;
     font-size: 16px;
     margin: 0;
@@ -106,10 +108,9 @@ button:active {
     color:#fff;
     text-decoration:none;
     text-shadow:0 -1px 0 rgba(0,0,0,0.25);
-    background-color:#3072b3;
+    background-color: #3072b3;
     background-image:linear-gradient(#599bcd,#3072b3);
     background-repeat:repeat-x;
-    border-color:#2a65a0;
 }
 
 .clear {
@@ -227,11 +228,11 @@ button:active {
 }
 
 .a-403 {
-    margin: 20px 75px 0 0 ;
+    margin: 10px 75px 0 0 ;
 }
 
 .img-500 {
-    margin: 25px 0 0 25px;
+    margin: 20px 0 0 25px;
 }
 
 .a-500 {

war/src/main/webapp/css/default-init.min.css

-html{height:100%;overflow:hidden}html,body{margin:0;padding:0}body{background-color:#f3f1e5;color:#333;font-family:\5fae\8f6f\96c5\9ed1;font-size:small;height:100%}h2{background:linear-gradient(#f9f9f9,#ececec) repeat scroll 0 0 transparent;border-radius:4px 4px 0 0;font-size:16px;margin:0;padding:10px 20px;text-shadow:0 -1px 0 rgba(255,255,255,0.5)}input{border:1px solid #ccc;border-radius:3px 3px 3px 3px;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset;font-size:13px;margin:15px 0;padding:7px 8px;transition:all .15s ease-in 0s;vertical-align:middle;width:410px}input:focus{box-shadow:0 1px 2px rgba(0,0,0,0.075) inset,0 0 5px rgbargba(200,200,200,0.9);border:1px solid #e6e5d9}.form{padding:20px}label{font-size:13px}button{position:relative;display:inline-block;font-size:13px;font-weight:700;color:#333;text-shadow:0 1px 0 rgba(255,255,255,0.9);white-space:nowrap;background-color:#eaeaea;background-image:linear-gradient(#fafafa,#eaeaea);background-repeat:repeat-x;border-radius:3px;border:1px solid #ddd;border-bottom-color:#c5c5c5;box-shadow:0 1px 3px rgba(0,0,0,0.075);vertical-align:baseline;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-appearance:none;outline:0;padding:7px 15px;margin-top:10px}button:hover,button:active{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#3072b3;background-image:linear-gradient(#599bcd,#3072b3);background-repeat:repeat-x;border-color:#2a65a0}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.main .icon{position:absolute;right:0;top:0;width:16px;height:16px}.solo{color:orangered;font-weight:bold}.logo{float:left;padding:162px 12px 0;width:153px}.wrapper{height:auto;min-height:100%;position:relative}.wrap{border-top:5px solid #e6e5d9;min-height:400px}.content{background:url("../images/zz.jpg") repeat-x scroll center bottom white;border-color:#e6e5d9;border-style:solid solid none;border-width:1px;margin:0 auto;position:relative;width:700px;top:60px}.main{border-left:1px solid #e6e5d9;float:right;font-size:15px;margin:24px 0;padding:12px 24px;width:470px;height:338px}.main a{text-decoration:none}.main li{margin:6px 0 6px 16px}.mian tr{height:54px}.footerWrapper{background-color:#fff;border-top:1px solid #e6e5d9;bottom:0;padding:12px 0;position:absolute;text-align:center;width:100%}.footerWrapper a{text-decoration:none}.article-pwd>div,.article-pwd>form{margin:0 20px}.article-pwd>div{margin-bottom:10px;max-height:264px;overflow:auto;word-wrap:break-word}.img-403,.img-500{box-shadow:0 0 5px #e6e5d9;margin:20px 0 0 45px;padding:5px}.a-403,.a-500{margin:20px 50px 0 0;text-align:right}.a-403{margin:20px 75px 0 0}.img-500{margin:25px 0 0 25px}.a-500{margin:25px 35px 0 0}.kill img{position:absolute;right:40px;top:200px}.kill ul{margin-bottom:50px}.kill p{margin:12px 20px}.kill span{margin-left:20px}#init{position:absolute;top:81px;width:470px}#init input{margin:5px 0;padding:5px 8px}#sys p{height:166px}#sys{padding:0 20px}#initButton{margin-right:10px}#tip{color:#21759b;font-weight:bold;margin-left:10px}
\ No newline at end of file
+html{height:100%;overflow:hidden}html,body{margin:0;padding:0}body{background-color:#f3f1e5;color:#333;font-family:\5fae\8f6f\96c5\9ed1;font-size:small;height:100%}h2{background:linear-gradient(#f9f9f9,#ececec) repeat scroll 0 0 transparent;border-radius:4px 4px 0 0;font-size:16px;margin:0;padding:10px 20px;text-shadow:0 -1px 0 rgba(255,255,255,0.5)}input{border:1px solid #ccc;border-radius:3px 3px 3px 3px;box-shadow:0 1px 2px rgba(0,0,0,0.075) inset;font-size:13px;margin:15px 0;padding:7px 8px;transition:all .15s ease-in 0s;vertical-align:middle;width:410px}input:focus{box-shadow:0 1px 2px rgba(0,0,0,0.075) inset,0 0 5px rgbargba(200,200,200,0.9);border:1px solid #e6e5d9}.form{padding:20px}label{font-size:13px}button{position:relative;display:inline-block;font-size:13px;font-weight:700;color:#333;text-shadow:0 1px 0 rgba(255,255,255,0.9);white-space:nowrap;background-color:#eaeaea;background-image:linear-gradient(#fafafa,#eaeaea);background-repeat:repeat-x;border-radius:3px;border:1px solid #ddd;border-bottom-color:#c5c5c5;box-shadow:0 1px 3px rgba(0,0,0,0.075);vertical-align:baseline;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-appearance:none;outline:0;padding:7px 15px;margin-top:10px}button:hover,button:active{color:#fff;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#3072b3;background-image:linear-gradient(#599bcd,#3072b3);background-repeat:repeat-x;border-color:#2a65a0}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.main .icon{position:absolute;right:0;top:0;width:16px;height:16px}.solo{color:orangered;font-weight:bold}.logo{float:left;padding:162px 12px 0;width:153px}.wrapper{height:auto;min-height:100%;position:relative}.wrap{border-top:5px solid #e6e5d9;min-height:400px}.content{background:url("../images/zz.jpg") repeat-x scroll center bottom white;border-color:#e6e5d9;border-style:solid solid none;border-width:1px;margin:0 auto;position:relative;width:700px;top:60px}.main{border-left:1px solid #e6e5d9;float:right;font-size:15px;margin:24px 0;padding:12px 24px;width:470px;height:338px}.main a{text-decoration:none}.main li{margin:6px 0 6px 16px}.footerWrapper{background-color:#fff;border-top:1px solid #e6e5d9;bottom:0;padding:12px 0;position:absolute;text-align:center;width:100%}.footerWrapper a{text-decoration:none}.article-pwd>div,.article-pwd>form{margin:0 20px}.article-pwd>div{margin-bottom:10px;max-height:264px;overflow:auto;word-wrap:break-word}.img-403,.img-500{box-shadow:0 0 5px #e6e5d9;margin:20px 0 0 45px;padding:5px}.a-403,.a-500{margin:20px 50px 0 0;text-align:right}.a-403{margin:20px 75px 0 0}.img-500{margin:25px 0 0 25px}.a-500{margin:25px 35px 0 0}.kill img{position:absolute;right:40px;top:200px}.kill ul{margin-bottom:50px}.kill p{margin:12px 20px}.kill span{margin-left:20px}#init{position:absolute;top:81px;width:470px}#init input,.register input{margin:5px 0;padding:5px 8px}#sys p{height:166px}#sys{padding:0 20px}#initButton{margin-right:10px}#tip{color:#21759b;font-weight:bold;margin-left:10px}
\ No newline at end of file

war/src/main/webapp/register.ftl

@@ -24,7 +24,7 @@
                         </a>
                     </div>
                     <div class="main register">
-                        <h2>${registerSoloUser}</h2>
+                        <h2>${registerSoloUserLabel}</h2>
                         <div class="form">
                             <label for="userEmail">
                                 ${commentEmail1Label}