Skip to content

S
solo
Commit d14ddcda authored by Liang Ding's avatar Liang Ding
Browse files
Options

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

parents d6037937 fd271592
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 212 deletions
war/src/main/resources/lang_en_US.properties
View file @ d14ddcda
...@@ -373,4 +373,5 @@ helloWorld.content=<p>Welcome to \ ...@@ -373,4 +373,5 @@ helloWorld.content=<p>Welcome to \
. This is your first post. Edit or delete it, then start blogging!</p> . 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. 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.
registerSoloUser=Register Solo User registerSoloUser=Register Solo User
registerLabel=Register
changeUserRole=Change Role changeUserRole=Change Role
\ No newline at end of file
war/src/main/resources/lang_zh_CN.properties
View file @ d14ddcda
...@@ -372,5 +372,6 @@ helloWorld.content=<p>\u6b22\u8fce\u4f7f\u7528 \ ...@@ -372,5 +372,6 @@ helloWorld.content=<p>\u6b22\u8fce\u4f7f\u7528 \
<span style="color: orangered; font-weight: bold;">Solo</span></a>\ <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> \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 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
registerSoloUser=\u6ce8\u518csolo\u7528\u6237 registerSoloUser=\u6ce8\u518c Solo \u7528\u6237
registerLabel=\u6ce8\u518c
changeUserRole=\u6539\u53d8\u89d2\u8272 changeUserRole=\u6539\u53d8\u89d2\u8272
\ No newline at end of file
war/src/main/webapp/css/default-init.css
View file @ d14ddcda
...@@ -186,11 +186,6 @@ button:active { ...@@ -186,11 +186,6 @@ button:active {
margin: 6px 0 6px 16px; margin: 6px 0 6px 16px;
} }
.mian tr {
height: 54px;
}
.footerWrapper { .footerWrapper {
background-color: #FFFFFF; background-color: #FFFFFF;
border-top: 1px solid #E6E5D9; border-top: 1px solid #E6E5D9;
...@@ -271,7 +266,8 @@ button:active { ...@@ -271,7 +266,8 @@ button:active {
width: 470px; width: 470px;
} }
#init input { #init input,
.register input {
margin: 5px 0; margin: 5px 0;
padding: 5px 8px; padding: 5px 8px;
} }
......
war/src/main/webapp/css/default-init.min.css
View file @ d14ddcda
html{height:100%;overflow:hidden}*,html,body{margin:0;padding:0}body{background-color:#f3f1e5;color:#4d505d;font-family:\5fae\8f6f\96c5\9ed1;font-size:small;height:100%}button{background:url(../images/icon.png) repeat center bottom;border:1px solid;border-color:#CCc #bbb #A0A0A0;border-radius:4px;height:28px;margin:0;padding:0 6px;vertical-align:top;float:right;margin:12px 0 0 24px;outline:0}input{background:none repeat scroll 0 0 #fbfbfb;border:1px solid #e5e5e5;box-shadow:1px 1px 2px rgba(200,200,200,0.2) inset;color:#4d505d;font-family:Helvetica,Arial,'sans-serif','\5fae\8f6f\96c5\9ed1';font-size:20px;font-weight:200;height:28px;margin-top:10px;outline:medium none;padding:3px;width:280px}input:focus{box-shadow:0 0 5px rgba(200,200,200,0.9)}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0;overflow:hidden}.none{display:none}.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 ul{margin-bottom:73px}.main li{margin:6px 0 6px 16px}.main p{margin:12px 0}.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{margin-bottom:10px;max-height:264px;overflow:auto;word-wrap:break-word}.article-pwd #confirm{margin-top:6px}.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}.login table{margin:66px auto}.kill{position:absolute;right:40px;top:230px}#init{position:absolute;top:102px;width:470px}#sys p{height:166px}#initButton{margin-right:10px}#tip{color:#21759b;float:right;font-weight:bold;margin-top:18px} 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 \ No newline at end of file
war/src/main/webapp/login.ftl
View file @ d14ddcda
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
<label for="userEmail"> <label for="userEmail">
${commentEmailLabel} ${commentEmailLabel}
</label> </label>
<input id="userEmail" /> <input id="userEmail" tabindex="1" />
<label for="userPassword"> <label for="userPassword">
${userPasswordLabel} <a href="/forgot">(${forgotLabel})</a> ${userPasswordLabel} <a href="/forgot">(${forgotLabel})</a>
</label> </label>
<input type="password" id="userPassword" /> <input type="password" id="userPassword" tabindex="2" />
<button onclick='login();'>${loginLabel}</button> <button onclick='login();'>${loginLabel}</button>
<span id="tip"></span> <span id="tip"></span>
</div> </div>
......
war/src/main/webapp/register.ftl
View file @ d14ddcda
This diff is collapsed.
war/src/main/webapp/top-bar.ftl
View file @ d14ddcda
<style type="text/css"> <style type="text/css">
#top { #top {
background-color: #FFF; background-color: #FFF;
background-image: linear-gradient(#FFFFFF,#E5E5E5); background-image: linear-gradient(#FFFFFF,#E5E5E5);
background-image: -ms-linear-gradient(#FFFFFF,#E5E5E5); background-image: -ms-linear-gradient(#FFFFFF,#E5E5E5);
background-image: -o-linear-gradient(#FFFFFF,#E5E5E5); background-image: -o-linear-gradient(#FFFFFF,#E5E5E5);
background-image: -webkit-linear-gradient(#FFFFFF,#E5E5E5); background-image: -webkit-linear-gradient(#FFFFFF,#E5E5E5);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFFFF', endColorstr='#E5E5E5'); filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#FFFFFF', endColorstr='#E5E5E5');
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
line-height: 26px; line-height: 26px;
display: none; display: none;
} }
#top a, #top span span { #top a, #top span span {
border-right: 1px solid #D9D9D9; border-right: 1px solid #D9D9D9;
color: #4C4C4C; color: #4C4C4C;
float: left; float: left;
line-height: 14px; line-height: 14px;
margin: 6px 0; margin: 6px 0;
padding: 0 6px; padding: 0 6px;
text-decoration: none; text-decoration: none;
text-shadow: 0 -1px 0 #FFFFFF; text-shadow: 0 -1px 0 #FFFFFF;
font-weight: normal; font-weight: normal;
} }
#top a:hover, #top a.hover { #top a:hover, #top a.hover {
background-color: #EEF2FA; background-color: #EEF2FA;
border-left-color: #707070; border-left-color: #707070;
border-radius: 0 13px 13px 0; border-radius: 0 13px 13px 0;
margin: 0px; margin: 0px;
line-height: 26px; line-height: 26px;
} }
#showTop { #showTop {
background-image: url("${contextPath}/images/arrow-right.png"); background-image: url("${contextPath}/images/arrow-right.png");
cursor: pointer; cursor: pointer;
height: 26px; height: 26px;
right: 0; right: 0;
position: absolute; position: absolute;
top: 0; top: 0;
width: 26px; width: 26px;
border-radius: 0 0 0 15px; border-radius: 0 0 0 15px;
z-index: 10; z-index: 10;
} }
#showTop:hover { #showTop:hover {
background-image: url("${contextPath}/images/arrow-right.gif"); background-image: url("${contextPath}/images/arrow-right.gif");
} }
#top #hideTop { #top #hideTop {
background-image: url("${contextPath}/images/arrow-left.png"); background-image: url("${contextPath}/images/arrow-left.png");
height: 26px; height: 26px;
margin: 0; margin: 0;
padding: 0; padding: 0;
width: 26px; width: 26px;
border: 0; border: 0;
} }
#top #hideTop:hover { #top #hideTop:hover {
background-image: url("${contextPath}/images/arrow-left.gif"); background-image: url("${contextPath}/images/arrow-left.gif");
border-radius: 0; border-radius: 0;
} }
</style> </style>
<div id="showTop"></div> <div id="showTop"></div>
<div id="top"> <div id="top">
<a href="https://github.com/b3log/b3log-solo" target="_blank" class="hover"> <a href="https://github.com/b3log/b3log-solo" target="_blank" class="hover">
B3log Solo B3log Solo
</a> </a>
<span class="left">&nbsp;${onlineVisitor1Label}${onlineVisitorCnt}</span> <span class="left">&nbsp;${onlineVisitor1Label}${onlineVisitorCnt}</span>
<span class="right" id="admin" data-login="${isLoggedIn?string}"> <span class="right" id="admin" data-login="${isLoggedIn?string}">
<#if isLoggedIn> <#if isLoggedIn>
<span>${userName}</span> <span>${userName}</span>
<#if isAdmin> <#if isAdmin>
<a href="javascript:Util.clearCache('all');"> <a href="javascript:Util.clearCache('all');">
${clearAllCacheLabel} ${clearAllCacheLabel}
</a> </a>
<a href="javascript:Util.clearCache();"> <a href="javascript:Util.clearCache();">
${clearCacheLabel} ${clearCacheLabel}
</a> </a>
</#if> </#if>
<a href="${contextPath}/admin-index.do#main" title="${adminLabel}"> <a href="${contextPath}/admin-index.do#main" title="${adminLabel}">
${adminLabel} ${adminLabel}
</a> </a>
<a href="${logoutURL}" title="${logoutLabel}">${logoutLabel}</a> <a href="${logoutURL}" title="${logoutLabel}">${logoutLabel}</a>
<#else> <#else>
<a href="${loginURL}" title="${loginLabel}">${loginLabel}</a> <a href="${loginURL}" title="${loginLabel}">${loginLabel}</a>
</#if> <a href="/register.html" title="{registerLabel}">{registerLabel}</a>
<#if isMobileRequest> </#if>
<a href="javascript:void(0)" onclick="Util.switchMobile('mobile');" title="${mobileLabel}">${mobileLabel}</a> <#if isMobileRequest>
</#if> <a href="javascript:void(0)" onclick="Util.switchMobile('mobile');" title="${mobileLabel}">${mobileLabel}</a>
<a href="javascript:void(0)" id="hideTop"></a> </#if>
</span> <a href="javascript:void(0)" id="hideTop"></a>
<div class="clear"></div> </span>
<div class="clear"></div>
</div> </div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment