Skip to content
This repository has been archived by the owner on Mar 14, 2019. It is now read-only.

Commit

Permalink
Merge branch 'feature/site-2.0-participate' of https://github.com/ral…
Browse files Browse the repository at this point in the history 
…phschindler/zf-web into feature/site-2.0-participate

Conflicts:
	public/css/main.css
  • Loading branch information
@weierophinney
weierophinney committed Sep 4, 2012
2 parents 7fa4205 + 2940619 commit 6467424
Show file tree
Hide file tree
Showing 14 changed files with 311 additions and 26 deletions.
65 changes: 62 additions & 3 deletions config/autoload/page-controller.global.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
'router' => array(
'routes' => array(
'participate' => array(
'type' => 'Zend\Mvc\Router\Http\Literal',
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => '/community',
'route' => '/participate[/]',
'defaults' => array(
'__NAMESPACE__' => 'PageController\Controller',
'controller' => 'Page',
Expand All @@ -14,7 +14,66 @@
),
'may_terminate' => true,
'child_routes' => array(
/* other child routes forthcoming */
'contribute' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => 'contributor-guide[/]',
'defaults' => array(
'page' => 'participate/contributor-guide',
),
),
'may_terminate' => true,
),
'contribute-v1' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => 'contributor-guide-v1[/]',
'defaults' => array(
'page' => 'participate/contributor-guide-v1',
),
),
'may_terminate' => true,
),
'conferences' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => 'conferences[/]',
'defaults' => array(
'page' => 'participate/conferences',
),
),
'may_terminate' => true,
),
'user-groups' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => 'user-groups[/]',
'defaults' => array(
'page' => 'participate/user-groups',
),
),
'may_terminate' => true,
),
'blogs' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => 'blogs[/]',
'defaults' => array(
'page' => 'participate/blogs',
),
),
'may_terminate' => true,
),
'contributors' => array(
'type' => 'Zend\Mvc\Router\Http\Segment',
'options' => array(
'route' => 'contributors[/]',
'defaults' => array(
'page' => 'participate/contributors',
),
),
'may_terminate' => true,
),
),
),
),
Expand Down
24 changes: 8 additions & 16 deletions module/PageController/view/page-controller/participate.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,36 @@ $this->render('page-controller/participate/sidebar');
Simply put: we haven't just built a framework together. We've built a community.
</p>

<h3><a href="/community/guide">Contributors Guide</a></h3>
<h3><a href="/participate/contributor-guide">Contributor Guide</a></h3>

<p>
Learn how you can contribute effectively, via our
<a href="/community/guide">contributors guide</a>.
Learn how you can contribute effectively with the resources listed in our
<a href="/participate/contributor-guide">contributor guide</a>.
</p>

<h3><a href="/community/resources">Resources</a></h3>

<p>
Zend supports the Zend Framework community by providing several useful
<a href="/community/resources">resources</a>
which promote open communication and continuous improvement.
</p>

<h3><a href="/community/groups">User Groups</a></h3>
<h3><a href="/participate/groups">User Groups</a></h3>

<p>
Want to learn more about Zend Framework? Want to help others learn? Look for a
<a href="/community/groups">user group</a> near you!
<a href="/participate/groups">user group</a> near you!
</p>

<h3><a href="/community/blogs">Learn from others</a></h3>
<h3><a href="/participate/blogs">Blogs</a></h3>

<p>
Many Zend Framework users are active bloggers, sharing tips and tricks. Get
a taste of what's out there on our <a href="/community/blogs">featured blogs</a>
page.
</p>

<h3><a href="/community/contributors">Contributors</a></h3>
<h3><a href="/participate/contributors">Contributors</a></h3>

<p>

Zend Framework's contributors have provided guidance, code, documentation,
tests, and support for other community members since the inception of the
project. You'll get a glimpse of a few of our contributors in our
<a href="/community/contributors">contributor gallery</a>.
<a href="/participate/contributors">contributor gallery</a>.

