Merge pull request #7 from b3log/0.6.0

0.6.0
This commit is contained in:
Liang Ding 2013-04-26 10:22:27 -07:00
commit 00a8f79373
29 changed files with 1608 additions and 1445 deletions

View File

@ -1,17 +1,18 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link href='http://fonts.googleapis.com/css?family=Neucha' rel='stylesheet' type='text/css' charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link href='http://fonts.googleapis.com/css?family=Reenie+Beanie' rel='stylesheet' type='text/css' charset="utf-8" /> <link href='http://fonts.googleapis.com/css?family=Neucha' rel='stylesheet' type='text/css' charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link href='http://fonts.googleapis.com/css?family=Reenie+Beanie' rel='stylesheet' type='text/css' charset="utf-8" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,26 +1,26 @@
# #
# Copyright (C) 2011, B3log Team # Copyright (C) 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: Andrea skin. # Description: Andrea skin.
# Version: 1.0.0.8, Nov 21, 2012 # Version: 1.0.0.8, Nov 21, 2012
# Author: Liyuan Li # Author: Liyuan Li
# #
name=Andrea name=Andrea
version=2.0.5 version=2.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=Refers to http://www.madeincima.eu memo=Refers to http://www.madeincima.eu

View File

@ -1,15 +1,16 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,27 +1,27 @@
# #
# Copyright (C) 2009, 2010, 2010, B3log Team # Copyright (C) 2009, 2010, 2010, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: Classic blue skin. # Description: Classic blue skin.
# Version: 1.0.0.8, Nov 21, 2012 # Version: 1.0.0.8, Nov 21, 2012
# Author: Liang Ding # Author: Liang Ding
# Author: Liyuan Li # Author: Liyuan Li
# #
name=\u7ecf\u5178\u6de1\u84dd name=\u7ecf\u5178\u6de1\u84dd
version=2.0.5 version=2.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=\u8fd9\u4e2a\u76ae\u80a4\u5f88\u4e11\u4e48\uff1f\u6211\u52d2\u4e2a\u53bb\u3002 memo=\u8fd9\u4e2a\u76ae\u80a4\u5f88\u4e11\u4e48\uff1f\u6211\u52d2\u4e2a\u53bb\u3002

View File

@ -1,15 +1,16 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,26 +1,26 @@
# #
# Copyright (C) 2011, B3log Team # Copyright (C) 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: Community skin. # Description: Community skin.
# Version: 1.0.0.9, Nov 21, 2012 # Version: 1.0.0.9, Nov 21, 2012
# Author: Liyuan Li # Author: Liyuan Li
# #
name=Community name=Community
version=2.0.5 version=2.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=Refers to http://demo.woothemes.com/skeptical/ memo=Refers to http://demo.woothemes.com/skeptical/

View File

@ -1,14 +1,15 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" /> <meta name="owner" content="B3log Team" />
<meta http-equiv="Window-target" content="_top" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,27 +1,27 @@
# #
# Copyright (C) 2009, 2010, 2011, B3log Team # Copyright (C) 2009, 2010, 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: ease skin. # Description: ease skin.
# Version: 1.0.0.4, Feb 4, 2013 # Version: 1.0.0.5, Apr 26, 2013
# Author: Liyuan Li # Author: Liyuan Li
# Author: Liang Ding # Author: Liang Ding
# #
name=ease name=ease
version=1.0.4 version=1.0.4
forSolo=0.5.6 forSolo=0.6.0
memo=\u56de\u5f52\u606c\u9759 memo=\u56de\u5f52\u606c\u9759

View File

@ -1,15 +1,16 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,27 +1,27 @@
# #
# Copyright (C) 2010, 2011, B3log Team # Copyright (C) 2010, 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: Favourite skin. # Description: Favourite skin.
# Version: 1.0.0.7, Nov 21, 2012 # Version: 1.0.0.7, Nov 21, 2012
# Author: Lamb Gao # Author: Lamb Gao
# Author: Liyuan Li # Author: Liyuan Li
# #
name=favourite name=favourite
version=2.0.5 version=2.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=Refers to http://www.iprimidieci.com/ memo=Refers to http://www.iprimidieci.com/

View File

