incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject [12/51] incubator git commit: Converted a few more pages. Removed placeholder content. Updated templates.
Date Thu, 06 Jul 2017 00:20:43 GMT
http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/blog/2013/first-post.html
----------------------------------------------------------------------
diff --git a/pages/blog/2013/first-post.html b/pages/blog/2013/first-post.html
deleted file mode 100644
index 346525f..0000000
--- a/pages/blog/2013/first-post.html
+++ /dev/null
@@ -1,34 +0,0 @@
-title=First Post
-date=2013-07-24
-type=post
-tags=blog
-status=published
-~~~~~~
-
-<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus.
Curabitur ut nisi lacus.</p>
-
-<ul>
-<li><a href="http://example.org">http://example.org</a></li>
-<li><a href="http://example.org">Example.org</a></li>
-</ul>
-
-<p>Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus.
Suspendisse leo arcu, 
-mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris
nec leo 
-ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor
elit sit amet 
-ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa
auctor risus, 
-id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales.</p>

-
-<pre class="prettyprint">
-<code>
-package org.jbake;
-
-public class Oven {
-	public static void main(String[] args) {
-		System.out.print("Baking!");
-  }
-}
-</code>
-</pre>
-
-<p>In consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique,
lectus massa posuere 
-libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.</p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/blog/2013/fourth-post.adoc
----------------------------------------------------------------------
diff --git a/pages/blog/2013/fourth-post.adoc b/pages/blog/2013/fourth-post.adoc
deleted file mode 100644
index f22ec22..0000000
--- a/pages/blog/2013/fourth-post.adoc
+++ /dev/null
@@ -1,20 +0,0 @@
-= Fourth Post
-Jonathan Bullock
-2013-10-17
-:jbake-type: post
-:jbake-status: published
-:jbake-tags: blog, asciidoc
-:idprefix:
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur
ut nisi lacus.
-
-* http://example.org
-* http://example.org[Example.org]
-
-Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse
leo arcu, 
-mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris
nec leo 
-ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor
elit sit amet 
-ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa
auctor risus, 
-id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales.
In 
-consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus
massa posuere 
-libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/blog/2013/second-post.md
----------------------------------------------------------------------
diff --git a/pages/blog/2013/second-post.md b/pages/blog/2013/second-post.md
deleted file mode 100644
index 936fa14..0000000
--- a/pages/blog/2013/second-post.md
+++ /dev/null
@@ -1,19 +0,0 @@
-title=Second Post
-date=2013-08-25
-type=post
-tags=blog
-status=published
-~~~~~~
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur
ut nisi lacus.
-
-* [http://example.org](http://example.org)
-* [Example.org](http://example.org)
-
-Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse
leo arcu, 
-mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris
nec leo 
-ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor
elit sit amet 
-ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa
auctor risus, 
-id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales.
In 
-consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus
massa posuere 
-libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/blog/2013/third-post.adoc
----------------------------------------------------------------------
diff --git a/pages/blog/2013/third-post.adoc b/pages/blog/2013/third-post.adoc
deleted file mode 100644
index c334f5a..0000000
--- a/pages/blog/2013/third-post.adoc
+++ /dev/null
@@ -1,22 +0,0 @@
-title=Third Post
-date=2013-09-26
-type=post
-tags=blog, asciidoc
-status=published
-~~~~~~
-= Third Post
-Jonathan Bullock
-2013-10-17
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur
ut nisi lacus.
-
-* http://example.org
-* http://example.org[Example.org]
-
-Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse
leo arcu, 
-mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris
nec leo 
-ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor
elit sit amet 
-ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa
auctor risus, 
-id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales.
In 
-consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus
massa posuere 
-libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/guides/branding.ad
----------------------------------------------------------------------
diff --git a/pages/guides/branding.ad b/pages/guides/branding.ad
new file mode 100644
index 0000000..6549a0d
--- /dev/null
+++ b/pages/guides/branding.ad
@@ -0,0 +1,108 @@
+= Branding Guide
+Apache Incubator PMC
+2002-10-16
+:jbake-type: guide
+:jbake-status: published
+:idprefix:
+:toc:
+:imagesdir: ../images/
+
+== Purpose of this document
+Podlings are, by definition, not yet fully accepted as part of the
+Apache Software Foundation. Therefore, they are subject to additional
+branding constraints, on top of the
+<a href="http://www.apache.org/foundation/marks/responsibility">branding
+guidelines for top-level projects</a>.
+
+== Publicity throughout the Incubation Process
+
+There are three stages in a podling's life-cycle that have an impact
+on the types of publicity seeking that are permitted.  We refer to
+"publicity seeking" as issuing press releases or otherwise affirmatively
+seeking publicity (seeding news stories, etc.).
+
+*Podling is in proposal/or pre-code-drop process*: No publicity
+seeking is permitted.  A podling is not allowed to be called <i>Apache
+&quot;Podling-Name&quot;</i> name until the podling is officially in
+Incubation, public mailing lists are announced, and code has been
+submitted into our repositories.
+
+*Podling has been approved for incubation, podling has launched
+public mailing lists, and podling has dropped code into
+repository*: A podling *MUST* now be called _Apache
+&quot;Podling-Name&quot;_ (see link:#naming[Naming] below).
+A podling and affiliated persons can issue press releases that
+reference the podling, but cannot issue press releases with the
+specific intent of announcing the Podling.  Podling can conduct
+informal pr activities, such as media outreach, blog publicity, etc.
+The ASF will not issue any press releases for any podling at this
+stage.  However, the
+link:http://www.apache.org/press/index.html#whoweare[Apache Press Team]
+*MUST* review any releases by affiliated
+organizations or groups to ensure they comply with these branding
+guidelines.
+
+*Podling has graduated from the Incubator*: The Apache Public
+Relations Committee is willing to issue formal press releases for all
+podlings who successfully graduate from the Incubator and are
+interested in issuing a press release.  Or, the ASF may enter into a
+joint press release with any other affiliated organizations or groups.
+
+== Naming
+
+After a podling has been approved, the lists are created, and the initial
+code drop has commenced, the podling _MUST_ be referred to as *Apache
+&quot;Podling-Name&quot;* _AND_ mention that the project is
+under Incubation.  Suitable mentions include:
+
+- Inclusion of the ++http://&quot;podling-name&quot;.incubator.apache.org/++  URL
+- *Apache &quot;Podling-Name&quot;* is currently undergoing Incubation at the Apache
Software Foundation.
+
+Other references may only be used upon prior approval by the
+Incubator PMC.  These statements only need to be disclosed upon the
+first reference in a document.
+
+== Disclaimers
+
+Podling web sites MUST include a clear disclaimer on their
+website and in all documentation (including releases) stating that
+they are in incubation. Podlings SHOULD use the following text for
+all disclaimers (replace the underlined phrases as appropriate):
+
+    Apache *Podling-Name* is an effort
+    undergoing incubation at The Apache Software Foundation (ASF),
+    sponsored by the *name of Apache TLP sponsor*. Incubation is required of all
+    newly accepted projects until a further review indicates that the
+    infrastructure, communications, and decision making process have
+    stabilized in a manner consistent with other successful ASF projects.
+    While incubation status is not necessarily a reflection of the
+    completeness or stability of the code, it does indicate that the
+    project has yet to be fully endorsed by the ASF.
+
+Podlings wishing to use a different disclaimer message MUST have the
+disclaimer approved by the Incubator PMC prior to use.
+
+For releases, the text SHOULD be included in a separate DISCLAIMER file
+stored alongside the NOTICE and LICENSE files.
+
+== Incubator Logo
+Podlings websites SHOULD contain the Apache Incubator Project
+logo as sign of affiliation.
+
+== Publicity activities
+Podlings MUST coordinate with the Apache Public Relations Committee on
+all publicity activities by a podling.
+
+The open source space can be difficult
+to negotiate even for experienced professionals. The Apache Public Relations
+Committee understands this space and it is in the best interests of all
+that they are consulted.
+
+== Response to Unapproved Statements
+The Apache Public Relations Committee SHALL affirmatively and publicly
+respond to any unapproved statements surrounding podlings which are factually
+incorrect.
+
+== Termination
+The Incubator PMC MAY consider the termination of a project for
+violation of these branding guidelines.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/guides/chair.ad
----------------------------------------------------------------------
diff --git a/pages/guides/chair.ad b/pages/guides/chair.ad
index 9227533..3f3b399 100644
--- a/pages/guides/chair.ad
+++ b/pages/guides/chair.ad
@@ -1,4 +1,4 @@
-= Chair of the IPMC
+= Incubator Chair Guide
 Apache Incubator PMC
 2002-10-16
 :jbake-type: guide
@@ -7,6 +7,61 @@ Apache Incubator PMC
 :toc:
 :imagesdir: ../images/
 
-This is the chair guide
-Again.
-Again.
\ No newline at end of file
+== Adding a new PMC member
+For a new PMC member being voted in, follow the link:http://www.apache.org/dev/pmc.html#newpmc[standard
procedure].  For an ASF Member exercising their prerogative to join the IPMC by request, the
only change in procedure is to alter the text of the NOTICE sent to the Board:
+
+----
+To: board at apache.org
+CC: private at incubator.apache.org
+Subject: [NOTICE] *Jane Doe* for Incubator PMC
+Body:
+
+Apache Member *Jane Doe* has requested to join the Incubator PMC.
+----
+
+After the NOTICE period expires, a welcome message should be sent to the new IPMC member.
+
+----
+Welcome to the Apache Incubator Project.
+
+Here is some information to get you started as a PMC member.
+
+- please subscribe to the incubator mailing lists:
+- general-subscribe at incubator.apache.org
+- private-subscribe at incubator.apache.org
+- cvs-subscribe at incubator.apache.org
+
+- the base incubator URL is https://svn.apache.org/repos/asf/incubator
+
+- all the public information, rules and policies about the Apache Incubator is in https://svn.apache.org/repos/asf/incubator/public/trunk/,
and thus published on https://incubator.apache.org/
+
+- https://home.apache.org/phonebook.html?ctte=incubator lists all PMC members. This is periodically
regenerated from https://svn.apache.org/repos/private/committers/board/committee-info.txt.
+
+- the Incubator website is maintained and published according to the instructions at http://incubator.apache.org/guides/website.html
+
+- status documents about Incubating projects are under incubator/public/trunk/content/project/
directory; please keep the ones you are mentoring updated
+
+- all committers on all incubating projects have access to the 'incubator/public' repository,
so they can participate in the general Incubator Project as committers
+
+- please read our work documents under incubator/public/trunk/content/incubation/ for more
information about the incubation process; they are published under https://incubator.apache.org/incubation/
+
+Thanks for helping us!
+----
+
+== Board Report
+
+The Incubator link:http://www.apache.org/foundation/board/reporting[reports] monthly to the
Apache
+link:http://www.apache.org/foundation/board[Board of Directors].  The report itself is the
collaborative effort of
+many Incubator contributors, but the Chair is ultimately responsible for ensuring that it
is filed.  
+
+The Board appreciates receiving the IPMC report:
+
+- on time
+- in a consistent format
+- with an accurate summary of the state of the reporting podlings
+
+The "runbook" for managing the preparation of the report is implemented as a script which
prints out documentation,
+instructions, literal commands, due dates, etc: https://svn.apache.org/repos/asf/incubator/public/trunk/report_runbook.py[report_runbook.py]
+
+Many of the tasks documented in the runbook may be attended to by either the Chair or a designee
such as a "Report
+Manager", but it's the Chair who is accountable for overseeing the process.

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/guides/committer.ad
----------------------------------------------------------------------
diff --git a/pages/guides/committer.ad b/pages/guides/committer.ad
index 1be093c..5e8e04d 100644
--- a/pages/guides/committer.ad
+++ b/pages/guides/committer.ad
@@ -7,6 +7,78 @@ Apache Incubator PMC`
 :toc:
 :imagesdir: ../images/
 
-This is the chair guide
-Again.
-Again.
\ No newline at end of file
+The link:http://incubator.apache.org/incubation/Roles_and_Responsibilities.html#Committers[Roles
and Responsibilities] document describes the general role of a
+committer on an incubating project. This page provides links to
+more information to help new committers get started.
+
+== Mailing Lists
+
+Everything -- but *everything*-- inside the Apache world
+occurs or is reflected in email. As some people say, 'If it isn't
+in my email, it didn't happen.' Decisions only get made on public
+Apache mail lists -- not anywhere off list, such as IRC, IM, or private 
+emails.
+ Each project has a set of lists, which are typically called
+*project*-dev, *project*-user, and
+*project*-commits. A few link:http://www.apache.org/foundation/mailinglists.html[Apache-wide
lists] cross all boundaries, including:
+
+- _committers_: sends important messages to all Apache committers; it's not used for discussions;
+- _community_: where all Apache committers can discuss things that are about Apache;
+- _infrastructure_: where the roots and the infrastructure team discuss and work on the Apache
infrastructure needs;
+- _legal-discuss_: where Apache committers can ask questions that have a legal aspect;
+- _repository_: discussions about the Apache artifact repository;
+- _party_: where people plan how to have fun. :-)
+
+Action items for committers include:
+
+- Become familiar with Apache developer link:http://www.apache.org/dev/contrib-email-tips.html[Tipsfor
email contributors].
+- Subscribe to the -user, -dev, and -commits lists for your project.
+- Become aware of what else is going on in the Incubator by subscribing to the Incubator's
general list.
+- Become aware of what else is going on at the ASF by subscribing to the
+link:http://www.apache.org/foundation/mailinglists.html#foundation-community[community],
+link:http://www.apache.org/foundation/mailinglists.html#foundation-infrastructure[infrastructure],

+and link:http://www.apache.org/foundation/mailinglists.html#foundation-legal[legal-discuss]
Apache-wide lists.
+
+
+Apache also has private lists. For example, your project will
+probably have a private mail list named *project*-private, 
+which your Podling PMC will use for sensitive discussions. Never 
+mix public and private mail lists in the same post -- see the 
+section titled link:http://www.apache.org/foundation/how-it-works.html#management[Balancing
confidentiality and public discussion]
+in link:http://www.apache.org/foundation/how-it-works.html[How it Works]. For example, never
include both your dev and private
+lists in the same post. Posting to the dev list is sufficient
+because each member of your Podling PMC will also be on that
+list. 
+
+== Project Web Site
+The Incubator link:sites.html[Podling Websites] guide documents how to get 
+your project web site going.
+
+== Committer Resources
+
+- The link:http://www.apache.org/dev/new-committers-guide.html[Guide for New Committers ]is
a great place to start and
+points to additional committer-only resources.
+
+- Browse the pages at http://www.apache.org/dev/ often.
+
+- Subscribe to the link:http://www.apache.org/foundation/mailinglists.html#foundation-infrastructure[infrastructure]
list, then
+raise awareness on your project on what goes on behind the
+scenes.
+- Be proactive about responding to infrastructure issues on
+your project mailing lists. Does the web server seem to be
+down? Is Jira or Subversion down? Check the link:http://www.apache.org/dev/#status[status
of servers]
+and explain the reason to your project lists (as you can
+see, no need to alert the ASF infrastructure people).
+
+
+== Podling PMC (PPMC)
+
+If you are a member of your PPMC, become familiar with the link:../incubation/Incubation_Policy.html[Incubation
Policy]
+and see the link:ppmc.html[Podling PMC Guide]. 
+
+== Questions?
+
+If you have any questions, please ask on the Incubator's general mail list. Don't forget
to check the information at:
+
+- http://www.apache.org/dev/ -- it is one of the most current resources for committers.
+- link:general.html#FAQ[Incubator General FAQ]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/index.ad
----------------------------------------------------------------------
diff --git a/pages/index.ad b/pages/index.ad
new file mode 100644
index 0000000..4babc39
--- /dev/null
+++ b/pages/index.ad
@@ -0,0 +1,22 @@
+= About the Apache Incubator
+Apache Incubator PMC
+2002-10-16
+:jbake-type: index
+:jbake-status: published
+:idprefix:
+:imagesdir: /images/
+
+The Incubator project is the entry path into The Apache Software Foundation (ASF) for projects
and codebases wishing to become part of the Foundation's efforts. All code donations from
external organisations and existing external projects wishing to join Apache enter through
the Incubator.
+
+The Apache Incubator has two primary goals:
+
+- Ensure all donations are in accordance with the ASF http://www.apache.org/licenses/[legal
standards]
+- Develop new communities that adhere to our http://www.apache.org/foundation/how-it-works.html[guiding
principles]
+
+See also the http://www.youtube.com/watch?v=KopPbWS87fw[Life In The Apache Incubator video],
where former Incubator PMC chair Jukka Zitting presents the Incubator, at ApacheCon EU 2012.
+
+== 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]

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/pages/index.html
----------------------------------------------------------------------
diff --git a/pages/index.html b/pages/index.html
deleted file mode 100644
index c002636..0000000
--- a/pages/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-title=Index
-type=homepage
-status=published
-~~~~~~
-
-Homepage
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/templates/header.gsp
----------------------------------------------------------------------
diff --git a/templates/header.gsp b/templates/header.gsp
index be4d7b6..d8e4af0 100644
--- a/templates/header.gsp
+++ b/templates/header.gsp
@@ -10,7 +10,7 @@
     <meta name="generator" content="JBake">
 
     <!-- Le styles -->
-    <link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><%
}%>css/bootstrap.min.css" rel="stylesheet">
+    <link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><%
}%>css/bootstrap.css" rel="stylesheet">
     <link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><%
}%>css/asciidoctor.css" rel="stylesheet">
     <link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><%
}%>css/base.css" rel="stylesheet">
     <link href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><%
}%>css/prettify.css" rel="stylesheet">

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/templates/index.gsp
----------------------------------------------------------------------
diff --git a/templates/index.gsp b/templates/index.gsp
index 0c86535..51fc7a5 100644
--- a/templates/index.gsp
+++ b/templates/index.gsp
@@ -2,22 +2,13 @@
 
 	<%include "menu.gsp"%>
 
-<h1>About the Apache Incubator</h1>
-The Incubator project is the entry path into The Apache Software Foundation (ASF) for projects
and codebases wishing to become part of the Foundation's efforts. All code donations from
external organisations and existing external projects wishing to join Apache enter through
the Incubator.
+<div class="page-header">
+    <h1>${content.title}</h1>
+</div>
 
-The Apache Incubator has two primary goals:
-<ul>
-    <li>Ensure all donations are in accordance with the ASF <a href="http://www.apache.org/licenses/">legal
standards</a></li>
-    <li>Develop new communities that adhere to our <a href="http://www.apache.org/foundation/how-it-works.html">guiding
principles</a></li>
-</ul>
-See also the <a href="http://www.youtube.com/watch?v=KopPbWS87fw">Life In The Apache
Incubator video</a>, where former Incubator PMC chair Jukka Zitting presents the Incubator,
at ApacheCon EU 2012.
-
-<h2>About The Apache Software Foundation</h2>
-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.
-
-<br/><br/>
-You can find out <a href="http://www.apache.org/foundation/">more about the ASF</a>.
-<br/><br/>
+${content.body}
+<br />
+<br />
 <ul>
 <%
 	def rootNode = new groovy.util.XmlSlurper().parse(new java.io.File("pages/podlings.xml"))

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/templates/menu.gsp
----------------------------------------------------------------------
diff --git a/templates/menu.gsp b/templates/menu.gsp
index 5f5bceb..3001007 100644
--- a/templates/menu.gsp
+++ b/templates/menu.gsp
@@ -8,13 +8,10 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="<%if (content.rootpath) {%>${content.rootpath}<%
} else { %><% }%>">Apache Incubator</a>
+          <a class="navbar-brand" href="<%if (content.rootpath) {%>${content.rootpath}<%
} else { %><% }%>"><i class="icon-home"></i>Apache Incubator</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li><a href="<%if (content.rootpath) {%>${content.rootpath}<%
} else { %><% }%>index.html">Home</a></li>
-            <li><a href="<%if (content.rootpath) {%>${content.rootpath}<%
} else { %><% }%>about.html">About</a></li>
-            <li><a href="<%if (content.rootpath) {%>${content.rootpath}<%
} else { %><% }%>${config.feed_file}">Subscribe</a></li>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Policies <b
class="caret"></b></a>
               <ul class="dropdown-menu">
@@ -35,4 +32,14 @@
         </div><!--/.nav-collapse -->
       </div>
     </div>
+    <div class="container">
+      <div class="row">
+        <div class="col-md-10">
+          <a href="http://www.apache.org/"><img src="/images/asf_logo_wide_small.png"
alt="The Apache Software Foundation" border="0" style="margin-top: 2px" width="62%"></a>
+        </div>
+        <div class="col-md-2">
+          <a href="http://incubator.apache.org/"><img src="/images/egg-logo2.png"
alt="Apache Incubator" border="0"></a>
+        </div>
+      </div>
+    </div>
     <div class="container">
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator/blob/c6e47152/templates/post.gsp
----------------------------------------------------------------------
diff --git a/templates/post.gsp b/templates/post.gsp
deleted file mode 100644
index f7fb4f8..0000000
--- a/templates/post.gsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%include "header.gsp"%>
-	
-	<%include "menu.gsp"%>
-	
-	<div class="page-header">
-		<h1>${content.title}</h1>
-	</div>
-
-	<p><em>${new java.text.SimpleDateFormat("dd MMMM yyyy", Locale.ENGLISH).format(content.date)}</em></p>
-
-	<p>${content.body}</p>
-
-	<hr />
-	
-<%include "footer.gsp"%>
\ No newline at end of file


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


Mime
View raw message