</p>

26 changes: 26 additions & 0 deletions module/PageController/view/page-controller/participate/blogs.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
$this->layout()->active = 'participate';
$this->render('page-controller/participate/sidebar');
?>
<section class="participate">
<h1>Blogs</h1>

<blockquote>
Featured Blogs From Community Members Who Regularly Cover ZF Topics
</blockquote>

<hr/>

<?php
$blogs = array(
array('Matthew Weier O\'Phinney', 'http://weierophinney.net/blog')
);
?>
<ol>
<?php foreach($blogs as $blog): ?>

<li><a href="<?php echo $blog[1] ?>"><?php echo $blog[0] ?></a></li>
<?php endforeach; ?>
</ol>

</section>
32 changes: 32 additions & 0 deletions module/PageController/view/page-controller/participate/conferences.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php
$this->layout()->active = 'participate';
$this->render('page-controller/participate/sidebar');
?>
<section class="participate">
<h1>Conferences</h1>

<blockquote>
Upcoming Conferences With Zend Framework Content and Community Members
</blockquote>

<hr/>

<p>
Listed below are upcoming conferences that generally have either ZF specific
talks or are well attended by members of the ZF community:
</p>


<?php
$cons = array(
array('ZendCon 2012', '5/21/12', '10/22/12-10/25/12')
);
?>
<ol>
<?php foreach($cons as $con): ?>

<li><?php echo $con[0] ?> / CfP Closes On <?php echo $con[1] ?> / Date: <?php echo $con[2] ?></li>
<?php endforeach; ?>
</ol>

</section>
30 changes: 30 additions & 0 deletions module/PageController/view/page-controller/participate/contributor-guide-v1.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
$this->layout()->active = 'participate';
$this->render('page-controller/participate/sidebar');
?>
<section class="participate" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
<h1>Contributor Guide (ZF v1)</h1>

<hr />

<p>
Zend Framework version 1 will be supported through __ of ____. At which point
it will be EOL. Version 1.12 is the last version in the 1.x series with new features.
If it is a new feature you wish to contribute, the best place to take this is ZF2.
</p>

<p>
For ZF1, we are accepting bug fixes to existing components. Security fixes will
be provided on both the 1.11 and 1.12 branch until EOL. If you have a fix for
a ZF1 issue, please carefully read
<a href="http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework">this document.</a>
It explains the procedures as it relates to the ZF1 process: using subversion, gaining access
to the repository, and signing/sending in the Contributor License Agreement (CLA).
</p>

<p>
Note: while ZF2 is CLA free, ZF1 and its contribution process still require this.
The license has not changed, and like ZF2 is the New BSD license.
</p>

</section>
109 changes: 109 additions & 0 deletions module/PageController/view/page-controller/participate/contributor-guide.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<?php
$this->layout()->active = 'participate';
$this->render('page-controller/participate/sidebar');
?>
<section class="participate">
<h1>Contributor Guide</h1>

<blockquote>
Have something you want to contribute back? Follow this helpful guide.
</blockquote>

<hr/>

<p>
In the spirit of open-source software, you can contribute as little or
as much as you like: bug reports, patches, full components or
documentation are all equally appreciated. The following section
describes contributing for Zend Framework version 2.
</p>

<p>
If you are wanting to contribute back to version 1 of the framework,
please read
<a href="/participate/contributor-guide-v1">"Zend Framework v1 Contributions"</a>.
</p>

<h2>So, You Want to File A Bug Report ... </h2>

<p>
So, you've found what you think might be a bug. Before you file it,
we'd ask that you ensure that what you have is indeed a bug, by doing
a little due-diligence (which also is good information to add to the
bug report):
</p>

<ul>
<li>See if your use case is covered in the <a href="/manual/2.0/en/index.html">manual</a></li>
<li>See if your use case is demonstrated by the <a href="/api/#">API docs.</a></li>
<li>Ask the <a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">mailing list</a> about your particular use case</li>
<li>Discuss your issue with someone in the IRC channel (see below)</li>
<li>Write a failing <a href="https://github.com/zendframework/zf2/tree/master/tests">test case</a></li>
</ul>

