Merge pull request #66 from AmsterdamPHP/master

Merging new features into 1.0.x branch

app/Resources/less/amsterdamphp.less

@@ -466,3 +466,21 @@ footer {
         padding: 15px;
     }
 }
+
+.github-floater {
+    margin-top: 15px;
+    float:  left;
+    font-size: 1.8em;
+    background-color: @amsRed;
+    color:  #ffffff;
+    padding:  6px;
+    .border-right-radius(5px);
+    .box-shadow(2px 2px 3px #9b9b9b);
+
+    ul {
+        .list-unstyled;
+        margin-bottom: 0;
+
+        a { color:  #ffffff; }
+    }
+}

src/AmsterdamPHP/Bundle/SiteBundle/Controller/ContactController.php

@@ -17,10 +17,10 @@ class ContactController extends Controller
     /**
      * @Route("/", name="amsphp_contact")
      * @Route("/", name="amsphp_be_a_speaker")
-     * @Route("/", name="amsphp_be_a_sponsor")
+     * @Route("/sponsor-us", name="amsphp_be_a_sponsor", defaults={"sponsor"=true})
      * @Template()
      */
-    public function indexAction()
+    public function indexAction($sponsor = false)
     {
 
         $form = $this->createForm('amsterdamphp_site_contact_type');
@@ -39,7 +39,8 @@ public function indexAction()
         }
 
         return [
-            'form' => $form->createView()
+            'form'            => $form->createView(),
+            'sponsor_context' => $sponsor
         ];
     }
 }

src/AmsterdamPHP/Bundle/SiteBundle/Resources/views/Contact/_sponsor_us.html.twig

@@ -0,0 +1,22 @@
+<h2>Sponsor Us</h2>
+
+<div class="row">
+    <div class="col-lg-8 col-md-8">
+        <p>If you wish to sponsor AmsterdamPHP we have many options available to you. Please look over the list below and pick an option.</p>
+
+        <ul>
+            <li><strong>Sponsor a Meeting</strong> If you wish to host a meeting, get in touch using the form below.</li>
+            <li><strong>Sponsorship Packages</strong> We have many packages available, please get in touch with the form below and we will send you details.</li>
+            <li><strong>Donations</strong> For small values you can use the donate button and we will get in touch.</li>
+        </ul>
+    </div>
+    <div class="col-lg-4 col-md-4 text-center">
+        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+            <input type="hidden" name="cmd" value="_s-xclick">
+            <input type="hidden" name="hosted_button_id" value="9DP976L7R54SS">
+            <input type="image" src="https://www.paypalobjects.com/en_US/NL/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+            <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+        </form>
+    </div>
+</div>
+

src/AmsterdamPHP/Bundle/SiteBundle/Resources/views/Contact/index.html.twig

@@ -30,6 +30,10 @@
                 <div class="form">
                     {% include 'BraincraftedBootstrapBundle::flash.html.twig' %}
 
+                    {% if sponsor_context %}
+                        {% include "AmsterdamPHPSiteBundle:Contact:_sponsor_us.html.twig" %}
+                    {% endif %}
+
                     <h2>Contact us</h2>
 
                     {{ form(form, { 'style': 'horizontal' }) }}

src/AmsterdamPHP/Bundle/SiteBundle/Resources/views/layout.html.twig

@@ -1,10 +1,19 @@
 {% extends '::base.html.twig' %}
 
 {% block body %}
+    <div class="github-floater" data-spy="affix" data-offset-top="60" data-offset-bottom="200">
+        <ul>
+            <li><a href="https://github.com/AmsterdamPHP/amsterdamphp.nl" data-toggle="tooltip" data-placement="right" title="Fork this on GitHub"><i class="fa fa-github"></i></a></li>
+            <li><a href="https://github.com/AmsterdamPHP/amsterdamphp.nl/issues" data-toggle="tooltip" data-placement="right" title="Report bugs on GitHub"><i class="fa fa-bug"></i></a></li>
+        </ul>
+    </div>
+
     <div class="container">
         <header>
             {% include 'AmsterdamPHPSiteBundle::_header.html.twig' %}
         </header>
+
+
         <div class="content">
             {% block content %}{% endblock %}
         </div>
@@ -14,3 +23,11 @@
     </div>
 
 {% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+
+    <script>
+        $('[data-toggle="tooltip"]').tooltip();
+    </script>
+{% endblock %}