@ -1,15 +1,16 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,26 +1,26 @@
# #
# Copyright (C) 2011, B3log Team # Copyright (C) 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: i-nove skin. # Description: i-nove skin.
# Version: 1.0.0.8, Nov 21, 2012 # Version: 1.0.0.8, Nov 21, 2012
# Author: Liyuan Li # Author: Liyuan Li
# #
name=i-nove name=i-nove
version=2.0.5 version=2.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=Refers to http://demo.neoease.com memo=Refers to http://demo.neoease.com

View File

@ -1,55 +1,56 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" /> <meta name="owner" content="B3log Team" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=2.0, user-scalable=yes" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<style type="text/css"> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/themes/default/style.css?${staticResourceVersion}" charset="utf-8" />
#headerbar, #wptouch-login, #wptouch-search { <style type="text/css">
background: #000000 url(/skins/${skinDirName}/themes/core/core-images/head-fade-bk.png); #headerbar, #wptouch-login, #wptouch-search {
} background: #000000 url(/skins/${skinDirName}/themes/core/core-images/head-fade-bk.png);
#headerbar-title, #headerbar-title a { }
color: #eeeeee; #headerbar-title, #headerbar-title a {
} color: #eeeeee;
#wptouch-menu-inner a:hover { }
color: #006bb3; #wptouch-menu-inner a:hover {
} color: #006bb3;
#catsmenu-inner a:hover { }
color: #006bb3; #catsmenu-inner a:hover {
} color: #006bb3;
#drop-fade { }
background: #333333; #drop-fade {
} background: #333333;
a, h3#com-head { }
color: #006bb3; a, h3#com-head {
} color: #006bb3;
}
a.h2, a.sh2, .page h2 {
font-family: 'Helvetica Neue'; a.h2, a.sh2, .page h2 {
} font-family: 'Helvetica Neue';
}
a.h2{
text-overflow: ellipsis; a.h2{
white-space: nowrap; text-overflow: ellipsis;
overflow: hidden; white-space: nowrap;
} overflow: hidden;
}
</style>
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> </style>
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
<script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/js/l10n.js?${staticResourceVersion}'></script> <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> <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/js/l10n.js?${staticResourceVersion}'></script>
<script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/themes/core/core.js?${staticResourceVersion}'></script> <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript"> <script type='text/javascript' src='${staticServePath}/skins/${skinDirName}/themes/core/core.js?${staticResourceVersion}'></script>
// Hides the addressbar on non-post pages <script type="text/javascript">
function hideURLbar() { window.scrollTo(0,1); } // Hides the addressbar on non-post pages
addEventListener('load', function() { setTimeout(hideURLbar, 0); }, false ); function hideURLbar() { window.scrollTo(0,1); }
</script> addEventListener('load', function() { setTimeout(hideURLbar, 0); }, false );
${htmlHead} </script>
${htmlHead}
</#macro> </#macro>

View File

@ -1,26 +1,26 @@
# #
# Copyright (C) 2009, 2010, 2010, B3log Team # Copyright (C) 2009, 2010, 2010, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: Mobile skin. # Description: Mobile skin.
# Version: 1.0.0.6, Feb 4, 2013 # Version: 1.0.0.7, Apr 26, 2013
# Author: Liang Ding # Author: Liang Ding
# #
name=Mobile name=Mobile
version=0.1.5 version=0.1.5
forSolo=0.5.6 forSolo=0.6.0
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002 memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002

View File

@ -2,10 +2,11 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="owner" content="B3log Team" />
<meta name="revised" content="${blogTitle?html}, ${year}" />
<meta name="copyright" content="B3log" /> <meta name="copyright" content="B3log" />
<meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />

View File

@ -1,26 +1,26 @@
# #
# Copyright (C) 2009, 2010, 2011, B3log Team # Copyright (C) 2009, 2010, 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: NeoEase skin. # Description: NeoEase skin.
# Version: 1.0.0.7, Nov 21, 2012 # Version: 1.0.0.7, Nov 21, 2012
# Author: Liyuan Li # Author: Liyuan Li
# #
name=NeoEase name=NeoEase
version=1.0.5 version=1.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=http://www.neoease.com/ memo=http://www.neoease.com/

View File

