Author: sebb
Date: Tue May 1 09:07:46 2018
New Revision: 1830663
URL: http://svn.apache.org/viewvc?rev=1830663&view=rev
Log:
Simplify by using chained layout for project pages
Update docs
Added:
attic/site-jekyll/src/_layouts/main.html (with props)
Removed:
attic/site-jekyll/src/_includes/
Modified:
attic/site-jekyll/README.md
attic/site-jekyll/src/_layouts/project.html
attic/site-jekyll/src/index.html
attic/site-jekyll/src/process.html
attic/site-jekyll/src/resolution.html
Modified: attic/site-jekyll/README.md
URL:
http://svn.apache.org/viewvc/attic/site-jekyll/README.md?rev=1830663&r1=1830662&r2=1830663&view=diff
==============================================================================
--- attic/site-jekyll/README.md (original)
+++ attic/site-jekyll/README.md Tue May 1 09:07:46 2018
@@ -5,14 +5,15 @@ src/ - source files used to generate the
_data/
project.txt - sample JSON object and comments
projects.json - data for all retired projects
- _includes/
- page_start.html - start of each page
- page_end.html - end of each page
_layouts/
+ main.html - main Attic template
project.html - template to process individual project pages
_plugins/
+ generate_flags.rb - Ruby post-processing script to generate flags and
banners
generate_projects.rb - Ruby script which processes the data file to
generate pages using the layout
- postwrite.rb - Ruby post-processing script to generate flags and banners
+flagged/ - static tree copied to output
+flags/
+ README.txt - explains purpose of flags directories
scripts/
Lua scripts for use by the web server
style/
Added: attic/site-jekyll/src/_layouts/main.html
URL:
http://svn.apache.org/viewvc/attic/site-jekyll/src/_layouts/main.html?rev=1830663&view=auto
==============================================================================
--- attic/site-jekyll/src/_layouts/main.html (added)
+++ attic/site-jekyll/src/_layouts/main.html Tue May 1 09:07:46 2018
@@ -0,0 +1,97 @@
+---
+# This is the main layout for the Attic site
+# It is used for all pages
+---
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); 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
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";>
+ <head>
+ <!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from XML source: DO NOT EDIT!
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <link rel="stylesheet" href="{{ page.myrelativeurl
}}style/compressed.css" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="{{ page.myrelativeurl }}style/style.css"
type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="{{ page.myrelativeurl }}style/attic.css"
type="text/css" media="screen, projection"/>
+ <!--[if IE]><link rel="stylesheet" href="{{ page.myrelativeurl
}}style/ie.css" type="text/css" media="screen, projection"/><![endif]-->
+ <meta name="author" content="The Apache Software Foundation" /><meta
name="email" content="general.AT.attic.apache.DOT.org" />
+ <title>{{ page.title }} - Apache Attic</title>
+
+ </head>
+ <body id="sub">
+ <div class="container">
+ <hr class="space col"/>
+ <div class="block">
+ <div class="column span-24">
+ <div id="header">
+ <!-- Add 'default' header section here. -->
+ <h1>{{ page.title }}</h1>
+ </div>
+ </div>
+ </div>
+ <hr/>
+ <div class="block content">
+ <div class="column span-15 colborder">
+
+{{ content }} </div>
+ <div class="column span-8 last">
+ <div class="block">
+ <div class="nav column span-11">
+ <div>
+ <div class="menuheader">The Apache Attic</div>
+ <ul>
+ <li><a href="{{ page.myrelativeurl }}index.html">Home</a></li>
+ <li><a href="{{ page.myrelativeurl }}process.html">Process</a></li>
+ <li><a href="http://issues.apache.org/jira/browse/ATTIC";>Process
tracking</a></li>
+ <li><a
href="https://whimsy.apache.org/board/minutes/Attic.html";>Board
Minutes</a></li>
+ <li><a href="http://www.apache.org/licenses/";>License</a></li>
+ <li><a href="http://www.apache.org/security/";>Security</a></li>
+ </ul>
+ <div class="menuheader">Related Apache Links</div>
+ <ul>
+ <li><a href="http://www.apache.org/";>Foundation</a></li>
+ <li><a
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+ <li><a
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+ <li><a href="http://incubator.apache.org/";>Incubator</a></li>
+ <li><a href="http://apachecon.com/";>ApacheCon</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="nav column prepend-1 span-12 last">
+ <h6>Projects in the Attic</h6>
+ <ul>{% for project in site.data.projects %}
+ <li><a href="{{ page.myrelativeurl }}projects/{{ project.stem
}}.html">{{ project.name }}</a></li> {% endfor %}
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="column span-24 footer">
+ <hr/>
+ <p>Copyright © 2009-2018 The Apache Software Foundation, Licensed
under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
Version 2.0</a>.<br/>
+ Apache and the Apache feather logo are trademarks of The Apache
Software Foundation.</p>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+
Propchange: attic/site-jekyll/src/_layouts/main.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: attic/site-jekyll/src/_layouts/project.html
URL:
http://svn.apache.org/viewvc/attic/site-jekyll/src/_layouts/project.html?rev=1830663&r1=1830662&r2=1830663&view=diff
==============================================================================
--- attic/site-jekyll/src/_layouts/project.html (original)
+++ attic/site-jekyll/src/_layouts/project.html Tue May 1 09:07:46 2018
@@ -1,9 +1,12 @@
---
+# This is the layout for project pages. It inherits from the main layout:
+layout: main
+
# define relative url to top level so includes can generate the correct
relative URLs
myrelativeurl: ../
+
# Note: title is defined in the generate_projects plugin
---
-{% include page_start.html %}
{%- comment %}
Variables used by the template (page.json.*):
@@ -27,7 +30,7 @@ website
wiki
wikiname
-{%- endcomment %}
+{%- endcomment -%}
<div class="section-content">
<p>{%- if page.json.website != '' %}<a href="{{ page.json.website }}">Apache
{{ page.json.name }}</a>{% else %}Apache {{ page.json.name }}{% endif %} moved
into the Attic in {{ page.json.retired }}.
{{ page.json.description }}</p>
@@ -105,4 +108,3 @@ wikiname
{%- endfor %}
{%- endif %}
</div>
-{% include page_end.html %}
Modified: attic/site-jekyll/src/index.html
URL:
http://svn.apache.org/viewvc/attic/site-jekyll/src/index.html?rev=1830663&r1=1830662&r2=1830663&view=diff
==============================================================================
--- attic/site-jekyll/src/index.html (original)
+++ attic/site-jekyll/src/index.html Tue May 1 09:07:46 2018
@@ -1,10 +1,10 @@
---
+layout: main
# TODO: convert to markdown
# define relative url to top level so includes can generate the correct
relative URLs
myrelativeurl: ''
title: The Apache Attic
---
-{% include page_start.html %}
<div class="section-content">
<p>
The Apache Attic was created in
@@ -83,4 +83,3 @@ title: The Apache Attic
<div class="section-content">
<p>The Apache Incubator project is the entry path into The Apache Software
Foundation for projects and codebases wishing to become part of the
Foundation's efforts. Not all projects 'graduate' out of the Incubator and are
instead retired. Those retired projects may be found on the Incubator's <a
href="http://incubator.apache.org/projects/index.html#retired";>Project
page</a>. </p>
</div>
-{% include page_end.html %}
Modified: attic/site-jekyll/src/process.html
URL:
http://svn.apache.org/viewvc/attic/site-jekyll/src/process.html?rev=1830663&r1=1830662&r2=1830663&view=diff
==============================================================================
--- attic/site-jekyll/src/process.html (original)
+++ attic/site-jekyll/src/process.html Tue May 1 09:07:46 2018
@@ -1,10 +1,10 @@
---
+layout: main
# TODO: convert to markdown
# define relative url to top level so includes can generate the correct
relative URLs
myrelativeurl: ''
title: Moving a project to the Attic
---
-{% include page_start.html %}
<div class="section-content">
<p>At some point a project will vote to join the Attic. The following defines
a process
to move that project into the Attic and gently close it down. </p>
@@ -220,4 +220,3 @@ on behalf of the Apache Attic and the no
<p>It's important to include the boilerplate from the project's site so people
know what we're talking about. </p>
</div>
-{% include page_end.html %}
Modified: attic/site-jekyll/src/resolution.html
URL:
http://svn.apache.org/viewvc/attic/site-jekyll/src/resolution.html?rev=1830663&r1=1830662&r2=1830663&view=diff
==============================================================================
--- attic/site-jekyll/src/resolution.html (original)
+++ attic/site-jekyll/src/resolution.html Tue May 1 09:07:46 2018
@@ -1,10 +1,10 @@
---
+layout: main
# TODO: convert to markdown
# define relative url to top level so includes can generate the correct
relative URLs
myrelativeurl: ''
title: Board Resolution to move to the Attic
---
-{% include page_start.html %}
<div class="section-content">
<p>The following is a sample resolution to move a project to the Apache Attic.
A project's
chair should include this in the agenda for the next board meeting. </p>
@@ -32,4 +32,3 @@ title: Board Resolution to move to the A
RESOLVED, that the Apache {PROJECT} PMC is hereby terminated.
</pre>
</div>
-{% include page_end.html %}
