Skip to content

S
solo-1
Commit 95e7c08f authored by Liang's avatar Liang
Browse files
Options

💄 update common page

parent 54295024
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 526 additions and 883 deletions
src/main/webapp/article-pwd.ftl
View file @ 95e7c08f
<!DOCTYPE html> <#include "macro-common-page.ftl">
<html>
<head>
<meta charset="utf-8" />
<title>${articleViewPwdLabel}</title>
<meta name="keywords" content="Solo,Java 博客,开源" />
<meta name="description" content="An open source blog with Java. Java 开源博客" />
<meta name="owner" content="B3log Team" />
<meta name="author" content="B3log Team" />
<meta name="generator" content="Solo" />
<meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta name="robots" content="noindex, follow" />
<meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
</head>
<body>
<div class="wrapper">
<div class="wrap">
<div class="content">
<div class="logo">
<a href="http://b3log.org" target="_blank">
<img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main article-pwd">
<h2>
${articleTitle}
</h2>
<div>
${articleAbstract}
</div>
<#if msg??>
<div>${msg}</div>
</#if>
<form method="POST" action="${servePath}/console/article-pwd">
<label for="pwdTyped">访问密码：</label>
<input type="password" id="pwdTyped" name="pwdTyped" />
<input type="hidden" name="articleId" value="${articleId}" />
<button id="confirm" type="submit">${confirmLabel}</button>
</form>
<a href="http://b3log.org" target="_blank">
<img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
</a>
</div>
<span class="clear"></span>
</div>
</div>
<div class="footerWrapper"> <@commonPage "${articleViewPwdLabel}">
<div class="footer"> <h2>
&copy; ${year} - <a href="${servePath}">${blogTitle}</a><br/> ${articleTitle}
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • <a href="https://hacpai.com/tag/solo" target="_blank">Solo</a> ${version} </h2>
</div> <br>
</div> <#if msg??>
</div> <div>${msg}</div>
</body> </#if>
</html> <form method="POST" action="${servePath}/console/article-pwd">
<label for="pwdTyped">访问密码：</label>
<input type="password" id="pwdTyped" name="pwdTyped" />
<input type="hidden" name="articleId" value="${articleId}" />
<button id="confirm" type="submit">${confirmLabel}</button>
</form>
</@commonPage>
\ No newline at end of file
src/main/webapp/css/default-init.css
View file @ 95e7c08f
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
html { html {
height: 100%; height: 100%;
overflow: hidden;
} }
html,body { html,body {
...@@ -32,7 +31,7 @@ html,body { ...@@ -32,7 +31,7 @@ html,body {
} }
body { body {
background-color: #F3F1E5; background-color: #fff;
color: #333; color: #333;
font-family: \5fae\8f6f\96c5\9ed1; font-family: \5fae\8f6f\96c5\9ed1;
font-size: small; font-size: small;
...@@ -40,7 +39,7 @@ body { ...@@ -40,7 +39,7 @@ body {
} }
h2 { h2 {
background-color:#ECECEC; background-color: #F3F1E5;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
font-size: 16px; font-size: 16px;
margin: 0; margin: 0;
...@@ -129,14 +128,6 @@ button:active { ...@@ -129,14 +128,6 @@ button:active {
display: none; display: none;
} }
.main .icon {
position: absolute;
right: 0px;
top: 0px;
width:16px;
height:16px;
}
.solo { .solo {
color: orangered; color: orangered;
font-weight: bold; font-weight: bold;
...@@ -144,32 +135,22 @@ button:active { ...@@ -144,32 +135,22 @@ button:active {
.logo { .logo {
float: left; float: left;
padding: 162px 12px 0; padding: 142px 12px 0;
width: 217px; width: 217px;
text-align: center; text-align: center;
} }
.wrapper {
height: auto;
min-height: 100%;
position: relative;
}
.wrap { .wrap {
border-top: 5px solid #E6E5D9; border-top: 5px solid #E6E5D9;
min-height: 400px; min-height: 400px;
padding: 110px 0;
background-color: #F3F1E5;
} }
.content { .content {
background: url("../images/zz.jpg") repeat-x scroll center bottom white; background-color: #fff;
border-color: #E6E5D9;
border-style: solid solid none;
border-width: 1px;
margin: 0 auto; margin: 0 auto;
padding: 0 0 28px 0;
position: relative;
width: 760px; width: 760px;
top: 60px;
} }
.main { .main {
...@@ -179,7 +160,7 @@ button:active { ...@@ -179,7 +160,7 @@ button:active {
margin: 24px 0; margin: 24px 0;
padding: 12px 24px; padding: 12px 24px;
width: 470px; width: 470px;
height: 338px; min-height: 300px;
} }
.main a { .main a {
...@@ -193,11 +174,8 @@ button:active { ...@@ -193,11 +174,8 @@ button:active {
.footerWrapper { .footerWrapper {
background-color: #FFFFFF; background-color: #FFFFFF;
border-top: 1px solid #E6E5D9; border-top: 1px solid #E6E5D9;
bottom: 0;
padding: 12px 0; padding: 12px 0;
position: absolute;
text-align: center; text-align: center;
width: 100%;
} }
.footerWrapper a { .footerWrapper a {
...@@ -220,7 +198,6 @@ button:active { ...@@ -220,7 +198,6 @@ button:active {
/* start 403/404/500 */ /* start 403/404/500 */
.img-403, .img-500 { .img-403, .img-500 {
box-shadow: 0 0 5px #E6E5D9;
margin: 20px 0 0 45px; margin: 20px 0 0 45px;
padding: 5px; padding: 5px;
} }
...@@ -270,7 +247,6 @@ button:active { ...@@ -270,7 +247,6 @@ button:active {
/* start init */ /* start init */
#init { #init {
position: absolute; position: absolute;
top: 81px;
width: 470px; width: 470px;
} }
......
src/main/webapp/error/403.ftl
View file @ 95e7c08f
<!DOCTYPE html> <#include "../macro-common-page.ftl">
<html>
<head> <@commonPage "403 Forbidden!">
<meta charset="utf-8" /> <h2>403 Forbidden!</h2>
<meta name="robots" content="none" /> <img class="img-403" src="${staticServePath}/images/403.png" alt="403: forbidden" title="403: forbidden" />
<title>${blogTitle} - 403 Forbidden!</title> <div class="a-403">
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <a href="${servePath}">Index</a> |
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <a href="${loginURL}">Login</a>
</head> </div>
<body> </@commonPage>
<div class="wrapper">
<div class="wrap">
<div class="content">
<div class="logo">
<a href="http://b3log.org" target="_blank">
<img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main">
<h2>403 Forbidden!</h2>
<img class="img-403" src="${staticServePath}/images/403.png" alt="403: forbidden" title="403: forbidden" />
<div class="a-403">
<a href="${servePath}">Index</a> |
<a href="${loginURL}">Login</a>
</div>
<a href="http://b3log.org" target="_blank">
<img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
</a>
</div>
<span class="clear"></span>
</div>
</div>
</div>
<div class="footerWrapper">
<div class="footer">
&copy; ${year}
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a>, ver ${version}
</div>
</div>
</body>
</html>
src/main/webapp/error/404.ftl
View file @ 95e7c08f
<!DOCTYPE html> <#include "../macro-common-page.ftl">
<html>
<head> <@commonPage "404 Not Found!">
<meta charset="utf-8" /> <h2>${title}</h2>
<meta name="robots" content="none" /> <img class="img-t0t" width="488" src="${staticServePath}/images/404.gif" title="404" alt="${title}"/>
<title>${blogTitle} - 404 Not Found!</title> <div class="a-404">
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> 欢迎访问
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <a href="https://hacpai.com">黑客与画家</a>
</head> </div>
<body> </@commonPage>
<div class="wrapper"> \ No newline at end of file
<div class="wrap">
<div class="content">
<div class="logo">
<a href="http://b3log.org" target="_blank">
<img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main">
<h2>404 Not Found!</h2>
<img class="img-t0t" width="488" src="${staticServePath}/images/404.gif" title="404" alt="500: not found!" />
<div class="a-404">
欢迎访问
<a href="https://hacpai.com">黑客与画家</a>
</div>
<a href="http://b3log.org" target="_blank">
<img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
</a>
</div>
<span class="clear"></span>
</div>
</div>
</div>
<div class="footerWrapper">
<div class="footer">
&copy; ${year}
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a>, ver ${version}
</div>
</div>
</body>
</html>
src/main/webapp/error/500.ftl
View file @ 95e7c08f
<!DOCTYPE html> <#include "../macro-common-page.ftl">
<html>
<head> <@commonPage "500 Internal Server Error!">
<meta charset="utf-8" /> <h2>500 Internal Server Error!</h2>
<title>${blogTitle} - 500 Internal Server Error!</title> <img class="img-500" src="${staticServePath}/images/500.png" title="500: internal error" alt="500: internal error" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <div class="a-500">
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> Please
</head> <a href="https://github.com/b3log/solo/issues/new">report</a> it to help us.
<body> Return to <a href="${servePath}">Index</a>.
<div class="wrapper"> </div>
<div class="wrap"> </@commonPage>
<div class="content"> \ No newline at end of file
<div class="logo">
<a href="http://b3log.org" target="_blank">
<img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main">
<h2>500 Internal Server Error!</h2>
<img class="img-500" src="${staticServePath}/images/500.png" title="500: internal error" alt="500: internal error" />
<div class="a-500">
Please
<a href="https://github.com/b3log/solo/issues/new">report</a> it to help us.
Return to <a href="${servePath}">Index</a>.
</div>
<a href="http://b3log.org" target="_blank">
<img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
</a>
</div>
<span class="clear"></span>
</div>
</div>
</div>
<div class="footerWrapper">
<div class="footer">
&copy; ${year}
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a>, ver ${version}
</div>
</div>
</body>
</html>
src/main/webapp/init.ftl
View file @ 95e7c08f
This diff is collapsed.
src/main/webapp/kill-browser.ftl
View file @ 95e7c08f
<!DOCTYPE html> <#include "macro-common-page.ftl">
<html>
<head> <@commonPage "403 Forbidden!">
<meta charset="utf-8" /> ${killBrowserLabel}
<title>${blogTitle}</title> <br/>
<meta name="keywords" content="Solo,Java 博客,开源" /> &nbsp; &nbsp;&nbsp; <button onclick="closeIframe();">${closeLabel}</button> &nbsp; &nbsp;
<meta name="description" content="An open source blog with Java. Java 开源博客" /> <button onclick="closeIframeForever();">${closeForeverLabel}</button>
<meta name="owner" content="B3log Team" /> <img src='${staticServePath}/images/kill-browser.png' title='Kill IE6' style="float: right;
<meta name="author" content="B3log Team" /> margin: -171px 0 0 0;" alt='Kill IE6'/>
<meta name="generator" content="Solo" /> <script>
<meta name="copyright" content="B3log" /> var closeIframe = function () {
<meta name="revised" content="B3log, ${year}" /> window.parent.$("iframe").prev().remove();
<meta http-equiv="Window-target" content="_top" /> window.parent.$("iframe").remove();
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> };
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
</head> var closeIframeForever = function () {
<body> window.parent.Cookie.createCookie("showKill", true, 365);
<div class="wrapper"> closeIframe();
<div class="wrap"> };
<div class="content" style="top:-6px"> </script>
<div class="logo"> </@commonPage>
<a href="http://b3log.org" target="_blank"> \ No newline at end of file
<img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main kill" style="height: 385px;">
${killBrowserLabel}
<br/>
&nbsp; &nbsp;&nbsp; <button onclick="closeIframe();">${closeLabel}</button> &nbsp; &nbsp;
<button onclick="closeIframeForever();">${closeForeverLabel}</button>
<img src='${staticServePath}/images/kill-browser.png' title='Kill IE6' alt='Kill IE6'/>
<a href="http://b3log.org" target="_blank">
<img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
</a>
</div>
<span class="clear"></span>
</div>
</div>
</div>
<script>
var closeIframe = function () {
window.parent.$("iframe").prev().remove();
window.parent.$("iframe").remove();
};
var closeIframeForever = function () {
window.parent.Cookie.createCookie("showKill", true, 365);
closeIframe();
};
</script>
</body>
</html>
src/main/webapp/login.ftl
View file @ 95e7c08f
This diff is collapsed.
src/main/webapp/macro-common-page.ftl 0 → 100644
View file @ 95e7c08f
<#macro commonPage title>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<meta name="robots" content="none"/>
<title><#if blogTitle??>${blogTitle} - </#if>${title}</title>
<link type="text/css" rel="stylesheet"
href="${staticServePath}/css/default-init${miniPostfix}.css?${staticResourceVersion}" charset="utf-8"/>
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/>
</head>
<body>
<div class="wrap">
<div class="content">
<div class="logo">
<a href="http://b3log.org" target="_blank">
<img border="0" alt="Solo" title="Solo" src="${staticServePath}/images/logo.jpg"/>
</a>
</div>
<div class="main">
<#nested >
</div>
<span class="clear"></span>
</div>
</div>
<div class="footerWrapper">
<div class="footer">
Powered by <a href="http://b3log.org" target="_blank">B3log 开源</a> • Solo ${version}
</div>
</div>
</body>
</html>
</#macro>
src/main/webapp/register.ftl
View file @ 95e7c08f
This diff is collapsed.
src/main/webapp/reset-pwd.ftl
View file @ 95e7c08f
This diff is collapsed.
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