@ -1,27 +1,28 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
<script type="text/javascript"> <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
(function() { <script type="text/javascript">
if (! (function() {
/*@cc_on!@*/ if (!
0) return; /*@cc_on!@*/
var e = "abbr, article, aside, audio, canvas, datalist, details, dialog, eventsource, figure, footer, header, hgroup, mark, menu, meter, nav, output, progress, section, time, video".split(', '); 0) return;
var i= e.length; var e = "abbr, article, aside, audio, canvas, datalist, details, dialog, eventsource, figure, footer, header, hgroup, mark, menu, meter, nav, output, progress, section, time, video".split(', ');
while (i--){ var i= e.length;
document.createElement(e[i]) while (i--){
} document.createElement(e[i])
})() }
</script> })()
${htmlHead} </script>
${htmlHead}
</#macro> </#macro>

View File

@ -1,26 +1,27 @@
# <<<<<<< HEAD
# Copyright (C) 2011, B3log Team #
# # Copyright (C) 2011, B3log Team
# Licensed under the Apache License, Version 2.0 (the "License"); #
# you may not use this file except in compliance with the License. # Licensed under the Apache License, Version 2.0 (the "License");
# You may obtain a copy of the License at # you may not use this file except in compliance with the License.
# # You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0 #
# # http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software #
# distributed under the License is distributed on an "AS IS" BASIS, # Unless required by applicable law or agreed to in writing, software
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # distributed under the License is distributed on an "AS IS" BASIS,
# See the License for the specific language governing permissions and # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# limitations under the License. # See the License for the specific language governing permissions and
# # limitations under the License.
#
#
# Description: html5 + css3 #
# Version: 1.0.0.9, Nov 21, 2012 # Description: html5 + css3
# Author: Liyuan Li # Version: 1.0.0.9, Nov 21, 2012
# # Author: Liyuan Li
#
name=owmx-3.0
version=2.0.6 name=owmx-3.0
forSolo=0.5.6 version=2.0.5
memo=Refers to http://dx.b3log.org forSolo=0.6.0
memo=Refers to http://lightdian.b3log.org

View File

