You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@incubator.apache.org by jo...@apache.org on 2017/06/17 12:12:38 UTC

[5/6] incubator git commit: Migrate landing page to use a homepage template.

Migrate landing page to use a homepage template.


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

Branch: refs/heads/jbake-site
Commit: c21565f135d3483917a049c5af69cd3e6ddfb4bf
Parents: 5140f7f
Author: John D. Ament <jo...@apache.org>
Authored: Sat Jun 17 08:11:27 2017 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Sat Jun 17 08:11:27 2017 -0400

----------------------------------------------------------------------
 jbake.properties       |  6 +++---
 pages/index.ad         |  7 +++----
 templates/homepage.gsp | 27 +++++++++++++++++++++++++++
 templates/index.gsp    | 20 --------------------
 4 files changed, 33 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator/blob/c21565f1/jbake.properties
----------------------------------------------------------------------
diff --git a/jbake.properties b/jbake.properties
index 8ec9603..b2e0a7d 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -1,7 +1,7 @@
-site.host=http://localhost:8820
+site.host=https://incubator.apache.org/ngtest/
 render.tags=false
 render.sitemap=true
-template.index.file=index.gsp
+template.homepage.file=homepage.gsp
 template.archive.file=archive.gsp
 template.tag.file=tags.gsp
 template.sitemap.file=sitemap.gsp
@@ -10,7 +10,7 @@ template.page.file=page.gsp
 template.feed.file=feed.gsp
 template.guide.file=guide.gsp
 template.policy.file=policy.gsp
-render.index=true
+render.index=false
 index.file=index.html
 content.folder=pages
 destination.folder=content
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c21565f1/pages/index.ad
----------------------------------------------------------------------
diff --git a/pages/index.ad b/pages/index.ad
index 4babc39..e815c5a 100644
--- a/pages/index.ad
+++ b/pages/index.ad
@@ -1,7 +1,7 @@
-= About the Apache Incubator
+= Apache Incubator
 Apache Incubator PMC
 2002-10-16
-:jbake-type: index
+:jbake-type: homepage
 :jbake-status: published
 :idprefix:
 :imagesdir: /images/
@@ -18,5 +18,4 @@ See also the http://www.youtube.com/watch?v=KopPbWS87fw[Life In The Apache Incub
 == About The Apache Software Foundation
 The Apache Software Foundation provides organizational, legal, and financial support for a broad range of open source software projects. The Foundation provides an established framework for intellectual property and financial contributions that simultaneously limits the potential legal exposure for the contributors. Through a collaborative and meritocratic development process, Apache projects deliver enterprise-grade, freely available software products that attract large communities of users. The pragmatic Apache License makes it easy for all users, commercial and individual, to deploy Apache products.
 
-
-You can find out http://www.apache.org/foundation/[more about the ASF]
+Click to find out http://www.apache.org/foundation/[more about the ASF]

http://git-wip-us.apache.org/repos/asf/incubator/blob/c21565f1/templates/homepage.gsp
----------------------------------------------------------------------
diff --git a/templates/homepage.gsp b/templates/homepage.gsp
new file mode 100644
index 0000000..4b3d7a4
--- /dev/null
+++ b/templates/homepage.gsp
@@ -0,0 +1,27 @@
+<% include "header.gsp" %>
+
+<% include "menu.gsp" %>
+
+<div class="incubator-page-header">
+    <h1>${content.title}</h1>
+</div>
+
+${content.body}
+
+Our Current 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" %>

http://git-wip-us.apache.org/repos/asf/incubator/blob/c21565f1/templates/index.gsp
----------------------------------------------------------------------
diff --git a/templates/index.gsp b/templates/index.gsp
deleted file mode 100644
index 8a727ab..0000000
--- a/templates/index.gsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%include "header.gsp"%>
-
-	<%include "menu.gsp"%>
-
-<div class="page-header">
-    <h1>${content.title}</h1>
-</div>
-Days Between:
-${content.body}
-<br />
-<br />
-<ul>
-<%
-	def rootNode = new groovy.util.XmlSlurper().parse(new java.io.File("pages/podlings.xml"))
-%>
-<%rootNode.children().each {podling -> %>
-<li>${podling.@name}</li>
-<%}%>
-</ul>
-<%include "footer.gsp"%>


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