From cba839034b665943f2e075c5b2b646d15f678308 Mon Sep 17 00:00:00 2001 From: Ruey-Cherng Yu Date: Fri, 11 Aug 2017 16:03:20 +0000 Subject: [PATCH] -Updated header.l10n.ent based on the zh_TW and en_US versions. -Changed to used layout files from en_US as zh_TW and jp versions are doing that as well. Old local layouts are deleted. Submitted by: Guangyuan (Charlie) Yang Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D11794 --- zh_CN.UTF-8/htdocs/Makefile | 2 +- zh_CN.UTF-8/htdocs/layout/Makefile | 15 --- zh_CN.UTF-8/htdocs/layout/Makefile.inc | 7 - zh_CN.UTF-8/htdocs/layout/css/Makefile | 16 --- zh_CN.UTF-8/htdocs/layout/css/fixed.css | 23 ---- zh_CN.UTF-8/htdocs/layout/css/fixed_large.css | 14 -- zh_CN.UTF-8/htdocs/layout/css/global.css | 18 --- zh_CN.UTF-8/htdocs/layout/css/layout.css | 62 --------- zh_CN.UTF-8/htdocs/layout/css/navigation.css | 39 ------ zh_CN.UTF-8/htdocs/layout/css/text.css | 28 ---- zh_CN.UTF-8/share/xml/header.l10n.ent | 122 +++++++++++++++--- 11 files changed, 105 insertions(+), 241 deletions(-) delete mode 100644 zh_CN.UTF-8/htdocs/layout/Makefile delete mode 100644 zh_CN.UTF-8/htdocs/layout/Makefile.inc delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/Makefile delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/fixed.css delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/fixed_large.css delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/global.css delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/layout.css delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/navigation.css delete mode 100644 zh_CN.UTF-8/htdocs/layout/css/text.css diff --git a/zh_CN.UTF-8/htdocs/Makefile b/zh_CN.UTF-8/htdocs/Makefile index 10550606e4..e9cdd3c0e9 100644 --- a/zh_CN.UTF-8/htdocs/Makefile +++ b/zh_CN.UTF-8/htdocs/Makefile @@ -76,7 +76,7 @@ SUBDIR+= doc # # Non-XML # SUBDIR+= cgi # SUBDIR+= gifs -SUBDIR+= layout +# SUBDIR+= layout #SUBDIR+= logo WEBDIR?= data/zh_CN diff --git a/zh_CN.UTF-8/htdocs/layout/Makefile b/zh_CN.UTF-8/htdocs/layout/Makefile deleted file mode 100644 index ddb3903e1e..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# The FreeBSD Simplified Chinese Project -# Original Revision: 1.1 -# -# $FreeBSD$ - -.if exists(../Makefile.conf) -.include "../Makefile.conf" -.endif -.if exists(../Makefile.inc) -.include "../Makefile.inc" -.endif - -SUBDIR= css - -.include "${DOC_PREFIX}/share/mk/web.site.mk" diff --git a/zh_CN.UTF-8/htdocs/layout/Makefile.inc b/zh_CN.UTF-8/htdocs/layout/Makefile.inc deleted file mode 100644 index a7977b07f6..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -# The FreeBSD Simplified Chinese Project -# Original Revision: 1.1 -# -# $FreeBSD$ - -WEBBASE?= /data/zh_CN/layout -DOC_PREFIX?= ${.CURDIR}/../../../.. diff --git a/zh_CN.UTF-8/htdocs/layout/css/Makefile b/zh_CN.UTF-8/htdocs/layout/css/Makefile deleted file mode 100644 index 39bc32e2e2..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# The FreeBSD Simplified Chinese Project -# Original Revision: 1.2 -# -# $FreeBSD$ - -.if exists(../Makefile.conf) -.include "../Makefile.conf" -.endif -.if exists(../Makefile.inc) -.include "../Makefile.inc" -.endif - -DATA= fixed.css fixed_large.css global.css layout.css navigation.css text.css - -.include "${DOC_PREFIX}/share/mk/web.site.mk" diff --git a/zh_CN.UTF-8/htdocs/layout/css/fixed.css b/zh_CN.UTF-8/htdocs/layout/css/fixed.css deleted file mode 100644 index 272e4f8ded..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/fixed.css +++ /dev/null @@ -1,23 +0,0 @@ -/* - FreeBSD.org - "Red" Style - - Inspired by AListApart, PositionIsEverything, Mozilla, Red Hat, and many more. - - Copyright (c) 2004, 2005 The FreeBSD Project - Copyright (c) 2004, 2005 Emily Boyd - - This file, and any imported stylesheets are licensed under the BSD license. - - The FreeBSD Simplified Chinese Project - Original Revision: 1.5 - - $FreeBSD$ -*/ - -@import url("global.css"); -@import url("layout.css"); -@import url("text.css"); -@import url("navigation.css"); -@import url("../../../layout/css/table.css"); - -@import url("../../../layout/css/iefixes.css"); diff --git a/zh_CN.UTF-8/htdocs/layout/css/fixed_large.css b/zh_CN.UTF-8/htdocs/layout/css/fixed_large.css deleted file mode 100644 index 37552af75c..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/fixed_large.css +++ /dev/null @@ -1,14 +0,0 @@ -/* - * FreeBSD Global Style - Large Text Version - * - * The FreeBSD Simplified Chinese Project - * Original Revision: 1.3 - * - * $FreeBSD$ - */ - -@import url("fixed.css"); - -body { - font-size: 93%; -} diff --git a/zh_CN.UTF-8/htdocs/layout/css/global.css b/zh_CN.UTF-8/htdocs/layout/css/global.css deleted file mode 100644 index a4ea4b4380..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/global.css +++ /dev/null @@ -1,18 +0,0 @@ -/* - * FreeBSD.org - Global Styles - * - * The FreeBSD Simplified Chinese Project - * Original Revision: 1.11 - * - * $FreeBSD$ - */ - -@import url("../../../layout/css/global.css"); - -h5 { - font-size: 1.09em; -} - -h6 { - font-size: 1.09em; -} diff --git a/zh_CN.UTF-8/htdocs/layout/css/layout.css b/zh_CN.UTF-8/htdocs/layout/css/layout.css deleted file mode 100644 index 201f415356..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/layout.css +++ /dev/null @@ -1,62 +0,0 @@ -/* - * FreeBSD.org - Layout Styles - * - * The FreeBSD Simplified Chinese Project - * Original Revision: 1.10 - * - * $FreeBSD$ - */ - -@import url("../../../layout/css/layout.css"); - -/* Container Definitions */ - -/* Search */ - -#search form input { - font-size: 1.09em; -} - -#search form #submit { - font-size: 1.09em; -} - -#search form #words { - font-size: 1.0em; -} - -/* Mirror Select */ - -#mirror form label { - font-size: 1.09em; -} - -#mirror form select { - font-size: 1.09em; -} - -#mirror form #mirrorsel { - font-size: 1.09em; -} - -#mirror input { - font-size: 1.09em; -} - -/* Content */ - -.frontnewcontent { - font-size: 1.1em; -} - -/* Get FreeBSD Box */ - -.frontgetcontent { - font-size: 1.4em; -} - -/* Footer */ - -#footer { - font-size: 1.09em; -} diff --git a/zh_CN.UTF-8/htdocs/layout/css/navigation.css b/zh_CN.UTF-8/htdocs/layout/css/navigation.css deleted file mode 100644 index 859e5d5155..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/navigation.css +++ /dev/null @@ -1,39 +0,0 @@ -/* - * FreeBSD.org - Navigation (and List) Styles - * - * The FreeBSD Simplified Chinese Project - * Original Revision: 1.4 - * $FreeBSD$ - */ - -@import url("../../../layout/css/navigation.css"); - -/* Site Navigation */ - -#topnav { - font-size: 1.09em; -} - -/* Language selection */ - -#languagenav { - font-size: 1.09em; -} - -/* The search navigation is the list of links above the search box. */ - -#searchnav { - font-size: 1.09em; -} - -/* Category Navigation */ - -#sidenav, #sidenav ul, #sidenav ul ul { - font-size: 1.0em; -} - -/* Right Navigation */ - -.rightnav, .rightnav ul, .rightnav ul ul { - font-size: 1.0em; -} diff --git a/zh_CN.UTF-8/htdocs/layout/css/text.css b/zh_CN.UTF-8/htdocs/layout/css/text.css deleted file mode 100644 index dfeac5b5de..0000000000 --- a/zh_CN.UTF-8/htdocs/layout/css/text.css +++ /dev/null @@ -1,28 +0,0 @@ -/* - * FreeBSD.org - Text Styles - * - * The FreeBSD Simplified Chinese Project - * Original Revision: 1.4 - * - * $FreeBSD$ - */ - -@import url("../../../layout/css/text.css"); - -/* Text Styles */ - -.txtdivider { - font-size: 1.09em; -} - -.txtnewsevent { - font-size: 1.09em; -} - -.txtshortcuts { - font-size: 1.09em; -} - -.txtdate { - font-size: 1.09em; -} diff --git a/zh_CN.UTF-8/share/xml/header.l10n.ent b/zh_CN.UTF-8/share/xml/header.l10n.ent index d35f9f1c73..c2cbf74d12 100644 --- a/zh_CN.UTF-8/share/xml/header.l10n.ent +++ b/zh_CN.UTF-8/share/xml/header.l10n.ent @@ -2,32 +2,118 @@ - + -站点地图 | - 版权信息 | © 1995-2007 The FreeBSD Project. + +站点地图 | + 法律信息 | © 1995–2017 FreeBSD 项目。 保留所有权利。'> -首页   |   联系   |   版权   |   ©right;'> + +主页   |   联系   |   版权   |   ©right;'> FreeBSD 主页'> - + - - + +
.
+
+ 捐赠 FreeBSD +
+
.
+ +'> + + + + + + -