@ -1,99 +1,99 @@
<#include "macro-head.ftl"> <#include "macro-head.ftl">
<#include "macro-comments.ftl"> <#include "macro-comments.ftl">
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<@head title="${article.articleTitle} - ${blogTitle}"> <@head title="${article.articleTitle} - ${blogTitle}">
<meta name="keywords" content="${article.articleTags}" /> <meta name="keywords" content="${article.articleTags}" />
<meta name="description" content="${article.articleAbstract?html}" /> <meta name="description" content="${article.articleAbstract?html}" />
</@head> </@head>
</head> </head>
<body> <body>
${topBarReplacement} ${topBarReplacement}
<#include "header.ftl"> <#include "header.ftl">
<div class="wrapper"> <div class="wrapper">
<div class="container"> <div class="container">
<div class="module"> <div class="module">
<article class="article"> <article class="article">
<time class="article-time"> <time class="article-time">
<span> <span>
<#if article.hasUpdated> <#if article.hasUpdated>
${article.articleUpdateDate?string("yy-MM-dd HH:mm")} ${article.articleUpdateDate?string("yy-MM-dd HH:mm")}
<#else> <#else>
${article.articleCreateDate?string("yy-MM-dd HH:mm")} ${article.articleCreateDate?string("yy-MM-dd HH:mm")}
</#if> </#if>
</span> </span>
</time> </time>
<h2 class="article-title"> <h2 class="article-title">
<a href="${servePath}${article.articlePermalink}"> <a href="${servePath}${article.articlePermalink}">
${article.articleTitle} ${article.articleTitle}
</a> </a>
<#if article.hasUpdated> <#if article.hasUpdated>
<sup> <sup>
${updatedLabel} ${updatedLabel}
</sup> </sup>
</#if> </#if>
<#if article.articlePutTop> <#if article.articlePutTop>
<sup> <sup>
${topArticleLabel} ${topArticleLabel}
</sup> </sup>
</#if> </#if>
</h2> </h2>
<div class="article-body"> <div class="article-body">
${article.articleContent} ${article.articleContent}
</div> </div>
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<p> <p>
${article.articleSign.signHTML} ${article.articleSign.signHTML}
</p> </p>
</#if> </#if>
<span class="ico-tags ico" title="${tagLabel}"> <span class="ico-tags ico" title="${tagLabel}">
<#list article.articleTags?split(",") as articleTag><a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if></#list> <#list article.articleTags?split(",") as articleTag><a rel="tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if></#list>
</span> </span>
<span class="ico-author ico" title="${authorLabel}"> <span class="ico-author ico" title="${authorLabel}">
<a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a> <a rel="author" href="${servePath}/authors/${article.authorId}">${article.authorName}</a>
</span> </span>
<span class="ico-comment ico" title="${commentLabel}"> <span class="ico-comment ico" title="${commentLabel}">
<a rel="nofollow" href="${servePath}${article.articlePermalink}#comments"> <a rel="nofollow" href="${servePath}${article.articlePermalink}#comments">
<#if article.articleCommentCount == 0> <#if article.articleCommentCount == 0>
${noCommentLabel} ${noCommentLabel}
<#else> <#else>
${article.articleCommentCount} ${article.articleCommentCount}
</#if> </#if>
</a> </a>
</span> </span>
<span class="ico-view ico" title="${viewLabel}"> <span class="ico-view ico" title="${viewLabel}">
<a rel="nofollow" href="${servePath}${article.articlePermalink}"> <a rel="nofollow" href="${servePath}${article.articlePermalink}">
${article.articleViewCount} ${article.articleViewCount}
</a> </a>
</span> </span>
</article> </article>
<div class="fn-clear" style="margin-top: 30px;"> <div class="fn-clear" style="margin-top: 30px;">
<#if nextArticlePermalink??> <#if nextArticlePermalink??>
<div class="left"> <div class="left">
<a href="${servePath}${nextArticlePermalink}"> <a href="${servePath}${nextArticlePermalink}">
<span class="ico-pre">«</span> <span class="ico-pre">«</span>
${nextArticleTitle} ${nextArticleTitle}
</a> </a>
</div> </div>
</#if> </#if>
<#if previousArticlePermalink??> <#if previousArticlePermalink??>
<div class="right"> <div class="right">
<a href="${servePath}${previousArticlePermalink}"> <a href="${servePath}${previousArticlePermalink}">
${previousArticleTitle} <span class="left">${previousArticleTitle}</span>
<span class="ico-next">»</span> <span class="ico-next">»</span>
</a> </a>
</div> </div>
</#if> </#if>
</div> </div>
<@comments commentList=articleComments article=article></@comments> <@comments commentList=articleComments article=article></@comments>
</div> </div>
</div> </div>
</div> </div>
<#include "footer.ftl"> <#include "footer.ftl">
<@comment_script oId=article.oId> <@comment_script oId=article.oId>
page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}";
</@comment_script> </@comment_script>
</body> </body>
</html> </html>

File diff suppressed because it is too large Load Diff

View File

