Mailing-List: contact cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: general@incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: johndament@apache.org
To: cvs@incubator.apache.org
Message-Id: <7f9d2d718d0d425aa41c461ffb7b9e1f@git.apache.org>
Subject: incubator git commit: Removed unused pages. Adding retired page. Move
 a few pages around.
Date: Sat, 24 Jun 2017 14:26:06 +0000 (UTC)
archived-at: Sat, 24 Jun 2017 14:26:08 -0000

Repository: incubator
Updated Branches:
  refs/heads/jbake-site 62a0b9ff7 -> c058f56f5


Removed unused pages.  Adding retired page.  Move a few pages around.


Project: http://git-wip-us.apache.org/repos/asf/incubator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator/commit/c058f56f
Tree: http://git-wip-us.apache.org/repos/asf/incubator/tree/c058f56f
Diff: http://git-wip-us.apache.org/repos/asf/incubator/diff/c058f56f

Branch: refs/heads/jbake-site
Commit: c058f56f59f625ee7a662f0d9d9b155664518eeb
Parents: 62a0b9f
Author: John D. Ament <johndament@apache.org>
Authored: Sat Jun 24 10:26:01 2017 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Sat Jun 24 10:26:01 2017 -0400

----------------------------------------------------------------------
 jbake.properties        |  1 +
 pages/guides/about.ad   | 10 ----------
 pages/guides/entry.ad   |  2 +-
 pages/guides/ppmc.ad    |  2 +-
 pages/guides/website.ad | 10 +++-------
 pages/past_podlings.ad  |  7 +++++++
 templates/retired.gsp   | 27 +++++++++++++++++++++++++++
 7 files changed, 40 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/jbake.properties
----------------------------------------------------------------------
diff --git a/jbake.properties b/jbake.properties
index 91a0da5..0f4947a 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -4,6 +4,7 @@ render.tags=false
 render.sitemap=true
 template.homepage.file=homepage.gsp
 template.simplepage.file=simplepage.gsp
+template.retired.file=retired.gsp
 template.archive.file=archive.gsp
 template.tag.file=tags.gsp
 template.sitemap.file=sitemap.gsp

http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/pages/guides/about.ad
----------------------------------------------------------------------
diff --git a/pages/guides/about.ad b/pages/guides/about.ad
deleted file mode 100644
index 742c638..0000000
--- a/pages/guides/about.ad
+++ /dev/null
@@ -1,10 +0,0 @@
-= About IPMC
-Apache Incubator PMC
-2002-10-16
-:jbake-type: guide
-:jbake-status: published
-:idprefix:
-:toc:
-:imagesdir: ../images/
-
-This is the about page
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/pages/guides/entry.ad
----------------------------------------------------------------------
diff --git a/pages/guides/entry.ad b/pages/guides/entry.ad
index 61e3039..b8d6fb4 100644
--- a/pages/guides/entry.ad
+++ b/pages/guides/entry.ad
@@ -12,7 +12,7 @@
 = Enter The Incubator
 Apache Incubator PMC
 2002-10-16
-:jbake-type: guide
+:jbake-type: proposalGuide
 :jbake-status: published
 :idprefix:
 :toc:

http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/pages/guides/ppmc.ad
----------------------------------------------------------------------
diff --git a/pages/guides/ppmc.ad b/pages/guides/ppmc.ad
index cc67126..6868310 100644
--- a/pages/guides/ppmc.ad
+++ b/pages/guides/ppmc.ad
@@ -9,7 +9,7 @@
 //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.
-= Apache Incubator: Podling Project Management Committee
+= Podling Project Management Committee
 Apache Incubator PMC
 2002-10-16
 :jbake-type: guide

http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/pages/guides/website.ad
----------------------------------------------------------------------
diff --git a/pages/guides/website.ad b/pages/guides/website.ad
index 64e4e5f..2f515dc 100644
--- a/pages/guides/website.ad
+++ b/pages/guides/website.ad
@@ -18,17 +18,17 @@ Apache Incubator PMC
 :toc:
 :imagesdir: ../images/
 
-The Incubator website is generated by the `incubator-site` git repository.  The primary document format is asciidoc, templates are based on gsp, and we use jbake to build it.
+The Incubator website is generated by the `incubator` git repository.  The primary document format is asciidoc, templates are based on gsp, and we use jbake to build it.
 
 You can edit files directly on github.
 
-#link pending#
+To work with the website, follow information on our link:https://git-wip-us.apache.org/repos/asf?p=incubator.git;a=blob;f=README.md;h=728dffc308b744f8e80195451603ad5d051c08bb;hb=refs/heads/jbake-site[README]
 
 After you make changes, the site is built automatically.  Build failures are sent to *cvs AT incubator.apache.org*
 
 == Edit the content
 === Help Wanted!
-People with commit access to the "incubator-site" git repository can edit the source
+People with commit access to the "incubator" git repository can edit the source
 documents in the "content" directory. That is any ASF Member and
 any committer on a current podling in incubation. So you can all help to
 keep your project's Status page up-to-date, and if you find problems with
@@ -37,7 +37,3 @@ If unsure, then discuss changes on the general mailing list.
 Note that the "policy" documents need special treatment.
 
 Anyone else can send patches to those documents to the INCUBATOR issue tracker.
-
-instructions coming...
-
-

http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/pages/past_podlings.ad
----------------------------------------------------------------------
diff --git a/pages/past_podlings.ad b/pages/past_podlings.ad
new file mode 100644
index 0000000..8b1be45
--- /dev/null
+++ b/pages/past_podlings.ad
@@ -0,0 +1,7 @@
+= Apache Incubator
+Apache Incubator PMC
+2002-10-16
+:jbake-type: retired
+:jbake-status: published
+:idprefix:
+:imagesdir: ./images/

http://git-wip-us.apache.org/repos/asf/incubator/blob/c058f56f/templates/retired.gsp
----------------------------------------------------------------------
diff --git a/templates/retired.gsp b/templates/retired.gsp
new file mode 100644
index 0000000..d695b75
--- /dev/null
+++ b/templates/retired.gsp
@@ -0,0 +1,27 @@
+<% include "header.gsp" %>
+
+<% include "menu.gsp" %>
+
+<div class="incubator-page-header">
+    <h1>${content.title}</h1>
+</div>
+
+${content.body}
+
+Our Past Podlings:
+<%
+    def source = new java.net.URL("http://svn.apache.org/repos/asf/incubator/public/trunk/content/podlings.xml")
+    def rootNode = new groovy.util.XmlSlurper(false, false, true).parseText(source.text)
+%>
+<div class="container-fluid">
+    <div class="row">
+        <% rootNode.children().each { podling ->
+            if (podling.@status != 'current') {
+        %>
+        <div class="col-md-3"><a href="/projects/${podling.@resource}.html">${podling.@name}</a></div>
+        <%
+                    }
+            } %>
+    </div>
+</div>
+<% include "footer.gsp" %>


---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org