<p>
<img src="/images/participate/icon_issue.gif" align="right" />
You don't have to do all of those, but by doing a few of them, it helps
ensure that your bug report is complete and will get tended to. When
you're finally ready, go to our <a href="/issues/">issue tracker for
ZF2</a>.
</p>

<h2>So, You Want to Contribute Code ... </h2>

<p>
By and large, this framework is built and maintained by the community.
This means that process for submitting something back, be it a patch,
some documentation, or new feature requires some level of community
interactions. As you can see with the "Fork Me On Github" banner on
the top right of this page, we proudly host our code on
<a href="http://github.com/zendframework/zf2/">github.com</a>.
</p>

<p>
If you're not already familar with git or github, take a moment to
read through our <a href="https://github.com/zendframework/zf2/blob/master/README-GIT.md">README-GIT.md</a>.
Committing code is as easy as 1,2,3:
</p>

<ol>
<li><b>Fork</b> the <a href="https://github.com/zendframework/zf2">zf2 project</a></li>
<li><b>Commit</b> a change and <b>push</b> to your github fork.</li>
<li>Send us a <b>pull request</b> for your changes to be included.</li>
</ol>

<h2>So, You Want to Hang-out With A Great Community ... </h2>

<p>
ZFers, as they are called, hang out in a number of different places.
Offline hangouts:
</p>

<ul>
<li><a href="/participate/user-groups">User Groups With ZF Community Members</a></li>
<li><a href="/participate/conferences">Conferences With ZF Talks</a></li>
</ul>

<p>
Online, ZFers can be found (links to more information on how to connect):
</p>

<ul>
<li>
<a name="irc" href="/irc-info">In IRC:</a> on freenode, chat rooms:
<ul>
<li><a href="irc://irc.freenode.net/zftalk.2">#zftalk.2</a></li>
<li><a href="irc://irc.freenode.net/zftalk">#zftalk</a></li>
<li><a href="irc://irc.freenode.net/zftalk.community">#zftalk.community</a></li>
</ul>

</li>
<li>
<a name="mailing-list" href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">On the mailing list</a>
</li>
</ul>



</section>

10 changes: 5 additions & 5 deletions module/PageController/view/page-controller/participate/sidebar.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php $this->placeholder('sidebar')->captureStart(); ?>
<ul>
<li><a href="/community/guide">Contributors Guide</a></li>
<li><a href="/community/resources">Resources</a></li>
<li><a href="/community/groups">User Groups</a></li>
<li><a href="/community/blogs">Blogs</a></li>
<li><a href="/community/contributors">Contributors</a></li>
<li><a href="/participate/contributor-guide">Contributor Guide</a></li>
<li><a href="/participate/conferences">Conferences</a></li>
<li><a href="/participate/groups">User Groups</a></li>
<li><a href="/participate/blogs">Blogs</a></li>
<li><a href="/participate/contributors">Contributors</a></li>
</ul>
<?php $this->placeholder('sidebar')->captureEnd(); ?>

24 changes: 24 additions & 0 deletions module/PageController/view/page-controller/participate/user-groups.phtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php
$this->layout()->active = 'participate';
$this->render('page-controller/participate/sidebar');
?>
<section class="participate">
<h1>User Groups</h1>

<blockquote>
User Groups That Feature Zend Framework Content
</blockquote>

<hr/>

<p>
Does your user group often have discussions on Zend Framework version
1 or version 2? If so, get in <a href="/contact?focus=user-group">touch with us</a>
so that we can list your user group on this page.
</p>

<ul>
<li><a href="http://nolaphp.org">NOLA PHP</a>: PHP User Group In New Orleans</li>
</ul>

</section>
Loading

0 comments on commit 6467424

Please sign in to comment.