@ -63,6 +63,7 @@ a:hover>.ico-next,a:hover>.ico-pre{background-color:#000;}
.footer a:hover{text-decoration:underline;} .footer a:hover{text-decoration:underline;}
.header .title{font-size:150%;margin:3px 0 0;} .header .title{font-size:150%;margin:3px 0 0;}
.header .title a{color:#414141;text-shadow:0 1px 0 rgba(255, 255, 255, 0.7);} .header .title a{color:#414141;text-shadow:0 1px 0 rgba(255, 255, 255, 0.7);}
.header .sub-title{float:left;max-width:574px;white-space:normal;word-wrap:break-word;}
.header li a{color:#444;padding:17px;line-height:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.7);white-space:nowrap;} .header li a{color:#444;padding:17px;line-height:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.7);white-space:nowrap;}
.header li a.current{border-bottom:2px solid #D26911;} .header li a.current{border-bottom:2px solid #D26911;}
.header a:hover{color:#000;} .header a:hover{color:#000;}
@ -79,6 +80,7 @@ a:hover>.ico-next,a:hover>.ico-pre{background-color:#000;}
.articles .r .dot{left:-37px;right:inherit;} .articles .r .dot{left:-37px;right:inherit;}
.articles .arrow{height:15px;position:absolute;right:-9px;top:21px;width:9px;} .articles .arrow{height:15px;position:absolute;right:-9px;top:21px;width:9px;}
.articles .r .arrow{background-position:0 -22px;left:-9px;right:inherit;} .articles .r .arrow{background-position:0 -22px;left:-9px;right:inherit;}
.articles pre{background-color:#F5F5F5;border:1px solid #ddd;border-radius:4px 4px 4px 4px;padding:9.5px;white-space:pre-wrap;word-wrap:break-word;}
time.article-time{top:-8px;left:50%;position:absolute;} time.article-time{top:-8px;left:50%;position:absolute;}
time.article-time>span{background-color:#FFFFFF;border:1px solid #A8A9A9;border-radius:20em 20em 20em 20em;font-size:80%;margin-left:-56px;padding:5px 10px;} time.article-time>span{background-color:#FFFFFF;border:1px solid #A8A9A9;border-radius:20em 20em 20em 20em;font-size:80%;margin-left:-56px;padding:5px 10px;}
article .article-title{margin:10px 0 0 0;} article .article-title{margin:10px 0 0 0;}

View File

@ -1,74 +1,74 @@
<div class="footer"> <div class="footer">
<div class="container fn-clear"> <div class="container fn-clear">
<div class="left"> <div class="left">
<span>&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a> <span>&copy; ${year}</span> - <a href="${servePath}">${blogTitle}</a>
Powered by Powered by
<a href="http://b3log.org" target="_blank"> <a href="http://b3log.org" target="_blank">
${b3logLabel}&nbsp; ${b3logLabel}&nbsp;
<b style="color: orangered;">Solo</b></a>, <b style="color: orangered;">Solo</b></a>,
ver ${version}&nbsp;&nbsp; ver ${version}&nbsp;&nbsp;
Theme by <a rel="friend" rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>. Theme by <a rel="friend" target="_blank" href="http://themify.me/demo/themes/postline/">Postline</a> & <a rel="friend" href="http://vanessa.b3log.org" target="_blank">Vanessa</a>.
</div> </div>
<div class="right fn-clear"> <div class="right fn-clear">
<span class="left"> <span class="left">
${viewCount1Label} ${viewCount1Label}
${statistic.statisticBlogViewCount} ${statistic.statisticBlogViewCount}
&nbsp;&nbsp; &nbsp;&nbsp;
${articleCount1Label} ${articleCount1Label}
${statistic.statisticPublishedBlogArticleCount} ${statistic.statisticPublishedBlogArticleCount}
&nbsp;&nbsp; &nbsp;&nbsp;
${commentCount1Label} ${commentCount1Label}
${statistic.statisticPublishedBlogCommentCount} ${statistic.statisticPublishedBlogCommentCount}
</span> </span>
<span class="ico-translate" onclick="timeline.translate()"></span> <span class="ico-translate" onclick="timeline.translate()"></span>
</div> </div>
</div> </div>
</div> </div>
<div class="ico-top none" onclick="Util.goTop()" title="TOP"></div> <div class="ico-top none" onclick="Util.goTop()" title="TOP"></div>
<script type="text/javascript"> <script type="text/javascript">
var latkeConfig = { var latkeConfig = {
"servePath": "${servePath}", "servePath": "${servePath}",
"staticServePath": "${staticServePath}" "staticServePath": "${staticServePath}"
}; };
var Label = { var Label = {
"tagLabel": "${tagLabel}", "tagLabel": "${tagLabel}",
"viewLabel": "${viewLabel}", "viewLabel": "${viewLabel}",
"commentLabel": "${commentLabel}", "commentLabel": "${commentLabel}",
"noCommentLabel": "${noCommentLabel}", "noCommentLabel": "${noCommentLabel}",
"topArticleLabel": "${topArticleLabel}", "topArticleLabel": "${topArticleLabel}",
"authorLabel": "${authorLabel}", "authorLabel": "${authorLabel}",
"updatedLabel": "${updatedLabel}", "updatedLabel": "${updatedLabel}",
"contentLabel": "${contentLabel}", "contentLabel": "${contentLabel}",
"abstractLabel": "${abstractLabel}", "abstractLabel": "${abstractLabel}",
"clearAllCacheLabel": "${clearAllCacheLabel}", "clearAllCacheLabel": "${clearAllCacheLabel}",
"clearCacheLabel": "${clearCacheLabel}", "clearCacheLabel": "${clearCacheLabel}",
"moreLabel": "${moreLabel}", "moreLabel": "${moreLabel}",
"adminLabel": "${adminLabel}", "adminLabel": "${adminLabel}",
"logoutLabel": "${logoutLabel}", "logoutLabel": "${logoutLabel}",
"skinDirName": "${skinDirName}", "skinDirName": "${skinDirName}",
"loginLabel": "${loginLabel}", "loginLabel": "${loginLabel}",
"em00Label": "${em00Label}", "em00Label": "${em00Label}",
"em01Label": "${em01Label}", "em01Label": "${em01Label}",
"em02Label": "${em02Label}", "em02Label": "${em02Label}",
"em03Label": "${em03Label}", "em03Label": "${em03Label}",
"em04Label": "${em04Label}", "em04Label": "${em04Label}",
"em05Label": "${em05Label}", "em05Label": "${em05Label}",
"em06Label": "${em06Label}", "em06Label": "${em06Label}",
"em07Label": "${em07Label}", "em07Label": "${em07Label}",
"em08Label": "${em08Label}", "em08Label": "${em08Label}",
"em09Label": "${em09Label}", "em09Label": "${em09Label}",
"em10Label": "${em10Label}", "em10Label": "${em10Label}",
"em11Label": "${em11Label}", "em11Label": "${em11Label}",
"em12Label": "${em12Label}", "em12Label": "${em12Label}",
"em13Label": "${em13Label}", "em13Label": "${em13Label}",
"em14Label": "${em14Label}", "em14Label": "${em14Label}",
"localeString": "${localeString}", "localeString": "${localeString}",
"yearLabel": "${yearLabel}", "yearLabel": "${yearLabel}",
"monthLabel": "${monthLabel}" "monthLabel": "${monthLabel}"
}; };
</script> </script>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/js/common${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/${skinDirName}${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script> <script type="text/javascript" src="${staticServePath}/skins/${skinDirName}/js/${skinDirName}${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
${plugins} ${plugins}

View File

@ -1,46 +1,46 @@
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script type="text/javascript"> <script type="text/javascript">
(function () { (function () {
var element = ['time', 'article']; var element = ['time', 'article'];
for (var i = 0; i < element.length; i++) { for (var i = 0; i < element.length; i++) {
document.createElement(element[i]); document.createElement(element[i]);
} }
})(); })();
</script> </script>
<![endif]--> <![endif]-->
<div class="header"> <div class="header">
<div class="container fn-clear"> <div class="container fn-clear">
<div class="left"> <div class="left">
<h1 class="title"> <h1 class="title">
<a href="${servePath}"> <a href="${servePath}">
${blogTitle} ${blogTitle}
</a> </a>
</h1> </h1>
<span>${blogSubtitle}</span> <span class="sub-title">${blogSubtitle}</span>
</div> </div>
<ul class="left"> <ul class="left">
<#list pageNavigations as page> <#list pageNavigations as page>
<li> <li>
<a href="${page.pagePermalink}" target="${page.pageOpenTarget}">${page.pageTitle}</a> <a href="${page.pagePermalink}" target="${page.pageOpenTarget}">${page.pageTitle}</a>
</li> </li>
</#list> </#list>
<li> <li>
<a href="${servePath}/dynamic.html">${dynamicLabel}</a> <a href="${servePath}/dynamic.html">${dynamicLabel}</a>
</li> </li>
<li> <li>
<a href="${servePath}/tags.html">${allTagsLabel}</a> <a href="${servePath}/tags.html">${allTagsLabel}</a>
</li> </li>
<li> <li>
<a rel="alternate" href="${servePath}/blog-articles-feed.do">Atom <img src="${staticServePath}/images/feed.png" alt="Atom"/></a> <a rel="alternate" href="${servePath}/blog-articles-feed.do">Atom <img src="${staticServePath}/images/feed.png" alt="Atom"/></a>
</li> </li>
</ul> </ul>
<form class="right" target="_blank" method="get" action="http://www.google.com/search"> <form class="right" target="_blank" method="get" action="http://www.google.com/search">
<input placeholder="${searchLabel}" id="search" type="text" name="q" /> <input placeholder="${searchLabel}" id="search" type="text" name="q" />
<input type="submit" name="btnG" value="" class="none" /> <input type="submit" name="btnG" value="" class="none" />
<input type="hidden" name="oe" value="UTF-8" /> <input type="hidden" name="oe" value="UTF-8" />
<input type="hidden" name="ie" value="UTF-8" /> <input type="hidden" name="ie" value="UTF-8" />
<input type="hidden" name="newwindow" value="0" /> <input type="hidden" name="newwindow" value="0" />
<input type="hidden" name="sitesearch" value="${blogHost}" /> <input type="hidden" name="sitesearch" value="${blogHost}" />
</form> </form>
</div> </div>
</div> </div>

View File

@ -18,7 +18,7 @@
* @fileoverview timeline js. * @fileoverview timeline js.
* *
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a> * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.0, Jan 30, 2013 * @version 1.0.1.1, Feb 20, 2013
*/ */
var timeline = { var timeline = {
_COLHA: 0, _COLHA: 0,
@ -35,7 +35,7 @@ var timeline = {
var $it = $(this), var $it = $(this),
isLeft = colH[1] > colH[0], isLeft = colH[1] > colH[0],
top = isLeft ? colH[0] : colH[1]; top = isLeft ? colH[0] : colH[1];
if (!$it.hasClass("r") && !$it.hasClass("l")) { if (parseInt($it.css("top")) !== top) {
$it.css({ $it.css({
"top": top + "px", "top": top + "px",
"position": "absolute" "position": "absolute"
@ -53,9 +53,10 @@ var timeline = {
$articles.height(colH[0] > colH[1] ? colH[0] : colH[1]); $articles.height(colH[0] > colH[1] ? colH[0] : colH[1]);
}); });
setTimeout(function () { $(window).resize();
$(".module img").imagesLoaded(function () {
$(window).resize(); $(window).resize();
}, 500); });
}, },
@ -96,7 +97,7 @@ var timeline = {
isLeft = colH[1] > colH[0], isLeft = colH[1] > colH[0],
top = isLeft ? colH[0] : colH[1]; top = isLeft ? colH[0] : colH[1];
if (!$it.hasClass("r") && !$it.hasClass("l")) { if (parseInt($it.css("top")) !== top) {
$it.css({ $it.css({
"top": top + "px", "top": top + "px",
"position": "absolute" "position": "absolute"
@ -115,9 +116,10 @@ var timeline = {
}); });
}); });
setTimeout(function () { $(window).resize();
$(".module img").imagesLoaded(function () {
$(window).resize(); $(window).resize();
}, 500); });
}, },
_setNavCurrent: function () { _setNavCurrent: function () {
@ -250,9 +252,10 @@ var timeline = {
$more.css("background", "none #60829F").text(Label.moreLabel); $more.css("background", "none #60829F").text(Label.moreLabel);
} }
setTimeout(function () { $(window).resize();
$(".module img").imagesLoaded(function () {
$(window).resize(); $(window).resize();
}, 500); });
} }
}); });
}, },
@ -282,9 +285,139 @@ var timeline = {
} }
}; };
/*!
* jQuery imagesLoaded plugin v2.1.1
* http://github.com/desandro/imagesloaded
*
* MIT License. by Paul Irish et al.
*/
/*jshint curly: true, eqeqeq: true, noempty: true, strict: true, undef: true, browser: true */
/*global jQuery: false */
;
(function($, undefined) {
'use strict';
// blank image data-uri bypasses webkit log warning (thx doug jones)
var BLANK = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';
$.fn.imagesLoaded = function( callback ) {
var $this = this,
deferred = $.isFunction($.Deferred) ? $.Deferred() : 0,
hasNotify = $.isFunction(deferred.notify),
$images = $this.find('img').add( $this.filter('img') ),
loaded = [],
proper = [],
broken = [];
// Register deferred callbacks
if ($.isPlainObject(callback)) {
$.each(callback, function (key, value) {
if (key === 'callback') {
callback = value;
} else if (deferred) {
deferred[key](value);
}
});
}
function doneLoading() {
var $proper = $(proper),
$broken = $(broken);
if ( deferred ) {
if ( broken.length ) {
deferred.reject( $images, $proper, $broken );
} else {
deferred.resolve( $images );
}
}
if ( $.isFunction( callback ) ) {
callback.call( $this, $images, $proper, $broken );
}
}
function imgLoadedHandler( event ) {
imgLoaded( event.target, event.type === 'error' );
}
function imgLoaded( img, isBroken ) {
// don't proceed if BLANK image, or image is already loaded
if ( img.src === BLANK || $.inArray( img, loaded ) !== -1 ) {
return;
}
// store element in loaded images array
loaded.push( img );
// keep track of broken and properly loaded images
if ( isBroken ) {
broken.push( img );
} else {
proper.push( img );
}
// cache image and its state for future calls
$.data( img, 'imagesLoaded', {
isBroken: isBroken,
src: img.src
} );
// trigger deferred progress method if present
if ( hasNotify ) {
deferred.notifyWith( $(img), [ isBroken, $images, $(proper), $(broken) ] );
}
// call doneLoading and clean listeners if all images are loaded
if ( $images.length === loaded.length ) {
setTimeout( doneLoading );
$images.unbind( '.imagesLoaded', imgLoadedHandler );
}
}
// if no images, trigger immediately
if ( !$images.length ) {
doneLoading();
} else {
$images.bind( 'load.imagesLoaded error.imagesLoaded', imgLoadedHandler )
.each( function( i, el ) {
var src = el.src;
// find out if this image has been already checked for status
// if it was, and src has not changed, call imgLoaded on it
var cached = $.data( el, 'imagesLoaded' );
if ( cached && cached.src === src ) {
imgLoaded( el, cached.isBroken );
return;
}
// if complete is true and browser supports natural sizes, try
// to check for image status manually
if ( el.complete && el.naturalWidth !== undefined ) {
imgLoaded( el, el.naturalWidth === 0 || el.naturalHeight === 0 );
return;
}
// cached images don't fire load sometimes, so we reset src, but only when
// dealing with IE, or image is complete (loaded) and failed manual check
// webkit hack from http://groups.google.com/group/jquery-dev/browse_thread/thread/eee6ab7b2da50e1f
if ( el.readyState || el.complete ) {
el.src = BLANK;
el.src = src;
}
});
}
return deferred ? deferred.promise( $this ) : $this;
};
})(jQuery);
(function () { (function () {
Util.init(); Util.init();
Util.replaceSideEm($(".recent-comments-content")); Util.replaceSideEm($(".comments .article-body"));
Util.buildTags("tagsSide"); Util.buildTags("tagsSide");
timeline.init(); timeline.init();

File diff suppressed because one or more lines are too long

View File

@ -1,14 +1,15 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,27 +1,27 @@
# #
# Copyright (C) 2009, 2010, 2011, B3log Team # Copyright (C) 2009, 2010, 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: timeline skin. # Description: timeline skin.
# Version: 1.0.0.1, Jan 7, 2013 # Version: 1.0.0.1, Jan 7, 2013
# Author: Liyuan Li # Author: Liyuan Li
# #
name=timeline name=timeline
version=1.0.1 version=1.0.1
forSolo=0.5.6 forSolo=0.6.0
memo=\u65f6\u5149\u6d41\u901d memo=\u65f6\u5149\u6d41\u901d
note=\u6b64\u76ae\u80a4\u5ffd\u7565\u66f4\u65b0\u3001\u7f6e\u9876\u6392\u5e8f note=\u6b64\u76ae\u80a4\u5ffd\u7565\u66f4\u65b0\u3001\u7f6e\u9876\u6392\u5e8f

View File

@ -1,15 +1,16 @@
<#macro head title> <#macro head title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<#nested> <#nested>
<meta name="author" content="B3log Team" /> <meta name="author" content="${blogTitle?html}" />
<meta name="generator" content="B3log" /> <meta name="generator" content="B3log Solo" />
<meta name="copyright" content="B3log" /> <meta name="owner" content="B3log Team" />
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="${blogTitle?html}, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta name="copyright" content="B3log" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/css/default-base${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
${htmlHead} <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead}
</#macro> </#macro>

View File

@ -1,26 +1,26 @@
# #
# Copyright (C) 2010, 2011, B3log Team # Copyright (C) 2010, 2011, B3log Team
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# #
# Description: Tree House skin. # Description: Tree House skin.
# Version: 1.0.0.8, Nov 21, 2012 # Version: 1.0.0.8, Nov 21, 2012
# Author: Liyuan Li # Author: Liyuan Li
# #
name=Tree House name=Tree House
version=2.0.5 version=2.0.5
forSolo=0.5.6 forSolo=0.6.0
memo=Refers to http://www.thepixel.com/blog memo=Refers to http://www.thepixel.com/blog