Permalink
Browse files

More site updates.

  • Loading branch information...
1 parent 72dd893 commit 5444190ea3618599334cb531fdb4b0efa400bb27 @trq trq committed Mar 18, 2012
Showing with 122 additions and 1 deletion.
  1. +25 −0 .phrozn/entries/about.twig
  2. +86 −0 .phrozn/entries/contrib.twig
  3. +2 −1 .phrozn/layouts/nav.twig
  4. +9 −0 .phrozn/layouts/page.twig
View
@@ -0,0 +1,25 @@
+layout: page.twig
+---
+<div class="well">
+ <h2>Where did Proem come from?</h2>
+ <blockquote>
+ –noun an introductory discourse; introduction; preface; preamble.<br />
+ Origin: 1350–1400; < L prooemium < Gk prooímion prelude (pro- pro-2 + oím(ē) song + -ion dim. suffix); r. ME proheme < MF < L, as above
+ </blockquote>
+ <p>
+ Proem started life in around early 2010 and has seen a few different incarnations since. At one stage
+ around the end of 2010 I had an almost complete framework in place. Things change however and a few
+ rewrites latter it is where it is today.
+ </p>
+ <p>
+ The current incarnation was started at the end of 2011 after playing with the PHP5.4 alphas for about 6 months.
+ </p>
+</div>
+<a name="contact"></a>
+<div class="well">
+ <h3>Contact me</h3>
+ <p>
+ I can be contacted via email at <a mailto="trq@proemframework.org">trq@proemframework.org</a>, find me
+ lurking on our #proem channel on freenode, or follow <a href="http://twitter.com/proem">@proem</a> or <a href="http://twitter.com">@tonyrq</a>
+ </p>
+</div>
@@ -0,0 +1,86 @@
+layout: page.twig
+---
+<div class="well">
+ <h2>Contributing</h2>
+ <p>
+ The Proem framework is currently in the very early stages of development and as such is still in what would be
+ considered very much a pre-alpha stage. The framework will be considered such all the way through the 0.x.x milestones.
+ </p>
+ <p>
+ This fact alone should create great incentive for people who want to get in on the ground floor and help out with a modern
+ MVC framework that utilises some of the newest features of PHP.
+ </p>
+</div>
+<div class="well">
+ <h3>Getting involved</h3>
+ <p>Getting involved is easy.</p>
+ <ul>
+ <li>Fork the framework</li>
+ <li>Commit changes to your fork</li>
+ <li>Send a pull request</li>
+ </ul>
+ <p>
+ We have an issue tracker on <a href="https://github.com/proem/proem/issues">Github</a>, pick a ticket and resolve it. If there
+ is something you want to work on and a ticket doesn't exist for it yet, create one.
+ </p>
+ <p>
+ If you want to have a chat about some functionality, bug or feature, join us in the #proem channel on freenode.
+ </p>
+ <p>
+ Just be aware before contributing, that we have a few simple guidelines.
+ </p>
+</div>
+<div class="well">
+ <h3>Developer guidelines</h3>
+ <ul>
+ <li>All pull requests should have a related issue in the issue tracker.</li>
+ <li>All pull requests should be made within a self contained branch created specifically for this feature.</li>
+ <li>All code should have accompanying and passing unit tests.</li>
+ <li>All code should be formatted and commented in a way that is consistent with the existing code base.</li>
+ </ul>
+ <p>
+ At this early stage I'm not going to get into the nitty gritty of <em>coding standards</em> and proposal guidelines.
+ Just keep things consistent and similar to what already exists.
+ <p>
+ <p>
+ Be aware that not all pull requests will be excepted as is. Some will provoke discussion. They will however, all be looked at.
+ </p>
+</div>
+<div class="well">
+ <h3>Git branching model</h3>
+ <p>
+ Currently we employ the Git branching model described by Vincent Driessen in his excellent blog post <a href="http://nvie.com/posts/a-successful-git-branching-model">here</a>.
+ </p>
+ <p>
+ There is a condensed version of this guide in the root of the repo (GITHOWTO.md).
+ </p>
+</div>
+<div class="well">
+ <h3>Tools of the trade</h3>
+ <p>
+ To work on Proem you will need:
+ </p>
+ <ul>
+ <li><a href="http://git-scm.com/">Git</a></li>
+ <li>A <a href="https://github.com">Github</a> account</a></li>
+ <li><a href="http://php.net">PHP</a> version 5.4 (we can provide sanboxes on request)</li>
+ <li><a href="https://github.com/sebastianbergmann/phpunit">PHPUnit 3.6</a></li>
+ </ul>
+ <p>
+ We also recommend installing <a href="https://github.com/proem/phake">phake</a> and <a href="https://github.com/composer/composer">composer</a>,
+ eventually these tools will be requirements.
+ </p>
+ <div class="alert alert-info">
+ <p>
+ Note that I currently have a pull request logged with the upstream phake developer that will hopefully see this packaged on <a href="http://packagist">packagist</a>.
+ This will mean we can easily pull it in as a dependency of Proem.
+ </p>
+ </div>
+</div>
+<div class="well">
+ <h3>Who can get involved?</h3>
+ <p>
+ First and foremost, Proem is meant to make our lives easier, it's meant to be fun. If your looking at this page and thinking it all looks to hard, don't.
+ If you want to get involved but aren't sure where to start, get in <a href="/about.html#contact">contact</a>. I'm a pretty easy going guy and am always willing to help.
+ </p>
+</div>
View
@@ -15,7 +15,8 @@
<li><a href="/">Home</a></li>
<li><a href="https://github.com/proem/proem/issues">Issues</a></li>
<li><a href="/docs">Documentation</a></li>
- <!--<li><a href="/contrib">Contribute</a></li>-->
+ <li><a href="/contrib.html">Contribute</a></li>
+ <li><a href="/about.html">About</a></li>
</ul>
</div>
</div>
@@ -0,0 +1,9 @@
+ {% include 'layouts/header.twig' %}
+ <div class="docs container">
+ <div class="row">
+ <div class="span12">
+ {{ content }}
+ </div>
+ </div>
+ </div>
+ {% include 'layouts/footer.twig' %}

0 comments on commit 5444190

Please sign in to comment.